Regenerated IncQuery patterns + test method rename

14 files changed, 123 insertions, 90 deletions

diff --git a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.dse/src/org/eclipse/viatra/dse/examples/bpmn/problems/BpmnProblemSaver.java b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.dse/src/org/eclipse/viatra/dse/examples/bpmn/problems/BpmnProblemSaver.java
index 3fb5d4a..6761357 100644
--- a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.dse/src/org/eclipse/viatra/dse/examples/bpmn/problems/BpmnProblemSaver.java
+++ b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.dse/src/org/eclipse/viatra/dse/examples/bpmn/problems/BpmnProblemSaver.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 public class BpmnProblemSaver {
 
     @Test
-    public void test() {
+    public void run() {
 
         SimplifiedBPMN root;
 
diff --git a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/AbsenceOfResourceInstancesQuerySpecification.java b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/AbsenceOfResourceInstancesQuerySpecification.java
index 430a524..e0a5e3c 100644
--- a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/AbsenceOfResourceInstancesQuerySpecification.java
+++ b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/AbsenceOfResourceInstancesQuerySpecification.java
@@ -4,17 +4,19 @@ import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.incquery.runtime.api.IncQueryEngine;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFPQuery;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.incquery.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.incquery.runtime.emf.types.EStructuralFeatureInstancesKey;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
 import org.eclipse.incquery.runtime.matchers.psystem.PBody;
 import org.eclipse.incquery.runtime.matchers.psystem.PVariable;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.Equality;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.ExportedParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeBinary;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeUnary;
+import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.QueryInitializationException;
 import org.eclipse.incquery.runtime.matchers.tuple.FlatTuple;
@@ -102,10 +104,10 @@ public final class AbsenceOfResourceInstancesQuerySpecification extends BaseGene
       	body.setExportedParameters(Arrays.<ExportedParameter>asList(
       		new ExportedParameter(body, var_RTV, "RTV")
       	));
-      	new TypeUnary(body, var_RTV, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceTypeVariant"), "org.eclipse.viatra.dse.examples.bpmn/ResourceTypeVariant");
+      	new TypeConstraint(body, new FlatTuple(var_RTV), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceTypeVariant")));
       	new NegativePatternCall(body, new FlatTuple(var___0_, var_RTV), InstanceOfVariantQuerySpecification.instance().getInternalQueryRepresentation());
-      	new TypeUnary(body, var___1_, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task"), "org.eclipse.viatra.dse.examples.bpmn/Task");
-      	new TypeBinary(body, CONTEXT, var___1_, var__virtual_0_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task", "variant"), "org.eclipse.viatra.dse.examples.bpmn/Task.variant");
+      	new TypeConstraint(body, new FlatTuple(var___1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task")));
+      	new TypeConstraint(body, new FlatTuple(var___1_, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task", "variant")));
       	new Equality(body, var__virtual_0_, var_RTV);
       	bodies.add(body);
       }
diff --git a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/AllocateTaskToVariantQuerySpecification.java b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/AllocateTaskToVariantQuerySpecification.java
index 69464c8..9e46b7d 100644
--- a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/AllocateTaskToVariantQuerySpecification.java
+++ b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/AllocateTaskToVariantQuerySpecification.java
@@ -4,17 +4,19 @@ import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.incquery.runtime.api.IncQueryEngine;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFPQuery;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.incquery.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.incquery.runtime.emf.types.EStructuralFeatureInstancesKey;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
 import org.eclipse.incquery.runtime.matchers.psystem.PBody;
 import org.eclipse.incquery.runtime.matchers.psystem.PVariable;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.Equality;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.ExportedParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeBinary;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeUnary;
+import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.QueryInitializationException;
 import org.eclipse.incquery.runtime.matchers.tuple.FlatTuple;
@@ -106,14 +108,14 @@ public final class AllocateTaskToVariantQuerySpecification extends BaseGenerated
       				
       		new ExportedParameter(body, var_RTV, "RTV")
       	));
-      	new TypeUnary(body, var_T, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task"), "org.eclipse.viatra.dse.examples.bpmn/Task");
-      	new TypeUnary(body, var_RTV, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceTypeVariant"), "org.eclipse.viatra.dse.examples.bpmn/ResourceTypeVariant");
+      	new TypeConstraint(body, new FlatTuple(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task")));
+      	new TypeConstraint(body, new FlatTuple(var_RTV), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceTypeVariant")));
       	new NegativePatternCall(body, new FlatTuple(var_T, var___0_), VariantAllocatedToTaskQuerySpecification.instance().getInternalQueryRepresentation());
-      	new TypeUnary(body, var_T, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task"), "org.eclipse.viatra.dse.examples.bpmn/Task");
-      	new TypeBinary(body, CONTEXT, var_T, var__virtual_0_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task", "resourceNeeded"), "org.eclipse.viatra.dse.examples.bpmn/Task.resourceNeeded");
+      	new TypeConstraint(body, new FlatTuple(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task")));
+      	new TypeConstraint(body, new FlatTuple(var_T, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task", "resourceNeeded")));
       	new Equality(body, var__virtual_0_, var_RT);
-      	new TypeUnary(body, var_RT, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceType"), "org.eclipse.viatra.dse.examples.bpmn/ResourceType");
-      	new TypeBinary(body, CONTEXT, var_RT, var__virtual_1_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceType", "variants"), "org.eclipse.viatra.dse.examples.bpmn/ResourceType.variants");
+      	new TypeConstraint(body, new FlatTuple(var_RT), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceType")));
+      	new TypeConstraint(body, new FlatTuple(var_RT, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceType", "variants")));
       	new Equality(body, var__virtual_1_, var_RTV);
       	bodies.add(body);
       }
diff --git a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/CreateResourceQuerySpecification.java b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/CreateResourceQuerySpecification.java
index e286a7a..7651522 100644
--- a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/CreateResourceQuerySpecification.java
+++ b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/CreateResourceQuerySpecification.java
@@ -4,16 +4,19 @@ import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.incquery.runtime.api.IncQueryEngine;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFPQuery;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.incquery.runtime.emf.types.EClassTransitiveInstancesKey;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
 import org.eclipse.incquery.runtime.matchers.psystem.PBody;
 import org.eclipse.incquery.runtime.matchers.psystem.PVariable;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeUnary;
+import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.QueryInitializationException;
+import org.eclipse.incquery.runtime.matchers.tuple.FlatTuple;
 import org.eclipse.viatra.dse.examples.bpmn.patterns.CreateResourceMatch;
 import org.eclipse.viatra.dse.examples.bpmn.patterns.CreateResourceMatcher;
 
@@ -94,8 +97,8 @@ public final class CreateResourceQuerySpecification extends BaseGeneratedEMFQuer
       	body.setExportedParameters(Arrays.<ExportedParameter>asList(
       		new ExportedParameter(body, var_RTV, "RTV")
       	));
-      	new TypeUnary(body, var_RTV, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceTypeVariant"), "org.eclipse.viatra.dse.examples.bpmn/ResourceTypeVariant");
-      	new TypeUnary(body, var_RTV, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceTypeVariant"), "org.eclipse.viatra.dse.examples.bpmn/ResourceTypeVariant");
+      	new TypeConstraint(body, new FlatTuple(var_RTV), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceTypeVariant")));
+      	new TypeConstraint(body, new FlatTuple(var_RTV), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceTypeVariant")));
       	bodies.add(body);
       }
       	// to silence compiler error
diff --git a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/InFlowQuerySpecification.java b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/InFlowQuerySpecification.java
index 53a0381..aa64103 100644
--- a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/InFlowQuerySpecification.java
+++ b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/InFlowQuerySpecification.java
@@ -4,20 +4,23 @@ import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.incquery.runtime.api.IPatternMatch;
 import org.eclipse.incquery.runtime.api.IncQueryEngine;
 import org.eclipse.incquery.runtime.api.IncQueryMatcher;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFPQuery;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.incquery.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.incquery.runtime.emf.types.EStructuralFeatureInstancesKey;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
 import org.eclipse.incquery.runtime.matchers.psystem.PBody;
 import org.eclipse.incquery.runtime.matchers.psystem.PVariable;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.Equality;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeBinary;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeUnary;
+import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.QueryInitializationException;
+import org.eclipse.incquery.runtime.matchers.tuple.FlatTuple;
 
 /**
  * A pattern-specific query specification that can instantiate InFlowMatcher in a type-safe way.
@@ -100,10 +103,10 @@ final class InFlowQuerySpecification extends BaseGeneratedEMFQuerySpecification<
       				
       		new ExportedParameter(body, var_Flow, "Flow")
       	));
-      	new TypeUnary(body, var_Element, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement"), "org.eclipse.viatra.dse.examples.bpmn/BaseElement");
-      	new TypeUnary(body, var_Flow, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow"), "org.eclipse.viatra.dse.examples.bpmn/SequenceFlow");
-      	new TypeUnary(body, var_Element, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement"), "org.eclipse.viatra.dse.examples.bpmn/BaseElement");
-      	new TypeBinary(body, CONTEXT, var_Element, var__virtual_0_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "inFlows"), "org.eclipse.viatra.dse.examples.bpmn/BaseElement.inFlows");
+      	new TypeConstraint(body, new FlatTuple(var_Element), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement")));
+      	new TypeConstraint(body, new FlatTuple(var_Flow), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow")));
+      	new TypeConstraint(body, new FlatTuple(var_Element), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement")));
+      	new TypeConstraint(body, new FlatTuple(var_Element, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "inFlows")));
       	new Equality(body, var__virtual_0_, var_Flow);
       	bodies.add(body);
       }
diff --git a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/InstanceOfVariantQuerySpecification.java b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/InstanceOfVariantQuerySpecification.java
index 84622ba..b6f6fc0 100644
--- a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/InstanceOfVariantQuerySpecification.java
+++ b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/InstanceOfVariantQuerySpecification.java
@@ -4,18 +4,21 @@ import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.incquery.runtime.api.IncQueryEngine;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFPQuery;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.incquery.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.incquery.runtime.emf.types.EStructuralFeatureInstancesKey;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
 import org.eclipse.incquery.runtime.matchers.psystem.PBody;
 import org.eclipse.incquery.runtime.matchers.psystem.PVariable;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.Equality;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeBinary;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeUnary;
+import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.QueryInitializationException;
+import org.eclipse.incquery.runtime.matchers.tuple.FlatTuple;
 import org.eclipse.viatra.dse.examples.bpmn.patterns.InstanceOfVariantMatch;
 import org.eclipse.viatra.dse.examples.bpmn.patterns.InstanceOfVariantMatcher;
 
@@ -100,10 +103,10 @@ public final class InstanceOfVariantQuerySpecification extends BaseGeneratedEMFQ
       				
       		new ExportedParameter(body, var_RTV, "RTV")
       	));
-      	new TypeUnary(body, var_RI, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceInstance"), "org.eclipse.viatra.dse.examples.bpmn/ResourceInstance");
-      	new TypeUnary(body, var_RTV, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceTypeVariant"), "org.eclipse.viatra.dse.examples.bpmn/ResourceTypeVariant");
-      	new TypeUnary(body, var_RI, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceInstance"), "org.eclipse.viatra.dse.examples.bpmn/ResourceInstance");
-      	new TypeBinary(body, CONTEXT, var_RI, var__virtual_0_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceInstance", "resourceTypeVariant"), "org.eclipse.viatra.dse.examples.bpmn/ResourceInstance.resourceTypeVariant");
+      	new TypeConstraint(body, new FlatTuple(var_RI), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceInstance")));
+      	new TypeConstraint(body, new FlatTuple(var_RTV), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceTypeVariant")));
+      	new TypeConstraint(body, new FlatTuple(var_RI), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceInstance")));
+      	new TypeConstraint(body, new FlatTuple(var_RI, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceInstance", "resourceTypeVariant")));
       	new Equality(body, var__virtual_0_, var_RTV);
       	bodies.add(body);
       }
diff --git a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/MakeParallelQuerySpecification.java b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/MakeParallelQuerySpecification.java
index 1f1109e..aa2a7a4 100644
--- a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/MakeParallelQuerySpecification.java
+++ b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/MakeParallelQuerySpecification.java
@@ -4,9 +4,12 @@ import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.incquery.runtime.api.IncQueryEngine;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFPQuery;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.incquery.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.incquery.runtime.emf.types.EStructuralFeatureInstancesKey;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
 import org.eclipse.incquery.runtime.matchers.psystem.PBody;
 import org.eclipse.incquery.runtime.matchers.psystem.PVariable;
@@ -15,8 +18,7 @@ import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.ExportedParam
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.Inequality;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.PatternMatchCounter;
 import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.ConstantValue;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeBinary;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeUnary;
+import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.QueryInitializationException;
 import org.eclipse.incquery.runtime.matchers.tuple.FlatTuple;
@@ -119,19 +121,19 @@ public final class MakeParallelQuerySpecification extends BaseGeneratedEMFQueryS
       				
       		new ExportedParameter(body, var_Root, "Root")
       	));
-      	new TypeUnary(body, var_T1, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task"), "org.eclipse.viatra.dse.examples.bpmn/Task");
-      	new TypeUnary(body, var_T2, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task"), "org.eclipse.viatra.dse.examples.bpmn/Task");
-      	new TypeUnary(body, var_Root, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SimplifiedBPMN"), "org.eclipse.viatra.dse.examples.bpmn/SimplifiedBPMN");
-      	new TypeUnary(body, var_Root, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SimplifiedBPMN"), "org.eclipse.viatra.dse.examples.bpmn/SimplifiedBPMN");
-      	new TypeUnary(body, var_T1, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task"), "org.eclipse.viatra.dse.examples.bpmn/Task");
-      	new TypeBinary(body, CONTEXT, var_T1, var__virtual_0_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "outFlows"), "org.eclipse.viatra.dse.examples.bpmn/BaseElement.outFlows");
+      	new TypeConstraint(body, new FlatTuple(var_T1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task")));
+      	new TypeConstraint(body, new FlatTuple(var_T2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task")));
+      	new TypeConstraint(body, new FlatTuple(var_Root), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SimplifiedBPMN")));
+      	new TypeConstraint(body, new FlatTuple(var_Root), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SimplifiedBPMN")));
+      	new TypeConstraint(body, new FlatTuple(var_T1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task")));
+      	new TypeConstraint(body, new FlatTuple(var_T1, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "outFlows")));
       	new Equality(body, var__virtual_0_, var_out);
       	new ConstantValue(body, var__virtual_1_, false);
-      	new TypeUnary(body, var_out, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow"), "org.eclipse.viatra.dse.examples.bpmn/SequenceFlow");
-      	new TypeBinary(body, CONTEXT, var_out, var__virtual_2_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow", "isDataFlow"), "org.eclipse.viatra.dse.examples.bpmn/SequenceFlow.isDataFlow");
+      	new TypeConstraint(body, new FlatTuple(var_out), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow")));
+      	new TypeConstraint(body, new FlatTuple(var_out, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow", "isDataFlow")));
       	new Equality(body, var__virtual_2_, var__virtual_1_);
-      	new TypeUnary(body, var_out, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow"), "org.eclipse.viatra.dse.examples.bpmn/SequenceFlow");
-      	new TypeBinary(body, CONTEXT, var_out, var__virtual_3_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow", "target"), "org.eclipse.viatra.dse.examples.bpmn/SequenceFlow.target");
+      	new TypeConstraint(body, new FlatTuple(var_out), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow")));
+      	new TypeConstraint(body, new FlatTuple(var_out, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow", "target")));
       	new Equality(body, var__virtual_3_, var_T2);
       	new Inequality(body, var_T1, var_T2);
       	new ConstantValue(body, var__virtual_4_, 1);
diff --git a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/MakeSequentialQuerySpecification.java b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/MakeSequentialQuerySpecification.java
index 905730e..1ae1769 100644
--- a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/MakeSequentialQuerySpecification.java
+++ b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/MakeSequentialQuerySpecification.java
@@ -4,9 +4,12 @@ import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.incquery.runtime.api.IncQueryEngine;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFPQuery;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.incquery.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.incquery.runtime.emf.types.EStructuralFeatureInstancesKey;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
 import org.eclipse.incquery.runtime.matchers.psystem.PBody;
 import org.eclipse.incquery.runtime.matchers.psystem.PVariable;
@@ -15,8 +18,7 @@ import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.ExportedParam
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.Inequality;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.PatternMatchCounter;
 import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.ConstantValue;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeBinary;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeUnary;
+import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.QueryInitializationException;
 import org.eclipse.incquery.runtime.matchers.tuple.FlatTuple;
@@ -121,30 +123,30 @@ public final class MakeSequentialQuerySpecification extends BaseGeneratedEMFQuer
       				
       		new ExportedParameter(body, var_Root, "Root")
       	));
-      	new TypeUnary(body, var_T1, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task"), "org.eclipse.viatra.dse.examples.bpmn/Task");
-      	new TypeUnary(body, var_T2, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task"), "org.eclipse.viatra.dse.examples.bpmn/Task");
-      	new TypeUnary(body, var_Root, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SimplifiedBPMN"), "org.eclipse.viatra.dse.examples.bpmn/SimplifiedBPMN");
-      	new TypeUnary(body, var_Root, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SimplifiedBPMN"), "org.eclipse.viatra.dse.examples.bpmn/SimplifiedBPMN");
-      	new TypeUnary(body, var_pg, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ParallelGateway"), "org.eclipse.viatra.dse.examples.bpmn/ParallelGateway");
-      	new TypeBinary(body, CONTEXT, var_pg, var__virtual_0_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "outFlows"), "org.eclipse.viatra.dse.examples.bpmn/BaseElement.outFlows");
-      	new TypeBinary(body, CONTEXT, var__virtual_0_, var__virtual_1_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow", "target"), "org.eclipse.viatra.dse.examples.bpmn/SequenceFlow.target");
+      	new TypeConstraint(body, new FlatTuple(var_T1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task")));
+      	new TypeConstraint(body, new FlatTuple(var_T2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task")));
+      	new TypeConstraint(body, new FlatTuple(var_Root), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SimplifiedBPMN")));
+      	new TypeConstraint(body, new FlatTuple(var_Root), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SimplifiedBPMN")));
+      	new TypeConstraint(body, new FlatTuple(var_pg), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ParallelGateway")));
+      	new TypeConstraint(body, new FlatTuple(var_pg, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "outFlows")));
+      	new TypeConstraint(body, new FlatTuple(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow", "target")));
       	new Equality(body, var__virtual_1_, var_T1);
-      	new TypeUnary(body, var_pg, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ParallelGateway"), "org.eclipse.viatra.dse.examples.bpmn/ParallelGateway");
-      	new TypeBinary(body, CONTEXT, var_pg, var__virtual_2_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "outFlows"), "org.eclipse.viatra.dse.examples.bpmn/BaseElement.outFlows");
-      	new TypeBinary(body, CONTEXT, var__virtual_2_, var__virtual_3_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow", "target"), "org.eclipse.viatra.dse.examples.bpmn/SequenceFlow.target");
+      	new TypeConstraint(body, new FlatTuple(var_pg), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ParallelGateway")));
+      	new TypeConstraint(body, new FlatTuple(var_pg, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "outFlows")));
+      	new TypeConstraint(body, new FlatTuple(var__virtual_2_, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow", "target")));
       	new Equality(body, var__virtual_3_, var_T2);
       	new Inequality(body, var_T1, var_T2);
       	new PatternMatchCounter(body, new FlatTuple(var_pg, var___0_), ParallelGatewayOutFlowQuerySpecification.instance().getInternalQueryRepresentation(), var__virtual_4_);
       	new Equality(body, var_N, var__virtual_4_);
       	new ConstantValue(body, var__virtual_5_, 2);
       	new Equality(body, var_N, var__virtual_5_);
-      	new TypeUnary(body, var_T1, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task"), "org.eclipse.viatra.dse.examples.bpmn/Task");
-      	new TypeBinary(body, CONTEXT, var_T1, var__virtual_6_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "outFlows"), "org.eclipse.viatra.dse.examples.bpmn/BaseElement.outFlows");
-      	new TypeBinary(body, CONTEXT, var__virtual_6_, var__virtual_7_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow", "target"), "org.eclipse.viatra.dse.examples.bpmn/SequenceFlow.target");
+      	new TypeConstraint(body, new FlatTuple(var_T1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task")));
+      	new TypeConstraint(body, new FlatTuple(var_T1, var__virtual_6_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "outFlows")));
+      	new TypeConstraint(body, new FlatTuple(var__virtual_6_, var__virtual_7_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow", "target")));
       	new Equality(body, var__virtual_7_, var_pg2);
-      	new TypeUnary(body, var_T2, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task"), "org.eclipse.viatra.dse.examples.bpmn/Task");
-      	new TypeBinary(body, CONTEXT, var_T2, var__virtual_8_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "outFlows"), "org.eclipse.viatra.dse.examples.bpmn/BaseElement.outFlows");
-      	new TypeBinary(body, CONTEXT, var__virtual_8_, var__virtual_9_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow", "target"), "org.eclipse.viatra.dse.examples.bpmn/SequenceFlow.target");
+      	new TypeConstraint(body, new FlatTuple(var_T2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task")));
+      	new TypeConstraint(body, new FlatTuple(var_T2, var__virtual_8_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "outFlows")));
+      	new TypeConstraint(body, new FlatTuple(var__virtual_8_, var__virtual_9_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow", "target")));
       	new Equality(body, var__virtual_9_, var_pg2);
       	bodies.add(body);
       }
diff --git a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/OutFlowQuerySpecification.java b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/OutFlowQuerySpecification.java
index 6f0904c..fefda7c 100644
--- a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/OutFlowQuerySpecification.java
+++ b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/OutFlowQuerySpecification.java
@@ -4,20 +4,23 @@ import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.incquery.runtime.api.IPatternMatch;
 import org.eclipse.incquery.runtime.api.IncQueryEngine;
 import org.eclipse.incquery.runtime.api.IncQueryMatcher;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFPQuery;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.incquery.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.incquery.runtime.emf.types.EStructuralFeatureInstancesKey;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
 import org.eclipse.incquery.runtime.matchers.psystem.PBody;
 import org.eclipse.incquery.runtime.matchers.psystem.PVariable;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.Equality;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeBinary;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeUnary;
+import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.QueryInitializationException;
+import org.eclipse.incquery.runtime.matchers.tuple.FlatTuple;
 
 /**
  * A pattern-specific query specification that can instantiate OutFlowMatcher in a type-safe way.
@@ -100,10 +103,10 @@ final class OutFlowQuerySpecification extends BaseGeneratedEMFQuerySpecification
       				
       		new ExportedParameter(body, var_Flow, "Flow")
       	));
-      	new TypeUnary(body, var_Element, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement"), "org.eclipse.viatra.dse.examples.bpmn/BaseElement");
-      	new TypeUnary(body, var_Flow, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow"), "org.eclipse.viatra.dse.examples.bpmn/SequenceFlow");
-      	new TypeUnary(body, var_Element, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement"), "org.eclipse.viatra.dse.examples.bpmn/BaseElement");
-      	new TypeBinary(body, CONTEXT, var_Element, var__virtual_0_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "outFlows"), "org.eclipse.viatra.dse.examples.bpmn/BaseElement.outFlows");
+      	new TypeConstraint(body, new FlatTuple(var_Element), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement")));
+      	new TypeConstraint(body, new FlatTuple(var_Flow), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow")));
+      	new TypeConstraint(body, new FlatTuple(var_Element), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement")));
+      	new TypeConstraint(body, new FlatTuple(var_Element, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "outFlows")));
       	new Equality(body, var__virtual_0_, var_Flow);
       	bodies.add(body);
       }
diff --git a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/ParallelGatewayOutFlowQuerySpecification.java b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/ParallelGatewayOutFlowQuerySpecification.java
index 7a106a3..b306c31 100644
--- a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/ParallelGatewayOutFlowQuerySpecification.java
+++ b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/ParallelGatewayOutFlowQuerySpecification.java
@@ -4,20 +4,23 @@ import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.incquery.runtime.api.IPatternMatch;
 import org.eclipse.incquery.runtime.api.IncQueryEngine;
 import org.eclipse.incquery.runtime.api.IncQueryMatcher;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFPQuery;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.incquery.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.incquery.runtime.emf.types.EStructuralFeatureInstancesKey;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
 import org.eclipse.incquery.runtime.matchers.psystem.PBody;
 import org.eclipse.incquery.runtime.matchers.psystem.PVariable;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.Equality;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeBinary;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeUnary;
+import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.QueryInitializationException;
+import org.eclipse.incquery.runtime.matchers.tuple.FlatTuple;
 
 /**
  * A pattern-specific query specification that can instantiate ParallelGatewayOutFlowMatcher in a type-safe way.
@@ -100,10 +103,10 @@ final class ParallelGatewayOutFlowQuerySpecification extends BaseGeneratedEMFQue
       				
       		new ExportedParameter(body, var_Flow, "Flow")
       	));
-      	new TypeUnary(body, var_PG, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ParallelGateway"), "org.eclipse.viatra.dse.examples.bpmn/ParallelGateway");
-      	new TypeUnary(body, var_Flow, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow"), "org.eclipse.viatra.dse.examples.bpmn/SequenceFlow");
-      	new TypeUnary(body, var_PG, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ParallelGateway"), "org.eclipse.viatra.dse.examples.bpmn/ParallelGateway");
-      	new TypeBinary(body, CONTEXT, var_PG, var__virtual_0_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "outFlows"), "org.eclipse.viatra.dse.examples.bpmn/BaseElement.outFlows");
+      	new TypeConstraint(body, new FlatTuple(var_PG), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ParallelGateway")));
+      	new TypeConstraint(body, new FlatTuple(var_Flow), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "SequenceFlow")));
+      	new TypeConstraint(body, new FlatTuple(var_PG), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ParallelGateway")));
+      	new TypeConstraint(body, new FlatTuple(var_PG, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "BaseElement", "outFlows")));
       	new Equality(body, var__virtual_0_, var_Flow);
       	bodies.add(body);
       }
diff --git a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/TaskNeedsVariantQuerySpecification.java b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/TaskNeedsVariantQuerySpecification.java
index ae5cbfa..641505d 100644
--- a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/TaskNeedsVariantQuerySpecification.java
+++ b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/TaskNeedsVariantQuerySpecification.java
@@ -4,20 +4,23 @@ import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.incquery.runtime.api.IPatternMatch;
 import org.eclipse.incquery.runtime.api.IncQueryEngine;
 import org.eclipse.incquery.runtime.api.IncQueryMatcher;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFPQuery;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.incquery.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.incquery.runtime.emf.types.EStructuralFeatureInstancesKey;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
 import org.eclipse.incquery.runtime.matchers.psystem.PBody;
 import org.eclipse.incquery.runtime.matchers.psystem.PVariable;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.Equality;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeBinary;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeUnary;
+import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.QueryInitializationException;
+import org.eclipse.incquery.runtime.matchers.tuple.FlatTuple;
 
 /**
  * A pattern-specific query specification that can instantiate TaskNeedsVariantMatcher in a type-safe way.
@@ -100,10 +103,10 @@ final class TaskNeedsVariantQuerySpecification extends BaseGeneratedEMFQuerySpec
       				
       		new ExportedParameter(body, var_RTV, "RTV")
       	));
-      	new TypeUnary(body, var_T, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task"), "org.eclipse.viatra.dse.examples.bpmn/Task");
-      	new TypeUnary(body, var_RTV, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceTypeVariant"), "org.eclipse.viatra.dse.examples.bpmn/ResourceTypeVariant");
-      	new TypeUnary(body, var_T, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task"), "org.eclipse.viatra.dse.examples.bpmn/Task");
-      	new TypeBinary(body, CONTEXT, var_T, var__virtual_0_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task", "variant"), "org.eclipse.viatra.dse.examples.bpmn/Task.variant");
+      	new TypeConstraint(body, new FlatTuple(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task")));
+      	new TypeConstraint(body, new FlatTuple(var_RTV), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceTypeVariant")));
+      	new TypeConstraint(body, new FlatTuple(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task")));
+      	new TypeConstraint(body, new FlatTuple(var_T, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task", "variant")));
       	new Equality(body, var__virtual_0_, var_RTV);
       	bodies.add(body);
       }
diff --git a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/UnassignedTaskQuerySpecification.java b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/UnassignedTaskQuerySpecification.java
index 72917ae..f4d34e5 100644
--- a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/UnassignedTaskQuerySpecification.java
+++ b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/UnassignedTaskQuerySpecification.java
@@ -4,15 +4,17 @@ import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.incquery.runtime.api.IncQueryEngine;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFPQuery;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.incquery.runtime.emf.types.EClassTransitiveInstancesKey;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
 import org.eclipse.incquery.runtime.matchers.psystem.PBody;
 import org.eclipse.incquery.runtime.matchers.psystem.PVariable;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.ExportedParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeUnary;
+import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.QueryInitializationException;
 import org.eclipse.incquery.runtime.matchers.tuple.FlatTuple;
@@ -98,7 +100,7 @@ public final class UnassignedTaskQuerySpecification extends BaseGeneratedEMFQuer
       	body.setExportedParameters(Arrays.<ExportedParameter>asList(
       		new ExportedParameter(body, var_T, "T")
       	));
-      	new TypeUnary(body, var_T, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task"), "org.eclipse.viatra.dse.examples.bpmn/Task");
+      	new TypeConstraint(body, new FlatTuple(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task")));
       	new NegativePatternCall(body, new FlatTuple(var_T, var___0_), VariantAllocatedToTaskQuerySpecification.instance().getInternalQueryRepresentation());
       	bodies.add(body);
       }
diff --git a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/UnrequiredResourceInstanceQuerySpecification.java b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/UnrequiredResourceInstanceQuerySpecification.java
index 2991b30..c26d128 100644
--- a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/UnrequiredResourceInstanceQuerySpecification.java
+++ b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/UnrequiredResourceInstanceQuerySpecification.java
@@ -4,17 +4,19 @@ import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.incquery.runtime.api.IncQueryEngine;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFPQuery;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.incquery.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.incquery.runtime.emf.types.EStructuralFeatureInstancesKey;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
 import org.eclipse.incquery.runtime.matchers.psystem.PBody;
 import org.eclipse.incquery.runtime.matchers.psystem.PVariable;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.Equality;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.ExportedParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeBinary;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeUnary;
+import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.QueryInitializationException;
 import org.eclipse.incquery.runtime.matchers.tuple.FlatTuple;
@@ -102,9 +104,9 @@ public final class UnrequiredResourceInstanceQuerySpecification extends BaseGene
       	body.setExportedParameters(Arrays.<ExportedParameter>asList(
       		new ExportedParameter(body, var_RI, "RI")
       	));
-      	new TypeUnary(body, var_RI, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceInstance"), "org.eclipse.viatra.dse.examples.bpmn/ResourceInstance");
-      	new TypeUnary(body, var_RI, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceInstance"), "org.eclipse.viatra.dse.examples.bpmn/ResourceInstance");
-      	new TypeBinary(body, CONTEXT, var_RI, var__virtual_0_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceInstance", "resourceTypeVariant"), "org.eclipse.viatra.dse.examples.bpmn/ResourceInstance.resourceTypeVariant");
+      	new TypeConstraint(body, new FlatTuple(var_RI), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceInstance")));
+      	new TypeConstraint(body, new FlatTuple(var_RI), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceInstance")));
+      	new TypeConstraint(body, new FlatTuple(var_RI, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceInstance", "resourceTypeVariant")));
       	new Equality(body, var__virtual_0_, var_RTV);
       	new NegativePatternCall(body, new FlatTuple(var___0_, var_RTV), TaskNeedsVariantQuerySpecification.instance().getInternalQueryRepresentation());
       	bodies.add(body);
diff --git a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/VariantAllocatedToTaskQuerySpecification.java b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/VariantAllocatedToTaskQuerySpecification.java
index 39cd2c2..8649a11 100644
--- a/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/VariantAllocatedToTaskQuerySpecification.java
+++ b/dse/bpmn/org.eclipse.viatra.dse.examples.bpmn.patterns/src-gen/org/eclipse/viatra/dse/examples/bpmn/patterns/util/VariantAllocatedToTaskQuerySpecification.java
@@ -4,18 +4,21 @@ import com.google.common.collect.Sets;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.incquery.runtime.api.IncQueryEngine;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFPQuery;
 import org.eclipse.incquery.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.incquery.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.incquery.runtime.emf.types.EStructuralFeatureInstancesKey;
 import org.eclipse.incquery.runtime.exception.IncQueryException;
 import org.eclipse.incquery.runtime.matchers.psystem.PBody;
 import org.eclipse.incquery.runtime.matchers.psystem.PVariable;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.Equality;
 import org.eclipse.incquery.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeBinary;
-import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeUnary;
+import org.eclipse.incquery.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.incquery.runtime.matchers.psystem.queries.QueryInitializationException;
+import org.eclipse.incquery.runtime.matchers.tuple.FlatTuple;
 import org.eclipse.viatra.dse.examples.bpmn.patterns.VariantAllocatedToTaskMatch;
 import org.eclipse.viatra.dse.examples.bpmn.patterns.VariantAllocatedToTaskMatcher;
 
@@ -100,10 +103,10 @@ public final class VariantAllocatedToTaskQuerySpecification extends BaseGenerate
       				
       		new ExportedParameter(body, var_RTV, "RTV")
       	));
-      	new TypeUnary(body, var_T, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task"), "org.eclipse.viatra.dse.examples.bpmn/Task");
-      	new TypeUnary(body, var_RTV, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceTypeVariant"), "org.eclipse.viatra.dse.examples.bpmn/ResourceTypeVariant");
-      	new TypeUnary(body, var_T, getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task"), "org.eclipse.viatra.dse.examples.bpmn/Task");
-      	new TypeBinary(body, CONTEXT, var_T, var__virtual_0_, getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task", "variant"), "org.eclipse.viatra.dse.examples.bpmn/Task.variant");
+      	new TypeConstraint(body, new FlatTuple(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task")));
+      	new TypeConstraint(body, new FlatTuple(var_RTV), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "ResourceTypeVariant")));
+      	new TypeConstraint(body, new FlatTuple(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task")));
+      	new TypeConstraint(body, new FlatTuple(var_T, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("org.eclipse.viatra.dse.examples.bpmn", "Task", "variant")));
       	new Equality(body, var__virtual_0_, var_RTV);
       	bodies.add(body);
       }