Optimizing generator with linear objective functions

73 files changed, 8297 insertions, 508 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 e697e27d..81ae9937 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 ddbe1979..10371590 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/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 e1e21292..49fafab3 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 b967ea7c..968ecef8 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 2c271c98..afb2c8de 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/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 40f87b4c..c1d5cb5e 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 d0715440..7fb5f085 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/META-INF/MANIFEST.MF b/Domains/ca.mcgill.rtgmrt.example.modes3/META-INF/MANIFEST.MF
index 96bd2113..8f900199 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/META-INF/MANIFEST.MF
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/META-INF/MANIFEST.MF
@@ -28,7 +28,8 @@ Require-Bundle: org.eclipse.viatra.query.runtime,
  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.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
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/plugin.xml b/Domains/ca.mcgill.rtgmrt.example.modes3/plugin.xml
index a105a729..f7d32541 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/plugin.xml
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/plugin.xml
@@ -21,6 +21,24 @@
       <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
index b8841928..d22bdd8b 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
@@ -40,12 +40,6 @@ pattern output(S1 : Segment, S2 : Segment) {
         find turnoutOutput(S1, S2);
 }
 
-//@Constraint(message = "noInputOfSegment", severity = "error", key = { S })
-//pattern noInputOfSegment(S : Segment) {
-//      neg find turnout(S);
-//      neg find output(_, S);
-//}
-
 @Constraint(message = "tooManyInputsOfSegment", severity = "error", key = { S })
 pattern tooManyInputsOfSegment(S : SimpleSegment) {
         find output(I1, S);
@@ -108,3 +102,194 @@ pattern reachable(S1 : Segment, S2 : Segment) {
 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
index fac7c496..613cb3e4 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3ModelGenerator.xtend
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3ModelGenerator.xtend
@@ -5,6 +5,7 @@ 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
@@ -14,6 +15,7 @@ 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
@@ -25,18 +27,38 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePro
 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.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
@@ -92,17 +114,21 @@ class Modes3ModelGenerator {
                                 minNewElements = modelSize
                                 maxNewElements = modelSize
                                 minNewElementsByType => [
-//                                      put(ecore2Logic.TypeofEClass(metamodelLogic.trace, Modes3Package.eINSTANCE.turnout), 5)
+//                                      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), 5)
-                                        put(ecore2Logic.TypeofEClass(metamodelLogic.trace, Modes3Package.eINSTANCE.turnout), 5)
+                                        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
                         ]
-                        scopeWeight = 5
+                        costObjectives += getObjective(ecore2Logic, metamodelLogic.trace)
+                        scopeWeight = 6
                         nameNewElements = false
                         typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis
                         stateCoderStrategy = StateCoderStrategy.PairwiseNeighbourhood
@@ -121,47 +147,60 @@ class Modes3ModelGenerator {
                 val solution = solver.solve(logic.output, config, workspace)
                 if (solution instanceof ModelResult) {
                         println("Saving generated solutions")
-                        val representations = solution.representation
-                        for (representationIndex : 0 ..< representations.size) {
-                                val representation = representations.get(representationIndex)
+                        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 (representation instanceof PartialInterpretation) {
+                                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) {
-                                                if (representation instanceof PartialInterpretation) {
-                                                        val rootType = (representation.problem.types.findFirst [
-                                                                name == "Modes3ModelRoot class DefinedPart"
-                                                        ] as TypeDefinition)
-                                                        val rootIntepretation = representation.partialtypeinterpratation.filter(
-                                                                PartialComplexTypeInterpretation).findFirst [
-                                                                interpretationOf.name == "Modes3ModelRoot class"
+                                                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
+                                                                }
                                                         ]
-                                                        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
                                                 }
+                                                rootType.elements.clear
                                                 val visualiser = new GraphvizVisualiser
                                                 val visualisation = visualiser.visualiseConcretization(representation)
                                                 visualisation.writeToFile(workspace, '''solution«representationNumber».png''')
                                         }
                                 } else {
-                                        workspace.writeText('''solution«representationNumber».txt''', representation.toString)
+                                        workspace.writeText('''solution«representationNumber».txt''', interpretation.toString)
                                 }
                         }
                 } else {
-                        println("Failed to solver problem")
+                        println("Failed to solve problem")
                         val partial = logic.output
                         workspace.writeModel(partial, "solution.partialinterpretation")
                 }
@@ -198,6 +237,94 @@ class Modes3ModelGenerator {
                 )
         }
 
+        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,
@@ -223,6 +350,8 @@ class Modes3ModelGenerator {
 
         private static enum MonitoringQuery {
                 closeTrains,
+                trainLocations,
+                endOfSiding,
                 misalignedTurnout
         }
 }
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
index b3e38571..a84c2906 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/.gitignore
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/.gitignore
@@ -31,3 +31,48 @@
 /.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/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/Modes3Queries.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Modes3Queries.java
index 6e244430..d1238d61 100644
--- 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
@@ -4,16 +4,34 @@
 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;
@@ -44,6 +62,24 @@ import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
  * <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
@@ -83,6 +119,24 @@ public final class Modes3Queries extends BaseGeneratedPatternGroup {
     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() {
@@ -204,4 +258,148 @@ public final class Modes3Queries extends BaseGeneratedPatternGroup {
   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/TooManyInputsOfSegment.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooManyInputsOfSegment.java
index ff82dda1..d12ec23e 100644
--- 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
@@ -46,12 +46,6 @@ import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
  * 
  * <p>Original source:
  *         <code><pre>
- *         //{@literal @}Constraint(message = "noInputOfSegment", severity = "error", key = { S })
- *         //pattern noInputOfSegment(S : Segment) {
- *         //   neg find turnout(S);
- *         //   neg find output(_, S);
- *         //}
- *         
  *         {@literal @}Constraint(message = "tooManyInputsOfSegment", severity = "error", key = { S })
  *         pattern tooManyInputsOfSegment(S : SimpleSegment) {
  *              find output(I1, S);
@@ -251,12 +245,6 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
    * 
    * <p>Original source:
    * <code><pre>
-   * //{@literal @}Constraint(message = "noInputOfSegment", severity = "error", key = { S })
-   * //pattern noInputOfSegment(S : Segment) {
-   * // neg find turnout(S);
-   * // neg find output(_, S);
-   * //}
-   * 
    * {@literal @}Constraint(message = "tooManyInputsOfSegment", severity = "error", key = { S })
    * pattern tooManyInputsOfSegment(S : SimpleSegment) {
    *    find output(I1, S);
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/xtend-gen/modes3/run/.CloseTrainsObjectiveHint.xtendbin b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.CloseTrainsObjectiveHint.xtendbin
new file mode 100644
index 00000000..87975792
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.CloseTrainsObjectiveHint.xtendbin
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.EndOfSidingObjectiveHint.xtendbin b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.EndOfSidingObjectiveHint.xtendbin
new file mode 100644
index 00000000..f243e180
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.EndOfSidingObjectiveHint.xtendbin
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.MisalignedTurnoutObjectiveHint.xtendbin b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.MisalignedTurnoutObjectiveHint.xtendbin
new file mode 100644
index 00000000..cdef4dc7
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.MisalignedTurnoutObjectiveHint.xtendbin
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3ModelGenerator.xtendbin b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3ModelGenerator.xtendbin
index 77f1ea6e..759ac9e4 100644
--- 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
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
index 4fdbb71b..386baeda 100644
--- 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
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
index e5e1b63e..79059b7f 100644
--- 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
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.TrainLocationsObjectiveHint.xtendbin b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.TrainLocationsObjectiveHint.xtendbin
new file mode 100644
index 00000000..3c3a380e
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.TrainLocationsObjectiveHint.xtendbin
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.gitignore b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.gitignore
index fb94df96..1a7df1d9 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.gitignore
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.gitignore
@@ -1,3 +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
index f32a7172..16db7053 100644
--- 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
@@ -13,6 +13,7 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logic
 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;
@@ -32,6 +33,7 @@ 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;
@@ -50,10 +52,15 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.par
 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;
@@ -64,10 +71,31 @@ 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;
@@ -102,6 +130,10 @@ public class Modes3ModelGenerator {
   private enum MonitoringQuery {
     closeTrains,
     
+    trainLocations,
+    
+    endOfSiding,
+    
     misalignedTurnout;
   }
   
@@ -183,8 +215,9 @@ public class Modes3ModelGenerator {
             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(5));
-              it_2.put(this.ecore2Logic.TypeofEClass(metamodelLogic.getTrace(), Modes3Package.eINSTANCE.getTurnout()), Integer.valueOf(5));
+              it_2.put(this.ecore2Logic.TypeofEClass(metamodelLogic.getTrace(), Modes3Package.eINSTANCE.getTrain()), Integer.valueOf((this.modelSize / 5)));
+              it_2.put(this.ecore2Logic.TypeofEClass(metamodelLogic.getTrace(), Modes3Package.eINSTANCE.getTurnout()), Integer.valueOf((this.modelSize / 5)));
+              it_2.put(this.ecore2Logic.TypeofEClass(metamodelLogic.getTrace(), Modes3Package.eINSTANCE.getSimpleSegment()), Integer.valueOf(((3 * this.modelSize) / 5)));
             };
             ObjectExtensions.<Map<Type, Integer>>operator_doubleArrow(
               it_1.maxNewElementsByType, _function_5);
@@ -196,7 +229,9 @@ public class Modes3ModelGenerator {
           };
           ObjectExtensions.<SolutionScope>operator_doubleArrow(
             it.solutionScope, _function_4);
-          it.scopeWeight = 5;
+          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;
@@ -224,80 +259,103 @@ public class Modes3ModelGenerator {
         URI _xifexpression = null;
         if ((solution instanceof ModelResult)) {
           InputOutput.<String>println("Saving generated solutions");
-          final EList<Object> representations = ((ModelResult)solution).getRepresentation();
-          int _size = representations.size();
+          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 Object representation = representations.get((representationIndex).intValue());
+              final LogicModelInterpretation interpretation = interpretations.get((representationIndex).intValue());
               final int representationNumber = ((representationIndex).intValue() + 1);
-              if ((representation instanceof PartialInterpretation)) {
+              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(((EObject)representation), _builder_1.toString());
+                workspace.writeModel(representation, _builder_1.toString());
                 final PartialInterpretation2Gml partialInterpretation2GML = new PartialInterpretation2Gml();
-                final String gml = partialInterpretation2GML.transform(((PartialInterpretation)representation));
+                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);
-                int _size_1 = ((PartialInterpretation)representation).getNewElements().size();
-                boolean _lessThan = (_size_1 < 160);
-                if (_lessThan) {
-                  if ((representation instanceof PartialInterpretation)) {
-                    final Function1<Type, Boolean> _function_3 = (Type it) -> {
+                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, "Modes3ModelRoot class DefinedPart"));
+                      return Boolean.valueOf(Objects.equal(_name_2, "id"));
                     };
-                    Type _findFirst = IterableExtensions.<Type>findFirst(((PartialInterpretation)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(((PartialInterpretation)representation).getPartialtypeinterpratation(), 
-                      PartialComplexTypeInterpretation.class), _function_4);
-                    rootIntepretation.getElements().removeAll(rootType.getElements());
-                    ((PartialInterpretation)representation).getProblem().getElements().removeAll(rootType.getElements());
-                    EList<PartialRelationInterpretation> _partialrelationinterpretation = ((PartialInterpretation)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);
+                    final EAttribute idFeature = IterableExtensions.<EAttribute>findFirst(obj.eClass().getEAllAttributes(), _function_3);
+                    if ((idFeature != null)) {
+                      obj.eSet(idFeature, Integer.valueOf(id));
+                      id++;
                     }
-                    rootType.getElements().clear();
                   }
+                }
+                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(((PartialInterpretation)representation));
-                  StringConcatenation _builder_3 = new StringConcatenation();
-                  _builder_3.append("solution");
-                  _builder_3.append(representationNumber);
-                  _builder_3.append(".png");
-                  visualisation.writeToFile(workspace, _builder_3.toString());
+                  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_4 = new StringConcatenation();
-                _builder_4.append("solution");
-                _builder_4.append(representationNumber);
-                _builder_4.append(".txt");
-                workspace.writeText(_builder_4.toString(), representation.toString());
+                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 solver problem");
+            InputOutput.<String>println("Failed to solve problem");
             final LogicProblem partial = logic.getOutput();
             _xblockexpression_1 = workspace.writeModel(partial, "solution.partialinterpretation");
           }
@@ -354,6 +412,153 @@ public class Modes3ModelGenerator {
     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;
     {
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/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..ec1557e8 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",
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/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.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 3bcd9116..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,226 +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.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

-

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

-        }

-}

-

-@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,

-                Collection<UnitPropagationPatternGenerator> unitPropagationPatternGenerators,

-                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,

-                        unitPropagationPatternGenerators, writeFiles)

-

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

-                scopePropagator.propagateAllScopeConstraints

-                val unitRulePropagator = refinementRuleProvider.createUnitPrulePropagator(logicProblem, emptySolution,

-                        queries, scopePropagator, statistics)

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

-                        queries, unitRulePropagator, nameNewElements, statistics)

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

-                        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 8e05665c..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,13 +79,7 @@ class ViatraReasoner extends LogicReasoner {
                         problem,

                         emptySolution,

                         workspace,

-                        viatraConfig.nameNewElements,

-                        viatraConfig.typeInferenceMethod,

-                        viatraConfig.calculateObjectCreationCosts,

-                        viatraConfig.scopePropagatorStrategy,

-                        viatraConfig.hints,

-                        viatraConfig.unitPropagationPatternGenerators,

-                        viatraConfig.documentationLevel

+                        viatraConfig

                 )

 

                 val compositeObjective = new ModelGenerationCompositeObjective(

@@ -112,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

 

@@ -185,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

@@ -211,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"

@@ -253,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"

@@ -287,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 a2ed6016..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,7 +4,6 @@ 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

@@ -12,6 +11,7 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.Polyhedr
 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

@@ -114,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 4800f71d..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,7 +298,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
                 return activationIds;

         }

 

-        private void checkForSolution(final Fitness fittness) {

+        private void checkForSolution(final Fitness fitness) {

                 solutionStore.newSolution(context);

         }

         

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/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore
new file mode 100644
index 00000000..7050a7e3
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore
@@ -0,0 +1 @@
+/queries/
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore
index 3b9ccef7..19bc3cc8 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore
+++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore
@@ -7,3 +7,7 @@
 /.MemberHasParent.java._trace
 /.TwoMembersHaveNoParent.java._trace
 /.NegativeAge.java._trace
+/MemberHasParent.java
+/NegativeAge.java
+/ParentTooYoung.java
+/TwoMembersHaveNoParent.java
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore
index 3b9ccef7..19bc3cc8 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore
+++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/src-gen/queries/.gitignore
@@ -7,3 +7,7 @@
 /.MemberHasParent.java._trace
 /.TwoMembersHaveNoParent.java._trace
 /.NegativeAge.java._trace
+/MemberHasParent.java
+/NegativeAge.java
+/ParentTooYoung.java
+/TwoMembersHaveNoParent.java
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
index 5c5071cc..23513b51 100644
--- 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
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/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