151 files changed, 26066 insertions, 1170 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
index 96d7f77b..1c86e38f 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
index 85768640..57c8ab25 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/META-INF/MANIFEST.MF b/Application/hu.bme.mit.inf.dslreasoner.application.ui/META-INF/MANIFEST.MF
index 38bb7dbd..2f2c83ef 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/META-INF/MANIFEST.MF
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/META-INF/MANIFEST.MF
@@ -22,7 +22,8 @@ Require-Bundle: hu.bme.mit.inf.dslreasoner.application,
  org.eclipse.xtext.builder,
  org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
  org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
- org.eclipse.viatra.addon.validation.runtime.ui;bundle-version="1.7.0"
+ org.eclipse.viatra.addon.validation.runtime.ui;bundle-version="1.7.0",
+ org.eclipse.viatra.query.patternlanguage.emf.ui;bundle-version="2.4.1"
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: hu.bme.mit.inf.dslreasoner.application.ui.quickfix,
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml b/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml
index 304df098..2895983e 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/plugin.xml
@@ -410,7 +410,7 @@
  <extension

        point="org.eclipse.ui.commands">

     <command

-          defaultHandler="hu.bme.mit.inf.dslreasoner.application.ui.execute.ExecuteScriptHandler"

+          defaultHandler="org.eclipse.viatra.query.patternlanguage.emf.ui.ReusablePatternLanguageExecutableExtensionFactory:hu.bme.mit.inf.dslreasoner.application.ui.execute.ExecuteScriptHandler"

           id="hu.bme.mit.inf.dslreasoner.application.ui.executescript"

           name="ExecuteScript">

     </command>

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/execute/ExecuteScriptHandler.java b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/execute/ExecuteScriptHandler.java
index 380410d0..8d9d07a6 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/execute/ExecuteScriptHandler.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/execute/ExecuteScriptHandler.java
@@ -12,14 +12,23 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;

 import org.eclipse.ui.handlers.HandlerUtil;

 

+import com.google.inject.Inject;

+import com.google.inject.Injector;

+

 import hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor;

 

 public class ExecuteScriptHandler extends AbstractHandler implements IHandler {

-

-        ScriptExecutor scriptExecutor = new ScriptExecutor(RuntimeConsoleBasedScriptConsole.FACTORY);

+        

+        ScriptExecutor scriptExecutor;

+        

+        @Inject

+        public void setInjector(Injector injector) {

+                scriptExecutor = new ScriptExecutor(RuntimeConsoleBasedScriptConsole.FACTORY, injector);

+        }

         

         @Override

         public Object execute(ExecutionEvent event) throws ExecutionException {

+                assert scriptExecutor != null : "Injector must be set";

                 ISelection selection = HandlerUtil.getCurrentSelection(event);

                 if(selection instanceof StructuredSelection) {

                         StructuredSelection structuredSelection = (StructuredSelection) selection;

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/Eclipse Application.launch b/Application/hu.bme.mit.inf.dslreasoner.application/Eclipse Application.launch
index 07eb0292..01894594 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/Eclipse Application.launch
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/Eclipse Application.launch
@@ -25,8 +25,1150 @@
     <booleanAttribute key="pde.generated.config" value="false"/>
     <stringAttribute key="pde.version" value="3.3"/>
     <stringAttribute key="product" value="org.eclipse.platform.ide"/>
-    <stringAttribute key="selected_target_plugins" value="com.eclipsesource.j2v8.linux_x86_64@default:default,com.github.mifmif.generex@default:default,com.google.gson@default:default,com.google.guava@default:default,com.google.inject.multibindings@default:false,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.jcraft.jzlib@default:default,com.sun.el@default:default,de.tuberlin.eecs.agg@default:default,dk.brics.automaton@default:default,guru.nidi.graphviz-java@default:default,javaewah@default:default,javax.activation@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml.bind@default:default,javax.xml@default:default,lpg.runtime.java@default:default,net.i2p.crypto.eddsa@default:default,org.antlr.runtime*3.2.0.v201101311130@default:default,org.antlr.runtime*4.3.0.v201502022030@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.constants@default:default,org.apache.batik.css*1.10.0.v20180703-1553@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.i18n@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.10.0.v20180703-1553@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec*1.10.0.v20180409-1845@default:default,org.apache.commons.codec*1.9.0.v20170208-1614@default:default,org.apache.commons.compress@default:default,org.apache.commons.exec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.commons.math3@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.felix.scr@1:true,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analyzers-common*6.1.0.v20161115-1612@default:default,org.apache.lucene.analyzers-common*7.5.0.v20181003-1532@default:default,org.apache.lucene.analyzers-smartcn@default:default,org.apache.lucene.core*6.1.0.v20170814-1820@default:default,org.apache.lucene.core*7.5.0.v20181003-1532@default:default,org.apache.lucene.queryparser@default:default,org.apache.sshd.core@default:default,org.apache.sshd.sftp@default:default,org.apache.ws.commons.util@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlgraphics@default:default,org.apache.xmlrpc@default:default,org.apiguardian@default:default,org.bouncycastle.bcpg@default:default,org.bouncycastle.bcpkix@default:default,org.bouncycastle.bcprov@default:default,org.eclipse.acceleo.annotations@default:default,org.eclipse.acceleo.query@default:default,org.eclipse.acceleo.ui.interpreter@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.collections@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions.supplier@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.tools.compat@default:default,org.eclipse.e4.tools.emf.editor3x@default:default,org.eclipse.e4.tools.emf.ui@default:default,org.eclipse.e4.tools.jdt.templates@default:default,org.eclipse.e4.tools.services@default:default,org.eclipse.e4.tools@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.swt.gtk@default:false,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.eef.common.ui@default:default,org.eclipse.eef.common@default:default,org.eclipse.eef.core.ext.widgets.reference@default:default,org.eclipse.eef.core@default:default,org.eclipse.eef.ext.widgets.reference@default:default,org.eclipse.eef.ide.ui.ext.widgets.reference@default:default,org.eclipse.eef.ide.ui.properties@default:default,org.eclipse.eef.ide.ui@default:default,org.eclipse.eef.properties.ui.legacy@default:default,org.eclipse.eef.properties.ui@default:default,org.eclipse.eef@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cdo.admin@default:default,org.eclipse.emf.cdo.common.db@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.compare@default:default,org.eclipse.emf.cdo.doc@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.examples.installer@default:default,org.eclipse.emf.cdo.explorer.ui@default:default,org.eclipse.emf.cdo.explorer@default:default,org.eclipse.emf.cdo.expressions.edit@default:default,org.eclipse.emf.cdo.expressions.editor@default:default,org.eclipse.emf.cdo.expressions@default:default,org.eclipse.emf.cdo.migrator@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.security.edit@default:default,org.eclipse.emf.cdo.security.editor@default:default,org.eclipse.emf.cdo.security.ui@default:default,org.eclipse.emf.cdo.security@default:default,org.eclipse.emf.cdo.server.admin@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server.ocl@default:default,org.eclipse.emf.cdo.server.product@default:default,org.eclipse.emf.cdo.server.security@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo.transfer.repository@default:default,org.eclipse.emf.cdo.transfer.ui@default:default,org.eclipse.emf.cdo.transfer.workspace.ui@default:default,org.eclipse.emf.cdo.transfer.workspace@default:default,org.eclipse.emf.cdo.transfer@default:default,org.eclipse.emf.cdo.ui.admin@default:default,org.eclipse.emf.cdo.ui.compare@default:default,org.eclipse.emf.cdo.ui.shared@default:default,org.eclipse.emf.cdo.ui.team@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.workspace@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diagram.edit@default:default,org.eclipse.emf.compare.diagram.ide.ui.sirius@default:default,org.eclipse.emf.compare.diagram.ide.ui@default:default,org.eclipse.emf.compare.diagram.sirius@default:default,org.eclipse.emf.compare.diagram@default:default,org.eclipse.emf.compare.doc@default:default,org.eclipse.emf.compare.edit@default:default,org.eclipse.emf.compare.egit.ui@default:default,org.eclipse.emf.compare.egit@default:default,org.eclipse.emf.compare.ide.ui@default:default,org.eclipse.emf.compare.ide@default:default,org.eclipse.emf.compare.rcp.ui@default:default,org.eclipse.emf.compare.rcp@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.ecoretools.design.ui@default:default,org.eclipse.emf.ecoretools.design@default:default,org.eclipse.emf.ecoretools.doc@default:default,org.eclipse.emf.ecoretools.ui@default:default,org.eclipse.emf.ecoretools@default:default,org.eclipse.emf.ecp.application.e3@default:default,org.eclipse.emf.ecp.application.e4@default:default,org.eclipse.emf.ecp.cdo.core@default:default,org.eclipse.emf.ecp.cdo.ui@default:default,org.eclipse.emf.ecp.common.ui@default:default,org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.core.emffilter@default:default,org.eclipse.emf.ecp.core@default:default,org.eclipse.emf.ecp.edit.swt@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.editor.e3@default:default,org.eclipse.emf.ecp.emf2web.json@default:default,org.eclipse.emf.ecp.emf2web.ui.json@default:default,org.eclipse.emf.ecp.emf2web.ui@default:default,org.eclipse.emf.ecp.emf2web@default:default,org.eclipse.emf.ecp.emfstore.core@default:default,org.eclipse.emf.ecp.emfstore.ui.e3@default:default,org.eclipse.emf.ecp.emfstore.ui.e4@default:default,org.eclipse.emf.ecp.emfstore.ui.search@default:default,org.eclipse.emf.ecp.emfstore.ui@default:default,org.eclipse.emf.ecp.explorereditorbridge@default:default,org.eclipse.emf.ecp.ide.editor.view.templatebridge@default:default,org.eclipse.emf.ecp.ide.editor.view@default:default,org.eclipse.emf.ecp.ide.editor.viewmodel@default:default,org.eclipse.emf.ecp.ide.util@default:default,org.eclipse.emf.ecp.ide.view.service@default:default,org.eclipse.emf.ecp.makeithappen.wizards@default:default,org.eclipse.emf.ecp.ui.e3@default:default,org.eclipse.emf.ecp.ui.e4@default:default,org.eclipse.emf.ecp.ui.rcp@default:default,org.eclipse.emf.ecp.ui.view.editor.controls@default:default,org.eclipse.emf.ecp.ui.view.linewrapper@default:default,org.eclipse.emf.ecp.ui.view.swt@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.ui@default:default,org.eclipse.emf.ecp.validation.connector@default:default,org.eclipse.emf.ecp.validation@default:default,org.eclipse.emf.ecp.view.categorization.model.edit@default:default,org.eclipse.emf.ecp.view.categorization.model@default:default,org.eclipse.emf.ecp.view.categorization.swt@default:default,org.eclipse.emf.ecp.view.compoundcontrol.model.edit@default:default,org.eclipse.emf.ecp.view.compoundcontrol.model@default:default,org.eclipse.emf.ecp.view.compoundcontrol.swt@default:default,org.eclipse.emf.ecp.view.compoundcontrol.tooling@default:default,org.eclipse.emf.ecp.view.context.locale@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.control.multireference@default:default,org.eclipse.emf.ecp.view.core.swt@default:default,org.eclipse.emf.ecp.view.custom.model.edit@default:default,org.eclipse.emf.ecp.view.custom.model@default:default,org.eclipse.emf.ecp.view.custom.ui.swt@default:default,org.eclipse.emf.ecp.view.edapt@default:default,org.eclipse.emf.ecp.view.group.model.edit@default:default,org.eclipse.emf.ecp.view.group.model@default:default,org.eclipse.emf.ecp.view.group.swt.collapsable@default:default,org.eclipse.emf.ecp.view.group.swt.embedded@default:default,org.eclipse.emf.ecp.view.group.ui.swt@default:default,org.eclipse.emf.ecp.view.horizontal.model.edit@default:default,org.eclipse.emf.ecp.view.horizontal.model@default:default,org.eclipse.emf.ecp.view.horizontal.ui.swt@default:default,org.eclipse.emf.ecp.view.indexdmr.model@default:default,org.eclipse.emf.ecp.view.label.model.edit@default:default,org.eclipse.emf.ecp.view.label.model@default:default,org.eclipse.emf.ecp.view.label.ui.swt@default:default,org.eclipse.emf.ecp.view.mappingdmr.model@default:default,org.eclipse.emf.ecp.view.migrator@default:default,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model.edapt@default:default,org.eclipse.emf.ecp.view.model.edit@default:default,org.eclipse.emf.ecp.view.model.editor@default:default,org.eclipse.emf.ecp.view.model.preview.common@default:default,org.eclipse.emf.ecp.view.model.preview.e3@default:default,org.eclipse.emf.ecp.view.model.project.installer@default:default,org.eclipse.emf.ecp.view.model.provider.generator@default:default,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.rule.model.edit@default:default,org.eclipse.emf.ecp.view.rule.model@default:default,org.eclipse.emf.ecp.view.rule@default:default,org.eclipse.emf.ecp.view.stack.model.edit@default:default,org.eclipse.emf.ecp.view.stack.model@default:default,org.eclipse.emf.ecp.view.stack.ui.swt@default:default,org.eclipse.emf.ecp.view.stack.viewmodel@default:default,org.eclipse.emf.ecp.view.swt.layout@default:default,org.eclipse.emf.ecp.view.table.columnservice@default:default,org.eclipse.emf.ecp.view.table.edapt@default:default,org.eclipse.emf.ecp.view.table.model.edit@default:default,org.eclipse.emf.ecp.view.table.model@default:default,org.eclipse.emf.ecp.view.table.ui.swt@default:default,org.eclipse.emf.ecp.view.template.annotation.model.edit@default:default,org.eclipse.emf.ecp.view.template.annotation.model@default:default,org.eclipse.emf.ecp.view.template.model.edit@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emf.ecp.view.template.service@default:default,org.eclipse.emf.ecp.view.template.tooling@default:default,org.eclipse.emf.ecp.view.treemasterdetail.model.edit@default:default,org.eclipse.emf.ecp.view.treemasterdetail.model@default:default,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt@default:default,org.eclipse.emf.ecp.view.treemasterdetail.validation@default:default,org.eclipse.emf.ecp.view.unset@default:default,org.eclipse.emf.ecp.view.util.swt@default:default,org.eclipse.emf.ecp.view.validation@default:default,org.eclipse.emf.ecp.view.vertical.model.edit@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emf.ecp.view.vertical.ui.swt@default:default,org.eclipse.emf.ecp.view.viewproxy.model.edit@default:default,org.eclipse.emf.ecp.view.viewproxy.model@default:default,org.eclipse.emf.ecp.view.workspace.migrator@default:default,org.eclipse.emf.ecp.workspace.core@default:default,org.eclipse.emf.ecp.workspace.ui@default:default,org.eclipse.emf.edapt.common@default:default,org.eclipse.emf.edapt.declaration@default:default,org.eclipse.emf.edapt.history@default:default,org.eclipse.emf.edapt.migration@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.emfstore.client.model.edit@default:default,org.eclipse.emf.emfstore.client.ui.rcp@default:false,org.eclipse.emf.emfstore.client.ui@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model.edit@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.example.installer@default:default,org.eclipse.emf.emfstore.examplemodel.edit@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.server.model.edit@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.henshin.diagram@default:default,org.eclipse.emf.henshin.edit@default:default,org.eclipse.emf.henshin.editor@default:default,org.eclipse.emf.henshin.examples@default:default,org.eclipse.emf.henshin.giraph@default:default,org.eclipse.emf.henshin.interpreter.ui@default:default,org.eclipse.emf.henshin.interpreter@default:default,org.eclipse.emf.henshin.model@default:default,org.eclipse.emf.henshin.multicda.cda@default:default,org.eclipse.emf.henshin.multicda.cpa.ui@default:default,org.eclipse.emf.henshin.multicda.cpa@default:default,org.eclipse.emf.henshin.rulegen.ui@default:default,org.eclipse.emf.henshin.rulegen@default:default,org.eclipse.emf.henshin.statespace.explorer@default:default,org.eclipse.emf.henshin.statespace.external@default:default,org.eclipse.emf.henshin.statespace@default:default,org.eclipse.emf.henshin.text.ide@default:default,org.eclipse.emf.henshin.text.transformation@default:default,org.eclipse.emf.henshin.text.ui@default:default,org.eclipse.emf.henshin.text@default:default,org.eclipse.emf.henshin.trace@default:default,org.eclipse.emf.henshin.wrap@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping.xsd2ecore.editor@default:default,org.eclipse.emf.mapping.xsd2ecore@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ide@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch.ui@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.parsley.cdo.common@default:default,org.eclipse.emf.parsley.cdo@default:default,org.eclipse.emf.parsley.common@default:default,org.eclipse.emf.parsley.doc@default:default,org.eclipse.emf.parsley.dsl.additional.builder@default:default,org.eclipse.emf.parsley.dsl.ide@default:default,org.eclipse.emf.parsley.dsl.ui@default:default,org.eclipse.emf.parsley.dsl@default:default,org.eclipse.emf.parsley.editors.common@default:default,org.eclipse.emf.parsley.editors@default:default,org.eclipse.emf.parsley.generator.common@default:default,org.eclipse.emf.parsley.junit4@default:default,org.eclipse.emf.parsley.runtime.common@default:default,org.eclipse.emf.parsley.runtime@default:default,org.eclipse.emf.parsley.ui.examples@default:default,org.eclipse.emf.parsley.views.common@default:default,org.eclipse.emf.parsley.views@default:default,org.eclipse.emf.parsley.wizards@default:default,org.eclipse.emf.parsley@default:default,org.eclipse.emf.query.doc@default:default,org.eclipse.emf.query.examples@default:default,org.eclipse.emf.query.ocl@default:default,org.eclipse.emf.query@default:default,org.eclipse.emf.transaction.doc@default:default,org.eclipse.emf.transaction.examples@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.doc@default:default,org.eclipse.emf.validation.examples@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui.ide@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.doc@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.emfforms.coffee.wizards@default:default,org.eclipse.emfforms.common.validation@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.bazaar@default:default,org.eclipse.emfforms.core.services.databinding.featurepath@default:default,org.eclipse.emfforms.core.services.databinding.index@default:default,org.eclipse.emfforms.core.services.databinding.mapping@default:default,org.eclipse.emfforms.core.services.domainexpander.default@default:default,org.eclipse.emfforms.core.services.domainexpander.index@default:default,org.eclipse.emfforms.core.services.domainexpander.mapping@default:default,org.eclipse.emfforms.core.services.domainexpander.table@default:default,org.eclipse.emfforms.core.services.editsupport@default:default,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services.legacy@default:default,org.eclipse.emfforms.core.services.locale.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.table.panel@default:default,org.eclipse.emfforms.core.services.mappingprovider.table@default:default,org.eclipse.emfforms.core.services.segments.featurepath@default:default,org.eclipse.emfforms.core.services.segments.index@default:default,org.eclipse.emfforms.core.services.segments.mapping@default:default,org.eclipse.emfforms.core.services.segments.multi@default:default,org.eclipse.emfforms.core.services.segments@default:default,org.eclipse.emfforms.core.services.structuralchange.default@default:default,org.eclipse.emfforms.core.services.structuralchange.index@default:default,org.eclipse.emfforms.core.services.structuralchange.mapping@default:default,org.eclipse.emfforms.core.services.structuralchange.table@default:default,org.eclipse.emfforms.core.services.structuralchange@default:default,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.editor.ecore@default:default,org.eclipse.emfforms.editor.genmodel@default:default,org.eclipse.emfforms.editor@default:default,org.eclipse.emfforms.example.common.wizards@default:default,org.eclipse.emfforms.ide.builder@default:default,org.eclipse.emfforms.ide.viewtemplate.builder@default:default,org.eclipse.emfforms.localization@default:default,org.eclipse.emfforms.setup.base@default:default,org.eclipse.emfforms.swt.control.multiattribute@default:default,org.eclipse.emfforms.swt.core.di.extension@default:default,org.eclipse.emfforms.swt.core.di@default:default,org.eclipse.emfforms.swt.core.plugin@default:default,org.eclipse.emfforms.swt.core@default:default,org.eclipse.emfforms.swt.table@default:default,org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default@default:default,org.eclipse.emfforms.swt.treemasterdetail@default:default,org.eclipse.emfforms.view.annotation.model.edit@default:default,org.eclipse.emfforms.view.annotation.model@default:default,org.eclipse.emfforms.view.indexsegment.model@default:default,org.eclipse.emfforms.view.mappingsegment.model@default:default,org.eclipse.emfforms.view.model.localization@default:default,org.eclipse.emfforms.view.multisegment.model.edit@default:default,org.eclipse.emfforms.view.multisegment.model@default:default,org.eclipse.epp.logging.aeri.core@default:default,org.eclipse.epp.logging.aeri.ide@default:default,org.eclipse.epp.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui.css@default:default,org.eclipse.epp.mpc.ui@default:default,org.eclipse.epp.package.common@default:default,org.eclipse.epp.package.modeling@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.linux.x86_64@default:false,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.fx.osgi@default:false,org.eclipse.gef.common@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gef.fx.swt@default:default,org.eclipse.gef.fx@default:default,org.eclipse.gef.geometry.convert.fx@default:default,org.eclipse.gef.geometry@default:default,org.eclipse.gef.graph@default:default,org.eclipse.gef.layout@default:default,org.eclipse.gef.mvc.fx@default:default,org.eclipse.gef.zest.fx.jface@default:default,org.eclipse.gef.zest.fx@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.examples.runtime.diagram.geoshapes@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model.edit@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model.editor@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model@default:default,org.eclipse.gmf.examples.runtime.diagram.logic@default:default,org.eclipse.gmf.examples.runtime.ui.pde@default:default,org.eclipse.gmf.examples.runtime@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing.win32@default:false,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd.ide@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.dnd@default:default,org.eclipse.gmf.runtime.diagram.ui.geoshapes@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.type.ui@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation.providers@default:default,org.eclipse.gmf.runtime.notation.sdk@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.runtime.sdk@default:default,org.eclipse.gmf@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.400.v20180921-1416@default:default,org.eclipse.jdt.annotation*2.2.200.v20180921-1416@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit5.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit.archive@default:default,org.eclipse.jgit.ssh.apache@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.launching@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.workspace.cli@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.mylyn.bugzilla.core@default:default,org.eclipse.mylyn.bugzilla.ide@default:default,org.eclipse.mylyn.bugzilla.ui@default:default,org.eclipse.mylyn.commons.core@default:default,org.eclipse.mylyn.commons.identity.core@default:default,org.eclipse.mylyn.commons.net@default:default,org.eclipse.mylyn.commons.notifications.core@default:default,org.eclipse.mylyn.commons.notifications.feed@default:default,org.eclipse.mylyn.commons.notifications.ui@default:default,org.eclipse.mylyn.commons.repositories.core@default:default,org.eclipse.mylyn.commons.repositories.ui@default:default,org.eclipse.mylyn.commons.screenshots@default:default,org.eclipse.mylyn.commons.ui@default:default,org.eclipse.mylyn.commons.workbench@default:default,org.eclipse.mylyn.commons.xmlrpc@default:default,org.eclipse.mylyn.context.core@default:default,org.eclipse.mylyn.context.tasks.ui@default:default,org.eclipse.mylyn.context.ui@default:default,org.eclipse.mylyn.debug.ui@default:default,org.eclipse.mylyn.discovery.core@default:default,org.eclipse.mylyn.discovery.ui@default:default,org.eclipse.mylyn.help.ui@default:default,org.eclipse.mylyn.ide.ant@default:default,org.eclipse.mylyn.ide.ui@default:default,org.eclipse.mylyn.java.tasks@default:default,org.eclipse.mylyn.java.ui@default:default,org.eclipse.mylyn.monitor.core@default:default,org.eclipse.mylyn.monitor.ui@default:default,org.eclipse.mylyn.pde.ui@default:default,org.eclipse.mylyn.resources.ui@default:default,org.eclipse.mylyn.tasks.bugs@default:default,org.eclipse.mylyn.tasks.core@default:default,org.eclipse.mylyn.tasks.index.core@default:default,org.eclipse.mylyn.tasks.index.ui@default:default,org.eclipse.mylyn.tasks.search@default:default,org.eclipse.mylyn.tasks.ui@default:default,org.eclipse.mylyn.team.ui@default:default,org.eclipse.mylyn.wikitext.ant@default:default,org.eclipse.mylyn.wikitext.asciidoc.ui@default:default,org.eclipse.mylyn.wikitext.asciidoc@default:default,org.eclipse.mylyn.wikitext.confluence.ui@default:default,org.eclipse.mylyn.wikitext.confluence@default:default,org.eclipse.mylyn.wikitext.context.ui@default:default,org.eclipse.mylyn.wikitext.help.ui@default:default,org.eclipse.mylyn.wikitext.html@default:default,org.eclipse.mylyn.wikitext.markdown.ui@default:default,org.eclipse.mylyn.wikitext.markdown@default:default,org.eclipse.mylyn.wikitext.mediawiki.ui@default:default,org.eclipse.mylyn.wikitext.mediawiki@default:default,org.eclipse.mylyn.wikitext.osgi@default:default,org.eclipse.mylyn.wikitext.tasks.ui@default:default,org.eclipse.mylyn.wikitext.textile.ui@default:default,org.eclipse.mylyn.wikitext.textile@default:default,org.eclipse.mylyn.wikitext.tracwiki.ui@default:default,org.eclipse.mylyn.wikitext.tracwiki@default:default,org.eclipse.mylyn.wikitext.twiki.ui@default:default,org.eclipse.mylyn.wikitext.twiki@default:default,org.eclipse.mylyn.wikitext.ui@default:default,org.eclipse.mylyn.wikitext@default:default,org.eclipse.nebula.widgets.tablecombo@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db.jdbc@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.debug@default:default,org.eclipse.net4j.examples.installer@default:default,org.eclipse.net4j.http.common@default:default,org.eclipse.net4j.http.server@default:default,org.eclipse.net4j.http@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.ui.shared@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.doc@default:default,org.eclipse.ocl.ecore.edit@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.edit@default:default,org.eclipse.ocl.ui@default:default,org.eclipse.ocl.uml.edit@default:default,org.eclipse.ocl.uml.ui@default:default,org.eclipse.ocl.uml@default:default,org.eclipse.ocl@default:default,org.eclipse.oomph.base.edit@default:default,org.eclipse.oomph.base@default:default,org.eclipse.oomph.extractor.lib@default:default,org.eclipse.oomph.jreinfo.ui@default:default,org.eclipse.oomph.jreinfo@default:default,org.eclipse.oomph.p2.core@default:default,org.eclipse.oomph.p2.doc@default:default,org.eclipse.oomph.p2.edit@default:default,org.eclipse.oomph.p2.ui@default:default,org.eclipse.oomph.p2@default:default,org.eclipse.oomph.predicates.edit@default:default,org.eclipse.oomph.predicates@default:default,org.eclipse.oomph.preferences@default:default,org.eclipse.oomph.resources.edit@default:default,org.eclipse.oomph.resources@default:default,org.eclipse.oomph.setup.core@default:default,org.eclipse.oomph.setup.doc@default:default,org.eclipse.oomph.setup.edit@default:default,org.eclipse.oomph.setup.editor@default:default,org.eclipse.oomph.setup.p2.edit@default:default,org.eclipse.oomph.setup.p2@default:default,org.eclipse.oomph.setup.sync@default:default,org.eclipse.oomph.setup.ui.questionnaire@default:default,org.eclipse.oomph.setup.ui@default:default,org.eclipse.oomph.setup@default:default,org.eclipse.oomph.ui@default:default,org.eclipse.oomph.util@default:default,org.eclipse.oomph.workingsets.edit@default:default,org.eclipse.oomph.workingsets.editor@default:default,org.eclipse.oomph.workingsets@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.papyrus.infra.gmfdiag.tooling.runtime@default:default,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.annotations@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.lib@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.ds1_2.lib@default:default,org.eclipse.pde.genericeditor.extension@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.sirius.common.acceleo.aql@default:default,org.eclipse.sirius.common.interpreter@default:default,org.eclipse.sirius.common.ui.ext@default:default,org.eclipse.sirius.common.ui@default:default,org.eclipse.sirius.common.xtext@default:default,org.eclipse.sirius.common@default:default,org.eclipse.sirius.diagram.formatdata@default:default,org.eclipse.sirius.diagram.layoutdata@default:default,org.eclipse.sirius.diagram.sequence.edit@default:default,org.eclipse.sirius.diagram.sequence.ui@default:default,org.eclipse.sirius.diagram.sequence@default:default,org.eclipse.sirius.diagram.ui.ext@default:default,org.eclipse.sirius.diagram.ui@default:default,org.eclipse.sirius.diagram@default:default,org.eclipse.sirius.ecore.extender@default:default,org.eclipse.sirius.editor.properties.ext.widgets.reference@default:default,org.eclipse.sirius.editor.properties@default:default,org.eclipse.sirius.editor@default:default,org.eclipse.sirius.ext.base@default:default,org.eclipse.sirius.ext.draw2d@default:default,org.eclipse.sirius.ext.e3.ui@default:default,org.eclipse.sirius.ext.e3@default:default,org.eclipse.sirius.ext.emf.edit@default:default,org.eclipse.sirius.ext.emf.tx@default:default,org.eclipse.sirius.ext.emf.ui@default:default,org.eclipse.sirius.ext.emf@default:default,org.eclipse.sirius.ext.gef@default:default,org.eclipse.sirius.ext.gmf.notation@default:default,org.eclipse.sirius.ext.gmf.runtime@default:default,org.eclipse.sirius.ext.ide@default:default,org.eclipse.sirius.ext.jface@default:default,org.eclipse.sirius.ext.swt@default:default,org.eclipse.sirius.interpreter@default:default,org.eclipse.sirius.properties.core@default:default,org.eclipse.sirius.properties.defaultrules@default:default,org.eclipse.sirius.properties.edit@default:default,org.eclipse.sirius.properties.ext.widgets.reference.edit@default:default,org.eclipse.sirius.properties.ext.widgets.reference@default:default,org.eclipse.sirius.properties@default:default,org.eclipse.sirius.synchronizer@default:default,org.eclipse.sirius.table.ui.ext@default:default,org.eclipse.sirius.table.ui@default:default,org.eclipse.sirius.table@default:default,org.eclipse.sirius.tree.ui.ext@default:default,org.eclipse.sirius.tree.ui@default:default,org.eclipse.sirius.tree@default:default,org.eclipse.sirius.ui.editor@default:default,org.eclipse.sirius.ui.ext@default:default,org.eclipse.sirius.ui.properties.ext.widgets.reference@default:default,org.eclipse.sirius.ui.properties@default:default,org.eclipse.sirius.ui@default:default,org.eclipse.sirius@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.genericeditor.diff.extension@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.tips.core@default:default,org.eclipse.tips.ide@default:default,org.eclipse.tips.json@default:default,org.eclipse.tips.ui@default:default,org.eclipse.tools.layout.spy@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.genericeditor@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.ant@default:default,org.eclipse.uml2.codegen.ecore.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.doc@default:default,org.eclipse.uml2.examples.uml.ui@default:default,org.eclipse.uml2.examples@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.ecore.exporter@default:default,org.eclipse.uml2.uml.ecore.importer@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.standard@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml.validation@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.uml2@default:default,org.eclipse.update.configurator@3:true,org.eclipse.urischeme@default:default,org.eclipse.userstorage.oauth@default:default,org.eclipse.userstorage.ui@default:default,org.eclipse.userstorage@default:default,org.eclipse.viatra.addon.databinding.runtime.validation@default:false,org.eclipse.viatra.addon.databinding.runtime@default:default,org.eclipse.viatra.addon.querybasedfeatures.runtime.validation@default:false,org.eclipse.viatra.addon.querybasedfeatures.runtime@default:default,org.eclipse.viatra.addon.querybasedfeatures.tooling@default:default,org.eclipse.viatra.addon.validation.core@default:default,org.eclipse.viatra.addon.validation.runtime.ui@default:default,org.eclipse.viatra.addon.validation.runtime.validation@default:false,org.eclipse.viatra.addon.validation.runtime@default:default,org.eclipse.viatra.addon.validation.tooling@default:default,org.eclipse.viatra.addon.viewers.runtime.validation@default:false,org.eclipse.viatra.addon.viewers.runtime.zest@default:default,org.eclipse.viatra.addon.viewers.runtime@default:default,org.eclipse.viatra.addon.viewers.tooling.ui.zest@default:default,org.eclipse.viatra.addon.viewers.tooling.ui@default:default,org.eclipse.viatra.documentation.help@default:default,org.eclipse.viatra.dse.genetic@default:default,org.eclipse.viatra.dse@default:default,org.eclipse.viatra.integration.zest@default:default,org.eclipse.viatra.query.patternlanguage.emf.ide@default:default,org.eclipse.viatra.query.patternlanguage.emf.ui@default:default,org.eclipse.viatra.query.patternlanguage.emf@default:default,org.eclipse.viatra.query.runtime.base.itc@default:default,org.eclipse.viatra.query.runtime.base@default:default,org.eclipse.viatra.query.runtime.localsearch@default:default,org.eclipse.viatra.query.runtime.matchers@default:default,org.eclipse.viatra.query.runtime.rete.recipes@default:default,org.eclipse.viatra.query.runtime.rete@default:default,org.eclipse.viatra.query.runtime.ui@default:default,org.eclipse.viatra.query.runtime@default:default,org.eclipse.viatra.query.testing.core@default:default,org.eclipse.viatra.query.testing.snapshot@default:default,org.eclipse.viatra.query.testing.ui@default:default,org.eclipse.viatra.query.tooling.core@default:default,org.eclipse.viatra.query.tooling.debug@default:default,org.eclipse.viatra.query.tooling.generator.model.ui@default:default,org.eclipse.viatra.query.tooling.generator.model@default:default,org.eclipse.viatra.query.tooling.localsearch.ui@default:default,org.eclipse.viatra.query.tooling.ui.retevis@default:default,org.eclipse.viatra.query.tooling.ui@default:default,org.eclipse.viatra.transformation.evm.transactions@default:default,org.eclipse.viatra.transformation.evm@default:default,org.eclipse.viatra.transformation.runtime.debug@default:default,org.eclipse.viatra.transformation.runtime.emf@default:default,org.eclipse.viatra.transformation.runtime.tracer@default:default,org.eclipse.viatra.transformation.runtime.transformationtrace@default:default,org.eclipse.viatra.transformation.tooling.debug.ui@default:default,org.eclipse.viatra.transformation.tooling.debug@default:default,org.eclipse.viatra.transformation.ui@default:default,org.eclipse.viatra.transformation.views@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd.cheatsheets@default:default,org.eclipse.xsd.doc@default:default,org.eclipse.xsd.ecore.converter@default:default,org.eclipse.xsd.ecore.exporter@default:default,org.eclipse.xsd.ecore.importer@default:default,org.eclipse.xsd.edit@default:default,org.eclipse.xsd.editor@default:default,org.eclipse.xsd.example.installer@default:default,org.eclipse.xsd.mapping.editor@default:default,org.eclipse.xsd.mapping@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide.common@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.m2e@default:default,org.eclipse.xtend.standalone@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder.standalone@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.idea.generator@default:default,org.eclipse.xtext.java@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.m2e@default:default,org.eclipse.xtext.purexbase.ide@default:default,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.testing@default:default,org.eclipse.xtext.ui.codemining@default:default,org.eclipse.xtext.ui.codetemplates.ide@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui.testing@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.ide@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.testing@default:default,org.eclipse.xtext.xbase.ui.testing@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.generator@default:default,org.eclipse.xtext.xtext.ide@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext.xtext.wizard@default:default,org.eclipse.xtext@default:default,org.h2@default:default,org.hamcrest.core@default:default,org.jfree.jcommon@default:default,org.jsoup@default:default,org.junit.jupiter.api@default:default,org.junit.jupiter.engine@default:default,org.junit.jupiter.migrationsupport@default:default,org.junit.jupiter.params@default:default,org.junit.platform.commons@default:default,org.junit.platform.engine@default:default,org.junit.platform.launcher@default:default,org.junit.platform.runner@default:default,org.junit.platform.suite.api@default:default,org.junit.vintage.engine@default:default,org.junit@default:default,org.moeaframework@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.opentest4j@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.sidiff.common.emf.extensions@default:default,org.sidiff.common.emf@default:default,org.sidiff.common.henshin@default:default,org.sidiff.common@default:default,org.sidiff.serge@default:default,org.silift.common.util@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:false,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,uk.ac.kcl.inf.mdeoptimiser.interfaces.cli@default:default,uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui@default:default,uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext@default:default,uk.ac.kcl.inf.mdeoptimiser.libraries.core@default:default,uk.ac.kcl.inf.mdeoptimiser.libraries.rulegen@default:default"/>
-    <stringAttribute key="selected_workspace_plugins" value="com.microsoft.z3@default:true,hu.bme.mit.inf.dlsreasoner.alloy.reasoner@default:default,hu.bme.mit.inf.dslreasoner.alloy.language.ui@default:default,hu.bme.mit.inf.dslreasoner.alloy.language@default:default,hu.bme.mit.inf.dslreasoner.application.ide@default:default,hu.bme.mit.inf.dslreasoner.application.ui@default:default,hu.bme.mit.inf.dslreasoner.application@default:default,hu.bme.mit.inf.dslreasoner.domains.cps.validation@default:default,hu.bme.mit.inf.dslreasoner.domains.cps@default:default,hu.bme.mit.inf.dslreasoner.domains.satellite.validation@default:default,hu.bme.mit.inf.dslreasoner.domains.satellite@default:default,hu.bme.mit.inf.dslreasoner.ecore2logic@default:default,hu.bme.mit.inf.dslreasoner.faulttree.components.ide@default:default,hu.bme.mit.inf.dslreasoner.faulttree.components.ui@default:default,hu.bme.mit.inf.dslreasoner.faulttree.components@default:default,hu.bme.mit.inf.dslreasoner.faulttree.model@default:default,hu.bme.mit.inf.dslreasoner.faulttree.transformation@default:default,hu.bme.mit.inf.dslreasoner.faulttree.ui@default:default,hu.bme.mit.inf.dslreasoner.logic.model.validation@default:default,hu.bme.mit.inf.dslreasoner.logic.model@default:default,hu.bme.mit.inf.dslreasoner.logic2ecore@default:default,hu.bme.mit.inf.dslreasoner.smt.language.ui@default:default,hu.bme.mit.inf.dslreasoner.smt.language@default:default,hu.bme.mit.inf.dslreasoner.smt.reasoner@default:default,hu.bme.mit.inf.dslreasoner.viatra2logic@default:default,hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.tests@default:default,hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery@default:default,hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage@default:default,hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner@default:default,hu.bme.mit.inf.dslreasoner.visualisation@default:default"/>
+    <setAttribute key="selected_target_bundles">
+        <setEntry value="com.eclipsesource.j2v8.linux_x86_64@default:default"/>
+        <setEntry value="com.github.mifmif.generex@default:default"/>
+        <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.guava@default:default"/>
+        <setEntry value="com.google.inject.multibindings@default:false"/>
+        <setEntry value="com.google.inject@default:default"/>
+        <setEntry value="com.ibm.icu@default:default"/>
+        <setEntry value="com.jcraft.jsch@default:default"/>
+        <setEntry value="com.jcraft.jzlib@default:default"/>
+        <setEntry value="com.sun.el@default:default"/>
+        <setEntry value="de.tuberlin.eecs.agg@default:default"/>
+        <setEntry value="dk.brics.automaton@default:default"/>
+        <setEntry value="guru.nidi.graphviz-java@default:default"/>
+        <setEntry value="javaewah@default:default"/>
+        <setEntry value="javax.activation@default:default"/>
+        <setEntry value="javax.annotation@default:default"/>
+        <setEntry value="javax.el@default:default"/>
+        <setEntry value="javax.inject@default:default"/>
+        <setEntry value="javax.servlet.jsp@default:default"/>
+        <setEntry value="javax.servlet@default:default"/>
+        <setEntry value="javax.xml.bind@default:default"/>
+        <setEntry value="javax.xml@default:default"/>
+        <setEntry value="lpg.runtime.java@default:default"/>
+        <setEntry value="net.i2p.crypto.eddsa@default:default"/>
+        <setEntry value="org.antlr.runtime*3.2.0.v201101311130@default:default"/>
+        <setEntry value="org.antlr.runtime*4.3.0.v201502022030@default:default"/>
+        <setEntry value="org.apache.ant@default:default"/>
+        <setEntry value="org.apache.batik.bridge@default:default"/>
+        <setEntry value="org.apache.batik.constants@default:default"/>
+        <setEntry value="org.apache.batik.css*1.10.0.v20180703-1553@default:default"/>
+        <setEntry value="org.apache.batik.css*1.6.0.v201011041432@default:default"/>
+        <setEntry value="org.apache.batik.dom.svg@default:default"/>
+        <setEntry value="org.apache.batik.dom@default:default"/>
+        <setEntry value="org.apache.batik.ext.awt@default:default"/>
+        <setEntry value="org.apache.batik.i18n@default:default"/>
+        <setEntry value="org.apache.batik.parser@default:default"/>
+        <setEntry value="org.apache.batik.pdf@default:default"/>
+        <setEntry value="org.apache.batik.svggen@default:default"/>
+        <setEntry value="org.apache.batik.transcoder@default:default"/>
+        <setEntry value="org.apache.batik.util*1.10.0.v20180703-1553@default:default"/>
+        <setEntry value="org.apache.batik.util*1.6.0.v201011041432@default:default"/>
+        <setEntry value="org.apache.batik.util.gui@default:default"/>
+        <setEntry value="org.apache.batik.xml@default:default"/>
+        <setEntry value="org.apache.commons.cli@default:default"/>
+        <setEntry value="org.apache.commons.codec*1.10.0.v20180409-1845@default:default"/>
+        <setEntry value="org.apache.commons.codec*1.9.0.v20170208-1614@default:default"/>
+        <setEntry value="org.apache.commons.compress@default:default"/>
+        <setEntry value="org.apache.commons.exec@default:default"/>
+        <setEntry value="org.apache.commons.httpclient@default:default"/>
+        <setEntry value="org.apache.commons.io@default:default"/>
+        <setEntry value="org.apache.commons.jxpath@default:default"/>
+        <setEntry value="org.apache.commons.lang3@default:default"/>
+        <setEntry value="org.apache.commons.lang@default:default"/>
+        <setEntry value="org.apache.commons.logging*1.1.1.v201101211721@default:default"/>
+        <setEntry value="org.apache.commons.logging*1.2.0.v20180409-1502@default:default"/>
+        <setEntry value="org.apache.commons.math3@default:default"/>
+        <setEntry value="org.apache.felix.gogo.command@default:default"/>
+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
+        <setEntry value="org.apache.felix.gogo.shell@default:default"/>
+        <setEntry value="org.apache.felix.scr@1:true"/>
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
+        <setEntry value="org.apache.jasper.glassfish@default:default"/>
+        <setEntry value="org.apache.log4j@default:default"/>
+        <setEntry value="org.apache.lucene.analyzers-common*6.1.0.v20161115-1612@default:default"/>
+        <setEntry value="org.apache.lucene.analyzers-common*7.5.0.v20181003-1532@default:default"/>
+        <setEntry value="org.apache.lucene.analyzers-smartcn@default:default"/>
+        <setEntry value="org.apache.lucene.core*6.1.0.v20170814-1820@default:default"/>
+        <setEntry value="org.apache.lucene.core*7.5.0.v20181003-1532@default:default"/>
+        <setEntry value="org.apache.lucene.queryparser@default:default"/>
+        <setEntry value="org.apache.sshd.core@default:default"/>
+        <setEntry value="org.apache.sshd.sftp@default:default"/>
+        <setEntry value="org.apache.ws.commons.util@default:default"/>
+        <setEntry value="org.apache.xerces@default:default"/>
+        <setEntry value="org.apache.xml.resolver@default:default"/>
+        <setEntry value="org.apache.xml.serializer@default:default"/>
+        <setEntry value="org.apache.xmlgraphics@default:default"/>
+        <setEntry value="org.apache.xmlrpc@default:default"/>
+        <setEntry value="org.apiguardian@default:default"/>
+        <setEntry value="org.bouncycastle.bcpg@default:default"/>
+        <setEntry value="org.bouncycastle.bcpkix@default:default"/>
+        <setEntry value="org.bouncycastle.bcprov@default:default"/>
+        <setEntry value="org.eclipse.acceleo.annotations@default:default"/>
+        <setEntry value="org.eclipse.acceleo.query@default:default"/>
+        <setEntry value="org.eclipse.acceleo.ui.interpreter@default:default"/>
+        <setEntry value="org.eclipse.ant.core@default:default"/>
+        <setEntry value="org.eclipse.ant.launching@default:default"/>
+        <setEntry value="org.eclipse.ant.ui@default:default"/>
+        <setEntry value="org.eclipse.collections@default:default"/>
+        <setEntry value="org.eclipse.compare.core@default:default"/>
+        <setEntry value="org.eclipse.compare@default:default"/>
+        <setEntry value="org.eclipse.core.commands@default:default"/>
+        <setEntry value="org.eclipse.core.contenttype@default:default"/>
+        <setEntry value="org.eclipse.core.databinding.beans@default:default"/>
+        <setEntry value="org.eclipse.core.databinding.observable@default:default"/>
+        <setEntry value="org.eclipse.core.databinding.property@default:default"/>
+        <setEntry value="org.eclipse.core.databinding@default:default"/>
+        <setEntry value="org.eclipse.core.expressions@default:default"/>
+        <setEntry value="org.eclipse.core.externaltools@default:default"/>
+        <setEntry value="org.eclipse.core.filebuffers@default:default"/>
+        <setEntry value="org.eclipse.core.filesystem.linux.x86_64@default:false"/>
+        <setEntry value="org.eclipse.core.filesystem@default:default"/>
+        <setEntry value="org.eclipse.core.jobs@default:default"/>
+        <setEntry value="org.eclipse.core.net.linux.x86_64@default:false"/>
+        <setEntry value="org.eclipse.core.net@default:default"/>
+        <setEntry value="org.eclipse.core.resources@default:default"/>
+        <setEntry value="org.eclipse.core.runtime@default:true"/>
+        <setEntry value="org.eclipse.core.variables@default:default"/>
+        <setEntry value="org.eclipse.debug.core@default:default"/>
+        <setEntry value="org.eclipse.debug.ui@default:default"/>
+        <setEntry value="org.eclipse.draw2d.doc.isv@default:default"/>
+        <setEntry value="org.eclipse.draw2d@default:default"/>
+        <setEntry value="org.eclipse.e4.core.commands@default:default"/>
+        <setEntry value="org.eclipse.e4.core.contexts@default:default"/>
+        <setEntry value="org.eclipse.e4.core.di.annotations@default:default"/>
+        <setEntry value="org.eclipse.e4.core.di.extensions.supplier@default:default"/>
+        <setEntry value="org.eclipse.e4.core.di.extensions@default:default"/>
+        <setEntry value="org.eclipse.e4.core.di@default:default"/>
+        <setEntry value="org.eclipse.e4.core.services@default:default"/>
+        <setEntry value="org.eclipse.e4.emf.xpath@default:default"/>
+        <setEntry value="org.eclipse.e4.tools.compat@default:default"/>
+        <setEntry value="org.eclipse.e4.tools.emf.editor3x@default:default"/>
+        <setEntry value="org.eclipse.e4.tools.emf.ui@default:default"/>
+        <setEntry value="org.eclipse.e4.tools.jdt.templates@default:default"/>
+        <setEntry value="org.eclipse.e4.tools.services@default:default"/>
+        <setEntry value="org.eclipse.e4.tools@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.bindings@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.css.core@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.css.swt.theme@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.css.swt@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.di@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.dialogs@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.model.workbench@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.services@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.swt.gtk@default:false"/>
+        <setEntry value="org.eclipse.e4.ui.widgets@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.workbench.addons.swt@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.workbench.renderers.swt@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.workbench.swt@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.workbench3@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.workbench@default:default"/>
+        <setEntry value="org.eclipse.ecf.filetransfer@default:default"/>
+        <setEntry value="org.eclipse.ecf.identity@default:default"/>
+        <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false"/>
+        <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient4@default:default"/>
+        <setEntry value="org.eclipse.ecf.provider.filetransfer.ssl@default:false"/>
+        <setEntry value="org.eclipse.ecf.provider.filetransfer@default:default"/>
+        <setEntry value="org.eclipse.ecf.ssl@default:false"/>
+        <setEntry value="org.eclipse.ecf@default:default"/>
+        <setEntry value="org.eclipse.eef.common.ui@default:default"/>
+        <setEntry value="org.eclipse.eef.common@default:default"/>
+        <setEntry value="org.eclipse.eef.core.ext.widgets.reference@default:default"/>
+        <setEntry value="org.eclipse.eef.core@default:default"/>
+        <setEntry value="org.eclipse.eef.ext.widgets.reference@default:default"/>
+        <setEntry value="org.eclipse.eef.ide.ui.ext.widgets.reference@default:default"/>
+        <setEntry value="org.eclipse.eef.ide.ui.properties@default:default"/>
+        <setEntry value="org.eclipse.eef.ide.ui@default:default"/>
+        <setEntry value="org.eclipse.eef.properties.ui.legacy@default:default"/>
+        <setEntry value="org.eclipse.eef.properties.ui@default:default"/>
+        <setEntry value="org.eclipse.eef@default:default"/>
+        <setEntry value="org.eclipse.egit.core@default:default"/>
+        <setEntry value="org.eclipse.egit.doc@default:default"/>
+        <setEntry value="org.eclipse.egit.ui@default:default"/>
+        <setEntry value="org.eclipse.egit@default:default"/>
+        <setEntry value="org.eclipse.emf.ant@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.admin@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.common.db@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.common@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.compare@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.doc@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.examples.installer@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.explorer.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.explorer@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.expressions.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.expressions.editor@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.expressions@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.migrator@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.net4j@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.security.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.security.editor@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.security.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.security@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.server.admin@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.server.db@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.server.net4j@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.server.ocl@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.server.product@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.server.security@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.server@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.transfer.repository@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.transfer.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.transfer.workspace.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.transfer.workspace@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.transfer@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.ui.admin@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.ui.compare@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.ui.shared@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.ui.team@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo.workspace@default:default"/>
+        <setEntry value="org.eclipse.emf.cdo@default:default"/>
+        <setEntry value="org.eclipse.emf.cheatsheets@default:default"/>
+        <setEntry value="org.eclipse.emf.codegen.ecore.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.codegen.ecore@default:default"/>
+        <setEntry value="org.eclipse.emf.codegen.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.codegen@default:default"/>
+        <setEntry value="org.eclipse.emf.common.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.common@default:default"/>
+        <setEntry value="org.eclipse.emf.compare.diagram.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.compare.diagram.ide.ui.sirius@default:default"/>
+        <setEntry value="org.eclipse.emf.compare.diagram.ide.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.compare.diagram.sirius@default:default"/>
+        <setEntry value="org.eclipse.emf.compare.diagram@default:default"/>
+        <setEntry value="org.eclipse.emf.compare.doc@default:default"/>
+        <setEntry value="org.eclipse.emf.compare.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.compare.egit.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.compare.egit@default:default"/>
+        <setEntry value="org.eclipse.emf.compare.ide.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.compare.ide@default:default"/>
+        <setEntry value="org.eclipse.emf.compare.rcp.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.compare.rcp@default:default"/>
+        <setEntry value="org.eclipse.emf.compare@default:default"/>
+        <setEntry value="org.eclipse.emf.converter@default:default"/>
+        <setEntry value="org.eclipse.emf.databinding.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.databinding@default:default"/>
+        <setEntry value="org.eclipse.emf.doc@default:default"/>
+        <setEntry value="org.eclipse.emf.ecore.change.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecore.change@default:default"/>
+        <setEntry value="org.eclipse.emf.ecore.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecore.editor@default:default"/>
+        <setEntry value="org.eclipse.emf.ecore.xmi@default:default"/>
+        <setEntry value="org.eclipse.emf.ecore@default:default"/>
+        <setEntry value="org.eclipse.emf.ecoretools.design.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.ecoretools.design@default:default"/>
+        <setEntry value="org.eclipse.emf.ecoretools.doc@default:default"/>
+        <setEntry value="org.eclipse.emf.ecoretools.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.ecoretools@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.application.e3@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.application.e4@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.cdo.core@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.cdo.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.common.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.common@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.core.emffilter@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.core@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.edit.swt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.editor.e3@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.emf2web.json@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.emf2web.ui.json@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.emf2web.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.emf2web@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.emfstore.core@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.emfstore.ui.e3@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.emfstore.ui.e4@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.emfstore.ui.search@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.emfstore.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.explorereditorbridge@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.ide.editor.view.templatebridge@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.ide.editor.view@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.ide.editor.viewmodel@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.ide.util@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.ide.view.service@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.makeithappen.wizards@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.ui.e3@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.ui.e4@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.ui.rcp@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.ui.view.editor.controls@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.ui.view.linewrapper@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.ui.view.swt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.ui.view@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.validation.connector@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.validation@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.categorization.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.categorization.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.categorization.swt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.compoundcontrol.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.compoundcontrol.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.compoundcontrol.swt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.compoundcontrol.tooling@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.context.locale@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.context@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.control.multireference@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.core.swt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.custom.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.custom.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.custom.ui.swt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.edapt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.group.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.group.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.group.swt.collapsable@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.group.swt.embedded@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.group.ui.swt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.horizontal.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.horizontal.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.horizontal.ui.swt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.indexdmr.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.label.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.label.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.label.ui.swt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.mappingdmr.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.migrator@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.model.common@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.model.edapt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.model.editor@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.model.preview.common@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.model.preview.e3@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.model.project.installer@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.model.provider.generator@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.model.provider.xmi@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.rule.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.rule.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.rule@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.stack.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.stack.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.stack.ui.swt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.stack.viewmodel@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.swt.layout@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.table.columnservice@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.table.edapt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.table.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.table.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.table.ui.swt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.template.annotation.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.template.annotation.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.template.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.template.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.template.service@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.template.tooling@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.treemasterdetail.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.treemasterdetail.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.treemasterdetail.ui.swt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.treemasterdetail.validation@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.unset@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.util.swt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.validation@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.vertical.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.vertical.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.vertical.ui.swt@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.viewproxy.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.viewproxy.model@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.view.workspace.migrator@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.workspace.core@default:default"/>
+        <setEntry value="org.eclipse.emf.ecp.workspace.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.edapt.common@default:default"/>
+        <setEntry value="org.eclipse.emf.edapt.declaration@default:default"/>
+        <setEntry value="org.eclipse.emf.edapt.history@default:default"/>
+        <setEntry value="org.eclipse.emf.edapt.migration@default:default"/>
+        <setEntry value="org.eclipse.emf.edit.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.emfstore.client.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.emfstore.client.ui.rcp@default:false"/>
+        <setEntry value="org.eclipse.emf.emfstore.client.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.emfstore.client@default:default"/>
+        <setEntry value="org.eclipse.emf.emfstore.common.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.emfstore.common.model@default:default"/>
+        <setEntry value="org.eclipse.emf.emfstore.common@default:default"/>
+        <setEntry value="org.eclipse.emf.emfstore.example.installer@default:default"/>
+        <setEntry value="org.eclipse.emf.emfstore.examplemodel.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.emfstore.examplemodel@default:default"/>
+        <setEntry value="org.eclipse.emf.emfstore.migration@default:default"/>
+        <setEntry value="org.eclipse.emf.emfstore.server.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.emfstore.server.model@default:default"/>
+        <setEntry value="org.eclipse.emf.emfstore.server@default:default"/>
+        <setEntry value="org.eclipse.emf.example.installer@default:default"/>
+        <setEntry value="org.eclipse.emf.exporter@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.diagram@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.editor@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.examples@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.giraph@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.interpreter.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.interpreter@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.model@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.multicda.cda@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.multicda.cpa.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.multicda.cpa@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.rulegen.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.rulegen@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.statespace.explorer@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.statespace.external@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.statespace@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.text.ide@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.text.transformation@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.text.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.text@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.trace@default:default"/>
+        <setEntry value="org.eclipse.emf.henshin.wrap@default:default"/>
+        <setEntry value="org.eclipse.emf.importer.ecore@default:default"/>
+        <setEntry value="org.eclipse.emf.importer.java@default:default"/>
+        <setEntry value="org.eclipse.emf.importer.rose@default:default"/>
+        <setEntry value="org.eclipse.emf.importer@default:default"/>
+        <setEntry value="org.eclipse.emf.mapping.ecore.editor@default:default"/>
+        <setEntry value="org.eclipse.emf.mapping.ecore2ecore.editor@default:default"/>
+        <setEntry value="org.eclipse.emf.mapping.ecore2ecore@default:default"/>
+        <setEntry value="org.eclipse.emf.mapping.ecore2xml.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.mapping.ecore2xml@default:default"/>
+        <setEntry value="org.eclipse.emf.mapping.ecore@default:default"/>
+        <setEntry value="org.eclipse.emf.mapping.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.mapping.xsd2ecore.editor@default:default"/>
+        <setEntry value="org.eclipse.emf.mapping.xsd2ecore@default:default"/>
+        <setEntry value="org.eclipse.emf.mapping@default:default"/>
+        <setEntry value="org.eclipse.emf.mwe.core@default:default"/>
+        <setEntry value="org.eclipse.emf.mwe.utils@default:default"/>
+        <setEntry value="org.eclipse.emf.mwe2.language.ide@default:default"/>
+        <setEntry value="org.eclipse.emf.mwe2.language.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.mwe2.language@default:default"/>
+        <setEntry value="org.eclipse.emf.mwe2.launch.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.mwe2.launch@default:default"/>
+        <setEntry value="org.eclipse.emf.mwe2.lib@default:default"/>
+        <setEntry value="org.eclipse.emf.mwe2.runtime@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.cdo.common@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.cdo@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.common@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.doc@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.dsl.additional.builder@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.dsl.ide@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.dsl.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.dsl@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.editors.common@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.editors@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.generator.common@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.junit4@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.runtime.common@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.runtime@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.ui.examples@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.views.common@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.views@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley.wizards@default:default"/>
+        <setEntry value="org.eclipse.emf.parsley@default:default"/>
+        <setEntry value="org.eclipse.emf.query.doc@default:default"/>
+        <setEntry value="org.eclipse.emf.query.examples@default:default"/>
+        <setEntry value="org.eclipse.emf.query.ocl@default:default"/>
+        <setEntry value="org.eclipse.emf.query@default:default"/>
+        <setEntry value="org.eclipse.emf.transaction.doc@default:default"/>
+        <setEntry value="org.eclipse.emf.transaction.examples@default:default"/>
+        <setEntry value="org.eclipse.emf.transaction.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.transaction@default:default"/>
+        <setEntry value="org.eclipse.emf.validation.doc@default:default"/>
+        <setEntry value="org.eclipse.emf.validation.examples@default:default"/>
+        <setEntry value="org.eclipse.emf.validation.ocl@default:default"/>
+        <setEntry value="org.eclipse.emf.validation.ui.ide@default:default"/>
+        <setEntry value="org.eclipse.emf.validation.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.validation@default:default"/>
+        <setEntry value="org.eclipse.emf.workspace.doc@default:default"/>
+        <setEntry value="org.eclipse.emf.workspace.ui@default:default"/>
+        <setEntry value="org.eclipse.emf.workspace@default:default"/>
+        <setEntry value="org.eclipse.emf@default:default"/>
+        <setEntry value="org.eclipse.emfforms.coffee.wizards@default:default"/>
+        <setEntry value="org.eclipse.emfforms.common.validation@default:default"/>
+        <setEntry value="org.eclipse.emfforms.common@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.bazaar@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.databinding.featurepath@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.databinding.index@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.databinding.mapping@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.domainexpander.default@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.domainexpander.index@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.domainexpander.mapping@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.domainexpander.table@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.editsupport@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.emf@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.emfspecificservice@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.legacy@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.locale.default@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.mappingprovider.default@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.mappingprovider.table.panel@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.mappingprovider.table@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.segments.featurepath@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.segments.index@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.segments.mapping@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.segments.multi@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.segments@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.structuralchange.default@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.structuralchange.index@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.structuralchange.mapping@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.structuralchange.table@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services.structuralchange@default:default"/>
+        <setEntry value="org.eclipse.emfforms.core.services@default:default"/>
+        <setEntry value="org.eclipse.emfforms.editor.ecore@default:default"/>
+        <setEntry value="org.eclipse.emfforms.editor.genmodel@default:default"/>
+        <setEntry value="org.eclipse.emfforms.editor@default:default"/>
+        <setEntry value="org.eclipse.emfforms.example.common.wizards@default:default"/>
+        <setEntry value="org.eclipse.emfforms.ide.builder@default:default"/>
+        <setEntry value="org.eclipse.emfforms.ide.viewtemplate.builder@default:default"/>
+        <setEntry value="org.eclipse.emfforms.localization@default:default"/>
+        <setEntry value="org.eclipse.emfforms.setup.base@default:default"/>
+        <setEntry value="org.eclipse.emfforms.swt.control.multiattribute@default:default"/>
+        <setEntry value="org.eclipse.emfforms.swt.core.di.extension@default:default"/>
+        <setEntry value="org.eclipse.emfforms.swt.core.di@default:default"/>
+        <setEntry value="org.eclipse.emfforms.swt.core.plugin@default:default"/>
+        <setEntry value="org.eclipse.emfforms.swt.core@default:default"/>
+        <setEntry value="org.eclipse.emfforms.swt.table@default:default"/>
+        <setEntry value="org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default@default:default"/>
+        <setEntry value="org.eclipse.emfforms.swt.treemasterdetail@default:default"/>
+        <setEntry value="org.eclipse.emfforms.view.annotation.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emfforms.view.annotation.model@default:default"/>
+        <setEntry value="org.eclipse.emfforms.view.indexsegment.model@default:default"/>
+        <setEntry value="org.eclipse.emfforms.view.mappingsegment.model@default:default"/>
+        <setEntry value="org.eclipse.emfforms.view.model.localization@default:default"/>
+        <setEntry value="org.eclipse.emfforms.view.multisegment.model.edit@default:default"/>
+        <setEntry value="org.eclipse.emfforms.view.multisegment.model@default:default"/>
+        <setEntry value="org.eclipse.epp.logging.aeri.core@default:default"/>
+        <setEntry value="org.eclipse.epp.logging.aeri.ide@default:default"/>
+        <setEntry value="org.eclipse.epp.mpc.core@default:default"/>
+        <setEntry value="org.eclipse.epp.mpc.help.ui@default:default"/>
+        <setEntry value="org.eclipse.epp.mpc.ui.css@default:default"/>
+        <setEntry value="org.eclipse.epp.mpc.ui@default:default"/>
+        <setEntry value="org.eclipse.epp.package.common@default:default"/>
+        <setEntry value="org.eclipse.epp.package.modeling@default:default"/>
+        <setEntry value="org.eclipse.equinox.app@default:default"/>
+        <setEntry value="org.eclipse.equinox.bidi@default:default"/>
+        <setEntry value="org.eclipse.equinox.common@2:true"/>
+        <setEntry value="org.eclipse.equinox.concurrent@default:default"/>
+        <setEntry value="org.eclipse.equinox.console@default:default"/>
+        <setEntry value="org.eclipse.equinox.ds@1:true"/>
+        <setEntry value="org.eclipse.equinox.event@default:default"/>
+        <setEntry value="org.eclipse.equinox.frameworkadmin.equinox@default:default"/>
+        <setEntry value="org.eclipse.equinox.frameworkadmin@default:default"/>
+        <setEntry value="org.eclipse.equinox.http.jetty@default:default"/>
+        <setEntry value="org.eclipse.equinox.http.registry@default:default"/>
+        <setEntry value="org.eclipse.equinox.http.servlet@default:default"/>
+        <setEntry value="org.eclipse.equinox.jsp.jasper.registry@default:default"/>
+        <setEntry value="org.eclipse.equinox.jsp.jasper@default:default"/>
+        <setEntry value="org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false"/>
+        <setEntry value="org.eclipse.equinox.launcher@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.artifact.repository@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.console@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.core@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.director.app@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.director@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.directorywatcher@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.discovery.compatibility@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.discovery@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.engine@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.extensionlocation@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.garbagecollector@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.jarprocessor@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.metadata.repository@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.metadata@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.operations@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.publisher.eclipse@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.publisher@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.reconciler.dropins@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.repository.tools@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.repository@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.touchpoint.eclipse@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.touchpoint.natives@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.transport.ecf@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.ui.discovery@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.ui.importexport@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.ui.sdk.scheduler@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.ui.sdk@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.ui@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.updatechecker@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.updatesite@default:default"/>
+        <setEntry value="org.eclipse.equinox.preferences@default:default"/>
+        <setEntry value="org.eclipse.equinox.registry@default:default"/>
+        <setEntry value="org.eclipse.equinox.security.linux.x86_64@default:false"/>
+        <setEntry value="org.eclipse.equinox.security.ui@default:default"/>
+        <setEntry value="org.eclipse.equinox.security@default:default"/>
+        <setEntry value="org.eclipse.equinox.simpleconfigurator.manipulator@default:default"/>
+        <setEntry value="org.eclipse.equinox.simpleconfigurator@1:true"/>
+        <setEntry value="org.eclipse.equinox.util@default:default"/>
+        <setEntry value="org.eclipse.fx.osgi@default:false"/>
+        <setEntry value="org.eclipse.gef.common@default:default"/>
+        <setEntry value="org.eclipse.gef.doc.isv@default:default"/>
+        <setEntry value="org.eclipse.gef.examples.ui.pde@default:default"/>
+        <setEntry value="org.eclipse.gef.fx.swt@default:default"/>
+        <setEntry value="org.eclipse.gef.fx@default:default"/>
+        <setEntry value="org.eclipse.gef.geometry.convert.fx@default:default"/>
+        <setEntry value="org.eclipse.gef.geometry@default:default"/>
+        <setEntry value="org.eclipse.gef.graph@default:default"/>
+        <setEntry value="org.eclipse.gef.layout@default:default"/>
+        <setEntry value="org.eclipse.gef.mvc.fx@default:default"/>
+        <setEntry value="org.eclipse.gef.zest.fx.jface@default:default"/>
+        <setEntry value="org.eclipse.gef.zest.fx@default:default"/>
+        <setEntry value="org.eclipse.gef@default:default"/>
+        <setEntry value="org.eclipse.gmf.examples.runtime.diagram.geoshapes@default:default"/>
+        <setEntry value="org.eclipse.gmf.examples.runtime.diagram.logic.model.edit@default:default"/>
+        <setEntry value="org.eclipse.gmf.examples.runtime.diagram.logic.model.editor@default:default"/>
+        <setEntry value="org.eclipse.gmf.examples.runtime.diagram.logic.model@default:default"/>
+        <setEntry value="org.eclipse.gmf.examples.runtime.diagram.logic@default:default"/>
+        <setEntry value="org.eclipse.gmf.examples.runtime.ui.pde@default:default"/>
+        <setEntry value="org.eclipse.gmf.examples.runtime@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.common.core@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.common.ui.action.ide@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.common.ui.action@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.common.ui.printing.win32@default:false"/>
+        <setEntry value="org.eclipse.gmf.runtime.common.ui.printing@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.common.ui.services.action@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.common.ui.services.dnd.ide@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.common.ui.services.dnd@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.common.ui.services.properties@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.common.ui.services@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.common.ui@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.diagram.core@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.diagram.ui.actions@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.diagram.ui.dnd@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.diagram.ui.geoshapes@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.diagram.ui.printing@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.diagram.ui.properties@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.diagram.ui.providers@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.diagram.ui.render@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.diagram.ui@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.draw2d.ui.render@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.draw2d.ui@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.emf.clipboard.core@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.emf.commands.core@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.emf.core@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.emf.type.core@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.emf.type.ui@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.emf.ui.properties@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.emf.ui@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.gef.ui@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.notation.edit@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.notation.providers@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.notation.sdk@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.notation@default:default"/>
+        <setEntry value="org.eclipse.gmf.runtime.sdk@default:default"/>
+        <setEntry value="org.eclipse.gmf@default:default"/>
+        <setEntry value="org.eclipse.help.base@default:default"/>
+        <setEntry value="org.eclipse.help.ui@default:default"/>
+        <setEntry value="org.eclipse.help.webapp@default:default"/>
+        <setEntry value="org.eclipse.help@default:default"/>
+        <setEntry value="org.eclipse.jdt.annotation*1.1.400.v20180921-1416@default:default"/>
+        <setEntry value="org.eclipse.jdt.annotation*2.2.200.v20180921-1416@default:default"/>
+        <setEntry value="org.eclipse.jdt.apt.core@default:default"/>
+        <setEntry value="org.eclipse.jdt.apt.pluggable.core@default:default"/>
+        <setEntry value="org.eclipse.jdt.apt.ui@default:default"/>
+        <setEntry value="org.eclipse.jdt.compiler.apt@default:false"/>
+        <setEntry value="org.eclipse.jdt.compiler.tool@default:false"/>
+        <setEntry value="org.eclipse.jdt.core.manipulation@default:default"/>
+        <setEntry value="org.eclipse.jdt.core@default:default"/>
+        <setEntry value="org.eclipse.jdt.debug.ui@default:default"/>
+        <setEntry value="org.eclipse.jdt.debug@default:default"/>
+        <setEntry value="org.eclipse.jdt.doc.isv@default:default"/>
+        <setEntry value="org.eclipse.jdt.doc.user@default:default"/>
+        <setEntry value="org.eclipse.jdt.junit.core@default:default"/>
+        <setEntry value="org.eclipse.jdt.junit.runtime@default:default"/>
+        <setEntry value="org.eclipse.jdt.junit4.runtime@default:default"/>
+        <setEntry value="org.eclipse.jdt.junit5.runtime@default:default"/>
+        <setEntry value="org.eclipse.jdt.junit@default:default"/>
+        <setEntry value="org.eclipse.jdt.launching@default:default"/>
+        <setEntry value="org.eclipse.jdt.ui@default:default"/>
+        <setEntry value="org.eclipse.jdt@default:default"/>
+        <setEntry value="org.eclipse.jem.util@default:default"/>
+        <setEntry value="org.eclipse.jetty.continuation@default:default"/>
+        <setEntry value="org.eclipse.jetty.http@default:default"/>
+        <setEntry value="org.eclipse.jetty.io@default:default"/>
+        <setEntry value="org.eclipse.jetty.security@default:default"/>
+        <setEntry value="org.eclipse.jetty.server@default:default"/>
+        <setEntry value="org.eclipse.jetty.servlet@default:default"/>
+        <setEntry value="org.eclipse.jetty.util@default:default"/>
+        <setEntry value="org.eclipse.jface.databinding@default:default"/>
+        <setEntry value="org.eclipse.jface.text@default:default"/>
+        <setEntry value="org.eclipse.jface@default:default"/>
+        <setEntry value="org.eclipse.jgit.archive@default:default"/>
+        <setEntry value="org.eclipse.jgit.ssh.apache@default:default"/>
+        <setEntry value="org.eclipse.jgit@default:default"/>
+        <setEntry value="org.eclipse.jsch.core@default:default"/>
+        <setEntry value="org.eclipse.jsch.ui@default:default"/>
+        <setEntry value="org.eclipse.ltk.core.refactoring@default:default"/>
+        <setEntry value="org.eclipse.ltk.ui.refactoring@default:default"/>
+        <setEntry value="org.eclipse.m2e.archetype.common@default:default"/>
+        <setEntry value="org.eclipse.m2e.core.ui@default:default"/>
+        <setEntry value="org.eclipse.m2e.core@default:default"/>
+        <setEntry value="org.eclipse.m2e.launching@default:default"/>
+        <setEntry value="org.eclipse.m2e.maven.indexer@default:default"/>
+        <setEntry value="org.eclipse.m2e.maven.runtime.slf4j.simple@default:default"/>
+        <setEntry value="org.eclipse.m2e.maven.runtime@default:default"/>
+        <setEntry value="org.eclipse.m2e.model.edit@default:default"/>
+        <setEntry value="org.eclipse.m2e.workspace.cli@default:default"/>
+        <setEntry value="org.eclipse.m2m.qvt.oml.common@default:default"/>
+        <setEntry value="org.eclipse.m2m.qvt.oml.cst.parser@default:default"/>
+        <setEntry value="org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default"/>
+        <setEntry value="org.eclipse.m2m.qvt.oml.emf.util@default:default"/>
+        <setEntry value="org.eclipse.m2m.qvt.oml@default:default"/>
+        <setEntry value="org.eclipse.mylyn.bugzilla.core@default:default"/>
+        <setEntry value="org.eclipse.mylyn.bugzilla.ide@default:default"/>
+        <setEntry value="org.eclipse.mylyn.bugzilla.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.commons.core@default:default"/>
+        <setEntry value="org.eclipse.mylyn.commons.identity.core@default:default"/>
+        <setEntry value="org.eclipse.mylyn.commons.net@default:default"/>
+        <setEntry value="org.eclipse.mylyn.commons.notifications.core@default:default"/>
+        <setEntry value="org.eclipse.mylyn.commons.notifications.feed@default:default"/>
+        <setEntry value="org.eclipse.mylyn.commons.notifications.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.commons.repositories.core@default:default"/>
+        <setEntry value="org.eclipse.mylyn.commons.repositories.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.commons.screenshots@default:default"/>
+        <setEntry value="org.eclipse.mylyn.commons.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.commons.workbench@default:default"/>
+        <setEntry value="org.eclipse.mylyn.commons.xmlrpc@default:default"/>
+        <setEntry value="org.eclipse.mylyn.context.core@default:default"/>
+        <setEntry value="org.eclipse.mylyn.context.tasks.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.context.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.debug.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.discovery.core@default:default"/>
+        <setEntry value="org.eclipse.mylyn.discovery.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.help.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.ide.ant@default:default"/>
+        <setEntry value="org.eclipse.mylyn.ide.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.java.tasks@default:default"/>
+        <setEntry value="org.eclipse.mylyn.java.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.monitor.core@default:default"/>
+        <setEntry value="org.eclipse.mylyn.monitor.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.pde.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.resources.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.tasks.bugs@default:default"/>
+        <setEntry value="org.eclipse.mylyn.tasks.core@default:default"/>
+        <setEntry value="org.eclipse.mylyn.tasks.index.core@default:default"/>
+        <setEntry value="org.eclipse.mylyn.tasks.index.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.tasks.search@default:default"/>
+        <setEntry value="org.eclipse.mylyn.tasks.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.team.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.ant@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.asciidoc.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.asciidoc@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.confluence.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.confluence@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.context.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.help.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.html@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.markdown.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.markdown@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.mediawiki.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.mediawiki@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.osgi@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.tasks.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.textile.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.textile@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.tracwiki.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.tracwiki@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.twiki.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.twiki@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext.ui@default:default"/>
+        <setEntry value="org.eclipse.mylyn.wikitext@default:default"/>
+        <setEntry value="org.eclipse.nebula.widgets.tablecombo@default:default"/>
+        <setEntry value="org.eclipse.net4j.db.h2@default:default"/>
+        <setEntry value="org.eclipse.net4j.db.jdbc@default:default"/>
+        <setEntry value="org.eclipse.net4j.db@default:default"/>
+        <setEntry value="org.eclipse.net4j.debug@default:default"/>
+        <setEntry value="org.eclipse.net4j.examples.installer@default:default"/>
+        <setEntry value="org.eclipse.net4j.http.common@default:default"/>
+        <setEntry value="org.eclipse.net4j.http.server@default:default"/>
+        <setEntry value="org.eclipse.net4j.http@default:default"/>
+        <setEntry value="org.eclipse.net4j.jvm@default:default"/>
+        <setEntry value="org.eclipse.net4j.tcp@default:default"/>
+        <setEntry value="org.eclipse.net4j.ui.shared@default:default"/>
+        <setEntry value="org.eclipse.net4j.ui@default:default"/>
+        <setEntry value="org.eclipse.net4j.util.ui@default:default"/>
+        <setEntry value="org.eclipse.net4j.util@default:default"/>
+        <setEntry value="org.eclipse.net4j@default:default"/>
+        <setEntry value="org.eclipse.ocl.common.ui@default:default"/>
+        <setEntry value="org.eclipse.ocl.common@default:default"/>
+        <setEntry value="org.eclipse.ocl.doc@default:default"/>
+        <setEntry value="org.eclipse.ocl.ecore.edit@default:default"/>
+        <setEntry value="org.eclipse.ocl.ecore@default:default"/>
+        <setEntry value="org.eclipse.ocl.edit@default:default"/>
+        <setEntry value="org.eclipse.ocl.ui@default:default"/>
+        <setEntry value="org.eclipse.ocl.uml.edit@default:default"/>
+        <setEntry value="org.eclipse.ocl.uml.ui@default:default"/>
+        <setEntry value="org.eclipse.ocl.uml@default:default"/>
+        <setEntry value="org.eclipse.ocl@default:default"/>
+        <setEntry value="org.eclipse.oomph.base.edit@default:default"/>
+        <setEntry value="org.eclipse.oomph.base@default:default"/>
+        <setEntry value="org.eclipse.oomph.extractor.lib@default:default"/>
+        <setEntry value="org.eclipse.oomph.jreinfo.ui@default:default"/>
+        <setEntry value="org.eclipse.oomph.jreinfo@default:default"/>
+        <setEntry value="org.eclipse.oomph.p2.core@default:default"/>
+        <setEntry value="org.eclipse.oomph.p2.doc@default:default"/>
+        <setEntry value="org.eclipse.oomph.p2.edit@default:default"/>
+        <setEntry value="org.eclipse.oomph.p2.ui@default:default"/>
+        <setEntry value="org.eclipse.oomph.p2@default:default"/>
+        <setEntry value="org.eclipse.oomph.predicates.edit@default:default"/>
+        <setEntry value="org.eclipse.oomph.predicates@default:default"/>
+        <setEntry value="org.eclipse.oomph.preferences@default:default"/>
+        <setEntry value="org.eclipse.oomph.resources.edit@default:default"/>
+        <setEntry value="org.eclipse.oomph.resources@default:default"/>
+        <setEntry value="org.eclipse.oomph.setup.core@default:default"/>
+        <setEntry value="org.eclipse.oomph.setup.doc@default:default"/>
+        <setEntry value="org.eclipse.oomph.setup.edit@default:default"/>
+        <setEntry value="org.eclipse.oomph.setup.editor@default:default"/>
+        <setEntry value="org.eclipse.oomph.setup.p2.edit@default:default"/>
+        <setEntry value="org.eclipse.oomph.setup.p2@default:default"/>
+        <setEntry value="org.eclipse.oomph.setup.sync@default:default"/>
+        <setEntry value="org.eclipse.oomph.setup.ui.questionnaire@default:default"/>
+        <setEntry value="org.eclipse.oomph.setup.ui@default:default"/>
+        <setEntry value="org.eclipse.oomph.setup@default:default"/>
+        <setEntry value="org.eclipse.oomph.ui@default:default"/>
+        <setEntry value="org.eclipse.oomph.util@default:default"/>
+        <setEntry value="org.eclipse.oomph.workingsets.edit@default:default"/>
+        <setEntry value="org.eclipse.oomph.workingsets.editor@default:default"/>
+        <setEntry value="org.eclipse.oomph.workingsets@default:default"/>
+        <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
+        <setEntry value="org.eclipse.osgi.services@default:default"/>
+        <setEntry value="org.eclipse.osgi.util@default:default"/>
+        <setEntry value="org.eclipse.osgi@-1:true"/>
+        <setEntry value="org.eclipse.papyrus.infra.gmfdiag.tooling.runtime@default:default"/>
+        <setEntry value="org.eclipse.pde.api.tools.annotations@default:default"/>
+        <setEntry value="org.eclipse.pde.api.tools.ui@default:default"/>
+        <setEntry value="org.eclipse.pde.api.tools@default:default"/>
+        <setEntry value="org.eclipse.pde.build@default:default"/>
+        <setEntry value="org.eclipse.pde.core@default:default"/>
+        <setEntry value="org.eclipse.pde.doc.user@default:default"/>
+        <setEntry value="org.eclipse.pde.ds.annotations@default:default"/>
+        <setEntry value="org.eclipse.pde.ds.core@default:default"/>
+        <setEntry value="org.eclipse.pde.ds.lib@default:default"/>
+        <setEntry value="org.eclipse.pde.ds.ui@default:default"/>
+        <setEntry value="org.eclipse.pde.ds1_2.lib@default:default"/>
+        <setEntry value="org.eclipse.pde.genericeditor.extension@default:default"/>
+        <setEntry value="org.eclipse.pde.junit.runtime@default:default"/>
+        <setEntry value="org.eclipse.pde.launching@default:default"/>
+        <setEntry value="org.eclipse.pde.runtime@default:default"/>
+        <setEntry value="org.eclipse.pde.ua.core@default:default"/>
+        <setEntry value="org.eclipse.pde.ua.ui@default:default"/>
+        <setEntry value="org.eclipse.pde.ui.templates@default:default"/>
+        <setEntry value="org.eclipse.pde.ui@default:default"/>
+        <setEntry value="org.eclipse.pde@default:default"/>
+        <setEntry value="org.eclipse.platform.doc.isv@default:default"/>
+        <setEntry value="org.eclipse.platform.doc.user@default:default"/>
+        <setEntry value="org.eclipse.platform@default:default"/>
+        <setEntry value="org.eclipse.rcp@default:default"/>
+        <setEntry value="org.eclipse.sdk@default:default"/>
+        <setEntry value="org.eclipse.search@default:default"/>
+        <setEntry value="org.eclipse.sirius.common.acceleo.aql@default:default"/>
+        <setEntry value="org.eclipse.sirius.common.interpreter@default:default"/>
+        <setEntry value="org.eclipse.sirius.common.ui.ext@default:default"/>
+        <setEntry value="org.eclipse.sirius.common.ui@default:default"/>
+        <setEntry value="org.eclipse.sirius.common.xtext@default:default"/>
+        <setEntry value="org.eclipse.sirius.common@default:default"/>
+        <setEntry value="org.eclipse.sirius.diagram.formatdata@default:default"/>
+        <setEntry value="org.eclipse.sirius.diagram.layoutdata@default:default"/>
+        <setEntry value="org.eclipse.sirius.diagram.sequence.edit@default:default"/>
+        <setEntry value="org.eclipse.sirius.diagram.sequence.ui@default:default"/>
+        <setEntry value="org.eclipse.sirius.diagram.sequence@default:default"/>
+        <setEntry value="org.eclipse.sirius.diagram.ui.ext@default:default"/>
+        <setEntry value="org.eclipse.sirius.diagram.ui@default:default"/>
+        <setEntry value="org.eclipse.sirius.diagram@default:default"/>
+        <setEntry value="org.eclipse.sirius.ecore.extender@default:default"/>
+        <setEntry value="org.eclipse.sirius.editor.properties.ext.widgets.reference@default:default"/>
+        <setEntry value="org.eclipse.sirius.editor.properties@default:default"/>
+        <setEntry value="org.eclipse.sirius.editor@default:default"/>
+        <setEntry value="org.eclipse.sirius.ext.base@default:default"/>
+        <setEntry value="org.eclipse.sirius.ext.draw2d@default:default"/>
+        <setEntry value="org.eclipse.sirius.ext.e3.ui@default:default"/>
+        <setEntry value="org.eclipse.sirius.ext.e3@default:default"/>
+        <setEntry value="org.eclipse.sirius.ext.emf.edit@default:default"/>
+        <setEntry value="org.eclipse.sirius.ext.emf.tx@default:default"/>
+        <setEntry value="org.eclipse.sirius.ext.emf.ui@default:default"/>
+        <setEntry value="org.eclipse.sirius.ext.emf@default:default"/>
+        <setEntry value="org.eclipse.sirius.ext.gef@default:default"/>
+        <setEntry value="org.eclipse.sirius.ext.gmf.notation@default:default"/>
+        <setEntry value="org.eclipse.sirius.ext.gmf.runtime@default:default"/>
+        <setEntry value="org.eclipse.sirius.ext.ide@default:default"/>
+        <setEntry value="org.eclipse.sirius.ext.jface@default:default"/>
+        <setEntry value="org.eclipse.sirius.ext.swt@default:default"/>
+        <setEntry value="org.eclipse.sirius.interpreter@default:default"/>
+        <setEntry value="org.eclipse.sirius.properties.core@default:default"/>
+        <setEntry value="org.eclipse.sirius.properties.defaultrules@default:default"/>
+        <setEntry value="org.eclipse.sirius.properties.edit@default:default"/>
+        <setEntry value="org.eclipse.sirius.properties.ext.widgets.reference.edit@default:default"/>
+        <setEntry value="org.eclipse.sirius.properties.ext.widgets.reference@default:default"/>
+        <setEntry value="org.eclipse.sirius.properties@default:default"/>
+        <setEntry value="org.eclipse.sirius.synchronizer@default:default"/>
+        <setEntry value="org.eclipse.sirius.table.ui.ext@default:default"/>
+        <setEntry value="org.eclipse.sirius.table.ui@default:default"/>
+        <setEntry value="org.eclipse.sirius.table@default:default"/>
+        <setEntry value="org.eclipse.sirius.tree.ui.ext@default:default"/>
+        <setEntry value="org.eclipse.sirius.tree.ui@default:default"/>
+        <setEntry value="org.eclipse.sirius.tree@default:default"/>
+        <setEntry value="org.eclipse.sirius.ui.editor@default:default"/>
+        <setEntry value="org.eclipse.sirius.ui.ext@default:default"/>
+        <setEntry value="org.eclipse.sirius.ui.properties.ext.widgets.reference@default:default"/>
+        <setEntry value="org.eclipse.sirius.ui.properties@default:default"/>
+        <setEntry value="org.eclipse.sirius.ui@default:default"/>
+        <setEntry value="org.eclipse.sirius@default:default"/>
+        <setEntry value="org.eclipse.swt.gtk.linux.x86_64@default:false"/>
+        <setEntry value="org.eclipse.swt@default:default"/>
+        <setEntry value="org.eclipse.team.core@default:default"/>
+        <setEntry value="org.eclipse.team.genericeditor.diff.extension@default:default"/>
+        <setEntry value="org.eclipse.team.ui@default:default"/>
+        <setEntry value="org.eclipse.text@default:default"/>
+        <setEntry value="org.eclipse.tips.core@default:default"/>
+        <setEntry value="org.eclipse.tips.ide@default:default"/>
+        <setEntry value="org.eclipse.tips.json@default:default"/>
+        <setEntry value="org.eclipse.tips.ui@default:default"/>
+        <setEntry value="org.eclipse.tools.layout.spy@default:default"/>
+        <setEntry value="org.eclipse.ui.browser@default:default"/>
+        <setEntry value="org.eclipse.ui.cheatsheets@default:default"/>
+        <setEntry value="org.eclipse.ui.console@default:default"/>
+        <setEntry value="org.eclipse.ui.editors@default:default"/>
+        <setEntry value="org.eclipse.ui.externaltools@default:default"/>
+        <setEntry value="org.eclipse.ui.forms@default:default"/>
+        <setEntry value="org.eclipse.ui.genericeditor@default:default"/>
+        <setEntry value="org.eclipse.ui.ide.application@default:default"/>
+        <setEntry value="org.eclipse.ui.ide@default:default"/>
+        <setEntry value="org.eclipse.ui.intro.quicklinks@default:default"/>
+        <setEntry value="org.eclipse.ui.intro.universal@default:default"/>
+        <setEntry value="org.eclipse.ui.intro@default:default"/>
+        <setEntry value="org.eclipse.ui.monitoring@default:default"/>
+        <setEntry value="org.eclipse.ui.navigator.resources@default:default"/>
+        <setEntry value="org.eclipse.ui.navigator@default:default"/>
+        <setEntry value="org.eclipse.ui.net@default:default"/>
+        <setEntry value="org.eclipse.ui.themes@default:default"/>
+        <setEntry value="org.eclipse.ui.trace@default:default"/>
+        <setEntry value="org.eclipse.ui.views.log@default:default"/>
+        <setEntry value="org.eclipse.ui.views.properties.tabbed@default:default"/>
+        <setEntry value="org.eclipse.ui.views@default:default"/>
+        <setEntry value="org.eclipse.ui.workbench.texteditor@default:default"/>
+        <setEntry value="org.eclipse.ui.workbench@default:default"/>
+        <setEntry value="org.eclipse.ui@default:default"/>
+        <setEntry value="org.eclipse.uml2.ant@default:default"/>
+        <setEntry value="org.eclipse.uml2.codegen.ecore.ui@default:default"/>
+        <setEntry value="org.eclipse.uml2.codegen.ecore@default:default"/>
+        <setEntry value="org.eclipse.uml2.common.edit@default:default"/>
+        <setEntry value="org.eclipse.uml2.common@default:default"/>
+        <setEntry value="org.eclipse.uml2.doc@default:default"/>
+        <setEntry value="org.eclipse.uml2.examples.uml.ui@default:default"/>
+        <setEntry value="org.eclipse.uml2.examples@default:default"/>
+        <setEntry value="org.eclipse.uml2.types@default:default"/>
+        <setEntry value="org.eclipse.uml2.uml.ecore.exporter@default:default"/>
+        <setEntry value="org.eclipse.uml2.uml.ecore.importer@default:default"/>
+        <setEntry value="org.eclipse.uml2.uml.edit@default:default"/>
+        <setEntry value="org.eclipse.uml2.uml.editor@default:default"/>
+        <setEntry value="org.eclipse.uml2.uml.profile.standard@default:default"/>
+        <setEntry value="org.eclipse.uml2.uml.resources@default:default"/>
+        <setEntry value="org.eclipse.uml2.uml.validation@default:default"/>
+        <setEntry value="org.eclipse.uml2.uml@default:default"/>
+        <setEntry value="org.eclipse.uml2@default:default"/>
+        <setEntry value="org.eclipse.update.configurator@3:true"/>
+        <setEntry value="org.eclipse.urischeme@default:default"/>
+        <setEntry value="org.eclipse.userstorage.oauth@default:default"/>
+        <setEntry value="org.eclipse.userstorage.ui@default:default"/>
+        <setEntry value="org.eclipse.userstorage@default:default"/>
+        <setEntry value="org.eclipse.viatra.addon.databinding.runtime.validation@default:false"/>
+        <setEntry value="org.eclipse.viatra.addon.databinding.runtime@default:default"/>
+        <setEntry value="org.eclipse.viatra.addon.querybasedfeatures.runtime.validation@default:false"/>
+        <setEntry value="org.eclipse.viatra.addon.querybasedfeatures.runtime@default:default"/>
+        <setEntry value="org.eclipse.viatra.addon.querybasedfeatures.tooling@default:default"/>
+        <setEntry value="org.eclipse.viatra.addon.validation.core@default:default"/>
+        <setEntry value="org.eclipse.viatra.addon.validation.runtime.ui@default:default"/>
+        <setEntry value="org.eclipse.viatra.addon.validation.runtime.validation@default:false"/>
+        <setEntry value="org.eclipse.viatra.addon.validation.runtime@default:default"/>
+        <setEntry value="org.eclipse.viatra.addon.validation.tooling@default:default"/>
+        <setEntry value="org.eclipse.viatra.addon.viewers.runtime.validation@default:false"/>
+        <setEntry value="org.eclipse.viatra.addon.viewers.runtime.zest@default:default"/>
+        <setEntry value="org.eclipse.viatra.addon.viewers.runtime@default:default"/>
+        <setEntry value="org.eclipse.viatra.addon.viewers.tooling.ui.zest@default:default"/>
+        <setEntry value="org.eclipse.viatra.addon.viewers.tooling.ui@default:default"/>
+        <setEntry value="org.eclipse.viatra.documentation.help@default:default"/>
+        <setEntry value="org.eclipse.viatra.dse.genetic@default:default"/>
+        <setEntry value="org.eclipse.viatra.dse@default:default"/>
+        <setEntry value="org.eclipse.viatra.integration.zest@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.patternlanguage.emf.ide@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.patternlanguage.emf.ui@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.patternlanguage.emf@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.runtime.base.itc@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.runtime.base@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.runtime.localsearch@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.runtime.matchers@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.runtime.rete.recipes@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.runtime.rete@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.runtime.ui@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.runtime@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.testing.core@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.testing.snapshot@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.testing.ui@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.tooling.core@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.tooling.debug@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.tooling.generator.model.ui@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.tooling.generator.model@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.tooling.localsearch.ui@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.tooling.ui.retevis@default:default"/>
+        <setEntry value="org.eclipse.viatra.query.tooling.ui@default:default"/>
+        <setEntry value="org.eclipse.viatra.transformation.evm.transactions@default:default"/>
+        <setEntry value="org.eclipse.viatra.transformation.evm@default:default"/>
+        <setEntry value="org.eclipse.viatra.transformation.runtime.debug@default:default"/>
+        <setEntry value="org.eclipse.viatra.transformation.runtime.emf@default:default"/>
+        <setEntry value="org.eclipse.viatra.transformation.runtime.tracer@default:default"/>
+        <setEntry value="org.eclipse.viatra.transformation.runtime.transformationtrace@default:default"/>
+        <setEntry value="org.eclipse.viatra.transformation.tooling.debug.ui@default:default"/>
+        <setEntry value="org.eclipse.viatra.transformation.tooling.debug@default:default"/>
+        <setEntry value="org.eclipse.viatra.transformation.ui@default:default"/>
+        <setEntry value="org.eclipse.viatra.transformation.views@default:default"/>
+        <setEntry value="org.eclipse.wst.common.core@default:default"/>
+        <setEntry value="org.eclipse.wst.common.emf@default:default"/>
+        <setEntry value="org.eclipse.wst.common.environment@default:default"/>
+        <setEntry value="org.eclipse.wst.common.frameworks@default:default"/>
+        <setEntry value="org.eclipse.wst.common.project.facet.core@default:default"/>
+        <setEntry value="org.eclipse.wst.common.uriresolver@default:default"/>
+        <setEntry value="org.eclipse.wst.sse.core@default:default"/>
+        <setEntry value="org.eclipse.wst.validation@default:default"/>
+        <setEntry value="org.eclipse.wst.xml.core@default:default"/>
+        <setEntry value="org.eclipse.wst.xsd.core@default:default"/>
+        <setEntry value="org.eclipse.xpand@default:default"/>
+        <setEntry value="org.eclipse.xsd.cheatsheets@default:default"/>
+        <setEntry value="org.eclipse.xsd.doc@default:default"/>
+        <setEntry value="org.eclipse.xsd.ecore.converter@default:default"/>
+        <setEntry value="org.eclipse.xsd.ecore.exporter@default:default"/>
+        <setEntry value="org.eclipse.xsd.ecore.importer@default:default"/>
+        <setEntry value="org.eclipse.xsd.edit@default:default"/>
+        <setEntry value="org.eclipse.xsd.editor@default:default"/>
+        <setEntry value="org.eclipse.xsd.example.installer@default:default"/>
+        <setEntry value="org.eclipse.xsd.mapping.editor@default:default"/>
+        <setEntry value="org.eclipse.xsd.mapping@default:default"/>
+        <setEntry value="org.eclipse.xsd@default:default"/>
+        <setEntry value="org.eclipse.xtend.core@default:default"/>
+        <setEntry value="org.eclipse.xtend.doc@default:default"/>
+        <setEntry value="org.eclipse.xtend.examples@default:default"/>
+        <setEntry value="org.eclipse.xtend.ide.common@default:default"/>
+        <setEntry value="org.eclipse.xtend.ide@default:default"/>
+        <setEntry value="org.eclipse.xtend.lib.macro@default:default"/>
+        <setEntry value="org.eclipse.xtend.lib@default:default"/>
+        <setEntry value="org.eclipse.xtend.m2e@default:default"/>
+        <setEntry value="org.eclipse.xtend.standalone@default:default"/>
+        <setEntry value="org.eclipse.xtend.typesystem.emf@default:default"/>
+        <setEntry value="org.eclipse.xtend@default:default"/>
+        <setEntry value="org.eclipse.xtext.activities@default:default"/>
+        <setEntry value="org.eclipse.xtext.builder.standalone@default:default"/>
+        <setEntry value="org.eclipse.xtext.builder@default:default"/>
+        <setEntry value="org.eclipse.xtext.common.types.edit@default:default"/>
+        <setEntry value="org.eclipse.xtext.common.types.shared.jdt38@default:false"/>
+        <setEntry value="org.eclipse.xtext.common.types.shared@default:default"/>
+        <setEntry value="org.eclipse.xtext.common.types.ui@default:default"/>
+        <setEntry value="org.eclipse.xtext.common.types@default:default"/>
+        <setEntry value="org.eclipse.xtext.doc@default:default"/>
+        <setEntry value="org.eclipse.xtext.ecore@default:default"/>
+        <setEntry value="org.eclipse.xtext.generator@default:default"/>
+        <setEntry value="org.eclipse.xtext.ide@default:default"/>
+        <setEntry value="org.eclipse.xtext.idea.generator@default:default"/>
+        <setEntry value="org.eclipse.xtext.java@default:default"/>
+        <setEntry value="org.eclipse.xtext.junit4@default:default"/>
+        <setEntry value="org.eclipse.xtext.logging@default:false"/>
+        <setEntry value="org.eclipse.xtext.m2e@default:default"/>
+        <setEntry value="org.eclipse.xtext.purexbase.ide@default:default"/>
+        <setEntry value="org.eclipse.xtext.purexbase.ui@default:default"/>
+        <setEntry value="org.eclipse.xtext.purexbase@default:default"/>
+        <setEntry value="org.eclipse.xtext.smap@default:default"/>
+        <setEntry value="org.eclipse.xtext.testing@default:default"/>
+        <setEntry value="org.eclipse.xtext.ui.codemining@default:default"/>
+        <setEntry value="org.eclipse.xtext.ui.codetemplates.ide@default:default"/>
+        <setEntry value="org.eclipse.xtext.ui.codetemplates.ui@default:default"/>
+        <setEntry value="org.eclipse.xtext.ui.codetemplates@default:default"/>
+        <setEntry value="org.eclipse.xtext.ui.ecore@default:default"/>
+        <setEntry value="org.eclipse.xtext.ui.shared@default:default"/>
+        <setEntry value="org.eclipse.xtext.ui.testing@default:default"/>
+        <setEntry value="org.eclipse.xtext.ui@default:default"/>
+        <setEntry value="org.eclipse.xtext.util@default:default"/>
+        <setEntry value="org.eclipse.xtext.xbase.ide@default:default"/>
+        <setEntry value="org.eclipse.xtext.xbase.junit@default:default"/>
+        <setEntry value="org.eclipse.xtext.xbase.lib@default:default"/>
+        <setEntry value="org.eclipse.xtext.xbase.testing@default:default"/>
+        <setEntry value="org.eclipse.xtext.xbase.ui.testing@default:default"/>
+        <setEntry value="org.eclipse.xtext.xbase.ui@default:default"/>
+        <setEntry value="org.eclipse.xtext.xbase@default:default"/>
+        <setEntry value="org.eclipse.xtext.xtext.generator@default:default"/>
+        <setEntry value="org.eclipse.xtext.xtext.ide@default:default"/>
+        <setEntry value="org.eclipse.xtext.xtext.ui.examples@default:default"/>
+        <setEntry value="org.eclipse.xtext.xtext.ui.graph@default:default"/>
+        <setEntry value="org.eclipse.xtext.xtext.ui@default:default"/>
+        <setEntry value="org.eclipse.xtext.xtext.wizard@default:default"/>
+        <setEntry value="org.eclipse.xtext@default:default"/>
+        <setEntry value="org.h2@default:default"/>
+        <setEntry value="org.hamcrest.core@default:default"/>
+        <setEntry value="org.jfree.jcommon@default:default"/>
+        <setEntry value="org.jsoup@default:default"/>
+        <setEntry value="org.junit.jupiter.api@default:default"/>
+        <setEntry value="org.junit.jupiter.engine@default:default"/>
+        <setEntry value="org.junit.jupiter.migrationsupport@default:default"/>
+        <setEntry value="org.junit.jupiter.params@default:default"/>
+        <setEntry value="org.junit.platform.commons@default:default"/>
+        <setEntry value="org.junit.platform.engine@default:default"/>
+        <setEntry value="org.junit.platform.launcher@default:default"/>
+        <setEntry value="org.junit.platform.runner@default:default"/>
+        <setEntry value="org.junit.platform.suite.api@default:default"/>
+        <setEntry value="org.junit.vintage.engine@default:default"/>
+        <setEntry value="org.junit@default:default"/>
+        <setEntry value="org.moeaframework@default:default"/>
+        <setEntry value="org.objectweb.asm.tree@default:default"/>
+        <setEntry value="org.objectweb.asm@default:default"/>
+        <setEntry value="org.opentest4j@default:default"/>
+        <setEntry value="org.sat4j.core@default:default"/>
+        <setEntry value="org.sat4j.pb@default:default"/>
+        <setEntry value="org.sidiff.common.emf.extensions@default:default"/>
+        <setEntry value="org.sidiff.common.emf@default:default"/>
+        <setEntry value="org.sidiff.common.henshin@default:default"/>
+        <setEntry value="org.sidiff.common@default:default"/>
+        <setEntry value="org.sidiff.serge@default:default"/>
+        <setEntry value="org.silift.common.util@default:default"/>
+        <setEntry value="org.slf4j.api@default:default"/>
+        <setEntry value="org.slf4j.impl.log4j12@default:false"/>
+        <setEntry value="org.tukaani.xz@default:default"/>
+        <setEntry value="org.w3c.css.sac@default:default"/>
+        <setEntry value="org.w3c.dom.events@default:default"/>
+        <setEntry value="org.w3c.dom.smil@default:default"/>
+        <setEntry value="org.w3c.dom.svg@default:default"/>
+        <setEntry value="uk.ac.kcl.inf.mdeoptimiser.interfaces.cli@default:default"/>
+        <setEntry value="uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui@default:default"/>
+        <setEntry value="uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext@default:default"/>
+        <setEntry value="uk.ac.kcl.inf.mdeoptimiser.libraries.core@default:default"/>
+        <setEntry value="uk.ac.kcl.inf.mdeoptimiser.libraries.rulegen@default:default"/>
+    </setAttribute>
+    <setAttribute key="selected_workspace_bundles">
+        <setEntry value="com.microsoft.z3@default:true"/>
+        <setEntry value="hu.bme.mit.inf.dlsreasoner.alloy.reasoner@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.alloy.language.ui@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.alloy.language@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.application.ide@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.application.ui@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.application@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.domains.cps.validation@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.domains.cps@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.domains.satellite.validation@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.domains.satellite@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.ecore2logic@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.faulttree.components.ide@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.faulttree.components.ui@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.faulttree.components@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.faulttree.model@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.faulttree.transformation@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.faulttree.ui@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.logic.model.validation@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.logic.model@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.logic2ecore@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.smt.language.ui@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.smt.language@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.smt.reasoner@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.viatra2logic@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.tests@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner@default:default"/>
+        <setEntry value="hu.bme.mit.inf.dslreasoner.visualisation@default:default"/>
+    </setAttribute>
     <booleanAttribute key="show_selected_only" value="false"/>
     <booleanAttribute key="tracing" value="false"/>
     <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend
index c3ba9f81..d718bb91 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend
@@ -1,5 +1,6 @@
 package hu.bme.mit.inf.dslreasoner.application.execution

 

+import com.google.inject.Injector

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.GenerationTask

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic

@@ -24,7 +25,9 @@ import java.util.LinkedList
 import java.util.Optional

 import org.eclipse.core.runtime.IProgressMonitor

 import org.eclipse.emf.common.util.URI

+import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor

 

+@FinalFieldsConstructor

 class GenerationTaskExecutor {

         val metamodelLoader = new MetamodelLoader

         val modelLoader = new ModelLoader

@@ -32,6 +35,7 @@ class GenerationTaskExecutor {
         val solverLoader = new SolverLoader

         val scopeLoader = new ScopeLoader

         val statisticsUtil = new StatisticSections2CSV

+        val Injector injector

         

         def executeGenerationTask(

                 GenerationTask task,

@@ -102,7 +106,7 @@ class GenerationTaskExecutor {
                         var domain2LogicTransformationTime = System.nanoTime

                         val Ecore2Logic ecore2Logic = new Ecore2Logic

                         val Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic)

-                        val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic)

+                        val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic, injector)

                         val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic

                         

                         var modelGeneration = ecore2Logic.transformMetamodel(metamodelDescriptor,new Ecore2LogicConfiguration())

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend
index c209cde5..371f6f8c 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/PatternLanguageWithRSSetup.xtend
@@ -1,11 +1,7 @@
 package hu.bme.mit.inf.dslreasoner.application.execution

 

-import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetupGenerated

-import com.google.inject.Injector

 import com.google.inject.Guice

-import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageRuntimeModule

-import com.google.inject.Guice;

-import com.google.inject.Injector;

+import com.google.inject.Injector

 import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetup

 

 class PatternLanguageWithRSSetup extends EMFPatternLanguageStandaloneSetup{

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend
index 3dea677f..9d0985d2 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptExecutor.xtend
@@ -1,5 +1,7 @@
 package hu.bme.mit.inf.dslreasoner.application.execution

 

+import com.google.inject.Inject

+import com.google.inject.Injector

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigReference

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigSpecification

 import hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigurationScript

@@ -33,11 +35,19 @@ import org.eclipse.core.runtime.jobs.Job
 import org.eclipse.emf.common.util.URI

 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor

 

-@FinalFieldsConstructor

 class ScriptExecutor {

         val parser = new ApplicationConfigurationParser

         

         val ScriptConsole.Factory scriptConsoleFactory

+        val Injector injector

+        

+        @FinalFieldsConstructor

+        new() {

+        }

+        

+        new(ScriptConsole.Factory scriptConsoleFactory) {

+                this(scriptConsoleFactory, null)

+        }

         

         /**

          * Executes a script

@@ -101,7 +111,7 @@ class ScriptExecutor {
         }

         

         def dispatch void execute(GenerationTask task, IProgressMonitor monitor) {

-                val generationTaskExecutor = new GenerationTaskExecutor

+                val generationTaskExecutor = new GenerationTaskExecutor(injector)

                 generationTaskExecutor.executeGenerationTask(task,this,scriptConsoleFactory,monitor)

         }

         

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend
index a549df00..fd50ad51 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend
@@ -28,6 +28,7 @@ import java.util.Optional
 import org.eclipse.viatra.query.patternlanguage.emf.vql.PatternModel

 import org.eclipse.xtext.EcoreUtil2

 import org.eclipse.xtext.xbase.lib.Functions.Function1

+import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloyBackendSolver

 

 class SolverLoader {

         def loadSolver(Solver solver, Map<String, String> config) {

@@ -73,9 +74,9 @@ class SolverLoader {
                                 if (!objectiveEntries.empty) {

                                         throw new IllegalArgumentException("Objectives are not supported by Alloy.")

                                 }

-                                val c = new SmtSolverConfiguration

-                                config.getAsBoolean("fixRandomSeed", console).ifPresent[c.fixRandomSeed = it]

-                                config.getAsType("path", console, [it], String).ifPresent[c.solverPath = it]

+                                val c = new AlloySolverConfiguration

+                                config.getAsInteger("symmetry", console).ifPresent[c.symmetry = it]

+                                config.getAsType("solver",console,[x|AlloyBackendSolver::valueOf(x)],AlloyBackendSolver).ifPresent[c.solver = it]

                                 c

                         }

                         case SMT_SOLVER: {

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/StandaloneScriptExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/StandaloneScriptExecutor.xtend
index 42be3ed7..23c76758 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/StandaloneScriptExecutor.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/StandaloneScriptExecutor.xtend
@@ -12,6 +12,8 @@ import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
 import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetup

 import org.eclipse.viatra.query.runtime.rete.matcher.ReteEngine

 import org.eclipse.xtext.resource.XtextResourceSet

+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions

+import org.eclipse.viatra.query.runtime.rete.matcher.ReteBackendFactory

 

 class StandaloneScriptExecutor {

         def static void main(String[] args) {

@@ -44,7 +46,10 @@ class StandaloneScriptExecutor {
                 Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("xmi",new XMIResourceFactoryImpl)

                 Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("logicproblem",new XMIResourceFactoryImpl)

                 Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("partialmodel",new XMIResourceFactoryImpl)

-                ReteEngine.getClass

+                //ReteEngine.getClass

+                

+                ViatraQueryEngineOptions.setSystemDefaultBackends(ReteBackendFactory.INSTANCE, ReteBackendFactory.INSTANCE,

+                        ReteBackendFactory.INSTANCE)

                 

                 val ext = path.split("\\.").last

                 if(ext.equals("vsconfig")) {

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/linking/ApplicationConfigurationLinkingService.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/linking/ApplicationConfigurationLinkingService.xtend
index fafba1d7..c876f3be 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/linking/ApplicationConfigurationLinkingService.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/linking/ApplicationConfigurationLinkingService.xtend
@@ -71,28 +71,29 @@ class ApplicationConfigurationLinkingService extends DefaultLinkingService {
         }

         

         private def getByUri(EObject context, EReference ref, INode node) {

+                val linkedObjects = super.getLinkedObjects(context, ref, node)

+                if (!linkedObjects.empty) {

+                        return linkedObjects

+                }

                 val uri = getNSUri(node)

                 if (uri.present) {

                         var URI createdURI

                         try {

                                 createdURI = URI.createURI(uri.get)

                         } catch (IllegalArgumentException e) {

-                                return super.getLinkedObjects(context, ref, node)

+                                return #[]

                         }

                         var Resource res

                         try {

                                 res = context.eResource.resourceSet.getResource(createdURI, true);

                         } catch (RuntimeException e) {

-                                return super.getLinkedObjects(context, ref, node)

+                                return #[]

                         }

                         if (res !== null && res.contents !== null) {

                                 return res.contents.filter[ref.EType.isInstance(it)].toList

-                        } else {

-                                return super.getLinkedObjects(context, ref, node)

                         }

-                } else {

-                        return super.getLinkedObjects(context, ref, node)

                 }

+                return #[]

         }

 

         private def getNSUri(INode node) {

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/start-standalone.launch b/Application/hu.bme.mit.inf.dslreasoner.application/start-standalone.launch
index 1f3744a7..437bc6e2 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/start-standalone.launch
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/start-standalone.launch
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/execution/StandaloneScriptExecutor.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor"/>
-<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="hu.bme.mit.inf.dslreasoner.application"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="hu.bme.mit.inf.dslreasoner.application"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/execution/StandaloneScriptExecutor.java"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="1"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="hu.bme.mit.inf.dslreasoner.application"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="EcoreGeneration.vsconfig"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="hu.bme.mit.inf.dslreasoner.application"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:Ecore-Plugin}"/>
 </launchConfiguration>
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin
index 287aa50d..a107bf27 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin
index e9b25b0a..994dbd52 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.gitignore b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.gitignore
index 1764b462..61ce5bef 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.gitignore
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.gitignore
@@ -1,2 +1,6 @@
 /.SolverSemanticHighlightCalculator.java._trace
 /.SolverSemanticTextAttributeProvider.java._trace
+/.SolverSemanticHighlightCalculator.xtendbin
+/.SolverSemanticTextAttributeProvider.xtendbin
+/SolverSemanticHighlightCalculator.java
+/SolverSemanticTextAttributeProvider.java
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin
index 79d18e32..9839769e 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore
index f1cb387a..565d4b27 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.gitignore
@@ -1 +1,3 @@
 /.SolverLanguageValidator.java._trace
+/.SolverLanguageValidator.xtendbin
+/SolverLanguageValidator.java
diff --git a/Application/org.eclipse.viatra.solver.language/.launch/Launch Runtime Eclipse.launch b/Application/org.eclipse.viatra.solver.language/.launch/Launch Runtime Eclipse.launch
index 1e189f24..d9fb69f1 100644
--- a/Application/org.eclipse.viatra.solver.language/.launch/Launch Runtime Eclipse.launch
+++ b/Application/org.eclipse.viatra.solver.language/.launch/Launch Runtime Eclipse.launch
@@ -1,35 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bad_container_name" value="/org.eclipse.viatra.solver.language/.launch/"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Launch Runtime Eclipse"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../eclipse-2020-03-runtime"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
+    <booleanAttribute key="append.args" value="true"/>
+    <booleanAttribute key="askclear" value="true"/>
+    <booleanAttribute key="automaticAdd" value="true"/>
+    <booleanAttribute key="automaticValidate" value="false"/>
+    <stringAttribute key="bad_container_name" value="/org.eclipse.viatra.solver.language/.launch/"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="false"/>
+    <booleanAttribute key="clearws" value="false"/>
+    <booleanAttribute key="clearwslog" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Launch Runtime Eclipse"/>
+    <booleanAttribute key="default" value="true"/>
+    <booleanAttribute key="includeOptional" value="true"/>
+    <stringAttribute key="location" value="${workspace_loc}/../eclipse-2020-09-runtime"/>
+    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
+        <mapEntry key="LD_LIBRARY_PATH" value="${resource_loc:/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib}"/>
+    </mapAttribute>
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+    </listAttribute>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-11-openjdk"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms512m -Xmx16g"/>
+    <stringAttribute key="pde.version" value="3.3"/>
+    <stringAttribute key="product" value="org.eclipse.platform.ide"/>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfig" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="true"/>
+    <booleanAttribute key="useProduct" value="true"/>
+    <booleanAttribute key="usefeatures" value="false"/>
 </launchConfiguration>
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin
index c529b829..d2fd056e 100644
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.gitignore b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.gitignore
index 9cf14147..5fbb81c3 100644
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.gitignore
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.gitignore
@@ -5,3 +5,5 @@
 /.SolverLanguageSyntheticTokenParser.java._trace
 /.SolverLanguageTokenSource.java._trace
 /.SolverLanguageTokenDefInjectingParser.java._trace
+/.SolverLanguageTokenDefInjectingParser.xtendbin
+/SolverLanguageTokenDefInjectingParser.java
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin
index 9ff56ed9..30cf1dbd 100644
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.gitignore b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.gitignore
index b8132d70..1f04090d 100644
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.gitignore
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.gitignore
@@ -1 +1,3 @@
 /.SolverLanguageSyntheticTokenSyntacticSequencer.java._trace
+/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin
+/SolverLanguageSyntheticTokenSyntacticSequencer.java
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..288a7692
--- /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..ddc8ea74
--- /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..e89ea81c
--- /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..e006abd7
--- /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..11227a1c
--- /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..90728c00
--- /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..4625dcf2
--- /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..d74342ba
--- /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..a0661c87
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3ModelGenerator.java
@@ -0,0 +1,597 @@
+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)));
+            };
+            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.yakindu.sgraph/plugin.xml b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
index 331e2b61..d4ab204e 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
@@ -39,72 +39,4 @@
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.twoSynch"/>
     </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/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/.classpath b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/.classpath
index 849e2a7b..2a747353 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/.classpath
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/.classpath
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
         <classpathentry kind="src" path="ecore-gen"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-        <classpathentry kind="src" path="src"/>
-        <classpathentry kind="src" path="xtend-gen"/>
-        <classpathentry kind="lib" path="lib/com.microsoft.z3.jar">
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
                 <attributes>
-                        <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="hu.bme.mit.inf.dslreasoner.viatra2logic/lib"/>
+                        <attribute name="module" value="true"/>
                 </attributes>
         </classpathentry>
+        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+        <classpathentry kind="src" path="src"/>
+        <classpathentry kind="src" path="xtend-gen"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/META-INF/MANIFEST.MF b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/META-INF/MANIFEST.MF
index c7242106..23fba304 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/META-INF/MANIFEST.MF
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/META-INF/MANIFEST.MF
@@ -20,11 +20,11 @@ Require-Bundle: com.google.guava,
  org.eclipse.viatra.query.patternlanguage.emf;bundle-version="2.0.0",

  org.eclipse.xtext,

  org.eclipse.xtext.xbase;bundle-version="2.18.0",

- hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0"

+ hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0",

+ com.microsoft.z3

 Bundle-ActivationPolicy: lazy

-Export-Package: hu.bme.mit.inf.dslreasoner.viatra2logic,

+Export-Package: 

+ hu.bme.mit.inf.dslreasoner.viatra2logic,

  hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations,

  hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.impl,

  hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.util

-Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.viatra2logic

-

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/lib/.gitignore b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/lib/.gitignore
deleted file mode 100644
index e69de29b..00000000
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/lib/.gitignore
+++ /dev/null
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Constraint2Logic.xtend b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Constraint2Logic.xtend
index b8c52af4..37fb81ae 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Constraint2Logic.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Constraint2Logic.xtend
@@ -1,5 +1,4 @@
 package hu.bme.mit.inf.dslreasoner.viatra2logic

-

 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.builder.LogicProblemBuilder

@@ -17,27 +16,27 @@ import org.eclipse.emf.ecore.EStructuralFeature
 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.aggregators.DoubleSumOperator

+import org.eclipse.viatra.query.runtime.matchers.aggregators.ExtremumOperator

+import org.eclipse.viatra.query.runtime.matchers.aggregators.ExtremumOperator.Extreme

+import org.eclipse.viatra.query.runtime.matchers.aggregators.IntegerSumOperator

+import org.eclipse.viatra.query.runtime.matchers.aggregators.LongSumOperator

 import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint

 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.Inequality

 import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall

+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.BinaryTransitiveClosure

 import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.ConstantValue

 import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall

 import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint

 

 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.AggregatorConstraint

-import org.eclipse.viatra.query.runtime.matchers.aggregators.DoubleSumOperator

-import org.eclipse.viatra.query.runtime.matchers.aggregators.IntegerSumOperator

-import org.eclipse.viatra.query.runtime.matchers.aggregators.LongSumOperator

-import org.eclipse.viatra.query.runtime.matchers.aggregators.ExtremumOperator

-import org.eclipse.viatra.query.runtime.matchers.aggregators.ExtremumOperator.Extreme

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.PatternMatchCounter

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation

 

 class Constraint2Logic {

         val extension LogicProblemBuilder builder = new LogicProblemBuilder

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend
index b4303739..6393121b 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/ExpressionEvaluation2Logic.xtend
@@ -12,11 +12,15 @@ import org.eclipse.xtext.xbase.XMemberFeatureCall
 import org.eclipse.xtext.xbase.XNumberLiteral

 import org.eclipse.xtext.xbase.XUnaryOperation

 

-import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*

-

 class ExpressionEvaluation2Logic {

         val extension LogicProblemBuilder builder = new LogicProblemBuilder

-        val NumericProblemSolver numericSolver = new NumericProblemSolver

+        var NumericProblemSolver _numericSolver = null //new NumericProblemSolver

+        def getNumericSolver() {

+                if(_numericSolver === null) {

+                        _numericSolver = new NumericProblemSolver

+                }

+                return _numericSolver

+        }

         

         def Term transformCheck(XExpression expression, Map<PVariable, Variable> variable2Variable) {

                 return expression.transform(variable2Variable)

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericProblemSolver.java b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericProblemSolver.java
index 0b249962..f1314925 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericProblemSolver.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericProblemSolver.java
@@ -1,17 +1,10 @@
 package hu.bme.mit.inf.dslreasoner.viatra2logic;

 

-import java.math.BigDecimal;

 import java.util.ArrayList;

 import java.util.HashMap;

-import java.util.HashSet;

 import java.util.List;

 import java.util.Map;

-import java.util.Map.Entry;

-import java.util.Random;

-import java.util.Set;

 

-import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;

 import org.eclipse.xtext.common.types.JvmIdentifiableElement;

 import org.eclipse.xtext.xbase.XBinaryOperation;

 import org.eclipse.xtext.xbase.XExpression;

@@ -29,10 +22,9 @@ import com.microsoft.z3.Solver;
 import com.microsoft.z3.Status;

 import com.microsoft.z3.enumerations.Z3_ast_print_mode;

 

-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.IntegerElement;

-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RealElement;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PrimitiveElement;

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RealElement;

 

 

 public class NumericProblemSolver {

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericTranslator.xtend b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericTranslator.xtend
index 81bc1796..b9eda7b3 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericTranslator.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/NumericTranslator.xtend
@@ -1,19 +1,17 @@
 package hu.bme.mit.inf.dslreasoner.viatra2logic

 

-import org.eclipse.xtext.xbase.XExpression

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation

-import org.eclipse.xtext.common.types.JvmIdentifiableElement

-import java.util.Set

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PrimitiveElement

-import java.util.Map

-import com.microsoft.z3.BoolExpr

-import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint

-import java.util.Map.Entry

-import org.eclipse.xtext.xbase.XFeatureCall

-import java.util.Comparator

 import java.util.ArrayList

+import java.util.Comparator

 import java.util.HashMap

 import java.util.List

+import java.util.Map

+import java.util.Map.Entry

+import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint

+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation

+import org.eclipse.xtext.common.types.JvmIdentifiableElement

+import org.eclipse.xtext.xbase.XExpression

+import org.eclipse.xtext.xbase.XFeatureCall

 

 class NumericTranslator {

         

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend
index 74e03f71..2f7febd0 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2Logic.xtend
@@ -1,5 +1,6 @@
 package hu.bme.mit.inf.dslreasoner.viatra2logic

 

+import com.google.inject.Injector

 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.builder.LogicProblemBuilder

@@ -50,7 +51,7 @@ class Viatra2LogicConfiguration {
         public var normalize = true

 }

 

-class  Viatra2Logic {

+class Viatra2Logic {

         val extension LogicProblemBuilder builder = new LogicProblemBuilder

         val extension Viatra2LogicAnnotationsFactory factory = Viatra2LogicAnnotationsFactory.eINSTANCE

         val normalizer = new PBodyNormalizer(EMFQueryMetaContext.DEFAULT)

@@ -59,12 +60,16 @@ class  Viatra2Logic {
         val Ecore2Logic ecore2Logic

         Constraint2Logic constraint2Logic

         

-        new(Ecore2Logic ecore2Logic) {

+        new(Ecore2Logic ecore2Logic, Injector injector) {

                 this.ecore2Logic = ecore2Logic

-                this.typeInferer = new Viatra2LogicTypeInferer(ecore2Logic)

+                this.typeInferer = new Viatra2LogicTypeInferer(ecore2Logic, injector)

                 this.constraint2Logic = new Constraint2Logic(ecore2Logic)

         }

         

+        new(Ecore2Logic ecore2Logic) {

+                this(ecore2Logic, null)

+        }

+        

         def TracedOutput<LogicProblem,Viatra2LogicTrace> transformQueries(

                 ViatraQuerySetDescriptor queries,

                 TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace,

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2LogicTypeInferer.xtend b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2LogicTypeInferer.xtend
index b8a6b9c1..1a96bf07 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2LogicTypeInferer.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/src/hu/bme/mit/inf/dslreasoner/viatra2logic/Viatra2LogicTypeInferer.xtend
@@ -1,5 +1,6 @@
 package hu.bme.mit.inf.dslreasoner.viatra2logic

 

+import com.google.inject.Injector

 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.builder.LogicProblemBuilder

@@ -18,7 +19,6 @@ import java.util.Set
 import org.eclipse.emf.ecore.EEnum

 import org.eclipse.emf.ecore.EcorePackage

 import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetup

-import org.eclipse.viatra.query.patternlanguage.emf.specification.XBaseEvaluator

 import org.eclipse.viatra.query.runtime.emf.EMFQueryMetaContext

 import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey

 import org.eclipse.viatra.query.runtime.emf.types.EClassUnscopedTransitiveInstancesKey

@@ -26,7 +26,6 @@ import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey
 import org.eclipse.viatra.query.runtime.matchers.context.IInputKey

 import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey

 import org.eclipse.viatra.query.runtime.matchers.planning.helpers.TypeHelper

-import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator

 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

@@ -40,285 +39,275 @@ import org.eclipse.xtext.xbase.typesystem.IBatchTypeResolver
 import org.eclipse.xtext.xbase.typesystem.references.UnknownTypeReference

 

 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*

-import org.eclipse.xtext.xbase.typesystem.references.InnerTypeReference

 

-class Viatra2LogicTypeInferer{

+class Viatra2LogicTypeInferer {

         val Ecore2Logic ecore2Logic

         val extension LogicProblemBuilder builder = new LogicProblemBuilder

         /**Typeresolver uses the same resolver as EMFPatternLanguageStandaloneSetup.*/

-        val IBatchTypeResolver typeResolver = 

-                (new EMFPatternLanguageStandaloneSetup).createInjector.getInstance(IBatchTypeResolver)

+        val IBatchTypeResolver typeResolver

         val expressionExtractor = new XExpressionExtractor

-        

-        new(Ecore2Logic ecore2Logic) {

+

+        new(Ecore2Logic ecore2Logic, Injector injector) {

                 this.ecore2Logic = ecore2Logic

+                val selectedInjector = injector ?:

+                        new EMFPatternLanguageStandaloneSetup().createStandaloneInjectorWithSeparateModules

+                this.typeResolver = selectedInjector.getInstance(IBatchTypeResolver)

+        }

+

+        new(Ecore2Logic ecore2Logic) {

+                this(ecore2Logic, null)

         }

-        

-        def Viatra2LogicTypeResult inferTypes(List<PQuery> pQueries, TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace, Viatra2LogicTrace viatra2LogicTrace) {

-                val Viatra2LogicTypeResult result = new Viatra2LogicTypeResult(new HashMap,new HashMap);

-                for(query : pQueries) {

-                        for(body: query.lookup(viatra2LogicTrace.query2Disjunction).bodies) {

-                                for(variable : body.uniqueVariables) {

-                                        getOrMakeTypeDecision(result,variable,body,ecore2LogicTrace,viatra2LogicTrace,emptySet)

+

+        def Viatra2LogicTypeResult inferTypes(List<PQuery> pQueries,

+                TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace, Viatra2LogicTrace viatra2LogicTrace) {

+                val Viatra2LogicTypeResult result = new Viatra2LogicTypeResult(new HashMap, new HashMap);

+                for (query : pQueries) {

+                        for (body : query.lookup(viatra2LogicTrace.query2Disjunction).bodies) {

+                                for (variable : body.uniqueVariables) {

+                                        getOrMakeTypeDecision(result, variable, body, ecore2LogicTrace, viatra2LogicTrace, emptySet)

                                 }

                         }

-                        for(parameter: query.parameters) {

-                                getOrMakeTypeDecision(result,query,parameter,ecore2LogicTrace,viatra2LogicTrace,emptySet)

+                        for (parameter : query.parameters) {

+                                getOrMakeTypeDecision(result, query, parameter, ecore2LogicTrace, viatra2LogicTrace, emptySet)

                         }

                 }

                 return result

         }

-        

-        private def TypeReference getOrMakeTypeDecision(

-                Viatra2LogicTypeResult result,

-                PVariable variable, PBody body,

-                TracedOutput<LogicProblem,  Ecore2Logic_Trace> ecore2LogicTrace,

-                Viatra2LogicTrace viatra2LogicTrace,

-                Set<? extends PParameter> checkedInDecisionMaking)

-        {

-                if(result.containsSolution(body,variable)) {

-                        return result.getType(body,variable)

+

+        private def TypeReference getOrMakeTypeDecision(Viatra2LogicTypeResult result, PVariable variable, PBody body,

+                TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace, Viatra2LogicTrace viatra2LogicTrace,

+                Set<? extends PParameter> checkedInDecisionMaking) {

+                if (result.containsSolution(body, variable)) {

+                        return result.getType(body, variable)

                 } else {

-                        val inferredTypesByViatra = TypeHelper::inferUnaryTypesFor(body.uniqueVariables, body.constraints, EMFQueryMetaContext.DEFAULT)

+                        val inferredTypesByViatra = TypeHelper::inferUnaryTypesFor(body.uniqueVariables, body.constraints,

+                                EMFQueryMetaContext.DEFAULT)

                         val constraintsForVariable = variable.lookup(inferredTypesByViatra)

-                        

-                        val typeConstraintsDerivedByTypeHelper = constraintsForVariable.map[transformTypeReference(ecore2LogicTrace)]

+

+                        val typeConstraintsDerivedByTypeHelper = constraintsForVariable.map [

+                                transformTypeReference(ecore2LogicTrace)

+                        ]

                         val typesFromEval = variable.getTypesFromEval(typeResolver)

-                        val typesFromAggregatorResult = variable.getTypeFromPassivePatternCallConstraintResult(

-                                result,

-                                ecore2LogicTrace,

-                                viatra2LogicTrace,

-                                checkedInDecisionMaking)

-                                 

-                        val typesFromPositiveReasoning = (typeConstraintsDerivedByTypeHelper + typesFromEval + typesFromAggregatorResult).filterNull

-                        

-                        val types = if(!typesFromPositiveReasoning.empty) {

-                                typesFromPositiveReasoning

-                        } else {

-                                variable.getTypeFromPassivePatternCallConstraints(

-                                        result,

-                                        ecore2LogicTrace,

-                                        viatra2LogicTrace,

+                        val typesFromAggregatorResult = variable.

+                                getTypeFromPassivePatternCallConstraintResult(result, ecore2LogicTrace, viatra2LogicTrace,

                                         checkedInDecisionMaking)

-                        }

-                        

+

+                        val typesFromPositiveReasoning = (typeConstraintsDerivedByTypeHelper + typesFromEval +

+                                typesFromAggregatorResult).filterNull

+

+                        val types = if (!typesFromPositiveReasoning.empty) {

+                                        typesFromPositiveReasoning

+                                } else {

+                                        variable.getTypeFromPassivePatternCallConstraints(result, ecore2LogicTrace, viatra2LogicTrace,

+                                                checkedInDecisionMaking)

+                                }

+

                         val commonSubtype = this.calculateCommonSubtype(types)

-                        

-                        result.addType(body,variable,commonSubtype)

+

+                        result.addType(body, variable, commonSubtype)

                         return commonSubtype

                 }

         }

 

-        private def TypeReference getOrMakeTypeDecision(

-                Viatra2LogicTypeResult result,

-                PQuery query,

-                PParameter parameter,

-                TracedOutput<LogicProblem,  Ecore2Logic_Trace> ecore2LogicTrace,

-                Viatra2LogicTrace viatra2LogicTrace,

-                Set<? extends PParameter> checkedInDecisionMaking)

-        {

-                if(checkedInDecisionMaking.contains(parameter)) {

+        private def TypeReference getOrMakeTypeDecision(Viatra2LogicTypeResult result, PQuery query, PParameter parameter,

+                TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace, Viatra2LogicTrace viatra2LogicTrace,

+                Set<? extends PParameter> checkedInDecisionMaking) {

+                if (checkedInDecisionMaking.contains(parameter)) {

                         return null

                 }

-                if(result.containsSolution(parameter)) {

+                if (result.containsSolution(parameter)) {

                         return result.getType(query, parameter)

                 }

-                

+

                 var TypeReference typeReference;

-                

-                if(parameter.declaredUnaryType !== null) {

-                         val key = parameter.declaredUnaryType

-                         typeReference = key.transformTypeReference(ecore2LogicTrace)

+

+                if (parameter.declaredUnaryType !== null) {

+                        val key = parameter.declaredUnaryType

+                        typeReference = key.transformTypeReference(ecore2LogicTrace)

                 } else {

                         val bodies = query.lookup(viatra2LogicTrace.query2Disjunction).bodies

                         val newChecked = new HashSet(checkedInDecisionMaking) => [add(parameter)]

-                        val Iterable<TypeReference> variableTypes = bodies.map[body|

+                        val Iterable<TypeReference> variableTypes = bodies.map [ body |

                                 val symbolicParameter = body.symbolicParameters.filter[patternParameter === parameter].head

                                 val variable = symbolicParameter.parameterVariable

-                                getOrMakeTypeDecision(result,variable,body,ecore2LogicTrace,viatra2LogicTrace,newChecked)

+                                getOrMakeTypeDecision(result, variable, body, ecore2LogicTrace, viatra2LogicTrace, newChecked)

                         ]

                         typeReference = calculateCommonSupertype(variableTypes)

                 }

-                result.addType(query,parameter,typeReference)

+                result.addType(query, parameter, typeReference)

                 return typeReference

         }

-        

+

         private def Iterable<? extends TypeReference> getTypesFromEval(PVariable v, IBatchTypeResolver typeResolver) {

                 val constraints = v.getReferringConstraintsOfType(

                         typeof(ExpressionEvaluation)

-                ).filter[

+                ).filter [

                         it.outputVariable === v

                 ]

                 val res = constraints.map[getTypeFromEval]

                 return res

         }

-        

+

         def TypeReference getTypeFromEval(ExpressionEvaluation evaluation) {

                 val XExpression expression = expressionExtractor.extractExpression(evaluation.evaluator)

                 val returnType = typeResolver.resolveTypes(expression).getReturnType(expression);

-                if(returnType === null || returnType instanceof UnknownTypeReference) {

+                if (returnType === null || returnType instanceof UnknownTypeReference) {

                         return null

                 } else {

                         val javaIdentifier = returnType.wrapperTypeIfPrimitive.javaIdentifier

-                        if(javaIdentifier == Boolean.name) {

+                        if (javaIdentifier == Boolean.name) {

                                 return LogicBool

-                        } else if(javaIdentifier == Integer.name || javaIdentifier == Short.name) {

+                        } else if (javaIdentifier == Integer.name || javaIdentifier == Short.name) {

                                 return LogicInt

-                        } else if(javaIdentifier == Double.name || javaIdentifier == Float.name){

+                        } else if (javaIdentifier == Double.name || javaIdentifier == Float.name) {

                                 return LogicReal

-                        } else if(javaIdentifier == String.name) {

+                        } else if (javaIdentifier == String.name) {

                                 return LogicString

                         } else {

                                 throw new UnsupportedOperationException('''Unsupported eval type: "«javaIdentifier»"!''')

                         }

                 }

         }

-        

+

         private def getTypeFromPassivePatternCallConstraintResult(

                 PVariable v,

                 Viatra2LogicTypeResult result,

-                TracedOutput<LogicProblem,  Ecore2Logic_Trace> ecore2LogicTrace,

+                TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace,

                 Viatra2LogicTrace viatra2LogicTrace,

                 Set<? extends PParameter> checkedInDecisionMaking

         ) {

                 val referringConstraints = v.referringConstraints

-                

-                val referringCountMatcherTargeting = referringConstraints

-                        .filter(PatternMatchCounter)

-                        .filter[it.resultVariable === v]

-                        .map[builder.LogicInt]

-                val referringAggregatorConstraintsTargeting = referringConstraints

-                        .filter(AggregatorConstraint)

-                        .filter[it.resultVariable === v]

-                        .map[ // get the type of the referred column

-                                getOrMakeTypeDecision(

-                                        result,

-                                        it.referredQuery,

-                                        it.referredQuery.parameters.get(aggregatedColumn),

-                                        ecore2LogicTrace,

-                                        viatra2LogicTrace,

-                                        checkedInDecisionMaking)]

-                                        

+

+                val referringCountMatcherTargeting = referringConstraints.filter(PatternMatchCounter).filter [

+                        it.resultVariable === v

+                ].map[builder.LogicInt]

+                val referringAggregatorConstraintsTargeting = referringConstraints.filter(AggregatorConstraint).filter [

+                        it.resultVariable === v

+                ].map [ // get the type of the referred column

+                        getOrMakeTypeDecision(result, it.referredQuery, it.referredQuery.parameters.get(aggregatedColumn),

+                                ecore2LogicTrace, viatra2LogicTrace, checkedInDecisionMaking)

+                ]

+

                 return referringCountMatcherTargeting + referringAggregatorConstraintsTargeting

         }

-        

+

         private def getTypeFromPassivePatternCallConstraints(

                 PVariable v,

                 Viatra2LogicTypeResult result,

-                TracedOutput<LogicProblem,  Ecore2Logic_Trace> ecore2LogicTrace,

+                TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace,

                 Viatra2LogicTrace viatra2LogicTrace,

                 Set<? extends PParameter> checkedInDecisionMaking

         ) {

                 val referringConstraints = v.referringConstraints

-                if(referringConstraints.size === 1) {

+                if (referringConstraints.size === 1) {

                         val onlyConstraint = referringConstraints.head

-                        

-                        if(onlyConstraint instanceof PatternCallBasedDeferred) {

+

+                        if (onlyConstraint instanceof PatternCallBasedDeferred) {

                                 val indexOfVariable = v.lookup(onlyConstraint.actualParametersTuple.invertIndex)

                                 val parameter = onlyConstraint.referredQuery.parameters.get(indexOfVariable)

-                                val res = getOrMakeTypeDecision(result, onlyConstraint.referredQuery, parameter, ecore2LogicTrace,viatra2LogicTrace,checkedInDecisionMaking)

+                                val res = getOrMakeTypeDecision(result, onlyConstraint.referredQuery, parameter, ecore2LogicTrace,

+                                        viatra2LogicTrace, checkedInDecisionMaking)

                                 return #[res]

                         } else {

                                 throw new IllegalArgumentException('''A non-PatternCallBasedDeferred type constraint is referring to the variable "«v.name»"!''')

                         }

                 } else {

-                        throw new IllegalArgumentException('''Multiple («referringConstraints.size», «FOR c:referringConstraints SEPARATOR ", "»«c»«ENDFOR») constraints are referring to variable "«v.name»", but no type is inferred!''')

+                        throw new IllegalArgumentException('''Multiple («referringConstraints.size», «FOR c : referringConstraints SEPARATOR ", "»«c»«ENDFOR») constraints are referring to variable "«v.name»", but no type is inferred!''')

                 }

         }

-        

+

         def TypeReference calculateCommonSubtype(Iterable<TypeReference> types) {

                 val primitiveTypeReferences = types.filter(PrimitiveTypeReference)

                 val complexTypeReferences = types.filter(ComplexTypeReference)

-                if(complexTypeReferences.isEmpty) {

+                if (complexTypeReferences.isEmpty) {

                         // If there is an int type, ...

-                        if(primitiveTypeReferences.exists[it instanceof IntTypeReference]) {

+                        if (primitiveTypeReferences.exists[it instanceof IntTypeReference]) {

                                 // ... and all types are either real or int, then return int!

-                                if(primitiveTypeReferences.forall[it instanceof RealTypeReference || it instanceof IntTypeReference]) {

+                                if (primitiveTypeReferences.forall[it instanceof RealTypeReference || it instanceof IntTypeReference]) {

                                         return primitiveTypeReferences.filter(IntTypeReference).head

-                                }

-                                // Otherwise, the types are inconsistent, because they mixing numeric and non-numeric types.

-                                else throw new IllegalArgumentException('''Inconsistent types: «primitiveTypeReferences.map[eClass.name].toSet.toList»''')

+                                } // Otherwise, the types are inconsistent, because they mixing numeric and non-numeric types.

+                                else

+                                        throw new IllegalArgumentException('''Inconsistent types: «primitiveTypeReferences.map[eClass.name].toSet.toList»''')

                         }

                         // If there is no Real, then the types should be homogenious

                         val head = primitiveTypeReferences.head

-                        if(primitiveTypeReferences.exists[it.eClass !== head.eClass]) {

+                        if (primitiveTypeReferences.exists[it.eClass !== head.eClass]) {

                                 throw new IllegalArgumentException('''Inconsistent types: «primitiveTypeReferences.map[eClass.name].toSet.toList»''')

                         }

                         return head

-                } else if(primitiveTypeReferences.isEmpty) {

+                } else if (primitiveTypeReferences.isEmpty) {

                         val complexTypes = complexTypeReferences.map[it.referred].toSet

-                        if(complexTypes.size === 1) {

+                        if (complexTypes.size === 1) {

                                 return builder.toTypeReference(complexTypes.head)

                         }

                         // Collect possible subtypes

                         val subtypeSets = complexTypes.map[it.transitiveClosureStar[it.subtypes].toSet]

                         val commonTypeSet = new HashSet(subtypeSets.head)

                         val otherSets = subtypeSets.tail

-                        for(otherSet : otherSets) {

+                        for (otherSet : otherSets) {

                                 commonTypeSet.retainAll(otherSet)

                         }

-                        if(commonTypeSet.empty) {

+                        if (commonTypeSet.empty) {

                                 throw new IllegalArgumentException('''Inconsistent types: «complexTypes.map[name].toList»''')

                         }

-                        

-                        

+

                         return calculateCommonComplexSupertype(commonTypeSet)

-                        

+

                 } else {

                         throw new IllegalArgumentException('''

                         Inconsistent types, mixing primitive and complex types:

                                 «primitiveTypeReferences.map[eClass.name].toSet.toList»

                                         and

                                 «complexTypeReferences.map[it.referred].toSet.map[name].toList»''')

-                        

+

                 }

         }

-        

-        

+

         def TypeReference calculateCommonSupertype(Iterable<TypeReference> types) {

                 val primitiveTypeReferences = types.filter(PrimitiveTypeReference)

                 val complexTypeReferences = types.filter(ComplexTypeReference)

-                if(complexTypeReferences.isEmpty) {

+                if (complexTypeReferences.isEmpty) {

                         // If there is a real type, ...

-                        if(primitiveTypeReferences.exists[it instanceof RealTypeReference]) {

+                        if (primitiveTypeReferences.exists[it instanceof RealTypeReference]) {

                                 // ... and all types are either real or int, then return real!

-                                if(primitiveTypeReferences.forall[it instanceof RealTypeReference || it instanceof IntTypeReference]) {

+                                if (primitiveTypeReferences.forall[it instanceof RealTypeReference || it instanceof IntTypeReference]) {

                                         return primitiveTypeReferences.filter(RealTypeReference).head

-                                }

-                                // Otherwise, the types are inconsistent, because they mixing numeric and non-numeric types.

-                                else throw new IllegalArgumentException('''Inconsistent types: «primitiveTypeReferences.map[eClass.name].toSet.toList»''')

+                                } // Otherwise, the types are inconsistent, because they mixing numeric and non-numeric types.

+                                else

+                                        throw new IllegalArgumentException('''Inconsistent types: «primitiveTypeReferences.map[eClass.name].toSet.toList»''')

                         }

                         // If there is no Real, then the types should be homogenious

                         val head = primitiveTypeReferences.head

-                        if(primitiveTypeReferences.exists[it.eClass !== head.eClass]) {

+                        if (primitiveTypeReferences.exists[it.eClass !== head.eClass]) {

                                 throw new IllegalArgumentException('''Inconsistent types: «primitiveTypeReferences.map[eClass.name].toSet.toList»''')

                         }

                         return head

-                } else if(primitiveTypeReferences.isEmpty) {

+                } else if (primitiveTypeReferences.isEmpty) {

                         val complexTypes = complexTypeReferences.map[it.referred].toSet

                         return calculateCommonComplexSupertype(complexTypes)

-                        

+

                 } else {

                         throw new IllegalArgumentException('''

                         Inconsistent types, mixing primitive and complex types:

                                 «primitiveTypeReferences.map[eClass.name].toSet.toList»

                                         and

                                 «complexTypeReferences.map[it.referred].toSet.map[name].toList»''')

-                        

+

                 }

         }

+

         def TypeReference calculateCommonComplexSupertype(Set<Type> complexTypes) {

-                if(complexTypes.size === 1) {

+                if (complexTypes.size === 1) {

                         return builder.toTypeReference(complexTypes.head)

                 }

                 // Collect possible supertypes

                 val supertypeSets = complexTypes.map[it.transitiveClosureStar[it.supertypes].toSet]

                 val commonTypeSet = new HashSet(supertypeSets.head)

                 val otherSets = supertypeSets.tail

-                for(otherSet : otherSets) {

+                for (otherSet : otherSets) {

                         commonTypeSet.retainAll(otherSet)

                 }

-                if(commonTypeSet.empty) {

+                if (commonTypeSet.empty) {

                         throw new IllegalArgumentException('''Inconsistent types: «complexTypes.map[name].toList»''')

                 }

                 // Remove type that already have covered

@@ -326,40 +315,44 @@ class Viatra2LogicTypeInferer{
                 commonTypeSet.removeAll(coveredTypes)

                 return builder.toTypeReference(commonTypeSet.head)

         }

-        

+

         /**

          * Transforms a Viatra type reference to a logic type.

          */

-        def dispatch TypeReference transformTypeReference(EDataTypeInSlotsKey k,TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace) {

-                val w = k.wrappedKey 

-                if(w == EcorePackage.Literals.EINT || w == EcorePackage.Literals.ESHORT || w == EcorePackage.Literals.ELONG) {

+        def dispatch TypeReference transformTypeReference(EDataTypeInSlotsKey k,

+                TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace) {

+                val w = k.wrappedKey

+                if (w == EcorePackage.Literals.EINT || w == EcorePackage.Literals.ESHORT || w == EcorePackage.Literals.ELONG) {

                         return builder.LogicInt

-                } else if(w == EcorePackage.Literals.EDOUBLE || w == EcorePackage.Literals.EFLOAT) {

+                } else if (w == EcorePackage.Literals.EDOUBLE || w == EcorePackage.Literals.EFLOAT) {

                         return builder.LogicReal

-                } else if(w == EcorePackage.Literals.EBOOLEAN) {

+                } else if (w == EcorePackage.Literals.EBOOLEAN) {

                         return builder.LogicBool

-                } else if(w == EcorePackage.Literals.ESTRING) {

+                } else if (w == EcorePackage.Literals.ESTRING) {

                         return builder.LogicString

-                } else if(w instanceof EEnum) {

-                        val c = this.ecore2Logic.TypeofEEnum(ecore2LogicTrace.trace,w)

+                } else if (w instanceof EEnum) {

+                        val c = this.ecore2Logic.TypeofEEnum(ecore2LogicTrace.trace, w)

                         return builder.toTypeReference(c);

-                } else throw new UnsupportedOperationException('''Unknown reference type «w.class.name»''')

+                } else

+                        throw new UnsupportedOperationException('''Unknown reference type «w.class.name»''')

         }

-        def dispatch TypeReference transformTypeReference(JavaTransitiveInstancesKey k,TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace) {

+

+        def dispatch TypeReference transformTypeReference(JavaTransitiveInstancesKey k,

+                TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace) {

                 val c = k.wrapperInstanceClass

-                if(c == Integer || c == Long || c == Short) {

+                if (c == Integer || c == Long || c == Short) {

                         return LogicInt

-                } else if(c == Float || c == Double) {

+                } else if (c == Float || c == Double) {

                         return LogicReal

-                } else if(c == Boolean) {

+                } else if (c == Boolean) {

                         return LogicBool

-                } else if(c == String) {

+                } else if (c == String) {

                         return LogicString

-                } else if(c.superclass == Enum){

+                } else if (c.superclass == Enum) {

                         val enums = ecore2Logic.allEnumsInScope(ecore2LogicTrace.trace)

-                        for(enum : enums) {

-                                if(c == enum.instanceClass) {

-                                        return builder.toTypeReference(ecore2Logic.TypeofEEnum(ecore2LogicTrace.trace,enum))

+                        for (enum : enums) {

+                                if (c == enum.instanceClass) {

+                                        return builder.toTypeReference(ecore2Logic.TypeofEEnum(ecore2LogicTrace.trace, enum))

                                 }

                         }

                         throw new IllegalArgumentException('''Enum type «c.simpleName» is not mapped to logic!''')

@@ -367,26 +360,31 @@ class Viatra2LogicTypeInferer{
                         return null

                 }

         }

-        def dispatch TypeReference transformTypeReference(EClassTransitiveInstancesKey k,TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace) {

+

+        def dispatch TypeReference transformTypeReference(EClassTransitiveInstancesKey k,

+                TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace) {

                 val c = k.wrappedKey

-                                

-                if(this.ecore2Logic.allClassesInScope(ecore2LogicTrace.trace).toList.contains(c)) {

-                        return builder.toTypeReference(this.ecore2Logic.TypeofEClass(ecore2LogicTrace.trace,k.wrappedKey))

+

+                if (this.ecore2Logic.allClassesInScope(ecore2LogicTrace.trace).toList.contains(c)) {

+                        return builder.toTypeReference(this.ecore2Logic.TypeofEClass(ecore2LogicTrace.trace, k.wrappedKey))

                 } else {

                         return null

                 }

         }

-        def dispatch TypeReference transformTypeReference(EClassUnscopedTransitiveInstancesKey k, TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace) {

+

+        def dispatch TypeReference transformTypeReference(EClassUnscopedTransitiveInstancesKey k,

+                TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace) {

                 val c = k.wrappedKey

-                

-                if(this.ecore2Logic.allClassesInScope(ecore2LogicTrace.trace).toList.contains(c)) {

-                        return builder.toTypeReference(this.ecore2Logic.TypeofEClass(ecore2LogicTrace.trace,k.wrappedKey))

+

+                if (this.ecore2Logic.allClassesInScope(ecore2LogicTrace.trace).toList.contains(c)) {

+                        return builder.toTypeReference(this.ecore2Logic.TypeofEClass(ecore2LogicTrace.trace, k.wrappedKey))

                 } else {

                         return null

                 }

         }

-        

-        def dispatch TypeReference transformTypeReference(IInputKey k,TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace) {

+

+        def dispatch TypeReference transformTypeReference(IInputKey k,

+                TracedOutput<LogicProblem, Ecore2Logic_Trace> ecore2LogicTrace) {

                 throw new IllegalArgumentException('''Unsupported type: «k.class.simpleName»''')

         }

-}
\ No newline at end of file
+}

diff --git a/Solvers/SMT-Solver/com.microsoft.z3/.classpath b/Solvers/SMT-Solver/com.microsoft.z3/.classpath
index ffdc022a..759c2ecb 100644
--- a/Solvers/SMT-Solver/com.microsoft.z3/.classpath
+++ b/Solvers/SMT-Solver/com.microsoft.z3/.classpath
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-        <classpathentry exported="true" kind="lib" path="com.microsoft.z3.jar">
-                <attributes>
-                        <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="com.microsoft.z3/lib"/>
-                </attributes>
-        </classpathentry>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
                 <attributes>
                         <attribute name="module" value="true"/>
                 </attributes>
         </classpathentry>
         <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+        <classpathentry exported="true" kind="lib" path="com.microsoft.z3.jar">
+                <attributes>
+                        <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="com.microsoft.z3/lib"/>
+                </attributes>
+        </classpathentry>
         <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Solvers/SMT-Solver/com.microsoft.z3/META-INF/MANIFEST.MF b/Solvers/SMT-Solver/com.microsoft.z3/META-INF/MANIFEST.MF
index d91e3272..9685b5ff 100644
--- a/Solvers/SMT-Solver/com.microsoft.z3/META-INF/MANIFEST.MF
+++ b/Solvers/SMT-Solver/com.microsoft.z3/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: Z3
 Bundle-SymbolicName: com.microsoft.z3
 Bundle-Version: 4.8.8.qualifier
 Bundle-Vendor: Microsoft
-Automatic-Module-Name: com.microsoft.z3
 Bundle-ClassPath: com.microsoft.z3.jar
 Bundle-NativeCode: lib/libz3.so;
  lib/libz3java.so;
@@ -20,3 +19,4 @@ Bundle-NativeCode: lib/libz3.so;
  processor=x86_64
 Export-Package: com.microsoft.z3,
  com.microsoft.z3.enumerations
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF
index b9da0f0b..f5eb5514 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ Export-Package: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra,
  hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.interval,
  hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.interval.aggregators,
  hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns,
- hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries
+ hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries,
+ hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.rules
 Require-Bundle: hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",
  hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0",
  hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
@@ -24,9 +25,8 @@ Require-Bundle: hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",
  org.eclipse.xtext;bundle-version="2.10.0",
  org.eclipse.viatra.transformation.runtime.emf;bundle-version="2.0.0",
  org.eclipse.xtext.xbase;bundle-version="2.10.0",
- com.microsoft.z3;bundle-version="4.8.5",
  hu.bme.mit.inf.dslreasoner.ilp.cbc;bundle-version="1.0.0",
- org.eclipse.viatra.query.runtime.rete;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ org.eclipse.viatra.query.runtime.rete;bundle-version="2.0.0",
+ com.microsoft.z3
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.apache.log4j
-Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationStatistics.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationStatistics.xtend
new file mode 100644
index 00000000..bd5bf807
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationStatistics.xtend
@@ -0,0 +1,47 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra
+
+class ModelGenerationStatistics {
+        public var long transformationExecutionTime = 0
+
+        synchronized def addExecutionTime(long amount) {
+                transformationExecutionTime += amount
+        }
+
+        public var long scopePropagationTime = 0
+
+        synchronized def addScopePropagationTime(long amount) {
+                scopePropagationTime += amount
+        }
+
+        public var long mustRelationPropagationTime = 0
+
+        synchronized def addMustRelationPropagationTime(long amount) {
+                mustRelationPropagationTime += amount
+        }
+
+        public var long preliminaryTypeAnalisisTime = 0
+
+        public var int decisionsTried = 0
+
+        synchronized def incrementDecisionCount() {
+                decisionsTried++
+        }
+
+        public var int transformationInvocations
+
+        synchronized def incrementTransformationCount() {
+                transformationInvocations++
+        }
+
+        public var int scopePropagatorInvocations
+
+        synchronized def incrementScopePropagationCount() {
+                scopePropagatorInvocations++
+        }
+
+        public var int scopePropagatorSolverInvocations
+
+        synchronized def incrementScopePropagationSolverCount() {
+                scopePropagatorSolverInvocations++
+        }
+}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/TypeInferenceMethod.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/TypeInferenceMethod.xtend
new file mode 100644
index 00000000..9296a0be
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/TypeInferenceMethod.xtend
@@ -0,0 +1,44 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra

+

+import com.google.common.collect.ImmutableMap

+import com.google.common.collect.ImmutableSet

+import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel

+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem

+import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.CachingSimplePolyhedronScopePropagatorStrategy

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.CbcPolyhedronSolver

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.MultiplicityGoalConstraintCalculator

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedronScopePropagator

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.RelationConstraintCalculator

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagator

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagatorStrategy

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.TypeHierarchyScopePropagator

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.Z3PolyhedronSolver

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.GeneratedPatterns

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.ModalPatternQueries

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternProvider

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.UnitPropagationPatternGenerator

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.rules.GoalConstraintProvider

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.rules.RefinementRuleProvider

+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

+import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace

+import java.util.Collection

+import java.util.List

+import java.util.Map

+import java.util.Set

+import org.eclipse.viatra.query.runtime.api.GenericQueryGroup

+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.ViatraQueryMatcher

+import org.eclipse.viatra.query.runtime.emf.EMFScope

+import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint

+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery

+import org.eclipse.viatra.transformation.runtime.emf.rules.batch.BatchTransformationRule

+import org.eclipse.xtend.lib.annotations.Data

+

+enum TypeInferenceMethod {

+        Generic,

+        PreliminaryAnalysis

+}
\ No newline at end of file
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ExtendedLinearExpressionBuilderFactory.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ExtendedLinearExpressionBuilderFactory.xtend
new file mode 100644
index 00000000..6054affe
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ExtendedLinearExpressionBuilderFactory.xtend
@@ -0,0 +1,140 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality
+
+import com.google.common.collect.ImmutableList
+import com.google.common.collect.ImmutableMap
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
+import java.util.ArrayList
+import java.util.HashMap
+import java.util.HashSet
+import java.util.List
+import java.util.Map
+import java.util.Set
+import org.eclipse.viatra.query.runtime.api.IPatternMatch
+import org.eclipse.xtend.lib.annotations.Accessors
+import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
+
+interface BoundSaturationListener {
+        def void boundsSaturated(Integer lower, Integer upper)
+}
+
+interface ExtendedLinearExpressionBuilderFactory {
+        def ExtendedLinearExpressionBuilder createBuilder()
+
+        def Dimension getDimension(IPatternMatch patternMatch)
+}
+
+interface ExtendedLinearExpressionBuilder extends LinearTypeExpressionBuilder {
+        override ExtendedLinearExpressionBuilder add(int scale, Type type)
+
+        def ExtendedLinearExpressionBuilder add(int scale, IPatternMatch patternMatch)
+
+        def ExtendedLinearExpressionBuilder add(int scale, Dimension dimension)
+
+        def LinearBoundedExpression build(BoundSaturationListener listener)
+}
+
+class ExtendedPolyhedronBuilder implements ExtendedLinearExpressionBuilderFactory {
+        val Map<Type, LinearBoundedExpression> typeBounds
+        val Map<Map<Dimension, Integer>, LinearBoundedExpression> expressionsCache
+
+        val ImmutableList.Builder<Dimension> dimensions = ImmutableList.builder
+        val Set<LinearConstraint> constraints = new HashSet
+        val Set<LinearBoundedExpression> expressionsToSaturate = new HashSet
+        val Map<IPatternMatch, Dimension> patternMatchCounts = new HashMap
+        @Accessors(PUBLIC_GETTER) val List<Pair<LinearBoundedExpression, BoundSaturationListener>> saturationListeners = new ArrayList
+
+        new(Polyhedron polyhedron, Map<Type, LinearBoundedExpression> typeBounds,
+                Map<Map<Dimension, Integer>, LinearBoundedExpression> initialExpressionsCache) {
+                this.typeBounds = typeBounds
+                this.expressionsCache = new HashMap(initialExpressionsCache)
+                dimensions.addAll(polyhedron.dimensions)
+                constraints.addAll(polyhedron.constraints)
+                expressionsToSaturate.addAll(polyhedron.expressionsToSaturate)
+        }
+
+        override createBuilder() {
+                new ExtendedLinearExpressionBuilderImpl(this)
+        }
+
+        override getDimension(IPatternMatch patternMatch) {
+                patternMatchCounts.computeIfAbsent(patternMatch) [ key |
+                        val dimension = new Dimension(key.toString, 0, null)
+                        dimensions.add(dimension)
+                        dimension
+                ]
+        }
+
+        def buildPolyhedron() {
+                new Polyhedron(
+                        dimensions.build,
+                        ImmutableList.copyOf(constraints),
+                        ImmutableList.copyOf(expressionsToSaturate)
+                )
+        }
+
+        @FinalFieldsConstructor
+        private static class ExtendedLinearExpressionBuilderImpl implements ExtendedLinearExpressionBuilder {
+                val ExtendedPolyhedronBuilder polyhedronBuilder
+
+                val Map<Dimension, Integer> coefficients = new HashMap
+
+                override add(int scale, Type type) {
+                        val expression = polyhedronBuilder.typeBounds.get(type)
+                        if (expression === null) {
+                                throw new IllegalArgumentException("Unknown Type: " + type)
+                        }
+                        add(scale, expression)
+                }
+
+                override add(int scale, IPatternMatch patternMatch) {
+                        val dimension = polyhedronBuilder.getDimension(patternMatch)
+                        add(scale, dimension)
+                }
+
+                private def add(int scale, LinearBoundedExpression expression) {
+                        switch (expression) {
+                                Dimension: add(scale, expression)
+                                LinearConstraint: add(scale, expression.coefficients)
+                                default: throw new IllegalArgumentException("Unknown LinearBoundedExpression: " + expression)
+                        }
+                }
+
+                private def add(int scale, Map<Dimension, Integer> coefficients) {
+                        for (pair : coefficients.entrySet) {
+                                add(scale * pair.value, pair.key)
+                        }
+                        this
+                }
+
+                override add(int scale, Dimension dimension) {
+                        coefficients.merge(dimension, scale)[a, b|a + b]
+                        this
+                }
+
+                override build() {
+                        val filteredCoefficients = ImmutableMap.copyOf(coefficients.filter [ _, coefficient |
+                                coefficient != 0
+                        ])
+                        polyhedronBuilder.expressionsCache.computeIfAbsent(filteredCoefficients) [ map |
+                                if (map.size == 1) {
+                                        val pair = map.entrySet.head
+                                        if (pair.value == 1) {
+                                                return pair.key
+                                        }
+                                }
+                                val constraint = new LinearConstraint(map)
+                                polyhedronBuilder.constraints.add(constraint)
+                                constraint
+                        ]
+                }
+
+                override build(BoundSaturationListener listener) {
+                        val expression = build()
+                        if (listener !== null) {
+                                polyhedronBuilder.expressionsToSaturate.add(expression)
+                                polyhedronBuilder.saturationListeners.add(expression -> listener)
+                        }
+                        expression
+                }
+        }
+}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ExtendedPolyhedronScopePropagatorStrategy.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ExtendedPolyhedronScopePropagatorStrategy.xtend
new file mode 100644
index 00000000..32923396
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ExtendedPolyhedronScopePropagatorStrategy.xtend
@@ -0,0 +1,63 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality
+
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationStatistics
+import java.util.Collection
+import java.util.Map
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation
+
+interface PolyhedronExtensionOperator {
+        def void extendPolyhedron(ExtendedLinearExpressionBuilderFactory factory)
+}
+
+class ExtendedPolyhedronScopePropagatorStrategy extends PolyhedronScopePropagatorStrategy {
+        val PolyhedronSolver solver
+        val Collection<PolyhedronExtensionOperator> extensionOperators
+
+        var Map<Type, LinearBoundedExpression> typeBounds
+        var Map<Map<Dimension, Integer>, LinearBoundedExpression> initialExpressionsCache
+
+        new(PolyhedronSolver solver, Collection<PolyhedronExtensionOperator> extensionOperators,
+                ModelGenerationStatistics statistics) {
+                super(statistics)
+                this.solver = solver
+                this.extensionOperators = extensionOperators
+        }
+
+        override setPolyhedron(Polyhedron polyhedron, Map<Type, LinearBoundedExpression> typeBounds,
+                Map<Map<Dimension, Integer>, LinearBoundedExpression> initialExpressionsCache) {
+                super.setPolyhedron(polyhedron, typeBounds, initialExpressionsCache)
+                this.typeBounds = typeBounds
+                this.initialExpressionsCache = initialExpressionsCache
+        }
+
+        override isRelevantRelation(Relation relation) {
+                true
+        }
+
+        override protected doSaturate() {
+                val builder = new ExtendedPolyhedronBuilder(polyhedron, typeBounds, initialExpressionsCache)
+                for (extensionOperator : extensionOperators) {
+                        extensionOperator.extendPolyhedron(builder)
+                }
+                val extendedPolyhedron = builder.buildPolyhedron()
+                val saturationOperator = solver.createSaturationOperator(extendedPolyhedron)
+                val result = try {
+                                saturationOperator.saturate()
+                        } finally {
+                                saturationOperator.close()
+                        }
+                if (result == PolyhedronSaturationResult.EMPTY) {
+                        // The partial model cannot be refined any more, we can't provide objective bounds.
+                        for (pair : builder.saturationListeners) {
+                                pair.value.boundsSaturated(null, null)
+                        }
+                        return false
+                }
+                for (pair : builder.saturationListeners) {
+                        val expression = pair.key
+                        pair.value.boundsSaturated(expression.lowerBound, expression.upperBound)
+                }
+                true
+        }
+}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/LinearTypeConstraintHint.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/LinearTypeConstraintHint.xtend
index 8c21ca1d..31f98e36 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/LinearTypeConstraintHint.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/LinearTypeConstraintHint.xtend
@@ -3,8 +3,10 @@ package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+import java.util.Map
 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
 
 interface LinearTypeExpressionBuilderFactory {
         def ViatraQueryMatcher<? extends IPatternMatch> createMatcher(String queryName)
@@ -24,7 +26,7 @@ interface RelationConstraintUpdater {
 }
 
 interface LinearTypeConstraintHint {
-        def CharSequence getAdditionalPatterns(PatternGenerator patternGenerator)
+        def CharSequence getAdditionalPatterns(PatternGenerator patternGenerator, Map<String, PQuery> fqnToPQuery)
         
         def RelationConstraintUpdater createConstraintUpdater(LinearTypeExpressionBuilderFactory builderFactory)
 }
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend
index c28d4caa..ad8f94ab 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend
@@ -1,7 +1,5 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality
 
-import com.google.common.cache.Cache
-import com.google.common.cache.CacheBuilder
 import com.google.common.collect.ImmutableList
 import com.google.common.collect.ImmutableMap
 import com.google.common.collect.ImmutableSet
@@ -23,7 +21,6 @@ import java.util.HashSet
 import java.util.List
 import java.util.Map
 import java.util.Set
-import javax.naming.OperationNotSupportedException
 import org.eclipse.viatra.query.runtime.api.IPatternMatch
 import org.eclipse.viatra.query.runtime.api.IQuerySpecification
 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine
@@ -32,31 +29,29 @@ import org.eclipse.viatra.query.runtime.emf.EMFScope
 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
 
 class PolyhedronScopePropagator extends TypeHierarchyScopePropagator {
-        static val CACHE_SIZE = 10000
-
         val boolean updateHeuristic
         val Map<Scope, LinearBoundedExpression> scopeBounds
         val LinearBoundedExpression topLevelBounds
         val Polyhedron polyhedron
-        val PolyhedronSaturationOperator operator
+        val PolyhedronScopePropagatorStrategy strategy
         val Set<Relation> relevantRelations
-        val Cache<PolyhedronSignature, PolyhedronSignature> cache = CacheBuilder.newBuilder.maximumSize(CACHE_SIZE).build
         List<RelationConstraintUpdater> updaters = emptyList
 
         new(PartialInterpretation p, ModelGenerationStatistics statistics, Set<? extends Type> possibleNewDynamicTypes,
                 Map<RelationMultiplicityConstraint, UnifinishedMultiplicityQueries> unfinishedMultiplicityQueries,
                 IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> hasElementInContainmentQuery,
                 Map<String, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> allPatternsByName,
-                Collection<LinearTypeConstraintHint> hints, PolyhedronSolver solver, boolean propagateRelations,
-                boolean updateHeuristic) {
+                Collection<LinearTypeConstraintHint> hints, PolyhedronScopePropagatorStrategy strategy,
+                boolean propagateRelations, boolean updateHeuristic) {
                 super(p, statistics)
                 this.updateHeuristic = updateHeuristic
+                this.strategy = strategy
                 val builder = new PolyhedronBuilder(p)
                 builder.buildPolyhedron(possibleNewDynamicTypes)
                 scopeBounds = builder.scopeBounds
                 topLevelBounds = builder.topLevelBounds
                 polyhedron = builder.polyhedron
-                operator = solver.createSaturationOperator(polyhedron)
+                strategy.setPolyhedron(polyhedron, builder.typeBounds, builder.expressionsCache)
                 propagateAllScopeConstraints()
                 if (propagateRelations) {
                         val maximumNumberOfNewNodes = topLevelBounds.upperBound
@@ -80,30 +75,10 @@ class PolyhedronScopePropagator extends TypeHierarchyScopePropagator {
                 resetBounds()
                 populatePolyhedronFromScope()
 //              println(polyhedron)
-                val signature = polyhedron.createSignature
-                val cachedSignature = cache.getIfPresent(signature)
-                switch (cachedSignature) {
-                        case null: {
-                                statistics.incrementScopePropagationSolverCount
-                                val result = operator.saturate()
-                                if (result == PolyhedronSaturationResult.EMPTY) {
-                                        cache.put(signature, PolyhedronSignature.EMPTY)
-//                                      println("INVALID")
-                                        setScopesInvalid()
-                                } else {
-                                        val resultSignature = polyhedron.createSignature
-                                        cache.put(signature, resultSignature)
-                                        populateScopesFromPolyhedron()
-                                }
-                        }
-                        case PolyhedronSignature.EMPTY:
-                                setScopesInvalid()
-                        PolyhedronSignature.Bounds: {
-                                polyhedron.applySignature(signature)
-                                populateScopesFromPolyhedron()
-                        }
-                        default:
-                                throw new IllegalStateException("Unknown polyhedron signature: " + signature)
+                if (strategy.saturate) {
+                        populateScopesFromPolyhedron()
+                } else {
+                        setScopesInvalid()
                 }
 //              println(polyhedron)
                 if (updateHeuristic) {
@@ -112,9 +87,9 @@ class PolyhedronScopePropagator extends TypeHierarchyScopePropagator {
         }
 
         override isPropagationNeededAfterAdditionToRelation(Relation r) {
-                relevantRelations.contains(r) || super.isPropagationNeededAfterAdditionToRelation(r)
+                relevantRelations.contains(r) || strategy.isRelevantRelation(r) || super.isPropagationNeededAfterAdditionToRelation(r)
         }
-        
+
         override isQueryEngineFlushRequiredBeforePropagation() {
                 true
         }
@@ -253,7 +228,10 @@ class PolyhedronScopePropagator extends TypeHierarchyScopePropagator {
                         }
                         buildRelevantRelations(constraints.keySet)
                         for (hint : hints) {
-                                updatersBuilder.add(hint.createConstraintUpdater(this))
+                                val updater = hint.createConstraintUpdater(this)
+                                if (updater !== null) {
+                                        updatersBuilder.add(updater)
+                                }
                         }
                         updaters = updatersBuilder.build
                         addCachedConstraintsToPolyhedron()
@@ -410,7 +388,7 @@ class PolyhedronScopePropagator extends TypeHierarchyScopePropagator {
                         for (scope : p.scopes) {
                                 switch (targetTypeInterpretation : scope.targetTypeInterpretation) {
                                         PartialPrimitiveInterpretation:
-                                                throw new OperationNotSupportedException("Primitive type scopes are not yet implemented")
+                                                throw new IllegalStateException("Primitive type scopes are not yet implemented")
                                         PartialComplexTypeInterpretation: {
                                                 val complexType = targetTypeInterpretation.interpretationOf
                                                 val typeBound = typeBounds.get(complexType)
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagatorStrategy.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagatorStrategy.xtend
new file mode 100644
index 00000000..f93dcd18
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagatorStrategy.xtend
@@ -0,0 +1,92 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality
+
+import com.google.common.cache.Cache
+import com.google.common.cache.CacheBuilder
+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.ModelGenerationStatistics
+import java.util.Map
+import org.eclipse.xtend.lib.annotations.Accessors
+import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
+
+@FinalFieldsConstructor
+abstract class PolyhedronScopePropagatorStrategy {
+        val ModelGenerationStatistics statistics
+
+        @Accessors(PUBLIC_GETTER) var Polyhedron polyhedron
+
+        def void setPolyhedron(Polyhedron polyhedron, Map<Type, LinearBoundedExpression> typeBounds,
+                Map<Map<Dimension, Integer>, LinearBoundedExpression> initialExpressionsCache) {
+                if (this.polyhedron !== null) {
+                        throw new IllegalStateException("polyhedron was already set")
+                }
+                this.polyhedron = polyhedron
+                initialize()
+        }
+
+        def boolean saturate() {
+                if (polyhedron === null) {
+                        throw new IllegalStateException("polyhedron was not set")
+                }
+                doSaturate()
+        }
+        
+        def boolean isRelevantRelation(Relation relation) {
+                false
+        }
+
+        protected def incrementScopePropagationSolverCount() {
+                statistics.incrementScopePropagationSolverCount()
+        }
+
+        protected def void initialize() {
+        }
+
+        protected def boolean doSaturate()
+}
+
+@FinalFieldsConstructor
+class CachingSimplePolyhedronScopePropagatorStrategy extends PolyhedronScopePropagatorStrategy {
+        static val CACHE_SIZE = 10000
+
+        val PolyhedronSolver solver
+
+        val Cache<PolyhedronSignature, PolyhedronSignature> cache = CacheBuilder.newBuilder.maximumSize(CACHE_SIZE).build
+        var PolyhedronSaturationOperator operator
+
+        new(PolyhedronSolver solver, ModelGenerationStatistics statistics) {
+                super(statistics)
+                this.solver = solver
+        }
+
+        override protected initialize() {
+                operator = solver.createSaturationOperator(polyhedron)
+        }
+
+        override protected doSaturate() {
+                val signature = polyhedron.createSignature
+                val cachedSignature = cache.getIfPresent(signature)
+                switch (cachedSignature) {
+                        case null: {
+                                incrementScopePropagationSolverCount()
+                                val result = operator.saturate()
+                                if (result == PolyhedronSaturationResult.EMPTY) {
+                                        cache.put(signature, PolyhedronSignature.EMPTY)
+                                        false
+                                } else {
+                                        val resultSignature = polyhedron.createSignature
+                                        cache.put(signature, resultSignature)
+                                        true
+                                }
+                        }
+                        case PolyhedronSignature.EMPTY:
+                                false
+                        PolyhedronSignature.Bounds: {
+                                polyhedron.applySignature(signature)
+                                true
+                        }
+                        default:
+                                throw new IllegalStateException("Unknown polyhedron signature: " + signature)
+                }
+        }
+}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronSolver.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronSolver.xtend
index 4e046190..21bd2d9e 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronSolver.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronSolver.xtend
@@ -116,7 +116,7 @@ abstract class PolyhedronSignature {
 }
 
 @Accessors
-abstract class LinearBoundedExpression {
+class Bounds {
         var Integer lowerBound
         var Integer upperBound
 
@@ -132,12 +132,19 @@ abstract class LinearBoundedExpression {
                 }
         }
 
+        def void assertBetween(Integer tighterLowerBound, Integer tighterUpperBound) {
+                tightenLowerBound(tighterLowerBound)
+                tightenUpperBound(tighterUpperBound)
+        }
+
         def void assertEqualsTo(int bound) {
-                tightenLowerBound(bound)
-                tightenUpperBound(bound)
+                assertBetween(bound, bound)
         }
 }
 
+abstract class LinearBoundedExpression extends Bounds {
+}
+
 @Accessors
 class Dimension extends LinearBoundedExpression {
         val String name
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagator.xtend
index 93b83577..cacba3c6 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagator.xtend
@@ -19,6 +19,8 @@ class ScopePropagator {
         val Map<PartialTypeInterpratation, Scope> type2Scope

         @Accessors(PROTECTED_GETTER) val Map<Scope, Set<Scope>> superScopes

         @Accessors(PROTECTED_GETTER) val Map<Scope, Set<Scope>> subScopes

+        

+        @Accessors(PUBLIC_GETTER) var scopePropagationNeeded = false

 

         new(PartialInterpretation p, ModelGenerationStatistics statistics) {

                 partialInterpretation = p

@@ -64,7 +66,8 @@ class ScopePropagator {
                 copyScopeBoundsToHeuristic()

         }

 

-        def propagateAllScopeConstraints() {

+        def void propagateAllScopeConstraints() {

+                scopePropagationNeeded = false

                 if (!valid) {

                         return

                 }

@@ -93,6 +96,7 @@ class ScopePropagator {
                 if (isPrimitive) {

                         return

                 }

+                scopePropagationNeeded = true

 //              println('''Adding to «(t as PartialComplexTypeInterpretation).interpretationOf.name»''')

                 val targetScope = type2Scope.get(t)

                 if (targetScope !== null) {

@@ -117,6 +121,12 @@ class ScopePropagator {
 //              this.partialInterpretation.scopes.forEach[println(''' «(it.targetTypeInterpretation as PartialComplexTypeInterpretation).interpretationOf.name»: «it.minNewElements»-«it.maxNewElements»''')]

 //              println('''All constraints are propagated upon increasing «(t as PartialComplexTypeInterpretation).interpretationOf.name»''')

         }

+        

+        def addedToRelation(Relation r) {

+                if (isPropagationNeededAfterAdditionToRelation(r)) {

+                        scopePropagationNeeded = true

+                }

+        }

 

         protected def setScopesInvalid() {

                 partialInterpretation.minNewElements = Integer.MAX_VALUE

@@ -127,7 +137,7 @@ class ScopePropagator {
                 }

         }

 

-        def isPropagationNeededAfterAdditionToRelation(Relation r) {

+        protected def isPropagationNeededAfterAdditionToRelation(Relation r) {

                 false

         }

         

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend
index 80bc3844..edf92343 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend
@@ -25,12 +25,13 @@ import java.util.HashMap
 import java.util.Map

 import org.eclipse.emf.ecore.EAttribute

 import org.eclipse.emf.ecore.EReference

+import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint

 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery

 import org.eclipse.xtend.lib.annotations.Accessors

+import org.eclipse.xtend.lib.annotations.Data

+import org.eclipse.xtend2.lib.StringConcatenationClient

 

 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*

-import org.eclipse.xtend.lib.annotations.Data

-import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint

 

 @Data class PatternGeneratorResult {

         CharSequence patternText

@@ -38,6 +39,14 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint
         HashMap<PConstraint,String> constraint2CurrentPreconditionName

 }

 

+interface UnitPropagationPatternGenerator {

+        def Map<Relation, String> getMustPatterns()

+        

+        def Map<Relation, String> getMustNotPatterns()

+        

+        def StringConcatenationClient getAdditionalPatterns(PatternGenerator generator, Map<String, PQuery> fqn2PQuery)

+}

+

 class PatternGenerator {

         @Accessors(PUBLIC_GETTER) val TypeIndexer typeIndexer // = new TypeIndexer(this)

         @Accessors(PUBLIC_GETTER) val RelationDeclarationIndexer relationDeclarationIndexer = new RelationDeclarationIndexer(

@@ -157,7 +166,8 @@ class PatternGenerator {
                 Map<String, PQuery> fqn2PQuery,

                 TypeAnalysisResult typeAnalysisResult,

                 RelationConstraints constraints,

-                Collection<LinearTypeConstraintHint> hints

+                Collection<LinearTypeConstraintHint> hints,

+                Collection<UnitPropagationPatternGenerator> unitPropagationPatternGenerators

         ) {

                 val first = 

                  '''

@@ -313,7 +323,7 @@ class PatternGenerator {
                         //////////

                         // 1.2 Relation Declaration Indexers

                         //////////

-                        «relationDeclarationIndexer.generateRelationIndexers(problem,problem.relations.filter(RelationDeclaration),fqn2PQuery)»

+                        «relationDeclarationIndexer.generateRelationIndexers(problem,problem.relations.filter(RelationDeclaration),unitPropagationPatternGenerators,fqn2PQuery)»

                         

                         //////////

                         // 1.3 Relation Definition Indexers

@@ -359,13 +369,16 @@ class PatternGenerator {
                         //////////

                         // 4.3 Relation refinement

                         //////////

-                        «relationRefinementGenerator.generateRefineReference(problem)»

+                        «relationRefinementGenerator.generateRefineReference(problem, unitPropagationPatternGenerators)»

                         

                         //////////

                         // 5 Hints

                         //////////

                         «FOR hint : hints»

-                                «hint.getAdditionalPatterns(this)»

+                                «hint.getAdditionalPatterns(this, fqn2PQuery)»

+                        «ENDFOR»

+                        «FOR generator : unitPropagationPatternGenerators»

+                                «generator.getAdditionalPatterns(this, fqn2PQuery)»

                         «ENDFOR»

                         

                         //////////

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend
index d57705ce..2e786286 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend
@@ -36,9 +36,10 @@ import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
         public Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unfinishedWFQueries

         public Map<RelationMultiplicityConstraint, UnifinishedMultiplicityQueries> multiplicityConstraintQueries

         public IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> hasElementInContainmentQuery

-        public Map<ObjectCreationPrecondition,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineObjectQueries

+        public Map<ObjectCreationPrecondition, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineObjectQueries

         public Map<? extends Type, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineTypeQueries

-        public Map<Pair<RelationDeclaration, Relation>,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refinerelationQueries

+        public Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineRelationQueries

+        public Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> mustRelationPropagationQueries

         public Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> mustUnitPropagationPreconditionPatterns

         public Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> currentUnitPropagationPreconditionPatterns

         public Map<RelationDefinition, ModalPatternQueries> modalRelationQueries

@@ -56,7 +57,7 @@ class ModalPatternQueries {
 class UnifinishedMultiplicityQueries {

         val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> existingMultiplicityQuery

         val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> existingInverseMultiplicityQuery

-        

+

         def Set<IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> getAllQueries() {

                 val builder = ImmutableSet.builder

                 if (existingMultiplicityQuery !== null) {

@@ -70,13 +71,13 @@ class UnifinishedMultiplicityQueries {
 }

 

 class PatternProvider {

-

         val TypeAnalysis typeAnalysis = new TypeAnalysis

 

         def generateQueries(LogicProblem problem, PartialInterpretation emptySolution, ModelGenerationStatistics statistics,

                 Set<PQuery> existingQueries, ReasonerWorkspace workspace, TypeInferenceMethod typeInferenceMethod,

-                ScopePropagatorStrategy scopePropagatorStrategy, RelationConstraints relationConstraints, 

-                Collection<LinearTypeConstraintHint> hints, boolean writeToFile) {

+                ScopePropagatorStrategy scopePropagatorStrategy, RelationConstraints relationConstraints,

+                Collection<LinearTypeConstraintHint> hints,

+                Collection<UnitPropagationPatternGenerator> unitPropagationPatternGenerators, boolean writeToFile) {

                 val fqn2Query = existingQueries.toMap[it.fullyQualifiedName]

                 val PatternGenerator patternGenerator = new PatternGenerator(typeInferenceMethod, scopePropagatorStrategy)

                 val typeAnalysisResult = if (patternGenerator.requiresTypeAnalysis) {

@@ -89,15 +90,16 @@ class PatternProvider {
                                 null

                         }

                 val patternGeneratorResult = patternGenerator.transformBaseProperties(problem, emptySolution, fqn2Query,

-                        typeAnalysisResult, relationConstraints, hints)

+                        typeAnalysisResult, relationConstraints, hints, unitPropagationPatternGenerators)

                 if (writeToFile) {

                         workspace.writeText('''generated3valued.vql_deactivated''', patternGeneratorResult.patternText)

                 }

                 val ParseUtil parseUtil = new ParseUtil

                 val generatedQueries = parseUtil.parse(patternGeneratorResult.patternText)

                 val runtimeQueries = calclulateRuntimeQueries(patternGenerator, problem, emptySolution, typeAnalysisResult,

-                        patternGeneratorResult.constraint2MustPreconditionName, patternGeneratorResult.constraint2CurrentPreconditionName,

-                        relationConstraints, generatedQueries)

+                        patternGeneratorResult.constraint2MustPreconditionName,

+                        patternGeneratorResult.constraint2CurrentPreconditionName, relationConstraints,

+                        unitPropagationPatternGenerators, generatedQueries)

                 return runtimeQueries

         }

 

@@ -109,14 +111,16 @@ class PatternProvider {
                 HashMap<PConstraint, String> mustUnitPropagationTrace,

                 HashMap<PConstraint, String> currentUnitPropagationTrace,

                 RelationConstraints relationConstraints,

+                Collection<UnitPropagationPatternGenerator> unitPropagationPatternGenerators,

                 Map<String, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> queries

         ) {

-                val Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>

-                        invalidWFQueries = patternGenerator.invalidIndexer.getInvalidateByWfQueryNames(problem).mapValues[it.lookup(queries)]

-                val Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>

-                        unfinishedWFQueries = patternGenerator.unfinishedIndexer.getUnfinishedWFQueryNames(problem).mapValues[it.lookup(queries)]

-                        

-                val unfinishedMultiplicities = patternGenerator.unfinishedIndexer.getUnfinishedMultiplicityQueries(relationConstraints.multiplicityConstraints)

+                val Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> invalidWFQueries = patternGenerator.

+                        invalidIndexer.getInvalidateByWfQueryNames(problem).mapValues[it.lookup(queries)]

+                val Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unfinishedWFQueries = patternGenerator.

+                        unfinishedIndexer.getUnfinishedWFQueryNames(problem).mapValues[it.lookup(queries)]

+

+                val unfinishedMultiplicities = patternGenerator.unfinishedIndexer.getUnfinishedMultiplicityQueries(

+                        relationConstraints.multiplicityConstraints)

                 val multiplicityConstraintQueries = unfinishedMultiplicities.mapValues [

                         new UnifinishedMultiplicityQueries(existingMultiplicityQueryName?.lookup(queries),

                                 existingInverseMultiplicityQueryName?.lookup(queries))

@@ -124,16 +128,22 @@ class PatternProvider {
                 val hasElementInContainmentQuery = patternGenerator.typeRefinementGenerator.hasElementInContainmentName.lookup(

                         queries)

 

-                val Map<ObjectCreationPrecondition,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>

-                        refineObjectsQueries = patternGenerator.typeRefinementGenerator.getRefineObjectQueryNames(problem,emptySolution,typeAnalysisResult).mapValues[it.lookup(queries)]

-                val Map<? extends Type,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>

-                        refineTypeQueries = patternGenerator.typeRefinementGenerator.getRefineTypeQueryNames(problem,emptySolution,typeAnalysisResult).mapValues[it.lookup(queries)]

-                val Map<Pair<RelationDeclaration, Relation>,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>

-                        refineRelationQueries = patternGenerator.relationRefinementGenerator.getRefineRelationQueries(problem).mapValues[it.lookup(queries)]

-                val Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> 

-                        mustUnitPropagationPreconditionPatterns = mustUnitPropagationTrace.mapValues[it.lookup(queries)]

-                val Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> 

-                        currentUnitPropagationPreconditionPatterns = currentUnitPropagationTrace.mapValues[it.lookup(queries)]

+                val Map<ObjectCreationPrecondition, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineObjectsQueries = patternGenerator.

+                        typeRefinementGenerator.getRefineObjectQueryNames(problem, emptySolution, typeAnalysisResult).mapValues [

+                                it.lookup(queries)

+                        ]

+                val Map<? extends Type, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineTypeQueries = patternGenerator.

+                        typeRefinementGenerator.getRefineTypeQueryNames(problem, emptySolution, typeAnalysisResult).mapValues [

+                                it.lookup(queries)

+                        ]

+                val Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineRelationQueries = patternGenerator.

+                        relationRefinementGenerator.getRefineRelationQueries(problem).mapValues[it.lookup(queries)]

+                val Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> mustRelationPropagationQueries = patternGenerator.

+                        relationRefinementGenerator.getMustPropagationQueries(problem, unitPropagationPatternGenerators).mapValues[it.lookup(queries)]

+                val Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> mustUnitPropagationPreconditionPatterns = mustUnitPropagationTrace.

+                        mapValues[it.lookup(queries)]

+                val Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> currentUnitPropagationPreconditionPatterns = currentUnitPropagationTrace.

+                        mapValues[it.lookup(queries)]

 

                 val modalRelationQueries = problem.relations.filter(RelationDefinition).toMap([it], [ relationDefinition |

                         val indexer = patternGenerator.relationDefinitionIndexer

@@ -143,7 +153,7 @@ class PatternProvider {
                                 indexer.relationDefinitionName(relationDefinition, Modality.CURRENT).lookup(queries)

                         )

                 ])

-                

+

                 return new GeneratedPatterns(

                         invalidWFQueries,

                         unfinishedWFQueries,

@@ -152,6 +162,7 @@ class PatternProvider {
                         refineObjectsQueries,

                         refineTypeQueries,

                         refineRelationQueries,

+                        mustRelationPropagationQueries,

                         mustUnitPropagationPreconditionPatterns,

                         currentUnitPropagationPreconditionPatterns,

                         modalRelationQueries,

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDeclarationIndexer.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDeclarationIndexer.xtend
index b4403979..23ba3cad 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDeclarationIndexer.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDeclarationIndexer.xtend
@@ -1,10 +1,13 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns

 

+import com.google.common.collect.ImmutableMap

+import com.google.common.collect.ImmutableSet

 import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.UpperMultiplicityAssertion

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration

 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem

 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality

+import java.util.Collection

 import java.util.HashMap

 import java.util.List

 import java.util.Map

@@ -14,41 +17,40 @@ import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
 

 class RelationDeclarationIndexer {

         val PatternGenerator base;

-        

+

         new(PatternGenerator base) {

                 this.base = base

         }

-        

-        def generateRelationIndexers(LogicProblem problem, Iterable<RelationDeclaration> relations, Map<String,PQuery> fqn2PQuery) {

+

+        def generateRelationIndexers(LogicProblem problem, Iterable<RelationDeclaration> relations,

+                Iterable<UnitPropagationPatternGenerator> unitPropagationPatternGenerators, Map<String, PQuery> fqn2PQuery) {

                 val upperMultiplicities = new HashMap

-                problem.annotations.filter(UpperMultiplicityAssertion).forEach[

-                        upperMultiplicities.put(it.relation,it.upper)

+                problem.annotations.filter(UpperMultiplicityAssertion).forEach [

+                        upperMultiplicities.put(it.relation, it.upper)

                 ]

-                

+                val mustNotRelations = ImmutableMap.copyOf(unitPropagationPatternGenerators.flatMap[mustNotPatterns.entrySet].

+                        groupBy[key].mapValues[ImmutableSet.copyOf(map[value])])

+

                 return '''

-                «FOR relation : relations»

-                        «IF base.isDerived(relation)»

-                                «generateDerivedMustRelation(problem,relation,base.getDerivedDefinition(relation).patternFullyQualifiedName.lookup(fqn2PQuery))»

-                                «generateDerivedMayRelation(problem,relation,base.getDerivedDefinition(relation).patternFullyQualifiedName.lookup(fqn2PQuery))»

-                        «ELSE»

-                                «generateMustRelation(problem,relation)»

-                                «generateMayRelation(problem,relation,upperMultiplicities,base.getContainments(problem),base.getInverseRelations(problem),fqn2PQuery)»

-                        «ENDIF»

-                «ENDFOR»

+                        «FOR relation : relations»

+                                «IF base.isDerived(relation)»

+                                        «generateDerivedMustRelation(problem,relation,base.getDerivedDefinition(relation).patternFullyQualifiedName.lookup(fqn2PQuery))»

+                                        «generateDerivedMayRelation(problem,relation,base.getDerivedDefinition(relation).patternFullyQualifiedName.lookup(fqn2PQuery))»

+                                «ELSE»

+                                        «generateMustRelation(problem, relation)»

+                                        «generateMayRelation(problem, relation, upperMultiplicities, base.getContainments(problem), base.getInverseRelations(problem), mustNotRelations.get(relation) ?: emptySet, fqn2PQuery)»

+                                «ENDIF»

+                        «ENDFOR»

                 '''

         }

-        

+

         def private patternName(RelationDeclaration r, Modality modality) {

                 '''«modality.name.toLowerCase»InRelation«base.canonizeName(r.name)»'''

         }

-        

-        def referRelation(

-                RelationDeclaration referred,

-                String sourceVariable,

-                String targetVariable,

-                Modality modality)

-        '''find «referred.patternName(modality)»(problem,interpretation,«sourceVariable»,«targetVariable»);'''

-        

+

+        def referRelation(RelationDeclaration referred, String sourceVariable, String targetVariable,

+                Modality modality) '''find «referred.patternName(modality)»(problem,interpretation,«sourceVariable»,«targetVariable»);'''

+

         def generateMustRelation(LogicProblem problem, RelationDeclaration relation) '''

                 /**

                  * Matcher for detecting tuples t where []«relation.name»(source,target)

@@ -65,59 +67,64 @@ class RelationDeclarationIndexer {
                         BinaryElementRelationLink.param2(link,target);

                 }

         '''

+

         def generateMayRelation(LogicProblem problem, RelationDeclaration relation,

-                Map<Relation, Integer> upperMultiplicities,

-                List<Relation> containments,

-                HashMap<Relation, Relation> inverseRelations,

-                Map<String,PQuery> fqn2PQuery)

-        {

+                Map<Relation, Integer> upperMultiplicities, List<Relation> containments,

+                HashMap<Relation, Relation> inverseRelations, Collection<String> mustNotRelations,

+                Map<String, PQuery> fqn2PQuery) {

                 return '''

-                /**

-                 * Matcher for detecting tuples t where <>«relation.name»(source,target)

-                 */

-                private pattern «relation.patternName(Modality.MAY)»(

-                        problem:LogicProblem, interpretation:PartialInterpretation,

-                        source: DefinedElement, target:DefinedElement)

-                {

-                        find interpretation(problem,interpretation);

-                        // The two endpoint of the link have to exist

-                        find mayExist(problem, interpretation, source);

-                        find mayExist(problem, interpretation, target);

-                        // Type consistency

-                        «base.typeIndexer.referInstanceOfByReference(relation.parameters.get(0),Modality.MAY,"source")»

-                        «base.typeIndexer.referInstanceOfByReference(relation.parameters.get(1),Modality.MAY,"target")»

-                        «IF upperMultiplicities.containsKey(relation)»

-                                // There are "numberOfExistingReferences" currently existing instances of the reference from the source,

-                                // the upper bound of the multiplicity should be considered.

-                                numberOfExistingReferences == count «referRelation(relation,"source","_",Modality.MUST)»

-                                numberOfExistingReferences != «upperMultiplicities.get(relation)»;

-                        «ENDIF»

-                        «IF inverseRelations.containsKey(relation) && upperMultiplicities.containsKey(inverseRelations.get(relation))»

-                                // There are "numberOfExistingReferences" currently existing instances of the reference to the target,

-                                // the upper bound of the opposite reference multiplicity should be considered.

-                                numberOfExistingOppositeReferences == count «base.referRelation(inverseRelations.get(relation),"target","_",Modality.MUST,fqn2PQuery)»

-                                numberOfExistingOppositeReferences != «upperMultiplicities.get(inverseRelations.get(relation))»;

-                        «ENDIF»

-                        «IF containments.contains(relation)»

-                                // The reference is containment, then a new reference cannot be create if:

-                                // 1. Multiple parents

-                                neg «base.containmentIndexer.referMustContaint("_","target")»

-                                // 2. Circle in the containment hierarchy

-                                neg «base.containmentIndexer.referTransitiveMustContains("target","source")»

-                        «ENDIF»

-                        «IF inverseRelations.containsKey(relation) && containments.contains(inverseRelations.get(relation))»

-                                // The eOpposite of the reference is containment, then a referene cannot be created if

-                                // 1. Multiple parents

-                                neg «base.containmentIndexer.referMustContaint("source","_")»

-                                // 2. Circle in the containment hierarchy

-                                neg «base.containmentIndexer.referTransitiveMustContains("source","target")»

-                        «ENDIF»

-                } or {

-                        «relation.referRelation("source","target",Modality.MUST)»

-                }

-        '''

+                        /**

+                         * Matcher for detecting tuples t where <>«relation.name»(source,target)

+                         */

+                        private pattern «relation.patternName(Modality.MAY)»(

+                                problem:LogicProblem, interpretation:PartialInterpretation,

+                                source: DefinedElement, target:DefinedElement)

+                        {

+                                find interpretation(problem,interpretation);

+                                // The two endpoint of the link have to exist

+                                find mayExist(problem, interpretation, source);

+                                find mayExist(problem, interpretation, target);

+                                // Type consistency

+                                «base.typeIndexer.referInstanceOfByReference(relation.parameters.get(0),Modality.MAY,"source")»

+                                «base.typeIndexer.referInstanceOfByReference(relation.parameters.get(1),Modality.MAY,"target")»

+                                «IF upperMultiplicities.containsKey(relation)»

+                                        // There are "numberOfExistingReferences" currently existing instances of the reference from the source,

+                                        // the upper bound of the multiplicity should be considered.

+                                        numberOfExistingReferences == count «referRelation(relation,"source","_",Modality.MUST)»

+                                        numberOfExistingReferences != «upperMultiplicities.get(relation)»;

+                                «ENDIF»

+                                «IF inverseRelations.containsKey(relation) && upperMultiplicities.containsKey(inverseRelations.get(relation))»

+                                        // There are "numberOfExistingReferences" currently existing instances of the reference to the target,

+                                        // the upper bound of the opposite reference multiplicity should be considered.

+                                        numberOfExistingOppositeReferences == count «base.referRelation(inverseRelations.get(relation),"target","_",Modality.MUST,fqn2PQuery)»

+                                        numberOfExistingOppositeReferences != «upperMultiplicities.get(inverseRelations.get(relation))»;

+                                «ENDIF»

+                                «IF containments.contains(relation)»

+                                        // The reference is containment, then a new reference cannot be create if:

+                                        // 1. Multiple parents

+                                        neg «base.containmentIndexer.referMustContaint("_","target")»

+                                        // 2. Circle in the containment hierarchy

+                                        neg «base.containmentIndexer.referTransitiveMustContains("target","source")»

+                                «ENDIF»

+                                «IF inverseRelations.containsKey(relation) && containments.contains(inverseRelations.get(relation))»

+                                        // The eOpposite of the reference is containment, then a referene cannot be created if

+                                        // 1. Multiple parents

+                                        neg «base.containmentIndexer.referMustContaint("source","_")»

+                                        // 2. Circle in the containment hierarchy

+                                        neg «base.containmentIndexer.referTransitiveMustContains("source","target")»

+                                «ENDIF»

+                                «IF !mustNotRelations.empty»

+                                        // ![] unit propagation relations

+                                        «FOR mustNotRelation : mustNotRelations»

+                                                neg find «mustNotRelation»(problem, interpretation, source, target);

+                                        «ENDFOR»

+                                «ENDIF»

+                        } or {

+                                «relation.referRelation("source","target",Modality.MUST)»

+                        }

+                '''

         }

-        

+

         def generateDerivedMustRelation(LogicProblem problem, RelationDeclaration relation, PQuery definition) '''

                 /**

                  * Matcher for detecting tuples t where []«relation.name»(source,target)

@@ -129,6 +136,7 @@ class RelationDeclarationIndexer {
                         «base.relationDefinitionIndexer.referPattern(definition,#["source","target"],Modality::MUST,true,false)»

                  }

         '''

+

         def generateDerivedMayRelation(LogicProblem problem, RelationDeclaration relation, PQuery definition) '''

                 /**

                  * Matcher for detecting tuples t where []«relation.name»(source,target)

@@ -140,4 +148,4 @@ class RelationDeclarationIndexer {
                         «base.relationDefinitionIndexer.referPattern(definition,#["source","target"],Modality::MAY,true,false)»

                  }

         '''

-}
\ No newline at end of file
+}

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend
index 783cd36b..6f5f2402 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend
@@ -1,10 +1,17 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns

 

+import com.google.common.collect.ImmutableList

+import com.google.common.collect.ImmutableMap

+import com.google.common.collect.ImmutableSet

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration

 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem

 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality

+import java.util.Collection

 import java.util.LinkedList

+import java.util.Map

+import java.util.Set

+import org.eclipse.xtend2.lib.StringConcatenationClient

 

 class RelationRefinementGenerator {

         PatternGenerator base;

@@ -13,53 +20,61 @@ class RelationRefinementGenerator {
                 this.base = base

         }

 

-        def CharSequence generateRefineReference(LogicProblem p) '''

-                «FOR relationRefinement : this.getRelationRefinements(p)»

-                        pattern «relationRefinementQueryName(relationRefinement.key,relationRefinement.value)»(

-                                problem:LogicProblem, interpretation:PartialInterpretation,

-                                relationIterpretation:PartialRelationInterpretation«IF relationRefinement.value !== null», oppositeInterpretation:PartialRelationInterpretation«ENDIF»,

-                                from: DefinedElement, to: DefinedElement)

-                        {

-                                find interpretation(problem,interpretation);

-                                PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);

-                                PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"«relationRefinement.key.name»");

-                                «IF relationRefinement.value !== null»

-                                        PartialInterpretation.partialrelationinterpretation(interpretation,oppositeInterpretation);

-                                        PartialRelationInterpretation.interpretationOf.name(oppositeInterpretation,"«relationRefinement.value.name»");

+        def CharSequence generateRefineReference(LogicProblem p,

+                Collection<UnitPropagationPatternGenerator> unitPropagationPatternGenerators) {

+                val mustRelations = getMustRelations(unitPropagationPatternGenerators)

+

+                '''

+                        «FOR relationRefinement : this.getRelationRefinements(p)»

+                                pattern «relationRefinementQueryName(relationRefinement.key,relationRefinement.value)»(

+                                        problem:LogicProblem, interpretation:PartialInterpretation,

+                                        relationIterpretation:PartialRelationInterpretation«IF relationRefinement.value !== null», oppositeInterpretation:PartialRelationInterpretation«ENDIF»,

+                                        from: DefinedElement, to: DefinedElement)

+                                {

+                                        find interpretation(problem,interpretation);

+                                        PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);

+                                        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"«relationRefinement.key.name»");

+                                        «IF relationRefinement.value !== null»

+                                                PartialInterpretation.partialrelationinterpretation(interpretation,oppositeInterpretation);

+                                                PartialRelationInterpretation.interpretationOf.name(oppositeInterpretation,"«relationRefinement.value.name»");

+                                        «ENDIF»

+                                        find mustExist(problem, interpretation, from);

+                                        find mustExist(problem, interpretation, to);

+                                        «base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(0), Modality::MUST,"from")»

+                                        «base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(1), Modality::MUST,"to")»

+                                        «base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MAY)»

+                                        neg «base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MUST)»

+                                }

+                                

+                                «IF isMustPropagationQueryNeeded(relationRefinement.key, relationRefinement.value, mustRelations)»

+                                        pattern «mustPropagationQueryName(relationRefinement.key)»(

+                                                problem:LogicProblem, interpretation:PartialInterpretation,

+                                                relationIterpretation:PartialRelationInterpretation«IF relationRefinement.value !== null», oppositeInterpretation:PartialRelationInterpretation«ENDIF»,

+                                                from: DefinedElement, to: DefinedElement)

+                                        «FOR body : getMustPropagationBodies(relationRefinement.key, relationRefinement.value, mustRelations) SEPARATOR " or "»

+                                                {

+                                                        «referRefinementQuery(relationRefinement.key, relationRefinement.value, "relationIterpretation", "oppositeInterpretation", "from", "to")»

+                                                        «body»

+                                                }

+                                        «ENDFOR»

                                 «ENDIF»

-                                find mustExist(problem, interpretation, from);

-                                find mustExist(problem, interpretation, to);

-                                «base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(0), Modality::MUST,"from")»

-                                «base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(1), Modality::MUST,"to")»

-                                «base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MAY)»

-                                neg «base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MUST)»

-                        }

-                «ENDFOR»

-        '''

+                        «ENDFOR»

+                '''

+        }

 

         def String relationRefinementQueryName(RelationDeclaration relation, Relation inverseRelation) {

                 '''«IF inverseRelation !== null»refineRelation_«base.canonizeName(relation.name)»_and_«base.canonizeName(inverseRelation.name)»«ELSE»refineRelation_«base.canonizeName(relation.name)»«ENDIF»'''

         }

 

+        def String mustPropagationQueryName(RelationDeclaration relation) {

+                '''mustPropagation_«base.canonizeName(relation.name)»'''

+        }

+

         def referRefinementQuery(RelationDeclaration relation, Relation inverseRelation, String relInterpretationName,

                 String inverseInterpretationName, String sourceName,

                 String targetName) '''find «this.relationRefinementQueryName(relation,inverseRelation)»(problem, interpretation, «relInterpretationName», «IF inverseRelation !== null»«inverseInterpretationName», «ENDIF»«sourceName», «targetName»);'''

 

         def getRefineRelationQueries(LogicProblem p) {

-//              val containmentRelations = p.containmentHierarchies.map[containmentRelations].flatten.toSet

-//              p.relations.filter(RelationDeclaration).filter[!containmentRelations.contains(it)].toInvertedMap['''refineRelation_«base.canonizeName(it.name)»''']

-                /*

-                 * val res = new LinkedHashMap

-                 * for(relation: getRelationRefinements(p)) {

-                 *      if(inverseRelations.containsKey(relation)) {

-                 *              val name = '''refineRelation_«base.canonizeName(relation.name)»_and_«base.canonizeName(inverseRelations.get(relation).name)»'''

-                 *              res.put(relation -> inverseRelations.get(relation),name)

-                 *      } else {

-                 *              val name = '''refineRelation_«base.canonizeName(relation.name)»'''

-                 *              res.put(relation -> null,name)

-                 *      }

-                 * }

-                 return res*/

                 getRelationRefinements(p).toInvertedMap[relationRefinementQueryName(it.key, it.value)]

         }

 

@@ -83,4 +98,54 @@ class RelationRefinementGenerator {
                 }

                 return list

         }

+

+        def getMustPropagationQueries(LogicProblem p,

+                Collection<UnitPropagationPatternGenerator> unitPropagationPatternGenerators) {

+                val refinements = getRelationRefinements(p)

+                val mustRelations = getMustRelations(unitPropagationPatternGenerators)

+                refinements.filter[isMustPropagationQueryNeeded(key, value, mustRelations)].toInvertedMap [

+                        mustPropagationQueryName(key)

+                ]

+        }

+

+        private def getMustRelations(Collection<UnitPropagationPatternGenerator> unitPropagationPatternGenerators) {

+                ImmutableMap.copyOf(unitPropagationPatternGenerators.flatMap[mustPatterns.entrySet].groupBy[key].mapValues [

+                        ImmutableSet.copyOf(map[value])

+                ])

+        }

+

+        private def isMustPropagationQueryNeeded(Relation relation, Relation inverseRelation,

+                Map<Relation, ? extends Set<String>> mustRelations) {

+                val mustSet = mustRelations.get(relation)

+                if (mustSet !== null && !mustSet.empty) {

+                        return true

+                }

+                if (inverseRelation !== null) {

+                        val inverseMustSet = mustRelations.get(inverseRelation)

+                        if (inverseMustSet !== null && !inverseMustSet.empty) {

+                                return true

+                        }

+                }

+                false

+        }

+

+        private def getMustPropagationBodies(Relation relation, Relation inverseRelation,

+                Map<Relation, ? extends Set<String>> mustRelations) {

+                val builder = ImmutableList.<StringConcatenationClient>builder()

+                val mustSet = mustRelations.get(relation)

+                if (mustSet !== null) {

+                        for (refinementQuery : mustSet) {

+                                builder.add('''find «refinementQuery»(problem, interpretation, from, to);''')

+                        }

+                }

+                if (inverseRelation !== null && inverseRelation != relation) {

+                        val inverseMustSet = mustRelations.get(inverseRelation)

+                        if (inverseMustSet !== null) {

+                                for (refinementQuery : inverseMustSet) {

+                                        builder.add('''find «refinementQuery»(problem, interpretation, to, from);''')

+                                }

+                        }

+                }

+                builder.build

+        }

 }

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend
index f7fe97a3..dca10baf 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend
@@ -1,5 +1,6 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.rules

 

+import com.google.common.collect.ImmutableList

 import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.InverseRelationAssertion

 import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.LowerMultiplicityAssertion

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.BoolTypeReference

@@ -29,12 +30,14 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.par
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationFactory

 import java.lang.reflect.Field

 import java.util.HashMap

+import java.util.Iterator

 import java.util.LinkedHashMap

 import java.util.LinkedList

 import java.util.List

 import java.util.Map

 import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine

 import org.eclipse.viatra.query.runtime.api.GenericPatternMatch

+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.ViatraQueryMatcher

@@ -43,6 +46,7 @@ import org.eclipse.viatra.query.runtime.rete.matcher.ReteBackendFactory
 import org.eclipse.viatra.transformation.runtime.emf.rules.batch.BatchTransformationRule

 import org.eclipse.viatra.transformation.runtime.emf.rules.batch.BatchTransformationRuleFactory

 import org.eclipse.xtend.lib.annotations.Data

+import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor

 import org.eclipse.xtext.xbase.lib.Functions.Function0

 

 class RefinementRuleProvider {

@@ -50,57 +54,55 @@ class RefinementRuleProvider {
         val extension PartialinterpretationFactory factory2 = PartialinterpretationFactory.eINSTANCE

         val extension LogiclanguageFactory factory3 = LogiclanguageFactory.eINSTANCE

 

-        var AdvancedViatraQueryEngine queryEngine

-        var Field delayMessageDelivery

-

         def canonizeName(String name) {

                 return name.replace(' ', '_')

         }

 

+        def createUnitPrulePropagator(LogicProblem p, PartialInterpretation i, GeneratedPatterns patterns,

+                ScopePropagator scopePropagator, ModelGenerationStatistics statistics) {

+                new UnitRulePropagator(p, i, this, scopePropagator, patterns.mustRelationPropagationQueries, statistics)

+        }

+

         def LinkedHashMap<ObjectCreationPrecondition, BatchTransformationRule<GenericPatternMatch, ViatraQueryMatcher<GenericPatternMatch>>> createObjectRefinementRules(

                 LogicProblem p,

                 PartialInterpretation i,

                 GeneratedPatterns patterns,

-                ScopePropagator scopePropagator,

+                UnitRulePropagator unitRulePropagator,

                 boolean nameNewElement,

                 ModelGenerationStatistics statistics

         ) {

                 val res = new LinkedHashMap

                 val recursiveObjectCreation = recursiveObjectCreation(p, i)

-                queryEngine = ViatraQueryEngine.on(new EMFScope(i)) as AdvancedViatraQueryEngine

-                delayMessageDelivery = queryEngine.class.getDeclaredField("delayMessageDelivery")

-                delayMessageDelivery.accessible = true

                 for (LHSEntry : patterns.refineObjectQueries.entrySet) {

                         val containmentRelation = LHSEntry.key.containmentRelation

                         val inverseRelation = LHSEntry.key.inverseContainment

                         val type = LHSEntry.key.newType

                         val lhs = LHSEntry.value as IQuerySpecification<ViatraQueryMatcher<GenericPatternMatch>>

                         val rule = createObjectCreationRule(p, containmentRelation, inverseRelation, type,

-                                recursiveObjectCreation.get(type), lhs, nameNewElement, scopePropagator, statistics)

+                                recursiveObjectCreation.get(type), lhs, nameNewElement, unitRulePropagator, statistics)

                         res.put(LHSEntry.key, rule)

                 }

                 return res

         }

 

         def private createObjectCreationRule(LogicProblem p, Relation containmentRelation, Relation inverseRelation,

-                Type type, List<ObjectCreationInterpretationData> recursiceObjectCreations,

+                Type type, List<ObjectCreationInterpretationData> recursiveObjectCreations,

                 IQuerySpecification<ViatraQueryMatcher<GenericPatternMatch>> lhs, boolean nameNewElement,

-                ScopePropagator scopePropagator, ModelGenerationStatistics statistics) {

+                UnitRulePropagator unitRulePropagator, ModelGenerationStatistics statistics) {

                 val name = '''addObject_«type.name.canonizeName»«IF containmentRelation!==null»_by_«containmentRelation.name.canonizeName»«ENDIF»'''

                 val ruleBuilder = factory.createRule(lhs).name(name)

                 if (containmentRelation !== null) {

                         if (inverseRelation !== null) {

                                 ruleBuilder.action [ match |

                                         statistics.incrementTransformationCount

-//                                      println(name)                                           

+//                                      println(name)

+                                        val startTime = System.nanoTime

                                         // val problem = match.get(0) as LogicProblem

                                         val interpretation = match.get(1) as PartialInterpretation

                                         val relationInterpretation = match.get(2) as PartialRelationInterpretation

                                         val inverseRelationInterpretation = match.get(3) as PartialRelationInterpretation

                                         val typeInterpretation = match.get(4) as PartialComplexTypeInterpretation

                                         val container = match.get(5) as DefinedElement

-

-                                        val startTime = System.nanoTime

                                         createObjectActionWithContainmentAndInverse(

                                                 nameNewElement,

                                                 interpretation,

@@ -109,29 +111,24 @@ class RefinementRuleProvider {
                                                 relationInterpretation,

                                                 inverseRelationInterpretation,

                                                 [createDefinedElement],

-                                                recursiceObjectCreations,

-                                                scopePropagator

+                                                recursiveObjectCreations,

+                                                unitRulePropagator

                                         )

                                         statistics.addExecutionTime(System.nanoTime - startTime)

 

-                                        flushQueryEngine(scopePropagator)

-

-                                        // Scope propagation

-                                        val propagatorStartTime = System.nanoTime

-                                        scopePropagator.propagateAllScopeConstraints()

-                                        statistics.addScopePropagationTime(System.nanoTime - propagatorStartTime)

+                                        unitRulePropagator.propagate

                                 ]

                         } else {

                                 ruleBuilder.action [ match |

                                         statistics.incrementTransformationCount

 //                                      println(name)

+                                        val startTime = System.nanoTime

                                         // val problem = match.get(0) as LogicProblem

                                         val interpretation = match.get(1) as PartialInterpretation

                                         val relationInterpretation = match.get(2) as PartialRelationInterpretation

                                         val typeInterpretation = match.get(3) as PartialComplexTypeInterpretation

                                         val container = match.get(4) as DefinedElement

 

-                                        val startTime = System.nanoTime

                                         createObjectActionWithContainment(

                                                 nameNewElement,

                                                 interpretation,

@@ -139,44 +136,34 @@ class RefinementRuleProvider {
                                                 container,

                                                 relationInterpretation,

                                                 [createDefinedElement],

-                                                recursiceObjectCreations,

-                                                scopePropagator

+                                                recursiveObjectCreations,

+                                                unitRulePropagator

                                         )

                                         statistics.addExecutionTime(System.nanoTime - startTime)

 

-                                        flushQueryEngine(scopePropagator)

-

-                                        // Scope propagation

-                                        val propagatorStartTime = System.nanoTime

-                                        scopePropagator.propagateAllScopeConstraints()

-                                        statistics.addScopePropagationTime(System.nanoTime - propagatorStartTime)

+                                        unitRulePropagator.propagate

                                 ]

                         }

                 } else {

                         ruleBuilder.action [ match |

                                 statistics.incrementTransformationCount

 //                              println(name)

+                                val startTime = System.nanoTime

                                 // val problem = match.get(0) as LogicProblem

                                 val interpretation = match.get(1) as PartialInterpretation

                                 val typeInterpretation = match.get(2) as PartialComplexTypeInterpretation

 

-                                val startTime = System.nanoTime

                                 createObjectAction(

                                         nameNewElement,

                                         interpretation,

                                         typeInterpretation,

                                         [createDefinedElement],

-                                        recursiceObjectCreations,

-                                        scopePropagator

+                                        recursiveObjectCreations,

+                                        unitRulePropagator

                                 )

                                 statistics.addExecutionTime(System.nanoTime - startTime)

 

-                                flushQueryEngine(scopePropagator)

-

-                                // Scope propagation

-                                val propagatorStartTime = System.nanoTime

-                                scopePropagator.propagateAllScopeConstraints()

-                                statistics.addScopePropagationTime(System.nanoTime - propagatorStartTime)

+                                unitRulePropagator.propagate

                         ]

                 }

                 return ruleBuilder.build

@@ -342,14 +329,14 @@ class RefinementRuleProvider {
                 [createStringElement]

         }

 

-        def createRelationRefinementRules(GeneratedPatterns patterns, ScopePropagator scopePropagator,

+        def createRelationRefinementRules(GeneratedPatterns patterns, UnitRulePropagator unitRulePropagator,

                 ModelGenerationStatistics statistics) {

                 val res = new LinkedHashMap

-                for (LHSEntry : patterns.refinerelationQueries.entrySet) {

+                for (LHSEntry : patterns.refineRelationQueries.entrySet) {

                         val declaration = LHSEntry.key.key

                         val inverseReference = LHSEntry.key.value

                         val lhs = LHSEntry.value as IQuerySpecification<ViatraQueryMatcher<GenericPatternMatch>>

-                        val rule = createRelationRefinementRule(declaration, inverseReference, lhs, scopePropagator, statistics)

+                        val rule = createRelationRefinementRule(declaration, inverseReference, lhs, unitRulePropagator, statistics)

                         res.put(LHSEntry.key, rule)

                 }

                 return res

@@ -357,59 +344,29 @@ class RefinementRuleProvider {
 

         def private BatchTransformationRule<GenericPatternMatch, ViatraQueryMatcher<GenericPatternMatch>> createRelationRefinementRule(

                 RelationDeclaration declaration, Relation inverseRelation,

-                IQuerySpecification<ViatraQueryMatcher<GenericPatternMatch>> lhs, ScopePropagator scopePropagator,

+                IQuerySpecification<ViatraQueryMatcher<GenericPatternMatch>> lhs, UnitRulePropagator unitRulePropagator,

                 ModelGenerationStatistics statistics) {

                 val name = '''addRelation_«declaration.name.canonizeName»«IF inverseRelation !== null»_and_«inverseRelation.name.canonizeName»«ENDIF»'''

                 val ruleBuilder = factory.createRule(lhs).name(name)

                 if (inverseRelation === null) {

                         ruleBuilder.action [ match |

                                 statistics.incrementTransformationCount

-

 //                              println(name)

-                                // val problem = match.get(0) as LogicProblem

-                                // val interpretation = match.get(1) as PartialInterpretation

-                                val relationInterpretation = match.get(2) as PartialRelationInterpretation

-                                val src = match.get(3) as DefinedElement

-                                val trg = match.get(4) as DefinedElement

-

-                                queryEngine.delayUpdatePropagation [

-                                        val startTime = System.nanoTime

-                                        createRelationLinkAction(src, trg, relationInterpretation)

-                                        statistics.addExecutionTime(System.nanoTime - startTime)

-                                ]

+                                val startTime = System.nanoTime

+                                createRelationLinkAction(match, unitRulePropagator)

+                                statistics.addExecutionTime(System.nanoTime - startTime)

 

-                                // Scope propagation

-                                if (scopePropagator.isPropagationNeededAfterAdditionToRelation(declaration)) {

-                                        queryEngine.delayUpdatePropagation [

-                                                val propagatorStartTime = System.nanoTime

-                                                scopePropagator.propagateAllScopeConstraints()

-                                                statistics.addScopePropagationTime(System.nanoTime - propagatorStartTime)

-                                        ]

-                                }

+                                unitRulePropagator.propagate

                         ]

                 } else {

                         ruleBuilder.action [ match |

                                 statistics.incrementTransformationCount

 //                              println(name)

-                                // val problem = match.get(0) as LogicProblem

-                                // val interpretation = match.get(1) as PartialInterpretation

-                                val relationInterpretation = match.get(2) as PartialRelationInterpretation

-                                val inverseInterpretation = match.get(3) as PartialRelationInterpretation

-                                val src = match.get(4) as DefinedElement

-                                val trg = match.get(5) as DefinedElement

-

                                 val startTime = System.nanoTime

-                                createRelationLinkWithInverse(src, trg, relationInterpretation, inverseInterpretation)

+                                createRelationLinkWithInverse(match, unitRulePropagator)

                                 statistics.addExecutionTime(System.nanoTime - startTime)

 

-                                // Scope propagation

-                                if (scopePropagator.isPropagationNeededAfterAdditionToRelation(declaration)) {

-                                        flushQueryEngine(scopePropagator)

-

-                                        val propagatorStartTime = System.nanoTime

-                                        scopePropagator.propagateAllScopeConstraints()

-                                        statistics.addScopePropagationTime(System.nanoTime - propagatorStartTime)

-                                }

+                                unitRulePropagator.propagate

                         ]

                 }

 

@@ -420,7 +377,7 @@ class RefinementRuleProvider {
         // Actions

         // ///////////////////////

         protected def void createObjectAction(boolean nameNewElement, ObjectCreationInterpretationData data,

-                DefinedElement container, ScopePropagator scopePropagator) {

+                DefinedElement container, UnitRulePropagator unitRulePropagator) {

                 if (data.containerInterpretation !== null) {

                         if (data.containerInverseInterpretation !== null) {

                                 createObjectActionWithContainmentAndInverse(

@@ -432,7 +389,7 @@ class RefinementRuleProvider {
                                         data.containerInverseInterpretation,

                                         data.constructor,

                                         data.recursiveConstructors,

-                                        scopePropagator

+                                        unitRulePropagator

                                 )

                         } else {

                                 createObjectActionWithContainment(

@@ -443,7 +400,7 @@ class RefinementRuleProvider {
                                         data.containerInterpretation,

                                         data.constructor,

                                         data.recursiveConstructors,

-                                        scopePropagator

+                                        unitRulePropagator

                                 )

                         }

                 } else {

@@ -453,7 +410,7 @@ class RefinementRuleProvider {
                                 data.typeInterpretation,

                                 data.constructor,

                                 data.recursiveConstructors,

-                                scopePropagator

+                                unitRulePropagator

                         )

                 }

 

@@ -468,7 +425,7 @@ class RefinementRuleProvider {
                 PartialRelationInterpretation inverseRelationInterpretation,

                 Function0<DefinedElement> constructor,

                 List<ObjectCreationInterpretationData> recursiceObjectCreations,

-                ScopePropagator scopePropagator

+                UnitRulePropagator unitRulePropagator

         ) {

                 val newElement = constructor.apply

                 if (nameNewElement) {

@@ -488,14 +445,16 @@ class RefinementRuleProvider {
                 inverseRelationInterpretation.relationlinks += newLink2

 

                 // Scope propagation

-                scopePropagator.decrementTypeScope(typeInterpretation)

+                unitRulePropagator.decrementTypeScope(typeInterpretation)

+                unitRulePropagator.addedToRelation(relationInterpretation.interpretationOf)

+                unitRulePropagator.addedToRelation(inverseRelationInterpretation.interpretationOf)

 

                 // Existence

                 interpretation.newElements += newElement

 

                 // Do recursive object creation

                 for (newConstructor : recursiceObjectCreations) {

-                        createObjectAction(nameNewElement, newConstructor, newElement, scopePropagator)

+                        createObjectAction(nameNewElement, newConstructor, newElement, unitRulePropagator)

                 }

 

                 return newElement

@@ -509,7 +468,7 @@ class RefinementRuleProvider {
                 PartialRelationInterpretation relationInterpretation,

                 Function0<DefinedElement> constructor,

                 List<ObjectCreationInterpretationData> recursiceObjectCreations,

-                ScopePropagator scopePropagator

+                UnitRulePropagator unitRulePropagator

         ) {

                 val newElement = constructor.apply

                 if (nameNewElement) {

@@ -524,16 +483,17 @@ class RefinementRuleProvider {
                 // ContainmentRelation

                 val newLink = factory2.createBinaryElementRelationLink => [it.param1 = container it.param2 = newElement]

                 relationInterpretation.relationlinks += newLink

+                unitRulePropagator.addedToRelation(relationInterpretation.interpretationOf)

 

                 // Scope propagation

-                scopePropagator.decrementTypeScope(typeInterpretation)

+                unitRulePropagator.decrementTypeScope(typeInterpretation)

 

                 // Existence

                 interpretation.newElements += newElement

 

                 // Do recursive object creation

                 for (newConstructor : recursiceObjectCreations) {

-                        createObjectAction(nameNewElement, newConstructor, newElement, scopePropagator)

+                        createObjectAction(nameNewElement, newConstructor, newElement, unitRulePropagator)

                 }

 

                 return newElement

@@ -541,7 +501,7 @@ class RefinementRuleProvider {
 

         protected def createObjectAction(boolean nameNewElement, PartialInterpretation interpretation,

                 PartialTypeInterpratation typeInterpretation, Function0<DefinedElement> constructor,

-                List<ObjectCreationInterpretationData> recursiceObjectCreations, ScopePropagator scopePropagator) {

+                List<ObjectCreationInterpretationData> recursiceObjectCreations, UnitRulePropagator unitRulePropagator) {

                 val newElement = constructor.apply

                 if (nameNewElement) {

                         newElement.name = '''new «interpretation.newElements.size»'''

@@ -554,38 +514,220 @@ class RefinementRuleProvider {
                 }

 

                 // Scope propagation

-                scopePropagator.decrementTypeScope(typeInterpretation)

+                unitRulePropagator.decrementTypeScope(typeInterpretation)

 

                 // Existence

                 interpretation.newElements += newElement

 

                 // Do recursive object creation

                 for (newConstructor : recursiceObjectCreations) {

-                        createObjectAction(nameNewElement, newConstructor, newElement, scopePropagator)

+                        createObjectAction(nameNewElement, newConstructor, newElement, unitRulePropagator)

                 }

 

                 return newElement

         }

 

-        protected def boolean createRelationLinkAction(DefinedElement src, DefinedElement trg,

-                PartialRelationInterpretation relationInterpretation) {

+        protected def createRelationLinkAction(IPatternMatch match, UnitRulePropagator unitRulePropagator) {

+                // val problem = match.get(0) as LogicProblem

+                // val interpretation = match.get(1) as PartialInterpretation

+                val relationInterpretation = match.get(2) as PartialRelationInterpretation

+                val src = match.get(3) as DefinedElement

+                val trg = match.get(4) as DefinedElement

+                createRelationLinkAction(src, trg, relationInterpretation, unitRulePropagator)

+        }

+

+        protected def void createRelationLinkAction(DefinedElement src, DefinedElement trg,

+                PartialRelationInterpretation relationInterpretation, UnitRulePropagator unitRulePropagator) {

                 val link = createBinaryElementRelationLink => [it.param1 = src it.param2 = trg]

                 relationInterpretation.relationlinks += link

+                unitRulePropagator.addedToRelation(relationInterpretation.interpretationOf)

         }

 

-        protected def boolean createRelationLinkWithInverse(DefinedElement src, DefinedElement trg,

-                PartialRelationInterpretation relationInterpretation, PartialRelationInterpretation inverseInterpretation) {

+        protected def void createRelationLinkWithInverse(IPatternMatch match, UnitRulePropagator unitRulePropagator) {

+                // val problem = match.get(0) as LogicProblem

+                // val interpretation = match.get(1) as PartialInterpretation

+                val relationInterpretation = match.get(2) as PartialRelationInterpretation

+                val inverseInterpretation = match.get(3) as PartialRelationInterpretation

+                val src = match.get(4) as DefinedElement

+                val trg = match.get(5) as DefinedElement

+                createRelationLinkWithInverse(src, trg, relationInterpretation, inverseInterpretation, unitRulePropagator)

+        }

+

+        protected def void createRelationLinkWithInverse(DefinedElement src, DefinedElement trg,

+                PartialRelationInterpretation relationInterpretation, PartialRelationInterpretation inverseInterpretation,

+                UnitRulePropagator unitRulePropagator) {

                 val link = createBinaryElementRelationLink => [it.param1 = src it.param2 = trg]

                 relationInterpretation.relationlinks += link

                 val inverseLink = createBinaryElementRelationLink => [it.param1 = trg it.param2 = src]

                 inverseInterpretation.relationlinks += inverseLink

+                unitRulePropagator.addedToRelation(relationInterpretation.interpretationOf)

+                unitRulePropagator.addedToRelation(inverseInterpretation.interpretationOf)

         }

 

-        protected def flushQueryEngine(ScopePropagator scopePropagator) {

-                if (scopePropagator.queryEngineFlushRequiredBeforePropagation && queryEngine.updatePropagationDelayed) {

-                        delayMessageDelivery.setBoolean(queryEngine, false)

-                        queryEngine.getQueryBackend(ReteBackendFactory.INSTANCE).flushUpdates

-                        delayMessageDelivery.setBoolean(queryEngine, true)

+        static class UnitRulePropagator {

+                val LogicProblem p

+                val PartialInterpretation i

+                val RefinementRuleProvider refinementRuleProvider

+                var AdvancedViatraQueryEngine queryEngine

+                var Field delayMessageDelivery

+                val ScopePropagator scopePropagator

+                val List<AbstractMustRelationPropagator<? extends IPatternMatch>> propagators

+                val ModelGenerationStatistics statistics

+

+                new(LogicProblem p, PartialInterpretation i, RefinementRuleProvider refinementRuleProvider,

+                        ScopePropagator scopePropagator,

+                        Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> mustRelationPropagationQueries,

+                        ModelGenerationStatistics statistics) {

+                        this.p = p

+                        this.i = i

+                        this.refinementRuleProvider = refinementRuleProvider

+                        queryEngine = ViatraQueryEngine.on(new EMFScope(i)) as AdvancedViatraQueryEngine

+                        delayMessageDelivery = queryEngine.class.getDeclaredField("delayMessageDelivery")

+                        delayMessageDelivery.accessible = true

+                        this.scopePropagator = scopePropagator

+                        propagators = ImmutableList.copyOf(mustRelationPropagationQueries.entrySet.map [ entry |

+                                val matcher = queryEngine.getMatcher(entry.value)

+                                getPropagator(entry.key.key, entry.key.value, matcher)

+                        ])

+                        this.statistics = statistics

+                }

+

+                def decrementTypeScope(PartialTypeInterpratation partialTypeInterpratation) {

+                        scopePropagator.decrementTypeScope(partialTypeInterpratation)

+                }

+

+                def addedToRelation(Relation r) {

+                        scopePropagator.addedToRelation(r)

+                }

+

+                def propagate() {

+                        var boolean changed

+                        do {

+                                val scopeChanged = propagateScope()

+                                val mustChanged = propagateMustRelations()

+                                changed = scopeChanged || mustChanged

+                        } while (changed)

+                }

+

+                protected def flushQueryEngine() {

+                        if (queryEngine.updatePropagationDelayed) {

+                                delayMessageDelivery.setBoolean(queryEngine, false)

+                                queryEngine.getQueryBackend(ReteBackendFactory.INSTANCE).flushUpdates

+                                delayMessageDelivery.setBoolean(queryEngine, true)

+                        }

+                }

+

+                protected def propagateScope() {

+                        if (scopePropagator.scopePropagationNeeded) {

+                                if (scopePropagator.queryEngineFlushRequiredBeforePropagation) {

+                                        flushQueryEngine()

+                                }

+                                val propagatorStartTime = System.nanoTime

+                                scopePropagator.propagateAllScopeConstraints()

+                                statistics.addScopePropagationTime(System.nanoTime - propagatorStartTime)

+                                true

+                        } else {

+                                false

+                        }

+                }

+

+                protected def propagateMustRelations() {

+                        if (propagators.empty) {

+                                return false

+                        }

+                        flushQueryEngine()

+                        val propagatorStartTime = System.nanoTime

+                        var changed = false

+                        for (propagator : propagators) {

+                                changed = propagator.propagate(p, i, refinementRuleProvider, this) || changed

+                        }

+                        statistics.addMustRelationPropagationTime(System.nanoTime - propagatorStartTime)

+                        changed

+                }

+

+                private static def <T extends IPatternMatch> getPropagator(Relation relation, Relation inverseRelation,

+                        ViatraQueryMatcher<T> matcher) {

+                        if (inverseRelation === null) {

+                                new MustRelationPropagator(matcher)

+                        } else if (relation == inverseRelation) {

+                                new MustRelationPropagatorWithSelfInverse(matcher)

+                        } else {

+                                new MustRelationPropagatorWithInverse(matcher)

+                        }

+                }

+

+                @FinalFieldsConstructor

+                private static abstract class AbstractMustRelationPropagator<T extends IPatternMatch> {

+                        val ViatraQueryMatcher<T> matcher

+

+                        def propagate(LogicProblem p, PartialInterpretation i, RefinementRuleProvider refinementRuleProvider,

+                                UnitRulePropagator unitRulePropagator) {

+                                val iterator = getIterator(p, i)

+                                if (!iterator.hasNext) {

+                                        return false

+                                }

+                                iterate(iterator, refinementRuleProvider, unitRulePropagator)

+                                true

+                        }

+

+                        def iterate(Iterator<T> iterator, RefinementRuleProvider refinementRuleProvider,

+                                UnitRulePropagator unitRulePropagator) {

+                                while (iterator.hasNext) {

+                                        doPropagate(iterator.next, refinementRuleProvider, unitRulePropagator)

+                                }

+                        }

+

+                        protected def getIterator(LogicProblem p, PartialInterpretation i) {

+                                val partialMatch = matcher.newEmptyMatch

+                                partialMatch.set(0, p)

+                                partialMatch.set(1, i)

+                                matcher.streamAllMatches(partialMatch).iterator

+                        }

+

+                        protected def void doPropagate(T match, RefinementRuleProvider refinementRuleProvider,

+                                UnitRulePropagator unitRulePropagator)

+                }

+

+                private static class MustRelationPropagator<T extends IPatternMatch> extends AbstractMustRelationPropagator<T> {

+                        new(ViatraQueryMatcher<T> matcher) {

+                                super(matcher)

+                        }

+

+                        override protected doPropagate(T match, RefinementRuleProvider refinementRuleProvider,

+                                UnitRulePropagator unitRulePropagator) {

+                                refinementRuleProvider.createRelationLinkAction(match, unitRulePropagator)

+                        }

+                }

+

+                private static class MustRelationPropagatorWithInverse<T extends IPatternMatch> extends AbstractMustRelationPropagator<T> {

+                        new(ViatraQueryMatcher<T> matcher) {

+                                super(matcher)

+                        }

+

+                        override protected doPropagate(T match, RefinementRuleProvider refinementRuleProvider,

+                                UnitRulePropagator unitRulePropagator) {

+                                refinementRuleProvider.createRelationLinkWithInverse(match, unitRulePropagator)

+                        }

+                }

+

+                private static class MustRelationPropagatorWithSelfInverse<T extends IPatternMatch> extends MustRelationPropagatorWithInverse<T> {

+                        new(ViatraQueryMatcher<T> matcher) {

+                                super(matcher)

+                        }

+

+                        override iterate(Iterator<T> iterator, RefinementRuleProvider refinementRuleProvider,

+                                UnitRulePropagator unitRulePropagator) {

+                                val pairs = newHashSet

+                                while (iterator.hasNext) {

+                                        val match = iterator.next

+                                        val src = match.get(4) as DefinedElement

+                                        val trg = match.get(5) as DefinedElement

+                                        if (!pairs.contains(trg -> src)) {

+                                                pairs.add(src -> trg)

+                                                doPropagate(match, refinementRuleProvider, unitRulePropagator)

+                                        }

+                                }

+                        }

                 }

         }

 }

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/util/ParseUtil.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/util/ParseUtil.xtend
index 26ec7091..69b54b8a 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/util/ParseUtil.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/util/ParseUtil.xtend
@@ -6,7 +6,6 @@ import com.google.inject.Inject
 import com.google.inject.Injector

 import com.google.inject.multibindings.Multibinder

 import com.google.inject.name.Names

-import com.google.inject.util.Modules

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage

 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage

@@ -46,7 +45,6 @@ import org.eclipse.xtext.scoping.IScope
 import org.eclipse.xtext.scoping.IScopeProvider

 import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider

 import org.eclipse.xtext.scoping.impl.SimpleScope

-import org.eclipse.xtext.service.AbstractGenericModule

 import org.eclipse.xtext.service.SingletonBinding

 import org.eclipse.xtext.workspace.IProjectConfigProvider

 

@@ -65,35 +63,32 @@ package class StandaloneParserWithFixedMetamodelProviderModule extends Standalon
                 Multibinder::newSetBinder(binder, IMetamodelProviderInstance);

         }

 

-}

-

-package class StandaloneParserOverridesModule extends AbstractGenericModule {

-

-        def Class<? extends IMetamodelProvider> bindIMetamodelProvider() {

+        @SingletonBinding

+        override IResourceServiceProvider.Registry bindIResourceServiceProvider$Registry() {

+                new VqlDeactivatedServiceProviderRegistry

+        }

+        

+        override Class<? extends IMetamodelProvider> bindIMetamodelProvider() {

                 FixedMetamodelProvider

         }

 

-        def Class<? extends IProjectConfigProvider> bindProjectConfigProvider() {

+        override Class<? extends IProjectConfigProvider> bindProjectConfigProvider() {

                 NullProjectConfigProvider

         }

 

         @SingletonBinding

-        def Class<? extends IResourceServiceProvider.Registry> bindIResourceServiceProvider$Registry() {

-                VqlDeactivatedServiceProviderRegistry

-        }

-

-        def EValidator.Registry bindEValidator$Registry() {

+        override EValidator.Registry bindEValidatorRegistry() {

                 // org.eclipse.xtext.validation.EValidatorRegistrar modifies EValidators already in the registry,

                 // so it is not safe to populate the registry from the EValidator.Registry.INSTANCE singleton.

                 // There is no need to execute any EValiator other than EMFPatternLanguageValidator,

                 // so we can start with a blank registry instead.

-                new EValidatorRegistryImpl()

+                new EValidatorRegistryImpl

         }

 

-        def EPackage.Registry bindEPackage$Registry() {

+        @SingletonBinding

+        override EPackage.Registry bindEPackageRegistry() {

                 new EPackageRegistryImpl(EPackage.Registry.INSTANCE)

         }

-

 }

 

 package class NullProjectConfigProvider implements IProjectConfigProvider {

@@ -136,10 +131,8 @@ class ParseUtil {
 

         def protected Injector internalCreateInjector() {

                 ensureViatraInitialized();

-                val runtimeModulemodule = new StandaloneParserWithFixedMetamodelProviderModule

-                val overridesModule = new StandaloneParserOverridesModule

-                val module = Modules.override(runtimeModulemodule).with(overridesModule)

-                val newInjector = Guice.createInjector(module)

+                val runtimeModule = new StandaloneParserWithFixedMetamodelProviderModule

+                val newInjector = Guice.createInjector(runtimeModule)

                 return newInjector

         }

 

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/META-INF/MANIFEST.MF
index 4ad61ccb..402a0b7d 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/META-INF/MANIFEST.MF
@@ -4,6 +4,7 @@ Bundle-Name: Reasoner
 Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner
 Bundle-Version: 1.0.0.qualifier
 Export-Package: hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner,
+ hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse,
  hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization
 Require-Bundle: hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
  hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ModelGenerationMethodBasedGlobalConstraint.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ModelGenerationMethodBasedGlobalConstraint.xtend
index 9ef5e091..691e0645 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ModelGenerationMethodBasedGlobalConstraint.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ModelGenerationMethodBasedGlobalConstraint.xtend
@@ -1,7 +1,6 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner
 
 import org.eclipse.viatra.dse.objectives.IGlobalConstraint
-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod
 
 abstract class ModelGenerationMethodBasedGlobalConstraint implements IGlobalConstraint {
         val protected ModelGenerationMethod method
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationMethodProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ModelGenerationMethodProvider.xtend
index 56beacfa..25137eba 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationMethodProvider.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ModelGenerationMethodProvider.xtend
@@ -1,215 +1,201 @@
-package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra

-

-import com.google.common.collect.ImmutableMap

-import com.google.common.collect.ImmutableSet

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel

-import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem

-import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.CbcPolyhedronSolver

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.MultiplicityGoalConstraintCalculator

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedronScopePropagator

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.RelationConstraintCalculator

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagator

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagatorStrategy

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.TypeHierarchyScopePropagator

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.Z3PolyhedronSolver

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.GeneratedPatterns

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.ModalPatternQueries

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternProvider

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.rules.GoalConstraintProvider

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.rules.RefinementRuleProvider

-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

-import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace

-import java.util.Collection

-import java.util.List

-import java.util.Map

-import java.util.Set

-import org.eclipse.viatra.query.runtime.api.GenericQueryGroup

-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.ViatraQueryMatcher

-import org.eclipse.viatra.query.runtime.emf.EMFScope

-import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery

-import org.eclipse.viatra.transformation.runtime.emf.rules.batch.BatchTransformationRule

-import org.eclipse.xtend.lib.annotations.Data

-

-class ModelGenerationStatistics {

-        public var long transformationExecutionTime = 0

-

-        synchronized def addExecutionTime(long amount) {

-                transformationExecutionTime += amount

-        }

-

-        public var long scopePropagationTime = 0

-

-        synchronized def addScopePropagationTime(long amount) {

-                scopePropagationTime += amount

-        }

-

-        public var long preliminaryTypeAnalisisTime = 0

-

-        public var int decisionsTried = 0

-

-        synchronized def incrementDecisionCount() {

-                decisionsTried++

-        }

-

-        public var int transformationInvocations

-

-        synchronized def incrementTransformationCount() {

-                transformationInvocations++

-        }

-

-        public var int scopePropagatorInvocations

-

-        synchronized def incrementScopePropagationCount() {

-                scopePropagatorInvocations++

-        }

-

-        public var int scopePropagatorSolverInvocations

-

-        synchronized def incrementScopePropagationSolverCount() {

-                scopePropagatorSolverInvocations++

-        }

-}

-

-@Data class ModelGenerationMethod {

-        ModelGenerationStatistics statistics

-

-        Collection<? extends BatchTransformationRule<?, ?>> objectRefinementRules

-        Collection<? extends BatchTransformationRule<?, ?>> relationRefinementRules

-

-        List<MultiplicityGoalConstraintCalculator> unfinishedMultiplicities

-

-        Collection<? extends IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unfinishedWF

-

-        Collection<? extends IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> invalidWF

-

-        Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> mustUnitPropagationPreconditions

-        Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> currentUnitPropagationPreconditions

-

-        Map<String, ModalPatternQueries> modalRelationQueries

-

-        Collection<? extends IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> allPatterns

-}

-

-enum TypeInferenceMethod {

-        Generic,

-        PreliminaryAnalysis

-}

-

-class ModelGenerationMethodProvider {

-        val PatternProvider patternProvider = new PatternProvider

-        val RefinementRuleProvider refinementRuleProvider = new RefinementRuleProvider

-        val GoalConstraintProvider goalConstraintProvider = new GoalConstraintProvider

-        val relationConstraintCalculator = new RelationConstraintCalculator

-

-        def ModelGenerationMethod createModelGenerationMethod(

-                LogicProblem logicProblem,

-                PartialInterpretation emptySolution,

-                ReasonerWorkspace workspace,

-                boolean nameNewElements,

-                TypeInferenceMethod typeInferenceMethod,

-                boolean calculateObjectCreationCosts,

-                ScopePropagatorStrategy scopePropagatorStrategy,

-                Collection<LinearTypeConstraintHint> hints,

-                DocumentationLevel debugLevel

-        ) {

-                val statistics = new ModelGenerationStatistics

-                val writeFiles = (debugLevel === DocumentationLevel.NORMAL || debugLevel === DocumentationLevel.FULL)

-

-                val Set<PQuery> existingQueries = logicProblem.relations.map[annotations].flatten.filter(TransfomedViatraQuery).

-                        map[it.patternPQuery as PQuery].toSet

-

-                val relationConstraints = relationConstraintCalculator.calculateRelationConstraints(logicProblem)

-                val queries = patternProvider.generateQueries(logicProblem, emptySolution, statistics, existingQueries,

-                        workspace, typeInferenceMethod, scopePropagatorStrategy, relationConstraints, hints, writeFiles)

-

-                val scopePropagator = createScopePropagator(scopePropagatorStrategy, emptySolution, hints, queries, statistics)

-                scopePropagator.propagateAllScopeConstraints

-                val objectRefinementRules = refinementRuleProvider.createObjectRefinementRules(logicProblem, emptySolution,

-                        queries, scopePropagator, nameNewElements, statistics)

-                val relationRefinementRules = refinementRuleProvider.createRelationRefinementRules(queries, scopePropagator,

-                        statistics)

-

-                val unfinishedMultiplicities = goalConstraintProvider.getUnfinishedMultiplicityQueries(logicProblem, queries,

-                        calculateObjectCreationCosts)

-

-                val unfinishedWF = queries.getUnfinishedWFQueries.values

-

-                val modalRelationQueriesBuilder = ImmutableMap.builder

-                for (entry : queries.modalRelationQueries.entrySet) {

-                        val annotation = entry.key.annotations.filter(TransfomedViatraQuery).head

-                        if (annotation !== null) {

-                                modalRelationQueriesBuilder.put(annotation.patternFullyQualifiedName, entry.value)

-                        }

-                }

-                val modalRelationQueries = modalRelationQueriesBuilder.build

-

-                val invalidWF = queries.getInvalidWFQueries.values

-

-                val mustUnitPropagationPreconditions = queries.getMustUnitPropagationPreconditionPatterns

-                val currentUnitPropagationPreconditions = queries.getCurrentUnitPropagationPreconditionPatterns

-

-                val queriesToPrepare = ImmutableSet.builder.addAll(queries.refineObjectQueries.values).addAll(

-                        queries.refineTypeQueries.values).addAll(queries.refinerelationQueries.values).addAll(queries.

-                        multiplicityConstraintQueries.values.flatMap[allQueries]).addAll(queries.unfinishedWFQueries.values).addAll(

-                        queries.invalidWFQueries.values).addAll(queries.mustUnitPropagationPreconditionPatterns.values).addAll(

-                        queries.currentUnitPropagationPreconditionPatterns.values).add(queries.hasElementInContainmentQuery).build

-                val queryEngine = ViatraQueryEngine.on(new EMFScope(emptySolution))

-                GenericQueryGroup.of(queriesToPrepare).prepare(queryEngine)

-

-                return new ModelGenerationMethod(

-                        statistics,

-                        objectRefinementRules.values,

-                        relationRefinementRules.values,

-                        unfinishedMultiplicities,

-                        unfinishedWF,

-                        invalidWF,

-                        mustUnitPropagationPreconditions,

-                        currentUnitPropagationPreconditions,

-                        modalRelationQueries,

-                        queries.allQueries

-                )

-        }

-

-        private def createScopePropagator(ScopePropagatorStrategy scopePropagatorStrategy,

-                PartialInterpretation emptySolution, Collection<LinearTypeConstraintHint> hints, GeneratedPatterns queries,

-                ModelGenerationStatistics statistics) {

-                if (!hints.empty && !(scopePropagatorStrategy instanceof ScopePropagatorStrategy.Polyhedral)) {

-                        throw new IllegalArgumentException("Only the Polyhedral scope propagator strategy can use hints.")

-                }

-                switch (scopePropagatorStrategy) {

-                        case ScopePropagatorStrategy.None,

-                        case ScopePropagatorStrategy.Basic:

-                                new ScopePropagator(emptySolution, statistics)

-                        case ScopePropagatorStrategy.BasicTypeHierarchy:

-                                new TypeHierarchyScopePropagator(emptySolution, statistics)

-                        ScopePropagatorStrategy.Polyhedral: {

-                                val types = queries.refineObjectQueries.keySet.map[newType].toSet

-                                val allPatternsByName = queries.allQueries.toMap[fullyQualifiedName]

-                                val solver = switch (scopePropagatorStrategy.solver) {

-                                        case Z3Integer:

-                                                new Z3PolyhedronSolver(false, scopePropagatorStrategy.timeoutSeconds)

-                                        case Z3Real:

-                                                new Z3PolyhedronSolver(true, scopePropagatorStrategy.timeoutSeconds)

-                                        case Cbc:

-                                                new CbcPolyhedronSolver(false, scopePropagatorStrategy.timeoutSeconds, true)

-                                        case Clp:

-                                                new CbcPolyhedronSolver(true, scopePropagatorStrategy.timeoutSeconds, true)

-                                        default:

-                                                throw new IllegalArgumentException("Unknown polyhedron solver: " +

-                                                        scopePropagatorStrategy.solver)

-                                }

-                                new PolyhedronScopePropagator(emptySolution, statistics, types, queries.multiplicityConstraintQueries,

-                                        queries.hasElementInContainmentQuery, allPatternsByName, hints, solver,

-                                        scopePropagatorStrategy.requiresUpperBoundIndexing, scopePropagatorStrategy.updateHeuristic)

-                        }

-                        default:

-                                throw new IllegalArgumentException("Unknown scope propagator strategy: " + scopePropagatorStrategy)

-                }

-        }

-}

+package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner
+
+import com.google.common.collect.ImmutableMap
+import com.google.common.collect.ImmutableSet
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem
+import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationStatistics
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.CachingSimplePolyhedronScopePropagatorStrategy
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.CbcPolyhedronSolver
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.MultiplicityGoalConstraintCalculator
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedronExtensionOperator
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedronScopePropagator
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.RelationConstraintCalculator
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagator
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagatorStrategy
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.TypeHierarchyScopePropagator
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.Z3PolyhedronSolver
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.GeneratedPatterns
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.ModalPatternQueries
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternProvider
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.rules.GoalConstraintProvider
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.rules.RefinementRuleProvider
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.DiversityChecker
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.ViatraReasonerSolutionSaver
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.ThreeValuedCostObjectiveProvider
+import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace
+import java.util.Collection
+import java.util.List
+import java.util.Map
+import java.util.Set
+import org.eclipse.viatra.dse.objectives.IObjective
+import org.eclipse.viatra.query.runtime.api.GenericQueryGroup
+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.ViatraQueryMatcher
+import org.eclipse.viatra.query.runtime.emf.EMFScope
+import org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
+import org.eclipse.viatra.transformation.runtime.emf.rules.batch.BatchTransformationRule
+import org.eclipse.xtend.lib.annotations.Data
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ExtendedPolyhedronScopePropagatorStrategy
+
+@Data class ModelGenerationMethod {
+        ModelGenerationStatistics statistics
+
+        Collection<? extends BatchTransformationRule<?, ?>> objectRefinementRules
+        Collection<? extends BatchTransformationRule<?, ?>> relationRefinementRules
+
+        List<MultiplicityGoalConstraintCalculator> unfinishedMultiplicities
+
+        Collection<? extends IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unfinishedWF
+
+        Collection<? extends IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> invalidWF
+
+        Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> mustUnitPropagationPreconditions
+        Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> currentUnitPropagationPreconditions
+
+        Map<String, ModalPatternQueries> modalRelationQueries
+
+        Collection<? extends IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> allPatterns
+
+        Collection<IObjective> costObjectives
+        boolean optimizationProblem
+        ViatraReasonerSolutionSaver solutionSaver
+}
+
+class ModelGenerationMethodProvider {
+        val PatternProvider patternProvider = new PatternProvider
+        val RefinementRuleProvider refinementRuleProvider = new RefinementRuleProvider
+        val GoalConstraintProvider goalConstraintProvider = new GoalConstraintProvider
+        val relationConstraintCalculator = new RelationConstraintCalculator
+
+        def ModelGenerationMethod createModelGenerationMethod(
+                LogicProblem logicProblem,
+                PartialInterpretation emptySolution,
+                ReasonerWorkspace workspace,
+                ViatraReasonerConfiguration config
+        ) {
+                val statistics = new ModelGenerationStatistics
+                val debugLevel = config.documentationLevel
+                val writeFiles = (debugLevel === DocumentationLevel.NORMAL || debugLevel === DocumentationLevel.FULL)
+
+                val Set<PQuery> existingQueries = logicProblem.relations.map[annotations].flatten.filter(TransfomedViatraQuery).
+                        map[it.patternPQuery as PQuery].toSet
+
+                val relationConstraints = relationConstraintCalculator.calculateRelationConstraints(logicProblem)
+                val queries = patternProvider.generateQueries(logicProblem, emptySolution, statistics, existingQueries,
+                        workspace, config.typeInferenceMethod, config.scopePropagatorStrategy, relationConstraints, config.hints,
+                        config.unitPropagationPatternGenerators, writeFiles)
+
+                val unfinishedMultiplicities = goalConstraintProvider.getUnfinishedMultiplicityQueries(logicProblem, queries,
+                        config.calculateObjectCreationCosts)
+                val unfinishedWF = queries.getUnfinishedWFQueries.values
+                val modalRelationQueriesBuilder = ImmutableMap.builder
+                for (entry : queries.modalRelationQueries.entrySet) {
+                        val annotation = entry.key.annotations.filter(TransfomedViatraQuery).head
+                        if (annotation !== null) {
+                                modalRelationQueriesBuilder.put(annotation.patternFullyQualifiedName, entry.value)
+                        }
+                }
+                val modalRelationQueries = modalRelationQueriesBuilder.build
+                val invalidWF = queries.getInvalidWFQueries.values
+                val mustUnitPropagationPreconditions = queries.getMustUnitPropagationPreconditionPatterns
+                val currentUnitPropagationPreconditions = queries.getCurrentUnitPropagationPreconditionPatterns
+                val queriesToPrepare = ImmutableSet.builder.addAll(queries.refineObjectQueries.values).addAll(
+                        queries.refineTypeQueries.values).addAll(queries.refineRelationQueries.values).addAll(
+                        queries.mustRelationPropagationQueries.values).addAll(queries.multiplicityConstraintQueries.values.flatMap [
+                        allQueries
+                ]).addAll(queries.unfinishedWFQueries.values).addAll(queries.invalidWFQueries.values).addAll(
+                        queries.mustUnitPropagationPreconditionPatterns.values).addAll(
+                        queries.currentUnitPropagationPreconditionPatterns.values).add(queries.hasElementInContainmentQuery).build
+                val queryEngine = ViatraQueryEngine.on(new EMFScope(emptySolution))
+                GenericQueryGroup.of(queriesToPrepare).prepare(queryEngine)
+
+                val objectiveProvider = new ThreeValuedCostObjectiveProvider(queryEngine, emptySolution, modalRelationQueries)
+                val transformedObjectives = objectiveProvider.getCostObjectives(config.costObjectives)
+
+                val solutionSaver = new ViatraReasonerSolutionSaver(transformedObjectives.leveledExtremalObjectives,
+                        config.solutionScope.numberOfRequiredSolutions, DiversityChecker.of(config.diversityRequirement))
+
+                val allHints = ImmutableSet.builder
+                allHints.addAll(config.hints)
+                for (hint : transformedObjectives.hints) {
+                        hint.boundsProvider = solutionSaver
+                        allHints.add(hint)
+                }
+
+                val scopePropagator = createScopePropagator(config.scopePropagatorStrategy, emptySolution, allHints.build,
+                        transformedObjectives.extensionOperators, queries, statistics)
+                scopePropagator.propagateAllScopeConstraints
+                val unitRulePropagator = refinementRuleProvider.createUnitPrulePropagator(logicProblem, emptySolution, queries,
+                        scopePropagator, statistics)
+                val objectRefinementRules = refinementRuleProvider.createObjectRefinementRules(logicProblem, emptySolution,
+                        queries, unitRulePropagator, config.nameNewElements, statistics)
+                val relationRefinementRules = refinementRuleProvider.createRelationRefinementRules(queries, unitRulePropagator,
+                        statistics)
+
+                return new ModelGenerationMethod(
+                        statistics,
+                        objectRefinementRules.values,
+                        relationRefinementRules.values,
+                        unfinishedMultiplicities,
+                        unfinishedWF,
+                        invalidWF,
+                        mustUnitPropagationPreconditions,
+                        currentUnitPropagationPreconditions,
+                        modalRelationQueries,
+                        queries.allQueries,
+                        transformedObjectives.objectives,
+                        transformedObjectives.optimizationProblem,
+                        solutionSaver
+                )
+        }
+
+        private def createScopePropagator(ScopePropagatorStrategy scopePropagatorStrategy,
+                PartialInterpretation emptySolution, Collection<LinearTypeConstraintHint> hints,
+                Collection<PolyhedronExtensionOperator> extensionOperators, GeneratedPatterns queries,
+                ModelGenerationStatistics statistics) {
+                if (!hints.empty && !(scopePropagatorStrategy instanceof ScopePropagatorStrategy.Polyhedral)) {
+                        throw new IllegalArgumentException("Only the Polyhedral scope propagator strategy can use hints.")
+                }
+                switch (scopePropagatorStrategy) {
+                        case ScopePropagatorStrategy.None,
+                        case ScopePropagatorStrategy.Basic:
+                                new ScopePropagator(emptySolution, statistics)
+                        case ScopePropagatorStrategy.BasicTypeHierarchy:
+                                new TypeHierarchyScopePropagator(emptySolution, statistics)
+                        ScopePropagatorStrategy.Polyhedral: {
+                                val types = queries.refineObjectQueries.keySet.map[newType].toSet
+                                val allPatternsByName = queries.allQueries.toMap[fullyQualifiedName]
+                                val solver = switch (scopePropagatorStrategy.solver) {
+                                        case Z3Integer:
+                                                new Z3PolyhedronSolver(false, scopePropagatorStrategy.timeoutSeconds)
+                                        case Z3Real:
+                                                new Z3PolyhedronSolver(true, scopePropagatorStrategy.timeoutSeconds)
+                                        case Cbc:
+                                                new CbcPolyhedronSolver(false, scopePropagatorStrategy.timeoutSeconds, true)
+                                        case Clp:
+                                                new CbcPolyhedronSolver(true, scopePropagatorStrategy.timeoutSeconds, true)
+                                        default:
+                                                throw new IllegalArgumentException("Unknown polyhedron solver: " +
+                                                        scopePropagatorStrategy.solver)
+                                }
+                                val strategy = if (extensionOperators.empty) {
+                                                new CachingSimplePolyhedronScopePropagatorStrategy(solver, statistics)
+                                        } else {
+                                                new ExtendedPolyhedronScopePropagatorStrategy(solver, extensionOperators, statistics)
+                                        }
+                                new PolyhedronScopePropagator(emptySolution, statistics, types, queries.multiplicityConstraintQueries,
+                                        queries.hasElementInContainmentQuery, allPatternsByName, hints, strategy,
+                                        scopePropagatorStrategy.requiresUpperBoundIndexing, scopePropagatorStrategy.updateHeuristic)
+                        }
+                        default:
+                                throw new IllegalArgumentException("Unknown scope propagator strategy: " + scopePropagatorStrategy)
+                }
+        }
+}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
index c333feca..8e992741 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
@@ -1,7 +1,5 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner

 

-import com.google.common.collect.ImmutableList

-import com.google.common.collect.Lists

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasonerException

@@ -11,7 +9,6 @@ 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.LogicresultFactory

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethodProvider

 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagatorStrategy

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.PartialInterpretationInitialiser

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

@@ -22,7 +19,6 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.sta
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.statecoder.PairwiseNeighbourhoodBasedStateCoderFactory

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.BasicScopeGlobalConstraint

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.BestFirstStrategyForModelGeneration

-import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.DiversityChecker

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.InconsistentScopeGlobalConstraint

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.LoggerSolutionFoundHandler

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.ModelGenerationCompositeObjective

@@ -32,11 +28,8 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.PunishSizeObjective
 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.ScopeObjective

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.SurelyViolatedObjectiveGlobalConstraint

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.UnfinishedMultiplicityObjective

-import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.ViatraReasonerSolutionSaver

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.WF2ObjectiveConverter

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.ObjectiveKind

-import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.ThreeValuedCostElement

-import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.ThreeValuedCostObjective

 import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace

 import java.util.List

 import java.util.Map

@@ -86,12 +79,7 @@ class ViatraReasoner extends LogicReasoner {
                         problem,

                         emptySolution,

                         workspace,

-                        viatraConfig.nameNewElements,

-                        viatraConfig.typeInferenceMethod,

-                        viatraConfig.calculateObjectCreationCosts,

-                        viatraConfig.scopePropagatorStrategy,

-                        viatraConfig.hints,

-                        viatraConfig.documentationLevel

+                        viatraConfig

                 )

 

                 val compositeObjective = new ModelGenerationCompositeObjective(

@@ -111,45 +99,21 @@ class ViatraReasoner extends LogicReasoner {
                         dse.addObjective(punishObjective)

                 }

 

-                val extremalObjectives = Lists.newArrayListWithExpectedSize(viatraConfig.costObjectives.size)

-                for (entry : viatraConfig.costObjectives.indexed) {

-                        val objectiveName = '''costObjective«entry.key»'''

-                        val objectiveConfig = entry.value

-                        val elementsBuilder = ImmutableList.builder

-                        for (elementConfig : objectiveConfig.elements) {

-                                val relationName = elementConfig.patternQualifiedName

-                                val modalQueries = method.modalRelationQueries.get(relationName)

-                                if (modalQueries === null) {

-                                        throw new IllegalArgumentException("Unknown relation: " + relationName)

-                                }

-                                elementsBuilder.add(new ThreeValuedCostElement(

-                                        modalQueries.currentQuery,

-                                        modalQueries.mayQuery,

-                                        modalQueries.mustQuery,

-                                        elementConfig.weight

-                                ))

-                        }

-                        val costElements = elementsBuilder.build

-                        val costObjective = new ThreeValuedCostObjective(objectiveName, costElements, objectiveConfig.kind,

-                                objectiveConfig.threshold, 3)

+                for (costObjective : method.costObjectives) {

                         dse.addObjective(costObjective)

-                        if (objectiveConfig.findExtremum) {

-                                extremalObjectives += costObjective

-                        }

                 }

-

                 val numberOfRequiredSolutions = configuration.solutionScope.numberOfRequiredSolutions

-                val solutionStore = if (extremalObjectives.empty) {

-                                new SolutionStore(numberOfRequiredSolutions)

-                        } else {

+                val solutionStore = if (method.optimizationProblem) {

                                 new SolutionStore()

+                        } else {

+                                new SolutionStore(numberOfRequiredSolutions)

                         }

                 solutionStore.registerSolutionFoundHandler(new LoggerSolutionFoundHandler(viatraConfig))

-                val diversityChecker = DiversityChecker.of(viatraConfig.diversityRequirement)

                 val numericSolver = new NumericSolver(method, viatraConfig.runIntermediateNumericalConsistencyChecks, false)

-                val solutionSaver = new ViatraReasonerSolutionSaver(newArrayList(extremalObjectives), numberOfRequiredSolutions,

-                        diversityChecker, numericSolver)

+                val solutionSaver = method.solutionSaver

+                solutionSaver.numericSolver = numericSolver

                 val solutionCopier = solutionSaver.solutionCopier

+                val diversityChecker = solutionSaver.diversityChecker

                 solutionStore.withSolutionSaver(solutionSaver)

                 dse.solutionStore = solutionStore

 

@@ -184,7 +148,8 @@ class ViatraReasoner extends LogicReasoner {
                         dse.addTransformationRule(rule)

                 }

 

-                val strategy = new BestFirstStrategyForModelGeneration(workspace, viatraConfig, method, solutionSaver, numericSolver)

+                val strategy = new BestFirstStrategyForModelGeneration(workspace, viatraConfig, method, solutionSaver,

+                        numericSolver)

                 viatraConfig.progressMonitor.workedForwardTransformation

                 val transformationFinished = System.nanoTime

                 val transformationTime = transformationFinished - transformationStartTime

@@ -210,14 +175,15 @@ class ViatraReasoner extends LogicReasoner {
                                         it.value = (pair.value / 1000000) as int

                                 ]

                         }

-                        for(x: 0..<strategy.times.size) {

+                        for (x : 0 ..< strategy.times.size) {

                                 it.entries += createStringStatisticEntry => [

                                         it.name = '''Solution«x+1»DetailedStatistics'''

                                         it.value = strategy.times.get(x)

                                 ]

                         }

                         it.entries += createIntStatisticEntry => [

-                                it.name = "ExplorationInitializationTime" it.value = ((strategy.explorationStarted-transformationFinished)/1000000) as int

+                                it.name = "ExplorationInitializationTime"

+                                it.value = ((strategy.explorationStarted - transformationFinished) / 1000000) as int

                         ]

                         it.entries += createIntStatisticEntry => [

                                 it.name = "TransformationExecutionTime"

@@ -228,6 +194,10 @@ class ViatraReasoner extends LogicReasoner {
                                 it.value = (method.statistics.scopePropagationTime / 1000000) as int

                         ]

                         it.entries += createIntStatisticEntry => [

+                                it.name = "MustRelationPropagationTime"

+                                it.value = (method.statistics.mustRelationPropagationTime / 1000000) as int

+                        ]

+                        it.entries += createIntStatisticEntry => [

                                 it.name = "TypeAnalysisTime"

                                 it.value = (method.statistics.preliminaryTypeAnalisisTime / 1000000) as int

                         ]

@@ -248,22 +218,28 @@ class ViatraReasoner extends LogicReasoner {
                                 it.value = dse.numberOfStates as int

                         ]

                         it.entries += createIntStatisticEntry => [

-                                it.name = "ForwardTime" it.value = (strategy.forwardTime/1000000) as int

+                                it.name = "ForwardTime"

+                                it.value = (strategy.forwardTime / 1000000) as int

                         ]

                         it.entries += createIntStatisticEntry => [

-                                it.name = "BacktrackingTime" it.value = (strategy.backtrackingTime/1000000) as int

+                                it.name = "BacktrackingTime"

+                                it.value = (strategy.backtrackingTime / 1000000) as int

                         ]

                         it.entries += createIntStatisticEntry => [

-                                it.name = "GlobalConstraintEvaluationTime" it.value = (strategy.globalConstraintEvaluationTime/1000000) as int

+                                it.name = "GlobalConstraintEvaluationTime"

+                                it.value = (strategy.globalConstraintEvaluationTime / 1000000) as int

                         ]

                         it.entries += createIntStatisticEntry => [

-                                it.name = "FitnessCalculationTime" it.value = (strategy.fitnessCalculationTime/1000000) as int

+                                it.name = "FitnessCalculationTime"

+                                it.value = (strategy.fitnessCalculationTime / 1000000) as int

                         ]

                         it.entries += createIntStatisticEntry => [

-                                it.name = "SolutionCopyTime" it.value = (solutionSaver.totalCopierRuntime/1000000) as int

+                                it.name = "SolutionCopyTime"

+                                it.value = (solutionSaver.totalCopierRuntime / 1000000) as int

                         ]

                         it.entries += createIntStatisticEntry => [

-                                it.name = "ActivationSelectionTime" it.value = (strategy.activationSelector.runtime/1000000) as int

+                                it.name = "ActivationSelectionTime"

+                                it.value = (strategy.activationSelector.runtime / 1000000) as int

                         ]

                         it.entries += createIntStatisticEntry => [

                                 it.name = "Decisions"

@@ -282,27 +258,34 @@ class ViatraReasoner extends LogicReasoner {
                                 it.value = method.statistics.scopePropagatorSolverInvocations

                         ]

                         it.entries += createIntStatisticEntry => [

-                                it.name = "NumericalSolverSumTime" it.value = (strategy.numericSolver.runtime/1000000) as int

+                                it.name = "NumericalSolverSumTime"

+                                it.value = (strategy.numericSolver.runtime / 1000000) as int

                         ]

                         it.entries += createIntStatisticEntry => [

-                                it.name = "NumericalSolverProblemFormingTime" it.value = (strategy.numericSolver.solverFormingProblem/1000000) as int

+                                it.name = "NumericalSolverProblemFormingTime"

+                                it.value = (strategy.numericSolver.solverFormingProblem / 1000000) as int

                         ]

                         it.entries += createIntStatisticEntry => [

-                                it.name = "NumericalSolverSolvingTime" it.value = (strategy.numericSolver.solverSolvingProblem/1000000) as int

+                                it.name = "NumericalSolverSolvingTime"

+                                it.value = (strategy.numericSolver.solverSolvingProblem / 1000000) as int

                         ]

                         it.entries += createIntStatisticEntry => [

-                                it.name = "NumericalSolverInterpretingSolution" it.value = (strategy.numericSolver.solverSolution/1000000) as int

+                                it.name = "NumericalSolverInterpretingSolution"

+                                it.value = (strategy.numericSolver.solverSolution / 1000000) as int

                         ]

                         it.entries += createIntStatisticEntry => [

-                                it.name = "NumericalSolverCachingTime" it.value = (strategy.numericSolver.cachingTime/1000000) as int

+                                it.name = "NumericalSolverCachingTime"

+                                it.value = (strategy.numericSolver.cachingTime / 1000000) as int

                         ]

                         it.entries += createIntStatisticEntry => [

-                                it.name = "NumericalSolverCallNumber" it.value = strategy.numericSolver.numberOfSolverCalls

+                                it.name = "NumericalSolverCallNumber"

+                                it.value = strategy.numericSolver.numberOfSolverCalls

                         ]

                         it.entries += createIntStatisticEntry => [

-                                it.name = "NumericalSolverCachedAnswerNumber" it.value = strategy.numericSolver.numberOfCachedSolverCalls

+                                it.name = "NumericalSolverCachedAnswerNumber"

+                                it.value = strategy.numericSolver.numberOfCachedSolverCalls

                         ]

-                        if(diversityChecker.active) {

+                        if (diversityChecker.active) {

                                 it.entries += createIntStatisticEntry => [

                                         it.name = "SolutionDiversityCheckTime"

                                         it.value = (diversityChecker.totalRuntime / 1000000) as int

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend
index 0173124c..fbe6da9d 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend
@@ -4,19 +4,20 @@ import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner
 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod

 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.TypeInferenceMethod

+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint

 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.logic2viatra.patterns.UnitPropagationPatternGenerator

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretationVisualiser

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostObjectiveHint

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.ObjectiveKind

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.ObjectiveThreshold

 import java.util.LinkedList

 import java.util.List

 import java.util.Set

 import org.eclipse.xtext.xbase.lib.Functions.Function1

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint

 

 enum StateCoderStrategy {

         Neighbourhood,

@@ -77,6 +78,8 @@ class ViatraReasonerConfiguration extends LogicSolverConfiguration {
         public var List<LinearTypeConstraintHint> hints = newArrayList

 

         public var List<CostObjectiveConfiguration> costObjectives = newArrayList

+        

+        public var List<UnitPropagationPatternGenerator> unitPropagationPatternGenerators = newArrayList

 }

 

 class DiversityDescriptor {

@@ -111,9 +114,11 @@ class CostObjectiveConfiguration {
         public var ObjectiveKind kind

         public var ObjectiveThreshold threshold

         public var boolean findExtremum

+        public var CostObjectiveHint hint

 }

 

 class CostObjectiveElementConfiguration {

         public var String patternQualifiedName

         public var int weight

 }

+

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
index a2de1abc..4b7cead1 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
@@ -28,8 +28,6 @@ import org.eclipse.viatra.dse.objectives.Fitness;
 import org.eclipse.viatra.dse.objectives.ObjectiveComparatorHelper;

 import org.eclipse.viatra.dse.solutionstore.ISolutionFoundHandler;

 import org.eclipse.viatra.dse.solutionstore.SolutionStore;

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher;

 

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel;

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner;

@@ -37,12 +35,11 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;
 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.InconsistencyResult;

 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.viatrasolver.logic2viatra.ModelGenerationMethod;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.PartialInterpretation2Logic;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation;

-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.statecoder.NeighbourhoodBasedPartialInterpretationStateCoder;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretationVisualisation;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretationVisualiser;

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration;

 import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace;

 

@@ -301,13 +298,12 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
                 return activationIds;

         }

 

-        private void checkForSolution(final Fitness fittness) {

+        private void checkForSolution(final Fitness fitness) {

                 solutionStore.newSolution(context);

         }

         

         public List<String> times = new LinkedList<String>();

         private void saveTimes() {

-                long statecoderTime = ((NeighbourhoodBasedPartialInterpretationStateCoder<?, ?>)this.context.getStateCoder()).getStatecoderRuntime()/1000000;

                 long forwardTime = context.getDesignSpaceManager().getForwardTime()/1000000;

                 long backtrackingTime = context.getDesignSpaceManager().getBacktrackingTime()/1000000;

                 long activationSelection = this.activationSelector.getRuntime()/1000000;

@@ -317,8 +313,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
                 long numericalSolverSolving = this.numericSolver.getSolverSolvingProblem()/1000000;

                 long numericalSolverInterpreting = this.numericSolver.getSolverSolution()/1000000;

                 this.times.add(

-                        "(TransformationExecutionTime"+method.getStatistics().transformationExecutionTime/1000000+ 

-                        "|StateCoderTime:"+statecoderTime+

+                        "(TransformationExecutionTime"+method.getStatistics().transformationExecutionTime/1000000+

                         "|ForwardTime:"+forwardTime+

                         "|Backtrackingtime:"+backtrackingTime+

                         "|GlobalConstraintEvaluationTime:"+(globalConstraintEvaluationTime/1000000)+

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend
index 066040a0..70e8e9c2 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/NumericSolver.xtend
@@ -1,13 +1,13 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse

 

 import hu.bme.mit.inf.dslreasoner.viatra2logic.NumericTranslator

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BooleanElement

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.IntegerElement

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PrimitiveElement

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RealElement

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.StringElement

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod

 import java.math.BigDecimal

 import java.util.HashMap

 import java.util.LinkedHashMap

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend
index cfd11816..b48d0831 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/PartialModelAsLogicInterpretation.xtend
@@ -22,12 +22,13 @@ import java.util.List
 import java.util.Map

 import java.util.TreeSet

 import org.eclipse.emf.ecore.EObject

+import org.eclipse.xtend.lib.annotations.Accessors

 import org.eclipse.xtext.xbase.lib.Functions.Function1

 

 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*

 

 class PartialModelAsLogicInterpretation implements LogicModelInterpretation{

-        val PartialInterpretation partialInterpretation

+        @Accessors val PartialInterpretation partialInterpretation

         val Map<EObject, EObject> trace;

         val Map<TypeDeclaration,PartialComplexTypeInterpretation> type2Interpretation

         val Map<RelationDeclaration,PartialRelationInterpretation> relation2Interpretation

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionCopier.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionCopier.xtend
index 38c8f5a1..33b69436 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionCopier.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionCopier.xtend
@@ -26,16 +26,12 @@ class CopiedSolution {
  * using the supplied {@link NumericSolver}.
  */
 class SolutionCopier {
-        val NumericSolver numericSolver
         val copiedSolutions = new LinkedHashMap<Object, CopiedSolution>
 
+        @Accessors NumericSolver numericSolver
         long startTime = System.nanoTime
         @Accessors(PUBLIC_GETTER) long totalCopierRuntime = 0
 
-        new(NumericSolver numericSolver) {
-                this.numericSolver = numericSolver
-        }
-
         def void copySolution(ThreadContext context, Object solutionId) {
                 val existingCopy = copiedSolutions.get(solutionId)
                 if (existingCopy === null) {
@@ -47,7 +43,7 @@ class SolutionCopier {
                         totalCopierRuntime += System.nanoTime - copyStart
                         val copierRuntime = System.nanoTime - startTime
                         val copiedSolution = new CopiedSolution(copiedPartialInterpretation, copier, copierRuntime)
-                        numericSolver.fillSolutionCopy(copiedSolution.trace)
+                        numericSolver?.fillSolutionCopy(copiedSolution.trace)
                         copiedSolutions.put(solutionId, copiedSolution)
                 } else {
                         existingCopy.current = true
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ViatraReasonerSolutionSaver.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ViatraReasonerSolutionSaver.xtend
index c0b5008c..e00f76ff 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ViatraReasonerSolutionSaver.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/ViatraReasonerSolutionSaver.xtend
@@ -1,5 +1,9 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse
 
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.Bounds
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.DirectionalThresholdObjective
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.IObjectiveBoundsProvider
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.ObjectiveThreshold
 import java.util.HashMap
 import java.util.Map
 import org.eclipse.viatra.dse.api.DSEException
@@ -18,24 +22,32 @@ import org.eclipse.xtend.lib.annotations.Accessors
  * Will also automatically fill any missing numerical values in the saved solutions
  * using the supplied {@link NumericSolver}.
  */
-class ViatraReasonerSolutionSaver implements ISolutionSaver {
+class ViatraReasonerSolutionSaver implements ISolutionSaver, IObjectiveBoundsProvider {
+        static val TOLERANCE = 1e-10
+
         @Accessors val SolutionCopier solutionCopier
-        val NumericSolver numericSolver
         @Accessors val DiversityChecker diversityChecker
+        val IObjective[][] leveledExtremalObjectives
         val boolean hasExtremalObjectives
         val int numberOfRequiredSolutions
         val ObjectiveComparatorHelper comparatorHelper
         val Map<SolutionTrajectory, Fitness> trajectories = new HashMap
 
-        @Accessors(PUBLIC_SETTER) var Map<Object, Solution> solutionsCollection
+        @Accessors var NumericSolver numericSolver
+        @Accessors var Map<Object, Solution> solutionsCollection
 
-        new(IObjective[][] leveledExtremalObjectives, int numberOfRequiredSolutions, DiversityChecker diversityChecker, NumericSolver numericSolver) {
+        new(IObjective[][] leveledExtremalObjectives, int numberOfRequiredSolutions, DiversityChecker diversityChecker) {
                 this.diversityChecker = diversityChecker
                 comparatorHelper = new ObjectiveComparatorHelper(leveledExtremalObjectives)
+                this.leveledExtremalObjectives = leveledExtremalObjectives
                 hasExtremalObjectives = leveledExtremalObjectives.exists[!empty]
                 this.numberOfRequiredSolutions = numberOfRequiredSolutions
-                this.solutionCopier = new SolutionCopier(numericSolver)
+                this.solutionCopier = new SolutionCopier
+        }
+        
+        def setNumericSolver(NumericSolver numericSolver) {
                 this.numericSolver = numericSolver
+                solutionCopier.numericSolver = numericSolver
         }
 
         override saveSolution(ThreadContext context, Object id, SolutionTrajectory solutionTrajectory) {
@@ -51,6 +63,7 @@ class ViatraReasonerSolutionSaver implements ISolutionSaver {
                 if (!shouldSaveSolution(fitness, context)) {
                         return false
                 }
+                println("Found: " + fitness)
                 val dominatedTrajectories = newArrayList
                 for (entry : trajectories.entrySet) {
                         val isLastFitnessBetter = comparatorHelper.compare(fitness, entry.value)
@@ -99,7 +112,7 @@ class ViatraReasonerSolutionSaver implements ISolutionSaver {
         }
 
         private def shouldSaveSolution(Fitness fitness, ThreadContext context) {
-                return fitness.satisifiesHardObjectives && numericSolver.currentSatisfiable
+                fitness.satisifiesHardObjectives && (numericSolver === null || numericSolver.currentSatisfiable)
         }
 
         private def basicSaveSolution(ThreadContext context, Object id, SolutionTrajectory solutionTrajectory,
@@ -145,8 +158,93 @@ class ViatraReasonerSolutionSaver implements ISolutionSaver {
                 }
                 solutionsCollection.size < numberOfRequiredSolutions
         }
-        
+
         def getTotalCopierRuntime() {
                 solutionCopier.totalCopierRuntime
         }
+
+        override computeRequiredBounds(IObjective objective, Bounds bounds) {
+                if (!hasExtremalObjectives) {
+                        return
+                }
+                if (objective instanceof DirectionalThresholdObjective) {
+                        switch (threshold : objective.threshold) {
+                                case ObjectiveThreshold.NO_THRESHOLD: {
+                                        // No threshold to set.
+                                }
+                                ObjectiveThreshold.Exclusive: {
+                                        switch (kind : objective.kind) {
+                                                case HIGHER_IS_BETTER:
+                                                        bounds.tightenLowerBound(Math.floor(threshold.threshold + 1) as int)
+                                                case LOWER_IS_BETTER:
+                                                        bounds.tightenUpperBound(Math.ceil(threshold.threshold - 1) as int)
+                                                default:
+                                                        throw new IllegalArgumentException("Unknown objective kind" + kind)
+                                        }
+                                        if (threshold.clampToThreshold) {
+                                                return
+                                        }
+                                }
+                                ObjectiveThreshold.Inclusive: {
+                                        switch (kind : objective.kind) {
+                                                case HIGHER_IS_BETTER:
+                                                        bounds.tightenLowerBound(Math.ceil(threshold.threshold) as int)
+                                                case LOWER_IS_BETTER:
+                                                        bounds.tightenUpperBound(Math.floor(threshold.threshold) as int)
+                                                default:
+                                                        throw new IllegalArgumentException("Unknown objective kind" + kind)
+                                        }
+                                        if (threshold.clampToThreshold) {
+                                                return
+                                        }
+                                }
+                                default:
+                                        throw new IllegalArgumentException("Unknown threshold: " + threshold)
+                        }
+                        for (level : leveledExtremalObjectives) {
+                                switch (level.size) {
+                                        case 0: {
+                                                // Nothing to do, wait for the next level.
+                                        }
+                                        case 1: {
+                                                val primaryObjective = level.get(0)
+                                                if (primaryObjective != objective) {
+                                                        // There are no worst-case bounds for secondary objectives.
+                                                        return
+                                                }
+                                        }
+                                        default:
+                                                // There are no worst-case bounds for Pareto front calculation.
+                                                return
+                                }
+                        }
+                        val fitnessIterator = trajectories.values.iterator
+                        if (!fitnessIterator.hasNext) {
+                                return
+                        }
+                        val fitness = fitnessIterator.next.get(objective.name)
+                        while (fitnessIterator.hasNext) {
+                                val otherFitness = fitnessIterator.next.get(objective.name)
+                                if (Math.abs(fitness - otherFitness) > TOLERANCE) {
+                                        throw new IllegalStateException("Inconsistent fitness: " + objective.name)
+                                }
+                        }
+                        switch (kind : objective.kind) {
+                                case HIGHER_IS_BETTER:
+                                        if (needsMoreSolutionsWithSameFitness) {
+                                                bounds.tightenLowerBound(Math.floor(fitness) as int)
+                                        } else {
+                                                bounds.tightenLowerBound(Math.floor(fitness + 1) as int)
+                                        }
+                                case LOWER_IS_BETTER:
+                                        if (needsMoreSolutionsWithSameFitness) {
+                                                bounds.tightenUpperBound(Math.ceil(fitness) as int)
+                                        } else {
+                                                bounds.tightenUpperBound(Math.ceil(fitness - 1) as int)
+                                        }
+                                default:
+                                        throw new IllegalArgumentException("Unknown objective kind" + kind)
+                        }
+                }
+        }
 }
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/CostElementMatchers.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/CostElementMatchers.xtend
new file mode 100644
index 00000000..885b14e8
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/CostElementMatchers.xtend
@@ -0,0 +1,137 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization
+
+import com.google.common.collect.ImmutableList
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage
+import java.util.List
+import org.eclipse.emf.ecore.EObject
+import org.eclipse.viatra.query.runtime.api.IPatternMatch
+import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher
+import org.eclipse.xtend.lib.annotations.Data
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+
+@FunctionalInterface
+interface ParameterScopeBound {
+        def double getUpperBound()
+}
+
+@Data
+class CostElementMatch {
+        val IPatternMatch match
+        val boolean must
+
+        def isMulti() {
+                CostElementMatchers.isMultiMatch(match)
+        }
+}
+
+@Data
+class CostElementMatchers {
+        val ViatraQueryMatcher<? extends IPatternMatch> currentMatcher
+        val ViatraQueryMatcher<? extends IPatternMatch> mayMatcher
+        val ViatraQueryMatcher<? extends IPatternMatch> mustMatcher
+        val List<ParameterScopeBound> parameterScopeBounds
+        val int weight
+
+        def getCurrentNumberOfMatches() {
+                currentMatcher.countMatches
+        }
+
+        def getMinimumNumberOfMatches() {
+                mustMatcher.countMatches
+        }
+
+        def getMaximumNumberOfMatches() {
+                var double sum = 0
+                val iterator = mayMatcher.streamAllMatches.iterator
+                while (iterator.hasNext) {
+                        val match = iterator.next
+                        var double product = 1
+                        val numberOfParameters = parameterScopeBounds.size
+                        for (var int i = 0; i < numberOfParameters; i++) {
+                                if (isMulti(match.get(i + 2))) {
+                                        val scopeBound = parameterScopeBounds.get(i)
+                                        product *= scopeBound.upperBound
+                                }
+
+                        }
+                        sum += product
+                }
+                sum
+        }
+
+        def getMatches() {
+                ImmutableList.copyOf(mayMatcher.streamAllMatches.iterator.map [ match |
+                        new CostElementMatch(match, mustMatcher.isMatch(match))
+                ])
+        }
+        
+        def projectMayMatch(IPatternMatch match, int... indices) {
+                mayMatcher.projectMatch(match, indices)
+        }
+        
+        private static def <T extends IPatternMatch> projectMatch(ViatraQueryMatcher<T> matcher, IPatternMatch match, int... indices) {
+                checkMatch(match)
+                val n = matcher.specification.parameters.length - 2
+                if (indices.length != n) {
+                        throw new IllegalArgumentException("Invalid number of projection indices")
+                }
+                val newMatch = matcher.newEmptyMatch
+                newMatch.set(0, match.get(0))
+                newMatch.set(1, match.get(1))
+                for (var int i = 0; i < n; i++) {
+                        newMatch.set(i + 2, match.get(indices.get(i)))
+                }
+                if (!matcher.hasMatch(newMatch)) {
+                        throw new IllegalArgumentException("Projected match does not exist")
+                }
+                return newMatch
+        }
+
+        private static def <T extends IPatternMatch> isMatch(ViatraQueryMatcher<T> matcher, IPatternMatch match) {
+                val n = matcher.specification.parameters.length
+                if (n != match.specification.parameters.length) {
+                        throw new IllegalArgumentException("Invalid number of match arguments")
+                }
+                val newMatch = matcher.newEmptyMatch
+                for (var int i = 0; i < n; i++) {
+                        newMatch.set(i, match.get(i))
+                }
+                return matcher.hasMatch(newMatch)
+        }
+
+        static def isMulti(Object o) {
+                if (o instanceof EObject) {
+                        switch (feature : o.eContainmentFeature) {
+                                case LogicproblemPackage.eINSTANCE.logicProblem_Elements,
+                                case PartialinterpretationPackage.eINSTANCE.partialInterpretation_NewElements:
+                                        false
+                                case PartialinterpretationPackage.eINSTANCE.partialInterpretation_OpenWorldElements:
+                                        true
+                                default:
+                                        throw new IllegalStateException("Unknown containment feature for element: " + feature)
+                        }
+                } else {
+                        false
+                }
+        }
+
+        static def isMultiMatch(IPatternMatch match) {
+                checkMatch(match)
+                val n = match.specification.parameters.length
+                for (var int i = 2; i < n; i++) {
+                        if (isMulti(match.get(i))) {
+                                return true
+                        }
+                }
+                false
+        }
+        
+        private static def checkMatch(IPatternMatch match) {
+                val n = match.specification.parameters.length
+                if (n < 2 || !(match.get(0) instanceof LogicProblem) || !(match.get(1) instanceof PartialInterpretation)) {
+                        throw new IllegalArgumentException("Match is not from the partial interpretation")
+                }
+        }
+}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/CostObjectiveHint.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/CostObjectiveHint.xtend
new file mode 100644
index 00000000..2434073d
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/CostObjectiveHint.xtend
@@ -0,0 +1,68 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization
+
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.BoundSaturationListener
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ExtendedLinearExpressionBuilder
+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.PolyhedronExtensionOperator
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator
+import java.util.Map
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
+import org.eclipse.xtend.lib.annotations.Accessors
+
+abstract class CostObjectiveHint implements LinearTypeConstraintHint, BoundSaturationListener {
+        @Accessors ThreeValuedCostObjective objective
+        @Accessors IObjectiveBoundsProvider boundsProvider
+        
+        Integer bestUpper = null
+
+        override getAdditionalPatterns(PatternGenerator patternGenerator, Map<String, PQuery> fqnToPQuery) {
+                ''''''
+        }
+
+        override createConstraintUpdater(LinearTypeExpressionBuilderFactory builderFactory) {
+                null
+        }
+        
+        def isExact() {
+                false
+        }
+
+        def PolyhedronExtensionOperator createPolyhedronExtensionOperator(
+                Map<String, CostElementMatchers> costElementMatchers) {
+                null
+        }
+        
+        def setObjective(ThreeValuedCostObjective objective) {
+                if (this.objective !== null) {
+                        throw new IllegalStateException("Objective was already set")
+                }
+                this.objective = objective
+        }
+        
+        def setBoundsProvider(IObjectiveBoundsProvider boundsProvider) {
+                if (this.boundsProvider !== null) {
+                        throw new IllegalStateException("Objective bounds provider was already set")
+                }
+                this.boundsProvider = boundsProvider
+        }
+        
+        protected def buildWithBounds(ExtendedLinearExpressionBuilder builder) {
+                val bounds = builder.build(this)
+                if (objective !== null && boundsProvider !== null) {
+                        boundsProvider.computeRequiredBounds(objective, bounds)
+                }
+                if (exact && bestUpper !== null) {
+                        bounds.tightenLowerBound(bestUpper)
+                }
+                bounds
+        }
+        
+        override boundsSaturated(Integer lower, Integer upper) {
+                if (upper !== null && (bestUpper === null || bestUpper < upper)) {
+                        bestUpper = upper
+                }
+                objective?.boundsSaturated(lower, upper)
+        }
+        
+}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/IObjectiveBoundsProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/IObjectiveBoundsProvider.xtend
new file mode 100644
index 00000000..3c4d36a5
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/IObjectiveBoundsProvider.xtend
@@ -0,0 +1,8 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization
+
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.Bounds
+import org.eclipse.viatra.dse.objectives.IObjective
+
+interface IObjectiveBoundsProvider {
+        def void computeRequiredBounds(IObjective objective, Bounds bounds)
+}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/ThreeValuedCostObjective.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/ThreeValuedCostObjective.xtend
index 0a6fd55b..9b1a7e9f 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/ThreeValuedCostObjective.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/ThreeValuedCostObjective.xtend
@@ -1,85 +1,80 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization
 
-import com.google.common.collect.ImmutableList
-import java.util.Collection
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.BoundSaturationListener
+import java.util.Map
 import org.eclipse.viatra.dse.base.ThreadContext
-import org.eclipse.viatra.query.runtime.api.IPatternMatch
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification
-import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher
-import org.eclipse.xtend.lib.annotations.Data
+import org.eclipse.xtend.lib.annotations.Accessors
 
-@Data
-class ThreeValuedCostElement {
-        val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> currentMatchQuery
-        val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> mayMatchQuery
-        val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> mustMatchQuery
-        val int weight
-}
-
-class ThreeValuedCostObjective extends AbstractThreeValuedObjective {
-        val Collection<ThreeValuedCostElement> costElements
-        Collection<CostElementMatchers> matchers
+class ThreeValuedCostObjective extends AbstractThreeValuedObjective implements BoundSaturationListener {
+        @Accessors val Map<String, CostElementMatchers> matchers
+        double lowerBoundHint = Double.NEGATIVE_INFINITY
+        double upperBoundHint = Double.POSITIVE_INFINITY
 
-        new(String name, Collection<ThreeValuedCostElement> costElements, ObjectiveKind kind, ObjectiveThreshold threshold,
+        new(String name, Map<String, CostElementMatchers> matchers, ObjectiveKind kind, ObjectiveThreshold threshold,
                 int level) {
                 super(name, kind, threshold, level)
-                this.costElements = costElements
+                this.matchers = matchers
         }
 
         override createNew() {
-                new ThreeValuedCostObjective(name, costElements, kind, threshold, level)
+                // new ThreeValuedCostObjective(name, matchers, kind, threshold, level)
+                throw new UnsupportedOperationException("ThreeValuedCostObjective can only be used from a single thread")
         }
 
         override init(ThreadContext context) {
-                val queryEngine = context.queryEngine
-                matchers = ImmutableList.copyOf(costElements.map [ element |
-                        new CostElementMatchers(
-                                queryEngine.getMatcher(element.currentMatchQuery),
-                                queryEngine.getMatcher(element.mayMatchQuery),
-                                queryEngine.getMatcher(element.mustMatchQuery),
-                                element.weight
-                        )
-                ])
         }
 
         override getRawFitness(ThreadContext context) {
-                var int cost = 0
-                for (matcher : matchers) {
-                        cost += matcher.weight * matcher.currentMatcher.countMatches
+                var double cost = 0
+                for (matcher : matchers.values) {
+                        cost += matcher.weight * matcher.currentNumberOfMatches
                 }
-                cost as double
+                cost
         }
 
         override getLowestPossibleFitness(ThreadContext threadContext) {
-                var int cost = 0
-                for (matcher : matchers) {
+                var double cost = 0
+                for (matcher : matchers.values) {
                         if (matcher.weight >= 0) {
-                                cost += matcher.weight * matcher.mustMatcher.countMatches
-                        } else if (matcher.mayMatcher.countMatches > 0) {
-                                // TODO Count may matches.
-                                return Double.NEGATIVE_INFINITY
+                                cost += matcher.weight * matcher.minimumNumberOfMatches
+                        } else {
+                                cost += matcher.weight * matcher.maximumNumberOfMatches
                         }
                 }
-                cost as double
+                val boundWithHint = Math.max(lowerBoundHint, cost)
+                if (boundWithHint > upperBoundHint) {
+                        throw new IllegalStateException("Inconsistent cost bounds")
+                }
+                boundWithHint
         }
 
         override getHighestPossibleFitness(ThreadContext threadContext) {
-                var int cost = 0
-                for (matcher : matchers) {
+                var double cost = 0
+                for (matcher : matchers.values) {
                         if (matcher.weight <= 0) {
-                                cost += matcher.weight * matcher.mustMatcher.countMatches
-                        } else if (matcher.mayMatcher.countMatches > 0) {
-                                return Double.POSITIVE_INFINITY
+                                cost += matcher.weight * matcher.minimumNumberOfMatches
+                        } else {
+                                cost += matcher.weight * matcher.maximumNumberOfMatches
                         }
                 }
-                cost as double
+                val boundWithHint = Math.min(upperBoundHint, cost)
+                if (boundWithHint < lowerBoundHint) {
+                        throw new IllegalStateException("Inconsistent cost bounds")
+                }
+                boundWithHint
         }
 
-        @Data
-        private static class CostElementMatchers {
-                val ViatraQueryMatcher<? extends IPatternMatch> currentMatcher
-                val ViatraQueryMatcher<? extends IPatternMatch> mayMatcher
-                val ViatraQueryMatcher<? extends IPatternMatch> mustMatcher
-                val int weight
+        override boundsSaturated(Integer lower, Integer upper) {
+                lowerBoundHint = if (lower === null) {
+                        Double.NEGATIVE_INFINITY
+                } else {
+                        lower
+                }
+                upperBoundHint = if (upper === null) {
+                        Double.POSITIVE_INFINITY
+                } else {
+                        upper
+                }
+                println('''Bounds saturated: «lower»..«upper»''')
         }
 }
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/ThreeValuedCostObjectiveProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/ThreeValuedCostObjectiveProvider.xtend
new file mode 100644
index 00000000..c2750acd
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/optimization/ThreeValuedCostObjectiveProvider.xtend
@@ -0,0 +1,205 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization
+
+import com.google.common.collect.ImmutableList
+import com.google.common.collect.ImmutableMap
+import com.google.common.collect.Lists
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.BoolTypeReference
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ComplexTypeReference
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntTypeReference
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealTypeReference
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.StringTypeReference
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeReference
+import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedronExtensionOperator
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.ModalPatternQueries
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialBooleanInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialComplexTypeInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialIntegerInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialRealInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialStringInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.CostObjectiveConfiguration
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.CostObjectiveElementConfiguration
+import java.util.Collection
+import java.util.Map
+import org.eclipse.viatra.dse.objectives.IObjective
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine
+import org.eclipse.xtend.lib.annotations.Data
+
+@Data
+class ThreeValuedCostObjectiveProviderResult {
+        val Collection<IObjective> objectives
+        val Collection<CostObjectiveHint> hints
+        val Collection<PolyhedronExtensionOperator> extensionOperators
+        val IObjective[][] leveledExtremalObjectives
+        val boolean optimizationProblem
+}
+
+class ThreeValuedCostObjectiveProvider {
+        static val COST_OBJECTIVE_LEVEL = 3
+
+        val ViatraQueryEngine queryEngine
+        val Map<String, ModalPatternQueries> modalRelationQueries
+        val Map<String, Relation> qualifiedNameToRelationMap
+        val ParameterScopeBound defaultBounds
+        val ParameterScopeBound booleanBounds
+        val ParameterScopeBound integerBounds
+        val ParameterScopeBound realBounds
+        val ParameterScopeBound stringBounds
+        val Map<TypeDeclaration, ParameterScopeBound> typeDeclarationToBoundsMap
+
+        new(ViatraQueryEngine queryEngine, PartialInterpretation interpretation,
+                Map<String, ModalPatternQueries> modalRelationQueries) {
+                this.queryEngine = queryEngine
+                this.modalRelationQueries = modalRelationQueries
+                qualifiedNameToRelationMap = ImmutableMap.copyOf(
+                        interpretation.problem.annotations.filter(TransfomedViatraQuery).
+                                toMap([patternFullyQualifiedName], [target]))
+                defaultBounds = new PartialInterpretationBasedParameterScopeBound(interpretation)
+                var ParameterScopeBound booleanBounds = null
+                var ParameterScopeBound integerBounds = null
+                var ParameterScopeBound realBounds = null
+                var ParameterScopeBound stringBounds = null
+                val typeDeclarationToBoundsMapBuilder = ImmutableMap.builder
+                for (scope : interpretation.scopes) {
+                        val bounds = new ScopeBasedParameterScopeBound(scope)
+                        switch (typeInterpretation : scope.targetTypeInterpretation) {
+                                PartialBooleanInterpretation:
+                                        if (booleanBounds === null) {
+                                                booleanBounds = bounds
+                                        } else {
+                                                throw new IllegalStateException("Duplicate partial boolean interpretation")
+                                        }
+                                PartialIntegerInterpretation:
+                                        if (integerBounds === null) {
+                                                integerBounds = bounds
+                                        } else {
+                                                throw new IllegalStateException("Duplicate partial integer interpretation")
+                                        }
+                                PartialRealInterpretation:
+                                        if (realBounds === null) {
+                                                realBounds = bounds
+                                        } else {
+                                                throw new IllegalStateException("Duplicate partial real interpretation")
+                                        }
+                                PartialStringInterpretation:
+                                        if (stringBounds === null) {
+                                                stringBounds = bounds
+                                        } else {
+                                                throw new IllegalStateException("Duplicate partial string interpretation")
+                                        }
+                                PartialComplexTypeInterpretation:
+                                        typeDeclarationToBoundsMapBuilder.put(typeInterpretation.interpretationOf, bounds)
+                        }
+                }
+                this.booleanBounds = booleanBounds ?: defaultBounds
+                this.integerBounds = integerBounds ?: defaultBounds
+                this.realBounds = realBounds ?: defaultBounds
+                this.stringBounds = stringBounds ?: defaultBounds
+                typeDeclarationToBoundsMap = typeDeclarationToBoundsMapBuilder.build
+        }
+
+        def getCostObjectives(Collection<CostObjectiveConfiguration> costObjectives) {
+                val objectives = ImmutableList.<IObjective>builder
+                val hints = ImmutableList.<CostObjectiveHint>builder
+                val extensionOperators = ImmutableList.<PolyhedronExtensionOperator>builder
+                val extremalObjectives = Lists.newArrayListWithExpectedSize(costObjectives.size)
+                for (entry : costObjectives.indexed) {
+                        val objectiveName = '''costObjective«entry.key»'''
+                        val objectiveConfig = entry.value
+                        val costObjective = transformCostObjective(objectiveConfig, objectiveName)
+                        objectives.add(costObjective)
+                        if (objectiveConfig.findExtremum) {
+                                extremalObjectives += costObjective
+                        }
+                        val hint = objectiveConfig.hint
+                        if (hint !== null) {
+                                hints.add(hint)
+                                hint.objective = costObjective
+                                val extensionOperator = hint.createPolyhedronExtensionOperator(costObjective.matchers)
+                                if (extensionOperator !== null) {
+                                        extensionOperators.add(extensionOperator)
+                                }
+                        }
+                }
+                new ThreeValuedCostObjectiveProviderResult(
+                        objectives.build,
+                        hints.build,
+                        extensionOperators.build,
+                        newArrayList(extremalObjectives),
+                        !extremalObjectives.empty
+                )
+        }
+
+        private def transformCostObjective(CostObjectiveConfiguration configuration, String name) {
+                val costElements = ImmutableMap.copyOf(configuration.elements.toMap([patternQualifiedName], [
+                        transformCostElement
+                ]))
+                new ThreeValuedCostObjective(name, costElements, configuration.kind, configuration.threshold,
+                        COST_OBJECTIVE_LEVEL)
+        }
+
+        private def transformCostElement(CostObjectiveElementConfiguration elementConfig) {
+                val relationName = elementConfig.patternQualifiedName
+                val modalQueries = modalRelationQueries.get(relationName)
+                if (modalQueries === null) {
+                        throw new IllegalArgumentException("Unknown relation queries: " + relationName)
+                }
+                val relation = qualifiedNameToRelationMap.get(relationName)
+                if (relation === null) {
+                        throw new IllegalArgumentException("Unknown transformed relation: " + relationName)
+                }
+                val parameterBounds = ImmutableList.copyOf(relation.parameters.map[parameterBound])
+                new CostElementMatchers(
+                        queryEngine.getMatcher(modalQueries.currentQuery),
+                        queryEngine.getMatcher(modalQueries.mayQuery),
+                        queryEngine.getMatcher(modalQueries.mustQuery),
+                        parameterBounds,
+                        elementConfig.weight
+                )
+        }
+
+        private def getParameterBound(TypeReference typeReference) {
+                switch (typeReference) {
+                        BoolTypeReference: booleanBounds
+                        IntTypeReference: integerBounds
+                        RealTypeReference: realBounds
+                        StringTypeReference: stringBounds
+                        ComplexTypeReference: typeDeclarationToBoundsMap.getOrDefault(typeReference.referred, defaultBounds)
+                }
+        }
+
+        private static abstract class AbstractParameterScopeBound implements ParameterScopeBound {
+                override getUpperBound() {
+                        val rawValue = rawUpperBound
+                        if (rawValue < 0) {
+                                Double.POSITIVE_INFINITY
+                        } else {
+                                rawValue
+                        }
+                }
+
+                protected def int getRawUpperBound()
+        }
+
+        @Data
+        private static class ScopeBasedParameterScopeBound extends AbstractParameterScopeBound {
+                val Scope scope
+
+                override protected getRawUpperBound() {
+                        scope.maxNewElements
+                }
+        }
+
+        @Data
+        private static class PartialInterpretationBasedParameterScopeBound extends AbstractParameterScopeBound {
+                val PartialInterpretation interpretation
+
+                override protected getRawUpperBound() {
+                        interpretation.maxNewElements
+                }
+        }
+}
diff --git a/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/base/DesignSpaceManager.java b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/base/DesignSpaceManager.java
index 7e7a6e51..133ef948 100644
--- a/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/base/DesignSpaceManager.java
+++ b/Solvers/VIATRA-Solver/org.eclipse.viatra.dse/src/org/eclipse/viatra/dse/base/DesignSpaceManager.java
@@ -369,6 +369,7 @@ public class DesignSpaceManager implements IBacktrackListener {
                 } catch (InvocationTargetException e) {
                         throw new RuntimeException(e);
                 }
+                backtrackingTime += System.nanoTime() - start;
                 updateActivationCodes();
 
                 Object lastActivationId = trajectory.getLastActivationId();
@@ -382,7 +383,6 @@ public class DesignSpaceManager implements IBacktrackListener {
                 }
 
                 logger.debug("Backtrack.");
-                backtrackingTime += System.nanoTime() - start;
 
                 return true;
         }
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin b/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin
deleted file mode 100644
index 4a93782b..00000000
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.originalFiles/xtend-gen/converter/.UML2TGF.xtendbin
+++ /dev/null
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTQual.vsconfig b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTQual.vsconfig
index 80ab2906..fa9cd6e2 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTQual.vsconfig
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/config/genericFamilyTreeSMTQual.vsconfig
@@ -36,6 +36,9 @@ generate {
                 log-level = normal,
                 "fitness-punishSize" = "false",
                 "fitness-scope" = "3",
+                "fitness-objectCreationCosts" = "true",
+                "scopePropagator" = "typeHierarchy",
+                "fitness-missing-containment" = "2",
                 "numeric-solver-at-end" = "true"
         }
         
diff --git a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/queries/SatelliteQueries.vql b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/queries/SatelliteQueries.vql
index 57b5933a..da889032 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.pledge.run/queries/SatelliteQueries.vql
+++ b/Tests/MODELS2020-CaseStudies/case.study.pledge.run/queries/SatelliteQueries.vql
@@ -245,146 +245,4 @@ pattern tooLowPathLengthForGroundStation(s:CommSubsystem) {
         GroundStationNetwork.commSubsystem(_,ts);
         check(l!=385000);//385.000km
 }
-////
-//// Metrics
-////
-//
-//// Coverage
-//
-//pattern coverageMetric(Coverage : java Double) {
-//      Coverage == sum find missionCoverage(_, #_);
-//}
-//
-//private pattern missionCoverage(Mission : InterferometryMission, Coverage : java Double) {
-//      InterferometryMission.observationTime(Mission, ObservationTime);
-//      ObserverCount == count find spacecraftWithInterferometryPayload(Mission, _);
-//      Coverage == eval(Math.pow(1 - 2.0 / ObserverCount, 1 + 9 * (1.0 / ObservationTime)) + 0.05 * ObservationTime / 3);
-//}
-//
-//// Time
-//
-//pattern timeMetric(Time : java Double) {
-//      Time == sum find missionTime(_, #_);
-//}
-//
-//private pattern missionTime(Mission : InterferometryMission, Time : java Double) {
-//      InterferometryMission.observationTime(Mission, ObservationTime);
-//      TrasmitTime == sum find transmitTime(Mission, _, #_);
-//      Time == eval(TrasmitTime + 60.0 * ObservationTime);
-//}
-//
-//private pattern transmitTime(Mission : InterferometryMission, Spacecraft : Spacecraft, TransmitTime : java Double) {
-//      ConstellationMission.spacecraft(Mission, Spacecraft);
-//      find scienceData(Spacecraft, ScienceData);
-//      IncomingData == sum find incomingData(Spacecraft, _, #_);
-//      find transmitRate(Spacecraft, TransmitRate);
-//      TransmitTime == eval((ScienceData + IncomingData) / (7.5 * TransmitRate));
-//}
-//
-//private pattern incomingData(Spacecraft : Spacecraft, Source : Spacecraft, Data : java Double) {
-//      find indirectCommunicationLink(Source, Spacecraft);
-//      find scienceData(Source, Data);
-//}
-//
-//private pattern scienceData(Spacecraft : Spacecraft, Data : java Double) {
-//      ConstellationMission.spacecraft(Mission, Spacecraft);
-//      InterferometryMission.observationTime(Mission, ObservationTime);
-//      Data == eval(12.0 * ObservationTime);
-//}
-//
-//private pattern transmitRate(Spacecraft : Spacecraft, TransmitRate : java Double) {
-//      find spacecraftUplink(Spacecraft, Comm, Target);
-//      UHFCommSubsystem(Comm);
-//      Spacecraft(Target);
-//      TransmitRate == 5.0;
-//} or {
-//      find spacecraftUplink(Spacecraft, Comm, Target);
-//      XCommSubsystem(Comm);
-//      Spacecraft(Target);
-//      TransmitRate == 1.6;
-//} or {
-//      find spacecraftUplink(Spacecraft, Comm, Target);
-//      XCommSubsystem(Comm);
-//      GroundStationNetwork(Target);
-//      TransmitRate == 0.7;
-//} or {
-//      find spacecraftUplink(Spacecraft, Comm, Target);
-//      KaCommSubsystem(Comm);
-//      Spacecraft(Target);
-//      TransmitRate == 220.0;
-//} or {
-//      find spacecraftUplink(Spacecraft, Comm, Target);
-//      KaCommSubsystem(Comm);
-//      GroundStationNetwork(Target);
-//      TransmitRate == 80.0;
-//}
-//
-//private pattern spacecraftUplink(Spacecraft : Spacecraft, TargetSubsystem : CommSubsystem, Target : CommunicatingElement) {
-//      CommunicatingElement.commSubsystem.target(Spacecraft, TargetSubsystem);
-//      CommunicatingElement.commSubsystem(Target, TargetSubsystem);
-//}
-//
-//// Cost
-//
-//pattern costMetric(Cost : java Double) {
-//      Cost == sum find missionCost(_, #_);
-//}
-//
-//private pattern missionCost(Mission : InterferometryMission, Cost : java Double) {
-//      InterferometryMission.observationTime(Mission, ObservationTime);
-//      SpacecraftCost == sum find spacecraftCost(Mission, _, #_);
-//      Cost == eval(SpacecraftCost + 100000.0 * ObservationTime);
-//}
-//
-//private pattern spacecraftCost(Mission : InterferometryMission, Spacecraft : Spacecraft, Cost : java Double) {
-//      ConstellationMission.spacecraft(Mission, Spacecraft);
-//      find spacecraftOfKindCount(Spacecraft, KindCount);
-//      find basePrice(Spacecraft, BasePrice);
-//      find interferometryPayloadCost(Spacecraft, InterferometryPayloadCost);
-//      find additionalCommSubsystemCost(Spacecraft, AdditionalCommSubsystemCost);
-//      Cost == eval(BasePrice * Math.pow(KindCount, -0.25) + InterferometryPayloadCost + AdditionalCommSubsystemCost);
-//}
-//
-//private pattern spacecraftOfKindCount(Sat : Spacecraft, Count : java Integer) {
-//      CubeSat3U(Sat);
-//      Count == count find cubeSat3U(_);
-//} or {
-//      CubeSat6U(Sat);
-//      Count == count find cubeSat6U(_);
-//} or {
-//      SmallSat(Sat);
-//      Count == count find smallSat(_);
-//}
-//
-//private pattern basePrice(Spacecraft : Spacecraft, BasePrice : java Double) {
-//      CubeSat3U(Spacecraft);
-//      BasePrice == 250000.0;
-//} or {
-//      CubeSat6U(Spacecraft);
-//      BasePrice == 750000.0;
-//} or {
-//      SmallSat(Spacecraft);
-//      BasePrice == 3000000.0;
-//}
-//
-//private pattern interferometryPayloadCost(Spacecraft : Spacecraft, Cost : java Double) {
-//      find spacecraftWithInterferometryPayload(_, Spacecraft);
-//      Cost == 50000.0;
-//} or {
-//      neg find spacecraftWithInterferometryPayload(_, Spacecraft);
-//      Cost == 0.0;
-//}
-//
-//private pattern additionalCommSubsystemCost(Spacecraft : Spacecraft, Cost : java Double) {
-//      find spacecraftWithTwoCommSubsystems(Spacecraft);
-//      Cost == 100000.0;
-//} or {
-//      neg find spacecraftWithTwoCommSubsystems(Spacecraft);
-//      Cost == 0.0;
-//}
-//
-//private pattern spacecraftWithTwoCommSubsystems(Spacecraft : Spacecraft) {
-//      Spacecraft.commSubsystem(Spacecraft, Subsystem1);
-//      Spacecraft.commSubsystem(Spacecraft, Subsystem2);
-//      Subsystem1 != Subsystem2;
-//}
+
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend
index 8d6523b1..300f8b51 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend
@@ -4,6 +4,8 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
 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 org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
 
 class FileSystemHint extends Ecore2LogicTraceBasedHint {
         static val REMAINING_CONTENTS_ROOT = "hint_root"
@@ -12,7 +14,7 @@ class FileSystemHint extends Ecore2LogicTraceBasedHint {
                 super(ecore2Logic, trace)
         }
 
-        override getAdditionalPatterns(PatternGenerator it) '''
+        override getAdditionalPatterns(PatternGenerator it, Map<String, PQuery> fqnToPQuery) '''
                 pattern «REMAINING_CONTENTS_ROOT»(problem:LogicProblem, interpretation:PartialInterpretation, remainingContents:java Integer) {
                         find interpretation(problem, interpretation);
                         remainingContents == sum find remainingContents_root_reference_Dir_helper(problem, interpretation, _, #_)
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend
index f4f36951..9cc6e415 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend
@@ -1,10 +1,10 @@
 package hu.bme.mit.inf.dslreasoner.run

 

-import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod

 import org.eclipse.viatra.dse.base.ThreadContext

+import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher

 

 class FileSystemInconsistencyDetector extends ModelGenerationMethodBasedGlobalConstraint {

         var PartialInterpretation partialInterpretation

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
index bf9ca274..cbc692b3 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
@@ -12,8 +12,8 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
 import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor

 import hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns

 import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod

 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint

 import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace

 import java.util.Collection

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend
index 97ce4ee6..9a84f777 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend
@@ -4,13 +4,15 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
 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 org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
 
 class SGraphHint extends Ecore2LogicTraceBasedHint {
         new(Ecore2Logic ecore2Logic, Ecore2Logic_Trace trace) {
                 super(ecore2Logic, trace)
         }
 
-        override getAdditionalPatterns(extension PatternGenerator patternGenerator) {
+        override getAdditionalPatterns(extension PatternGenerator patternGenerator, Map<String, PQuery> fqnToPQuery) {
                 ""
         }
 
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend
index 22addd3d..b8167566 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphInconsistencyDetector.xtend
@@ -1,7 +1,7 @@
 package hu.bme.mit.inf.dslreasoner.run

 

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethod

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethod

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint

 import org.eclipse.viatra.dse.base.ThreadContext

 import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend
index ef5b779e..28954d60 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend
@@ -5,6 +5,8 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality
 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 org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
 
 class SatelliteHint extends Ecore2LogicTraceBasedHint {
         static val INTERFEROMETY_PAYLOAD = "hint_interferometryPayload"
@@ -14,7 +16,7 @@ class SatelliteHint extends Ecore2LogicTraceBasedHint {
                 super(ecore2Logic, trace)
         }
 
-        override getAdditionalPatterns(PatternGenerator it) '''
+        override getAdditionalPatterns(PatternGenerator it, Map<String, PQuery> fqnToPQuery) '''
                 pattern «INTERFEROMETY_PAYLOAD»(problem:LogicProblem, interpretation:PartialInterpretation, object:DefinedElement) {
                         find interpretation(problem, interpretation);
                         find mustExist(problem, interpretation, object);
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
index b65826ad..5e2d0920 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
@@ -1,9 +1,8 @@
 package hu.bme.mit.inf.dslreasoner.run

 

 import functionalarchitecture.FunctionalarchitecturePackage

+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Model

 import hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns

-import hu.bme.mit.inf.dslreasoner.domains.transima.fam.Model

-import hu.bme.mit.inf.dslreasoner.domains.transima.fam.Type

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration

 import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor

@@ -15,7 +14,6 @@ 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.viatrasolver.logic2viatra.cardinality.ScopePropagatorStrategy

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml

@@ -121,8 +119,6 @@ class SimpleRun {
                 val patterns = i.specifications.toList

                 val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name== "Constraint"]].toSet

                 val derivedFeatures = new LinkedHashMap

-                derivedFeatures.put(Type.instance,metamodel.attributes.filter[it.name == "type"].head)

-                derivedFeatures.put(Model.instance,metamodel.references.filter[it.name == "model"].head)

                 val res = new ViatraQuerySetDescriptor(

                         patterns,

                         wfPatterns,