36 files changed, 1260 insertions, 606 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF
index 83c90829..639a8a9c 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF
@@ -28,7 +28,8 @@ Require-Bundle: org.eclipse.core.runtime,
 org.eclipse.xtend.lib.macro,
 org.eclipse.viatra.query.runtime;bundle-version="1.5.0",
 org.eclipse.viatra.dse;bundle-version="0.15.0",
- hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0"
+ hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
+ org.eclipse.collections;bundle-version="10.1.0"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialInterpretation.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialInterpretation.java
index 098cc15b..9d0c3fea 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialInterpretation.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialInterpretation.java
@@ -30,6 +30,7 @@ import org.eclipse.emf.ecore.EObject;
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getScopes <em>Scopes</em>}</li>
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMinNewElements <em>Min New Elements</em>}</li>
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMaxNewElements <em>Max New Elements</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}</li>
 * </ul>
 *
 * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation()
@@ -255,4 +256,27 @@ public interface PartialInterpretation extends EObject {
         */
        void setMaxNewElements(int value);
+        /**
+         * Returns the value of the '<em><b>Min New Elements Heuristic</b></em>' attribute.
+         * The default value is <code>"0"</code>.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Min New Elements Heuristic</em>' attribute.
+         * @see #setMinNewElementsHeuristic(int)
+         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getPartialInterpretation_MinNewElementsHeuristic()
+         * @model default="0" required="true"
+         * @generated
+         */
+        int getMinNewElementsHeuristic();
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Min New Elements Heuristic</em>' attribute.
+         * @see #getMinNewElementsHeuristic()
+         * @generated
+         */
+        void setMinNewElementsHeuristic(int value);
 } // PartialInterpretation
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialinterpretationPackage.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialinterpretationPackage.java
index 4f34b9b7..f462ebe4 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialinterpretationPackage.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/PartialinterpretationPackage.java
@@ -167,13 +167,22 @@ public interface PartialinterpretationPackage extends EPackage {
        int PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS = 10;
        /**
+         * The feature id for the '<em><b>Min New Elements Heuristic</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC = 11;
+        /**
         * The number of structural features of the '<em>Partial Interpretation</em>' class.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
         * @generated
         * @ordered
         */
-        int PARTIAL_INTERPRETATION_FEATURE_COUNT = 11;
+        int PARTIAL_INTERPRETATION_FEATURE_COUNT = 12;
        /**
         * The number of operations of the '<em>Partial Interpretation</em>' class.
@@ -913,13 +922,22 @@ public interface PartialinterpretationPackage extends EPackage {
        int SCOPE__TARGET_TYPE_INTERPRETATION = 2;
        /**
+         * The feature id for the '<em><b>Min New Elements Heuristic</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SCOPE__MIN_NEW_ELEMENTS_HEURISTIC = 3;
+        /**
         * The number of structural features of the '<em>Scope</em>' class.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
         * @generated
         * @ordered
         */
-        int SCOPE_FEATURE_COUNT = 3;
+        int SCOPE_FEATURE_COUNT = 4;
        /**
         * The number of operations of the '<em>Scope</em>' class.
@@ -1358,6 +1376,17 @@ public interface PartialinterpretationPackage extends EPackage {
        EAttribute getPartialInterpretation_MaxNewElements();
        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Min New Elements Heuristic</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation#getMinNewElementsHeuristic()
+         * @see #getPartialInterpretation()
+         * @generated
+         */
+        EAttribute getPartialInterpretation_MinNewElementsHeuristic();
+        /**
         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialConstantInterpretation <em>Partial Constant Interpretation</em>}'.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
@@ -1750,6 +1779,17 @@ public interface PartialinterpretationPackage extends EPackage {
        EReference getScope_TargetTypeInterpretation();
        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Min New Elements Heuristic</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getMinNewElementsHeuristic()
+         * @see #getScope()
+         * @generated
+         */
+        EAttribute getScope_MinNewElementsHeuristic();
+        /**
         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialPrimitiveInterpretation <em>Partial Primitive Interpretation</em>}'.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
@@ -1953,6 +1993,14 @@ public interface PartialinterpretationPackage extends EPackage {
                EAttribute PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS = eINSTANCE.getPartialInterpretation_MaxNewElements();
                /**
+                 * The meta object literal for the '<em><b>Min New Elements Heuristic</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC = eINSTANCE.getPartialInterpretation_MinNewElementsHeuristic();
+                /**
                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialConstantInterpretationImpl <em>Partial Constant Interpretation</em>}' class.
                 * <!-- begin-user-doc -->
                 * <!-- end-user-doc -->
@@ -2279,6 +2327,14 @@ public interface PartialinterpretationPackage extends EPackage {
                EReference SCOPE__TARGET_TYPE_INTERPRETATION = eINSTANCE.getScope_TargetTypeInterpretation();
                /**
+                 * The meta object literal for the '<em><b>Min New Elements Heuristic</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute SCOPE__MIN_NEW_ELEMENTS_HEURISTIC = eINSTANCE.getScope_MinNewElementsHeuristic();
+                /**
                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialPrimitiveInterpretationImpl <em>Partial Primitive Interpretation</em>}' class.
                 * <!-- begin-user-doc -->
                 * <!-- end-user-doc -->
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/Scope.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/Scope.java
index 155b9f00..a0b58615 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/Scope.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/Scope.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EObject;
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getMinNewElements <em>Min New Elements</em>}</li>
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getMaxNewElements <em>Max New Elements</em>}</li>
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getTargetTypeInterpretation <em>Target Type Interpretation</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}</li>
 * </ul>
 *
 * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getScope()
@@ -105,4 +106,27 @@ public interface Scope extends EObject {
         */
        void setTargetTypeInterpretation(PartialTypeInterpratation value);
+        /**
+         * Returns the value of the '<em><b>Min New Elements Heuristic</b></em>' attribute.
+         * The default value is <code>"0"</code>.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Min New Elements Heuristic</em>' attribute.
+         * @see #setMinNewElementsHeuristic(int)
+         * @see hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage#getScope_MinNewElementsHeuristic()
+         * @model default="0" required="true"
+         * @generated
+         */
+        int getMinNewElementsHeuristic();
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.Scope#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Min New Elements Heuristic</em>' attribute.
+         * @see #getMinNewElementsHeuristic()
+         * @generated
+         */
+        void setMinNewElementsHeuristic(int value);
 } // Scope
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BinaryElementRelationLinkImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BinaryElementRelationLinkImpl.java
index f5efe02a..ca33dd65 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BinaryElementRelationLinkImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BinaryElementRelationLinkImpl.java
@@ -73,6 +73,7 @@ public class BinaryElementRelationLinkImpl extends RelationLinkImpl implements B
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public DefinedElement getParam1() {
                if (param1 != null && param1.eIsProxy()) {
                        InternalEObject oldParam1 = (InternalEObject)param1;
@@ -99,6 +100,7 @@ public class BinaryElementRelationLinkImpl extends RelationLinkImpl implements B
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setParam1(DefinedElement newParam1) {
                DefinedElement oldParam1 = param1;
                param1 = newParam1;
@@ -111,6 +113,7 @@ public class BinaryElementRelationLinkImpl extends RelationLinkImpl implements B
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public DefinedElement getParam2() {
                if (param2 != null && param2.eIsProxy()) {
                        InternalEObject oldParam2 = (InternalEObject)param2;
@@ -137,6 +140,7 @@ public class BinaryElementRelationLinkImpl extends RelationLinkImpl implements B
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setParam2(DefinedElement newParam2) {
                DefinedElement oldParam2 = param2;
                param2 = newParam2;
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BooleanElementImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BooleanElementImpl.java
index e906e07d..5f12d9e4 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BooleanElementImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/BooleanElementImpl.java
@@ -69,6 +69,7 @@ public class BooleanElementImpl extends PrimitiveElementImpl implements BooleanE
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public boolean isValue() {
                return value;
        }
@@ -78,6 +79,7 @@ public class BooleanElementImpl extends PrimitiveElementImpl implements BooleanE
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setValue(boolean newValue) {
                boolean oldValue = value;
                value = newValue;
@@ -152,7 +154,7 @@ public class BooleanElementImpl extends PrimitiveElementImpl implements BooleanE
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (value: ");
                result.append(value);
                result.append(')');
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/IntegerElementImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/IntegerElementImpl.java
index ef1a4b96..c8fbe1dd 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/IntegerElementImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/IntegerElementImpl.java
@@ -69,6 +69,7 @@ public class IntegerElementImpl extends PrimitiveElementImpl implements IntegerE
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public int getValue() {
                return value;
        }
@@ -78,6 +79,7 @@ public class IntegerElementImpl extends PrimitiveElementImpl implements IntegerE
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setValue(int newValue) {
                int oldValue = value;
                value = newValue;
@@ -152,7 +154,7 @@ public class IntegerElementImpl extends PrimitiveElementImpl implements IntegerE
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (value: ");
                result.append(value);
                result.append(')');
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkElementImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkElementImpl.java
index 749a03c5..c319a3f4 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkElementImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkElementImpl.java
@@ -83,6 +83,7 @@ public class NaryRelationLinkElementImpl extends MinimalEObjectImpl.Container im
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public int getIndex() {
                return index;
        }
@@ -92,6 +93,7 @@ public class NaryRelationLinkElementImpl extends MinimalEObjectImpl.Container im
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setIndex(int newIndex) {
                int oldIndex = index;
                index = newIndex;
@@ -104,6 +106,7 @@ public class NaryRelationLinkElementImpl extends MinimalEObjectImpl.Container im
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public DefinedElement getParam() {
                if (param != null && param.eIsProxy()) {
                        InternalEObject oldParam = (InternalEObject)param;
@@ -130,6 +133,7 @@ public class NaryRelationLinkElementImpl extends MinimalEObjectImpl.Container im
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setParam(DefinedElement newParam) {
                DefinedElement oldParam = param;
                param = newParam;
@@ -215,7 +219,7 @@ public class NaryRelationLinkElementImpl extends MinimalEObjectImpl.Container im
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (index: ");
                result.append(index);
                result.append(')');
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkImpl.java
index f387ee06..9f7628cf 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/NaryRelationLinkImpl.java
@@ -66,6 +66,7 @@ public class NaryRelationLinkImpl extends RelationLinkImpl implements NaryRelati
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<NaryRelationLinkElement> getElements() {
                if (elements == null) {
                        elements = new EObjectContainmentEList<NaryRelationLinkElement>(NaryRelationLinkElement.class, this, PartialinterpretationPackage.NARY_RELATION_LINK__ELEMENTS);
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialComplexTypeInterpretationImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialComplexTypeInterpretationImpl.java
index 07ee282d..c00b4278 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialComplexTypeInterpretationImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialComplexTypeInterpretationImpl.java
@@ -79,6 +79,7 @@ public class PartialComplexTypeInterpretationImpl extends PartialTypeInterpratat
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<PartialComplexTypeInterpretation> getSupertypeInterpretation() {
                if (supertypeInterpretation == null) {
                        supertypeInterpretation = new EObjectResolvingEList<PartialComplexTypeInterpretation>(PartialComplexTypeInterpretation.class, this, PartialinterpretationPackage.PARTIAL_COMPLEX_TYPE_INTERPRETATION__SUPERTYPE_INTERPRETATION);
@@ -91,6 +92,7 @@ public class PartialComplexTypeInterpretationImpl extends PartialTypeInterpratat
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public TypeDeclaration getInterpretationOf() {
                if (interpretationOf != null && interpretationOf.eIsProxy()) {
                        InternalEObject oldInterpretationOf = (InternalEObject)interpretationOf;
@@ -117,6 +119,7 @@ public class PartialComplexTypeInterpretationImpl extends PartialTypeInterpratat
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setInterpretationOf(TypeDeclaration newInterpretationOf) {
                TypeDeclaration oldInterpretationOf = interpretationOf;
                interpretationOf = newInterpretationOf;
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialConstantInterpretationImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialConstantInterpretationImpl.java
index 81b2ce8d..6d51f0db 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialConstantInterpretationImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialConstantInterpretationImpl.java
@@ -63,6 +63,7 @@ public class PartialConstantInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public ConstantDeclaration getInterpretationOf() {
                if (interpretationOf != null && interpretationOf.eIsProxy()) {
                        InternalEObject oldInterpretationOf = (InternalEObject)interpretationOf;
@@ -89,6 +90,7 @@ public class PartialConstantInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setInterpretationOf(ConstantDeclaration newInterpretationOf) {
                ConstantDeclaration oldInterpretationOf = interpretationOf;
                interpretationOf = newInterpretationOf;
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialFunctionInterpretationImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialFunctionInterpretationImpl.java
index 2d361e8e..855c4abc 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialFunctionInterpretationImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialFunctionInterpretationImpl.java
@@ -63,6 +63,7 @@ public class PartialFunctionInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public FunctionDeclaration getInterpretationOf() {
                if (interpretationOf != null && interpretationOf.eIsProxy()) {
                        InternalEObject oldInterpretationOf = (InternalEObject)interpretationOf;
@@ -89,6 +90,7 @@ public class PartialFunctionInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setInterpretationOf(FunctionDeclaration newInterpretationOf) {
                FunctionDeclaration oldInterpretationOf = interpretationOf;
                interpretationOf = newInterpretationOf;
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialInterpretationImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialInterpretationImpl.java
index bce3e2e0..9afdd8d2 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialInterpretationImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialInterpretationImpl.java
@@ -47,6 +47,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getScopes <em>Scopes</em>}</li>
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getMinNewElements <em>Min New Elements</em>}</li>
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getMaxNewElements <em>Max New Elements</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.PartialInterpretationImpl#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}</li>
 * </ul>
 *
 * @generated
@@ -183,6 +184,26 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
        protected int maxNewElements = MAX_NEW_ELEMENTS_EDEFAULT;
        /**
+         * The default value of the '{@link #getMinNewElementsHeuristic() <em>Min New Elements Heuristic</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getMinNewElementsHeuristic()
+         * @generated
+         * @ordered
+         */
+        protected static final int MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT = 0;
+        /**
+         * The cached value of the '{@link #getMinNewElementsHeuristic() <em>Min New Elements Heuristic</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getMinNewElementsHeuristic()
+         * @generated
+         * @ordered
+         */
+        protected int minNewElementsHeuristic = MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT;
+        /**
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
         * @generated
@@ -206,6 +227,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public LogicProblem getProblem() {
                if (problem != null && problem.eIsProxy()) {
                        InternalEObject oldProblem = (InternalEObject)problem;
@@ -232,6 +254,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setProblem(LogicProblem newProblem) {
                LogicProblem oldProblem = problem;
                problem = newProblem;
@@ -244,6 +267,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<PartialConstantInterpretation> getPartialconstantinterpretation() {
                if (partialconstantinterpretation == null) {
                        partialconstantinterpretation = new EObjectContainmentEList<PartialConstantInterpretation>(PartialConstantInterpretation.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PARTIALCONSTANTINTERPRETATION);
@@ -256,6 +280,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<PartialRelationInterpretation> getPartialrelationinterpretation() {
                if (partialrelationinterpretation == null) {
                        partialrelationinterpretation = new EObjectContainmentEList<PartialRelationInterpretation>(PartialRelationInterpretation.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PARTIALRELATIONINTERPRETATION);
@@ -268,6 +293,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<PartialFunctionInterpretation> getPartialfunctioninterpretation() {
                if (partialfunctioninterpretation == null) {
                        partialfunctioninterpretation = new EObjectContainmentEList<PartialFunctionInterpretation>(PartialFunctionInterpretation.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PARTIALFUNCTIONINTERPRETATION);
@@ -280,6 +306,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<DefinedElement> getNewElements() {
                if (newElements == null) {
                        newElements = new EObjectContainmentEList<DefinedElement>(DefinedElement.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__NEW_ELEMENTS);
@@ -292,6 +319,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<PartialTypeInterpratation> getPartialtypeinterpratation() {
                if (partialtypeinterpratation == null) {
                        partialtypeinterpratation = new EObjectContainmentEList<PartialTypeInterpratation>(PartialTypeInterpratation.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__PARTIALTYPEINTERPRATATION);
@@ -304,6 +332,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<DefinedElement> getOpenWorldElements() {
                if (openWorldElements == null) {
                        openWorldElements = new EObjectContainmentEList<DefinedElement>(DefinedElement.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__OPEN_WORLD_ELEMENTS);
@@ -316,6 +345,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public LogicProblem getProblemConainer() {
                return problemConainer;
        }
@@ -340,6 +370,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setProblemConainer(LogicProblem newProblemConainer) {
                if (newProblemConainer != problemConainer) {
                        NotificationChain msgs = null;
@@ -359,6 +390,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<Scope> getScopes() {
                if (scopes == null) {
                        scopes = new EObjectContainmentEList<Scope>(Scope.class, this, PartialinterpretationPackage.PARTIAL_INTERPRETATION__SCOPES);
@@ -371,6 +403,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public int getMinNewElements() {
                return minNewElements;
        }
@@ -380,6 +413,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setMinNewElements(int newMinNewElements) {
                int oldMinNewElements = minNewElements;
                minNewElements = newMinNewElements;
@@ -392,6 +426,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public int getMaxNewElements() {
                return maxNewElements;
        }
@@ -401,6 +436,7 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setMaxNewElements(int newMaxNewElements) {
                int oldMaxNewElements = maxNewElements;
                maxNewElements = newMaxNewElements;
@@ -414,6 +450,29 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
         * @generated
         */
        @Override
+        public int getMinNewElementsHeuristic() {
+                return minNewElementsHeuristic;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setMinNewElementsHeuristic(int newMinNewElementsHeuristic) {
+                int oldMinNewElementsHeuristic = minNewElementsHeuristic;
+                minNewElementsHeuristic = newMinNewElementsHeuristic;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, PartialinterpretationPackage.PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC, oldMinNewElementsHeuristic, minNewElementsHeuristic));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
                switch (featureID) {
                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__PARTIALCONSTANTINTERPRETATION:
@@ -467,6 +526,8 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                                return getMinNewElements();
                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS:
                                return getMaxNewElements();
+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC:
+                                return getMinNewElementsHeuristic();
                }
                return super.eGet(featureID, resolve, coreType);
        }
@@ -520,6 +581,9 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS:
                                setMaxNewElements((Integer)newValue);
                                return;
+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC:
+                                setMinNewElementsHeuristic((Integer)newValue);
+                                return;
                }
                super.eSet(featureID, newValue);
        }
@@ -565,6 +629,9 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS:
                                setMaxNewElements(MAX_NEW_ELEMENTS_EDEFAULT);
                                return;
+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC:
+                                setMinNewElementsHeuristic(MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT);
+                                return;
                }
                super.eUnset(featureID);
        }
@@ -599,6 +666,8 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
                                return minNewElements != MIN_NEW_ELEMENTS_EDEFAULT;
                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS:
                                return maxNewElements != MAX_NEW_ELEMENTS_EDEFAULT;
+                        case PartialinterpretationPackage.PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC:
+                                return minNewElementsHeuristic != MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT;
                }
                return super.eIsSet(featureID);
        }
@@ -612,11 +681,13 @@ public class PartialInterpretationImpl extends MinimalEObjectImpl.Container impl
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (minNewElements: ");
                result.append(minNewElements);
                result.append(", maxNewElements: ");
                result.append(maxNewElements);
+                result.append(", minNewElementsHeuristic: ");
+                result.append(minNewElementsHeuristic);
                result.append(')');
                return result.toString();
        }
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialRelationInterpretationImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialRelationInterpretationImpl.java
index 71aef9af..7ad06504 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialRelationInterpretationImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialRelationInterpretationImpl.java
@@ -106,6 +106,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public RelationDeclaration getInterpretationOf() {
                if (interpretationOf != null && interpretationOf.eIsProxy()) {
                        InternalEObject oldInterpretationOf = (InternalEObject)interpretationOf;
@@ -132,6 +133,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setInterpretationOf(RelationDeclaration newInterpretationOf) {
                RelationDeclaration oldInterpretationOf = interpretationOf;
                interpretationOf = newInterpretationOf;
@@ -144,6 +146,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<RelationLink> getRelationlinks() {
                if (relationlinks == null) {
                        relationlinks = new EObjectContainmentEList<RelationLink>(RelationLink.class, this, PartialinterpretationPackage.PARTIAL_RELATION_INTERPRETATION__RELATIONLINKS);
@@ -156,6 +159,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public TypeReference getParam1() {
                if (param1 != null && param1.eIsProxy()) {
                        InternalEObject oldParam1 = (InternalEObject)param1;
@@ -182,6 +186,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setParam1(TypeReference newParam1) {
                TypeReference oldParam1 = param1;
                param1 = newParam1;
@@ -194,6 +199,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public TypeReference getParam2() {
                if (param2 != null && param2.eIsProxy()) {
                        InternalEObject oldParam2 = (InternalEObject)param2;
@@ -220,6 +226,7 @@ public class PartialRelationInterpretationImpl extends MinimalEObjectImpl.Contai
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setParam2(TypeReference newParam2) {
                TypeReference oldParam2 = param2;
                param2 = newParam2;
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialTypeInterpratationImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialTypeInterpratationImpl.java
index da9b1472..51eabd2c 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialTypeInterpratationImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialTypeInterpratationImpl.java
@@ -76,6 +76,7 @@ public abstract class PartialTypeInterpratationImpl extends MinimalEObjectImpl.C
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<DefinedElement> getElements() {
                if (elements == null) {
                        elements = new EObjectResolvingEList<DefinedElement>(DefinedElement.class, this, PartialinterpretationPackage.PARTIAL_TYPE_INTERPRATATION__ELEMENTS);
@@ -88,6 +89,7 @@ public abstract class PartialTypeInterpratationImpl extends MinimalEObjectImpl.C
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EList<Scope> getScopes() {
                if (scopes == null) {
                        scopes = new EObjectWithInverseResolvingEList<Scope>(Scope.class, this, PartialinterpretationPackage.PARTIAL_TYPE_INTERPRATATION__SCOPES, PartialinterpretationPackage.SCOPE__TARGET_TYPE_INTERPRETATION);
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationFactoryImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationFactoryImpl.java
index af1db8a1..06ca4e37 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationFactoryImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationFactoryImpl.java
@@ -84,6 +84,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialInterpretation createPartialInterpretation() {
                PartialInterpretationImpl partialInterpretation = new PartialInterpretationImpl();
                return partialInterpretation;
@@ -94,6 +95,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialConstantInterpretation createPartialConstantInterpretation() {
                PartialConstantInterpretationImpl partialConstantInterpretation = new PartialConstantInterpretationImpl();
                return partialConstantInterpretation;
@@ -104,6 +106,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialRelationInterpretation createPartialRelationInterpretation() {
                PartialRelationInterpretationImpl partialRelationInterpretation = new PartialRelationInterpretationImpl();
                return partialRelationInterpretation;
@@ -114,6 +117,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialFunctionInterpretation createPartialFunctionInterpretation() {
                PartialFunctionInterpretationImpl partialFunctionInterpretation = new PartialFunctionInterpretationImpl();
                return partialFunctionInterpretation;
@@ -124,6 +128,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public UnaryElementRelationLink createUnaryElementRelationLink() {
                UnaryElementRelationLinkImpl unaryElementRelationLink = new UnaryElementRelationLinkImpl();
                return unaryElementRelationLink;
@@ -134,6 +139,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public BinaryElementRelationLink createBinaryElementRelationLink() {
                BinaryElementRelationLinkImpl binaryElementRelationLink = new BinaryElementRelationLinkImpl();
                return binaryElementRelationLink;
@@ -144,6 +150,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public NaryRelationLink createNaryRelationLink() {
                NaryRelationLinkImpl naryRelationLink = new NaryRelationLinkImpl();
                return naryRelationLink;
@@ -154,6 +161,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public NaryRelationLinkElement createNaryRelationLinkElement() {
                NaryRelationLinkElementImpl naryRelationLinkElement = new NaryRelationLinkElementImpl();
                return naryRelationLinkElement;
@@ -164,6 +172,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public BooleanElement createBooleanElement() {
                BooleanElementImpl booleanElement = new BooleanElementImpl();
                return booleanElement;
@@ -174,6 +183,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public IntegerElement createIntegerElement() {
                IntegerElementImpl integerElement = new IntegerElementImpl();
                return integerElement;
@@ -184,6 +194,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public RealElement createRealElement() {
                RealElementImpl realElement = new RealElementImpl();
                return realElement;
@@ -194,6 +205,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public StringElement createStringElement() {
                StringElementImpl stringElement = new StringElementImpl();
                return stringElement;
@@ -204,6 +216,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public Scope createScope() {
                ScopeImpl scope = new ScopeImpl();
                return scope;
@@ -214,6 +227,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialBooleanInterpretation createPartialBooleanInterpretation() {
                PartialBooleanInterpretationImpl partialBooleanInterpretation = new PartialBooleanInterpretationImpl();
                return partialBooleanInterpretation;
@@ -224,6 +238,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialIntegerInterpretation createPartialIntegerInterpretation() {
                PartialIntegerInterpretationImpl partialIntegerInterpretation = new PartialIntegerInterpretationImpl();
                return partialIntegerInterpretation;
@@ -234,6 +249,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialRealInterpretation createPartialRealInterpretation() {
                PartialRealInterpretationImpl partialRealInterpretation = new PartialRealInterpretationImpl();
                return partialRealInterpretation;
@@ -244,6 +260,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialStringInterpretation createPartialStringInterpretation() {
                PartialStringInterpretationImpl partialStringInterpretation = new PartialStringInterpretationImpl();
                return partialStringInterpretation;
@@ -254,6 +271,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialComplexTypeInterpretation createPartialComplexTypeInterpretation() {
                PartialComplexTypeInterpretationImpl partialComplexTypeInterpretation = new PartialComplexTypeInterpretationImpl();
                return partialComplexTypeInterpretation;
@@ -264,6 +282,7 @@ public class PartialinterpretationFactoryImpl extends EFactoryImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialinterpretationPackage getPartialinterpretationPackage() {
                return (PartialinterpretationPackage)getEPackage();
        }
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationPackageImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationPackageImpl.java
index a21dc306..1ea3a11d 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationPackageImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PartialinterpretationPackageImpl.java
@@ -227,7 +227,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
        /**
         * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-         * 
+         *
         * <p>This method is used to initialize {@link PartialinterpretationPackage#eINSTANCE} when that field is accessed.
         * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
         * <!-- begin-user-doc -->
@@ -241,7 +241,8 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                if (isInited) return (PartialinterpretationPackage)EPackage.Registry.INSTANCE.getEPackage(PartialinterpretationPackage.eNS_URI);
                // Obtain or create and register package
-                PartialinterpretationPackageImpl thePartialinterpretationPackage = (PartialinterpretationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PartialinterpretationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PartialinterpretationPackageImpl());
+                Object registeredPartialinterpretationPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+                PartialinterpretationPackageImpl thePartialinterpretationPackage = registeredPartialinterpretationPackage instanceof PartialinterpretationPackageImpl ? (PartialinterpretationPackageImpl)registeredPartialinterpretationPackage : new PartialinterpretationPackageImpl();
                isInited = true;
@@ -258,7 +259,6 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                // Mark meta-data to indicate it can't be changed
                thePartialinterpretationPackage.freeze();
-  
                // Update the registry and return the package
                EPackage.Registry.INSTANCE.put(PartialinterpretationPackage.eNS_URI, thePartialinterpretationPackage);
                return thePartialinterpretationPackage;
@@ -269,6 +269,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialInterpretation() {
                return partialInterpretationEClass;
        }
@@ -278,6 +279,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_Problem() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(0);
        }
@@ -287,6 +289,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_Partialconstantinterpretation() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(1);
        }
@@ -296,6 +299,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_Partialrelationinterpretation() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(2);
        }
@@ -305,6 +309,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_Partialfunctioninterpretation() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(3);
        }
@@ -314,6 +319,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_NewElements() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(4);
        }
@@ -323,6 +329,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_Partialtypeinterpratation() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(5);
        }
@@ -332,6 +339,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_OpenWorldElements() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(6);
        }
@@ -341,6 +349,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_ProblemConainer() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(7);
        }
@@ -350,6 +359,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialInterpretation_Scopes() {
                return (EReference)partialInterpretationEClass.getEStructuralFeatures().get(8);
        }
@@ -359,6 +369,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getPartialInterpretation_MinNewElements() {
                return (EAttribute)partialInterpretationEClass.getEStructuralFeatures().get(9);
        }
@@ -368,6 +379,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getPartialInterpretation_MaxNewElements() {
                return (EAttribute)partialInterpretationEClass.getEStructuralFeatures().get(10);
        }
@@ -377,6 +389,17 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
+        public EAttribute getPartialInterpretation_MinNewElementsHeuristic() {
+                return (EAttribute)partialInterpretationEClass.getEStructuralFeatures().get(11);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
        public EClass getPartialConstantInterpretation() {
                return partialConstantInterpretationEClass;
        }
@@ -386,6 +409,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialConstantInterpretation_InterpretationOf() {
                return (EReference)partialConstantInterpretationEClass.getEStructuralFeatures().get(0);
        }
@@ -395,6 +419,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialRelationInterpretation() {
                return partialRelationInterpretationEClass;
        }
@@ -404,6 +429,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialRelationInterpretation_InterpretationOf() {
                return (EReference)partialRelationInterpretationEClass.getEStructuralFeatures().get(0);
        }
@@ -413,6 +439,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialRelationInterpretation_Relationlinks() {
                return (EReference)partialRelationInterpretationEClass.getEStructuralFeatures().get(1);
        }
@@ -422,6 +449,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialRelationInterpretation_Param1() {
                return (EReference)partialRelationInterpretationEClass.getEStructuralFeatures().get(2);
        }
@@ -431,6 +459,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialRelationInterpretation_Param2() {
                return (EReference)partialRelationInterpretationEClass.getEStructuralFeatures().get(3);
        }
@@ -440,6 +469,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialFunctionInterpretation() {
                return partialFunctionInterpretationEClass;
        }
@@ -449,6 +479,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialFunctionInterpretation_InterpretationOf() {
                return (EReference)partialFunctionInterpretationEClass.getEStructuralFeatures().get(0);
        }
@@ -458,6 +489,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialTypeInterpratation() {
                return partialTypeInterpratationEClass;
        }
@@ -467,6 +499,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialTypeInterpratation_Elements() {
                return (EReference)partialTypeInterpratationEClass.getEStructuralFeatures().get(0);
        }
@@ -476,6 +509,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialTypeInterpratation_Scopes() {
                return (EReference)partialTypeInterpratationEClass.getEStructuralFeatures().get(1);
        }
@@ -485,6 +519,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getRelationLink() {
                return relationLinkEClass;
        }
@@ -494,6 +529,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getUnaryElementRelationLink() {
                return unaryElementRelationLinkEClass;
        }
@@ -503,6 +539,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getUnaryElementRelationLink_Param1() {
                return (EReference)unaryElementRelationLinkEClass.getEStructuralFeatures().get(0);
        }
@@ -512,6 +549,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getBinaryElementRelationLink() {
                return binaryElementRelationLinkEClass;
        }
@@ -521,6 +559,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getBinaryElementRelationLink_Param1() {
                return (EReference)binaryElementRelationLinkEClass.getEStructuralFeatures().get(0);
        }
@@ -530,6 +569,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getBinaryElementRelationLink_Param2() {
                return (EReference)binaryElementRelationLinkEClass.getEStructuralFeatures().get(1);
        }
@@ -539,6 +579,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getNaryRelationLink() {
                return naryRelationLinkEClass;
        }
@@ -548,6 +589,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getNaryRelationLink_Elements() {
                return (EReference)naryRelationLinkEClass.getEStructuralFeatures().get(0);
        }
@@ -557,6 +599,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getNaryRelationLinkElement() {
                return naryRelationLinkElementEClass;
        }
@@ -566,6 +609,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getNaryRelationLinkElement_Index() {
                return (EAttribute)naryRelationLinkElementEClass.getEStructuralFeatures().get(0);
        }
@@ -575,6 +619,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getNaryRelationLinkElement_Param() {
                return (EReference)naryRelationLinkElementEClass.getEStructuralFeatures().get(1);
        }
@@ -584,6 +629,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPrimitiveElement() {
                return primitiveElementEClass;
        }
@@ -593,6 +639,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getPrimitiveElement_ValueSet() {
                return (EAttribute)primitiveElementEClass.getEStructuralFeatures().get(0);
        }
@@ -602,6 +649,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getBooleanElement() {
                return booleanElementEClass;
        }
@@ -611,6 +659,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getBooleanElement_Value() {
                return (EAttribute)booleanElementEClass.getEStructuralFeatures().get(0);
        }
@@ -620,6 +669,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getIntegerElement() {
                return integerElementEClass;
        }
@@ -629,6 +679,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getIntegerElement_Value() {
                return (EAttribute)integerElementEClass.getEStructuralFeatures().get(0);
        }
@@ -638,6 +689,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getRealElement() {
                return realElementEClass;
        }
@@ -647,6 +699,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getRealElement_Value() {
                return (EAttribute)realElementEClass.getEStructuralFeatures().get(0);
        }
@@ -656,6 +709,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getStringElement() {
                return stringElementEClass;
        }
@@ -665,6 +719,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getStringElement_Value() {
                return (EAttribute)stringElementEClass.getEStructuralFeatures().get(0);
        }
@@ -674,6 +729,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getScope() {
                return scopeEClass;
        }
@@ -683,6 +739,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getScope_MinNewElements() {
                return (EAttribute)scopeEClass.getEStructuralFeatures().get(0);
        }
@@ -692,6 +749,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EAttribute getScope_MaxNewElements() {
                return (EAttribute)scopeEClass.getEStructuralFeatures().get(1);
        }
@@ -701,6 +759,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getScope_TargetTypeInterpretation() {
                return (EReference)scopeEClass.getEStructuralFeatures().get(2);
        }
@@ -710,6 +769,17 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
+        public EAttribute getScope_MinNewElementsHeuristic() {
+                return (EAttribute)scopeEClass.getEStructuralFeatures().get(3);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
        public EClass getPartialPrimitiveInterpretation() {
                return partialPrimitiveInterpretationEClass;
        }
@@ -719,6 +789,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialBooleanInterpretation() {
                return partialBooleanInterpretationEClass;
        }
@@ -728,6 +799,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialIntegerInterpretation() {
                return partialIntegerInterpretationEClass;
        }
@@ -737,6 +809,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialRealInterpretation() {
                return partialRealInterpretationEClass;
        }
@@ -746,6 +819,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialStringInterpretation() {
                return partialStringInterpretationEClass;
        }
@@ -755,6 +829,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EClass getPartialComplexTypeInterpretation() {
                return partialComplexTypeInterpretationEClass;
        }
@@ -764,6 +839,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialComplexTypeInterpretation_SupertypeInterpretation() {
                return (EReference)partialComplexTypeInterpretationEClass.getEStructuralFeatures().get(0);
        }
@@ -773,6 +849,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public EReference getPartialComplexTypeInterpretation_InterpretationOf() {
                return (EReference)partialComplexTypeInterpretationEClass.getEStructuralFeatures().get(1);
        }
@@ -782,6 +859,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialinterpretationFactory getPartialinterpretationFactory() {
                return (PartialinterpretationFactory)getEFactoryInstance();
        }
@@ -817,6 +895,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                createEReference(partialInterpretationEClass, PARTIAL_INTERPRETATION__SCOPES);
                createEAttribute(partialInterpretationEClass, PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS);
                createEAttribute(partialInterpretationEClass, PARTIAL_INTERPRETATION__MAX_NEW_ELEMENTS);
+                createEAttribute(partialInterpretationEClass, PARTIAL_INTERPRETATION__MIN_NEW_ELEMENTS_HEURISTIC);
                partialConstantInterpretationEClass = createEClass(PARTIAL_CONSTANT_INTERPRETATION);
                createEReference(partialConstantInterpretationEClass, PARTIAL_CONSTANT_INTERPRETATION__INTERPRETATION_OF);
@@ -869,6 +948,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                createEAttribute(scopeEClass, SCOPE__MIN_NEW_ELEMENTS);
                createEAttribute(scopeEClass, SCOPE__MAX_NEW_ELEMENTS);
                createEReference(scopeEClass, SCOPE__TARGET_TYPE_INTERPRETATION);
+                createEAttribute(scopeEClass, SCOPE__MIN_NEW_ELEMENTS_HEURISTIC);
                partialPrimitiveInterpretationEClass = createEClass(PARTIAL_PRIMITIVE_INTERPRETATION);
@@ -945,6 +1025,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                initEReference(getPartialInterpretation_Scopes(), this.getScope(), null, "scopes", null, 0, -1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                initEAttribute(getPartialInterpretation_MinNewElements(), ecorePackage.getEInt(), "minNewElements", "0", 1, 1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                initEAttribute(getPartialInterpretation_MaxNewElements(), ecorePackage.getEInt(), "maxNewElements", "-1", 1, 1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getPartialInterpretation_MinNewElementsHeuristic(), ecorePackage.getEInt(), "minNewElementsHeuristic", "0", 1, 1, PartialInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                initEClass(partialConstantInterpretationEClass, PartialConstantInterpretation.class, "PartialConstantInterpretation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
                initEReference(getPartialConstantInterpretation_InterpretationOf(), theLogiclanguagePackage.getConstantDeclaration(), null, "interpretationOf", null, 1, 1, PartialConstantInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -997,6 +1078,7 @@ public class PartialinterpretationPackageImpl extends EPackageImpl implements Pa
                initEAttribute(getScope_MinNewElements(), ecorePackage.getEInt(), "minNewElements", "0", 1, 1, Scope.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                initEAttribute(getScope_MaxNewElements(), ecorePackage.getEInt(), "maxNewElements", "-1", 1, 1, Scope.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                initEReference(getScope_TargetTypeInterpretation(), this.getPartialTypeInterpratation(), this.getPartialTypeInterpratation_Scopes(), "targetTypeInterpretation", null, 1, 1, Scope.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getScope_MinNewElementsHeuristic(), ecorePackage.getEInt(), "minNewElementsHeuristic", "0", 1, 1, Scope.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                initEClass(partialPrimitiveInterpretationEClass, PartialPrimitiveInterpretation.class, "PartialPrimitiveInterpretation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PrimitiveElementImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PrimitiveElementImpl.java
index 29a1e1be..a8ef81b0 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PrimitiveElementImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/PrimitiveElementImpl.java
@@ -71,6 +71,7 @@ public abstract class PrimitiveElementImpl extends DefinedElementImpl implements
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public boolean isValueSet() {
                return valueSet;
        }
@@ -80,6 +81,7 @@ public abstract class PrimitiveElementImpl extends DefinedElementImpl implements
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setValueSet(boolean newValueSet) {
                boolean oldValueSet = valueSet;
                valueSet = newValueSet;
@@ -154,7 +156,7 @@ public abstract class PrimitiveElementImpl extends DefinedElementImpl implements
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (valueSet: ");
                result.append(valueSet);
                result.append(')');
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/RealElementImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/RealElementImpl.java
index 0361a3e9..67cff5a2 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/RealElementImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/RealElementImpl.java
@@ -71,6 +71,7 @@ public class RealElementImpl extends PrimitiveElementImpl implements RealElement
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public BigDecimal getValue() {
                return value;
        }
@@ -80,6 +81,7 @@ public class RealElementImpl extends PrimitiveElementImpl implements RealElement
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setValue(BigDecimal newValue) {
                BigDecimal oldValue = value;
                value = newValue;
@@ -154,7 +156,7 @@ public class RealElementImpl extends PrimitiveElementImpl implements RealElement
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (value: ");
                result.append(value);
                result.append(')');
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/ScopeImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/ScopeImpl.java
index d8ade871..a1b6de35 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/ScopeImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/ScopeImpl.java
@@ -26,6 +26,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.ScopeImpl#getMinNewElements <em>Min New Elements</em>}</li>
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.ScopeImpl#getMaxNewElements <em>Max New Elements</em>}</li>
 *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.ScopeImpl#getTargetTypeInterpretation <em>Target Type Interpretation</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.impl.ScopeImpl#getMinNewElementsHeuristic <em>Min New Elements Heuristic</em>}</li>
 * </ul>
 *
 * @generated
@@ -82,6 +83,26 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
        protected PartialTypeInterpratation targetTypeInterpretation;
        /**
+         * The default value of the '{@link #getMinNewElementsHeuristic() <em>Min New Elements Heuristic</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getMinNewElementsHeuristic()
+         * @generated
+         * @ordered
+         */
+        protected static final int MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT = 0;
+        /**
+         * The cached value of the '{@link #getMinNewElementsHeuristic() <em>Min New Elements Heuristic</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getMinNewElementsHeuristic()
+         * @generated
+         * @ordered
+         */
+        protected int minNewElementsHeuristic = MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT;
+        /**
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
         * @generated
@@ -105,6 +126,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public int getMinNewElements() {
                return minNewElements;
        }
@@ -114,6 +136,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setMinNewElements(int newMinNewElements) {
                int oldMinNewElements = minNewElements;
                minNewElements = newMinNewElements;
@@ -126,6 +149,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public int getMaxNewElements() {
                return maxNewElements;
        }
@@ -135,6 +159,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setMaxNewElements(int newMaxNewElements) {
                int oldMaxNewElements = maxNewElements;
                maxNewElements = newMaxNewElements;
@@ -147,6 +172,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public PartialTypeInterpratation getTargetTypeInterpretation() {
                if (targetTypeInterpretation != null && targetTypeInterpretation.eIsProxy()) {
                        InternalEObject oldTargetTypeInterpretation = (InternalEObject)targetTypeInterpretation;
@@ -188,6 +214,7 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setTargetTypeInterpretation(PartialTypeInterpratation newTargetTypeInterpretation) {
                if (newTargetTypeInterpretation != targetTypeInterpretation) {
                        NotificationChain msgs = null;
@@ -208,6 +235,29 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
         * @generated
         */
        @Override
+        public int getMinNewElementsHeuristic() {
+                return minNewElementsHeuristic;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setMinNewElementsHeuristic(int newMinNewElementsHeuristic) {
+                int oldMinNewElementsHeuristic = minNewElementsHeuristic;
+                minNewElementsHeuristic = newMinNewElementsHeuristic;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, PartialinterpretationPackage.SCOPE__MIN_NEW_ELEMENTS_HEURISTIC, oldMinNewElementsHeuristic, minNewElementsHeuristic));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
                switch (featureID) {
                        case PartialinterpretationPackage.SCOPE__TARGET_TYPE_INTERPRETATION:
@@ -247,6 +297,8 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
                        case PartialinterpretationPackage.SCOPE__TARGET_TYPE_INTERPRETATION:
                                if (resolve) return getTargetTypeInterpretation();
                                return basicGetTargetTypeInterpretation();
+                        case PartialinterpretationPackage.SCOPE__MIN_NEW_ELEMENTS_HEURISTIC:
+                                return getMinNewElementsHeuristic();
                }
                return super.eGet(featureID, resolve, coreType);
        }
@@ -268,6 +320,9 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
                        case PartialinterpretationPackage.SCOPE__TARGET_TYPE_INTERPRETATION:
                                setTargetTypeInterpretation((PartialTypeInterpratation)newValue);
                                return;
+                        case PartialinterpretationPackage.SCOPE__MIN_NEW_ELEMENTS_HEURISTIC:
+                                setMinNewElementsHeuristic((Integer)newValue);
+                                return;
                }
                super.eSet(featureID, newValue);
        }
@@ -289,6 +344,9 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
                        case PartialinterpretationPackage.SCOPE__TARGET_TYPE_INTERPRETATION:
                                setTargetTypeInterpretation((PartialTypeInterpratation)null);
                                return;
+                        case PartialinterpretationPackage.SCOPE__MIN_NEW_ELEMENTS_HEURISTIC:
+                                setMinNewElementsHeuristic(MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT);
+                                return;
                }
                super.eUnset(featureID);
        }
@@ -307,6 +365,8 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
                                return maxNewElements != MAX_NEW_ELEMENTS_EDEFAULT;
                        case PartialinterpretationPackage.SCOPE__TARGET_TYPE_INTERPRETATION:
                                return targetTypeInterpretation != null;
+                        case PartialinterpretationPackage.SCOPE__MIN_NEW_ELEMENTS_HEURISTIC:
+                                return minNewElementsHeuristic != MIN_NEW_ELEMENTS_HEURISTIC_EDEFAULT;
                }
                return super.eIsSet(featureID);
        }
@@ -320,11 +380,13 @@ public class ScopeImpl extends MinimalEObjectImpl.Container implements Scope {
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (minNewElements: ");
                result.append(minNewElements);
                result.append(", maxNewElements: ");
                result.append(maxNewElements);
+                result.append(", minNewElementsHeuristic: ");
+                result.append(minNewElementsHeuristic);
                result.append(')');
                return result.toString();
        }
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/StringElementImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/StringElementImpl.java
index f207401d..0242c9b2 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/StringElementImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/StringElementImpl.java
@@ -69,6 +69,7 @@ public class StringElementImpl extends PrimitiveElementImpl implements StringEle
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public String getValue() {
                return value;
        }
@@ -78,6 +79,7 @@ public class StringElementImpl extends PrimitiveElementImpl implements StringEle
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setValue(String newValue) {
                String oldValue = value;
                value = newValue;
@@ -152,7 +154,7 @@ public class StringElementImpl extends PrimitiveElementImpl implements StringEle
        public String toString() {
                if (eIsProxy()) return super.toString();
-                StringBuffer result = new StringBuffer(super.toString());
+                StringBuilder result = new StringBuilder(super.toString());
                result.append(" (value: ");
                result.append(value);
                result.append(')');
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/UnaryElementRelationLinkImpl.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/UnaryElementRelationLinkImpl.java
index 2cb56323..e76a89b7 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/UnaryElementRelationLinkImpl.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/ecore-gen/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/partialinterpretation/impl/UnaryElementRelationLinkImpl.java
@@ -62,6 +62,7 @@ public class UnaryElementRelationLinkImpl extends RelationLinkImpl implements Un
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public DefinedElement getParam1() {
                if (param1 != null && param1.eIsProxy()) {
                        InternalEObject oldParam1 = (InternalEObject)param1;
@@ -88,6 +89,7 @@ public class UnaryElementRelationLinkImpl extends RelationLinkImpl implements Un
         * <!-- end-user-doc -->
         * @generated
         */
+        @Override
        public void setParam1(DefinedElement newParam1) {
                DefinedElement oldParam1 = param1;
                param1 = newParam1;
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.ecore b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.ecore
index acf82a3f..47d54258 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.ecore
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.ecore
@@ -27,6 +27,9 @@
        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="0"/>
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxNewElements" lowerBound="1"
        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="-1"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minNewElementsHeuristic"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="0"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="PartialConstantInterpretation">
    <eStructuralFeatures xsi:type="ecore:EReference" name="interpretationOf" lowerBound="1"
@@ -92,6 +95,9 @@
        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="-1"/>
    <eStructuralFeatures xsi:type="ecore:EReference" name="targetTypeInterpretation"
        lowerBound="1" eType="#//PartialTypeInterpratation" eOpposite="#//PartialTypeInterpratation/scopes"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minNewElementsHeuristic"
+        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="0"/>
  </eClassifiers>
  <eClassifiers xsi:type="ecore:EClass" name="PartialPrimitiveInterpretation" abstract="true"
      eSuperTypes="#//PartialTypeInterpratation"/>
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.genmodel b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.genmodel
index 2ac0a4f3..daeaf594 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.genmodel
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialInterpretation.genmodel
@@ -18,7 +18,10 @@
      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialInterpretation/partialtypeinterpratation"/>
      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialInterpretation/openWorldElements"/>
      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialInterpretation/problemConainer"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialInterpretation/scope"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialInterpretation/scopes"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//PartialInterpretation/minNewElements"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//PartialInterpretation/maxNewElements"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//PartialInterpretation/minNewElementsHeuristic"/>
    </genClasses>
    <genClasses ecoreClass="PartialInterpretation.ecore#//PartialConstantInterpretation">
      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialConstantInterpretation/interpretationOf"/>
@@ -33,9 +36,8 @@
      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialFunctionInterpretation/interpretationOf"/>
    </genClasses>
    <genClasses ecoreClass="PartialInterpretation.ecore#//PartialTypeInterpratation">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialTypeInterpratation/interpretationOf"/>
      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialTypeInterpratation/elements"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialTypeInterpratation/supertypeInterpretation"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialTypeInterpratation/scopes"/>
    </genClasses>
    <genClasses image="false" ecoreClass="PartialInterpretation.ecore#//RelationLink"/>
    <genClasses ecoreClass="PartialInterpretation.ecore#//UnaryElementRelationLink">
@@ -50,6 +52,7 @@
    </genClasses>
    <genClasses ecoreClass="PartialInterpretation.ecore#//NaryRelationLinkElement">
      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//NaryRelationLinkElement/index"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//NaryRelationLinkElement/param"/>
    </genClasses>
    <genClasses image="false" ecoreClass="PartialInterpretation.ecore#//PrimitiveElement">
      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//PrimitiveElement/valueSet"/>
@@ -70,11 +73,16 @@
      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//Scope/minNewElements"/>
      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//Scope/maxNewElements"/>
      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//Scope/targetTypeInterpretation"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PartialInterpretation.ecore#//Scope/minNewElementsHeuristic"/>
    </genClasses>
    <genClasses image="false" ecoreClass="PartialInterpretation.ecore#//PartialPrimitiveInterpretation"/>
    <genClasses ecoreClass="PartialInterpretation.ecore#//PartialBooleanInterpretation"/>
    <genClasses ecoreClass="PartialInterpretation.ecore#//PartialIntegerInterpretation"/>
    <genClasses ecoreClass="PartialInterpretation.ecore#//PartialRealInterpretation"/>
    <genClasses ecoreClass="PartialInterpretation.ecore#//PartialStringInterpretation"/>
+    <genClasses ecoreClass="PartialInterpretation.ecore#//PartialComplexTypeInterpretation">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialComplexTypeInterpretation/supertypeInterpretation"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialInterpretation.ecore#//PartialComplexTypeInterpretation/interpretationOf"/>
+    </genClasses>
  </genPackages>
 </genmodel:GenModel>
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
index 8aaaacb5..cb5b587f 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
@@ -1,5 +1,6 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic
+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.builder.TracedOutput
@@ -12,18 +13,18 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.Par
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.Problem2PartialInterpretationTrace
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialRelationInterpretation
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationFactory
+import java.math.BigDecimal
 import java.util.HashMap
+import java.util.HashSet
 import java.util.List
 import java.util.Map
+import java.util.Set
 import org.eclipse.emf.common.util.Enumerator
+import org.eclipse.emf.ecore.EAttribute
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.resource.Resource
 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
-import java.util.HashSet
-import java.util.Set
-import java.math.BigDecimal
-import org.eclipse.emf.ecore.EAttribute
 class InstanceModel2PartialInterpretation {
        val extension LogiclanguageFactory factory = LogiclanguageFactory.eINSTANCE
@@ -36,7 +37,19 @@ class InstanceModel2PartialInterpretation {
                Resource resource,
                boolean withID) 
        {
-                val objects = resource.allContents.toList
+                val objectsBuilder = ImmutableList.builder
+                val treeIterator = resource.allContents
+                val referencesUsed = ecore2Logic.allReferencesInScope(metamodelTranslationResult.trace).toSet
+                while (treeIterator.hasNext) {
+                        val object = treeIterator.next
+                        val containingReference = object.eContainmentFeature
+                        if (containingReference === null || referencesUsed.contains(containingReference)) {
+                                objectsBuilder.add(object)
+                        } else {
+                                treeIterator.prune
+                        }
+                }
+                val objects = objectsBuilder.build
                return transform(metamodelTranslationResult,objects,withID)
        }
        
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend
index f7a1ce4f..20ff58f2 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend
@@ -2,19 +2,24 @@ package hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage
 import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput
 import hu.bme.mit.inf.dslreasoner.logic.model.builder.TypeScopes
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.And
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.BoolLiteral
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntLiteral
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguageFactory
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealLiteral
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDefinition
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.StringLiteral
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicValue
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition
 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem
 import hu.bme.mit.inf.dslreasoner.logic.model.patterns.SupertypeStar
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partial2logicannotations.PartialModelRelation2Assertion
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BinaryElementRelationLink
 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.NaryRelationLink
 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
@@ -22,10 +27,10 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.par
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialRealInterpretation
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialRelationInterpretation
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialStringInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialTypeInterpratation
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationFactory
 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.partialinterpretationlanguage.partialinterpretation.UnaryElementRelationLink
 import java.math.BigDecimal
 import java.util.HashMap
 import java.util.Map
@@ -35,13 +40,6 @@ import org.eclipse.viatra.query.runtime.emf.EMFScope
 import org.eclipse.xtend.lib.annotations.Data
 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicValue
-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.And
-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.BoolLiteral
-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntLiteral
-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealLiteral
-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.StringLiteral
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialTypeInterpratation
 @Data class Problem2PartialInterpretationTrace {
        Map<TypeDeclaration, PartialComplexTypeInterpretation> type2Interpretation
@@ -193,7 +191,7 @@ class PartialInterpretationInitialiser {
                interpretation.minNewElements = minNewElements
                interpretation.maxNewElements = maxNewElements
                // elements from problem are included
-                if(maxNewElements>0) {
+                if(maxNewElements != 0) {
                        val newElements = createDefinedElement => [it.name = "New Objects"]
                        interpretation.openWorldElements += newElements 
                }
@@ -212,12 +210,8 @@ class PartialInterpretationInitialiser {
        def private initialiseTypeScope(PartialTypeInterpratation interpretation, Integer min, Integer max) {
                val res = createScope
                res.targetTypeInterpretation = interpretation
-                if(min !== null) {
+                res.minNewElements = min ?: 0
-                        res.minNewElements = min
+                res.maxNewElements = max ?: -1
-                }
-                if(max !== null) {
-                        res.maxNewElements = max
-                }
                return res
        }
        
@@ -233,7 +227,11 @@ class PartialInterpretationInitialiser {
        
        def private Map<RelationDeclaration, PartialRelationInterpretation> initRelations(PartialInterpretation interpretation, PrimitiveValueTrace trace) {
                val Map<RelationDeclaration, PartialRelationInterpretation> relation2Interpretation = new HashMap
-                for(relation : interpretation.problem.relations.filter(RelationDeclaration)) {
+                val definedRelationDeclarations = interpretation.problem.relations.filter(RelationDefinition).map[defines]
+                val undefinedRelationDeclarations = interpretation.problem.relations.filter(RelationDeclaration).filter[
+                        declared | !definedRelationDeclarations.exists[defined | defined === declared]
+                ]
+                for(relation : undefinedRelationDeclarations) {
                        val partialInterpretation = relation.initialisePartialRelationInterpretation
                        interpretation.partialrelationinterpretation += partialInterpretation
                        relation2Interpretation.put(relation,partialInterpretation)
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/Descriptor.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/Descriptor.xtend
index 41482b28..685a1f5a 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/Descriptor.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/Descriptor.xtend
@@ -4,10 +4,21 @@ import java.util.HashMap
 import java.util.Map
 import java.util.Set
 import org.eclipse.xtend.lib.annotations.Data
+import org.eclipse.xtend2.lib.StringConcatenationClient
 @Data abstract class AbstractNodeDescriptor {
-        long dataHash
+        int dataHash
-        
+        protected def StringConcatenationClient prettyPrint() {
+                '''(«dataHash»)[«class.simpleName»]'''
+        }
+        override toString() {
+                '''
+                        «prettyPrint»
+                '''
+        }
 //      @Pure
 //      @Override
 //      override public boolean equals(Object obj) {
@@ -24,34 +35,45 @@ import org.eclipse.xtend.lib.annotations.Data
 //      }
 }
-@Data class LocalNodeDescriptor extends AbstractNodeDescriptor{
+@Data class LocalNodeDescriptor extends AbstractNodeDescriptor {
        Set<String> types
        String id;
        new(String id, Set<String> types) {
-                super(calcualteDataHash(id,types))
+                super(calcualteDataHash(id, types))
                this.types = types
                this.id = id
        }
-        
        def private static calcualteDataHash(String id, Set<String> types) {
                val int prime = 31;
                var result = 0
-            if(id !== null)
+                if (id !== null)
-                        result = id.hashCode();
+                        result = id.hashCode();
-                if(types !== null) { 
+                if (types !== null) {
-                        result = prime * result + types.hashCode
+                        result = prime * result + types.hashCode
-                }
+                }
-                return result
+                return result
        }
-        
        override hashCode() {
-                return this.dataHash.hashCode
+                return this.dataHash
        }
-        
+        override equals(Object other) {
+                other.class == LocalNodeDescriptor && (other as AbstractNodeDescriptor).hashCode == hashCode
+        }
+        override protected prettyPrint() {
+                '''(«dataHash»)[«IF id !== null»id = "«id»"«IF types === null || !types.empty», «ENDIF»«ENDIF»«IF types === null»TYPES = null«ELSE»«FOR type : types SEPARATOR ", "»«type»«ENDFOR»«ENDIF»]'''
+        }
        override toString() {
-                return class.name + this.dataHash
+                '''
+                        «prettyPrint»
+                '''
        }
-        
 //      @Pure
 //      @Override
 //      override public boolean equals(Object obj) {
@@ -66,7 +88,6 @@ import org.eclipse.xtend.lib.annotations.Data
 //                      return false;
 //              return true;
 //      }
-        
 //      @Pure
 //      override public boolean equals(Object obj) {
 //              if (this === obj)
@@ -97,118 +118,91 @@ import org.eclipse.xtend.lib.annotations.Data
        String type
 }
-@Data class FurtherNodeDescriptor<NodeRep> extends AbstractNodeDescriptor{
+@Data class FurtherNodeDescriptor<NodeRep> extends AbstractNodeDescriptor {
-        
+        NodeRep previousRepresentation
-         NodeRep previousRepresentation
+        Map<IncomingRelation<NodeRep>, Integer> incomingEdges
-         Map<IncomingRelation<NodeRep>,Integer> incomingEdges
+        Map<OutgoingRelation<NodeRep>, Integer> outgoingEdges
-         Map<OutgoingRelation<NodeRep>,Integer> outgoingEdges
-         
+        new(NodeRep previousRepresentation, Map<IncomingRelation<NodeRep>, Integer> incomingEdges,
-         new(
+                Map<OutgoingRelation<NodeRep>, Integer> outgoingEdges) {
-                NodeRep previousRepresentation,
+                super(calculateDataHash(previousRepresentation, incomingEdges, outgoingEdges))
-                Map<IncomingRelation<NodeRep>,Integer> incomingEdges,
+                this.previousRepresentation = previousRepresentation
-                Map<OutgoingRelation<NodeRep>,Integer> outgoingEdges)
+                this.incomingEdges = incomingEdges
-        {
+                this.outgoingEdges = outgoingEdges
-                super(calculateDataHash(previousRepresentation,incomingEdges,outgoingEdges))
-                this.previousRepresentation = previousRepresentation
-                this.incomingEdges = new HashMap(incomingEdges)
-                this.outgoingEdges = new HashMap(outgoingEdges)
-         }
-         
-        static def private <NodeRep> int calculateDataHash(
-                NodeRep previousRepresentation,
-                Map<IncomingRelation<NodeRep>,Integer> incomingEdges,
-                Map<OutgoingRelation<NodeRep>,Integer> outgoingEdges)
-        {
-            val int prime = 31;
-            var int result = previousRepresentation.hashCode;
-            if(incomingEdges !== null)
-                        result = prime * result + incomingEdges.hashCode();
-                if(outgoingEdges !== null) 
-                        result = prime * result + outgoingEdges.hashCode();
-            return result;
-        }
-        
-        override hashCode() {
-                return this.dataHash.hashCode 
        }
-        
-        override toString() {
+        static def private <NodeRep> int calculateDataHash(NodeRep previousRepresentation,
-                return class.name + dataHash
+                Map<IncomingRelation<NodeRep>, Integer> incomingEdges, Map<OutgoingRelation<NodeRep>, Integer> outgoingEdges) {
-//              return '''[«previousRepresentation»,(«FOR
+                val int prime = 31;
-//                      in: incomingEdges.entrySet»(«in.key.type.name»=«in.key.from»,«in.value»)«ENDFOR»),(«FOR
+                var int result = previousRepresentation.hashCode;
-//                      out: outgoingEdges.entrySet»(«out.key.type.name»=«out.key.to»,«out.value»)«ENDFOR»),«FOR
+                if (incomingEdges !== null)
-//                      att: attributeValues»(«att.type.name»=«att.value»)«ENDFOR»]'''
+                        result = prime * result + hashIncomingNeighborhood(incomingEdges)
+                if (outgoingEdges !== null)
+                        result = prime * result + hashOutgoingNeighborhood(outgoingEdges)
+                return result;
        }
-        
-//      @Pure
-//      @Override
-//      override public boolean equals(Object obj) {
-//              if (this === obj)
-//                      return true;
-//              if (obj === null)
-//                      return false;
-//              if (getClass() != obj.getClass())
-//                      return false;
-//              val AbstractNodeDescriptor other = obj as AbstractNodeDescriptor;
-//              if (other.dataHash != this.dataHash)
-//                      return false;
-//              return true;
-//      }
-        
-//      @Pure
-//      override public boolean equals(Object obj) {
-//              if (this === obj)
-//                      return true;
-//              if (obj === null)
-//                      return false;
-//              if (getClass() != obj.getClass())
-//                      return false;
-//              if (!super.equals(obj))
-//                      return false;
-//              val FurtherNodeDescriptor<?> other = obj as FurtherNodeDescriptor<?>;
-//              if (this.previousRepresentation === null) {
-//                      if (other.previousRepresentation != null)
-//                              return false;
-//                      
-//              }
-////            } else if (!this.previousRepresentation.equals(other.previousRepresentation))
-////                    return false;
-//              if (this.incomingEdges === null) {
-//                      if (other.incomingEdges != null)
-//                              return false;
-//              } else if (!this.incomingEdges.equals(other.incomingEdges))
-//                      return false;
-//              if (this.outgoingEdges === null) {
-//                      if (other.outgoingEdges != null)
-//                              return false;
-//              } else if (!this.outgoingEdges.equals(other.outgoingEdges))
-//                      return false;
-//              if (this.attributeValues === null) {
-//                      if (other.attributeValues != null)
-//                              return false;
-//              } else if (!this.attributeValues.equals(other.attributeValues))
-//                      return false;
-//              return true;
-//      }
-}
-/*
+        override hashCode() {
-@Data
+                return this.dataHash
-class ModelDescriptor {
+        }
-        int dataHash
-        int unknownElements
+        override equals(Object other) {
-        Map<? extends AbstractNodeDescriptor,Integer> knownElements
+                other.class == FurtherNodeDescriptor && (other as AbstractNodeDescriptor).hashCode == hashCode
+        }
+        override prettyPrint() {
+                '''
+                («dataHash»)[
+                        PREV = «previousRepresentation?.prettyPrint»
+                        «IF incomingEdges === null»
+                                IN null
+                        «ELSE»
+                                «FOR edge : incomingEdges.entrySet»
+                                        IN «edge.value» «edge.key.type» = «edge.key.from.prettyPrint»
+                                «ENDFOR»
+                        «ENDIF»
+                        «IF outgoingEdges === null»
+                                OUT null
+                        «ELSE»
+                                «FOR edge : outgoingEdges.entrySet»
+                                        OUT «edge.value» «edge.key.type» = «edge.key.to.prettyPrint»
+                                «ENDFOR»
+                        «ENDIF»
+                ]'''
+        }
+        private def StringConcatenationClient prettyPrint(NodeRep rep) {
+                if (rep instanceof AbstractNodeDescriptor) {
+                        rep.prettyPrint
+                } else {
+                        '''«rep»'''
+                }
+        }
        
-        public new(Map<? extends AbstractNodeDescriptor,Integer> knownElements, int unknownElements) {
+        private static def <NodeRep> hashIncomingNeighborhood(Map<IncomingRelation<NodeRep>, Integer> neighborhood) {
-                this.dataHash = calculateDataHash(knownElements,unknownElements)
+                val int prime = 31
-                this.unknownElements = unknownElements
+                var int hash = 0
-                this.knownElements = knownElements
+                for (entry : neighborhood.entrySet) {
+                        val relation = entry.key
+                        hash += (prime * relation.from.hashCode + relation.type.hashCode).bitwiseXor(entry.value.hashCode)
+                }
+                hash
        }
        
-        def private static calculateDataHash(Map<? extends AbstractNodeDescriptor,Integer> knownElements, int unknownElements)
+        private static def <NodeRep> hashOutgoingNeighborhood(Map<OutgoingRelation<NodeRep>, Integer> neighborhood) {
-        {
+                val int prime = 31
-                val int prime = 31;
+                var int hash = 0
-                return knownElements.hashCode * prime + unknownElements.hashCode 
+                for (entry : neighborhood.entrySet) {
+                        val relation = entry.key
+                        hash += (prime * relation.to.hashCode + relation.type.hashCode).bitwiseXor(entry.value.hashCode)
+                }
+                hash
+        }
+        override toString() {
+                '''
+                        «prettyPrint»
+                '''
        }
 }
-*/
-\ No newline at end of file
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/NeighbourhoodOptions.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/NeighbourhoodOptions.xtend
new file mode 100644
index 00000000..c6e03f75
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/NeighbourhoodOptions.xtend
@@ -0,0 +1,22 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration
+import java.util.Set
+import org.eclipse.xtend.lib.annotations.Data
+@Data
+class NeighbourhoodOptions {
+        public static val FixPointRange = -1
+        public static val GraphWidthRange = -2
+        public static val FullParallels = Integer.MAX_VALUE
+        public static val MaxNumbers = Integer.MAX_VALUE
+        public static val DEFAULT = new NeighbourhoodOptions(FixPointRange, FullParallels, MaxNumbers, null, null)
+        val int range
+        val int parallels
+        val int maxNumber
+        val Set<TypeDeclaration> relevantTypes
+        val Set<RelationDeclaration> relevantRelations
+}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2Hash.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2Hash.xtend
index d474877d..5da202eb 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2Hash.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2Hash.xtend
@@ -1,25 +1,33 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood
-import java.util.Map
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement
+import java.util.Map
+import org.eclipse.collections.api.factory.Maps
 class PartialInterpretation2Hash extends PartialInterpretation2NeighbourhoodRepresentation<Integer, Integer>{
        
-        protected new() {
+        new() {
                super(false, true)
        }
        
        override protected createLocalRepresentation(Map<DefinedElement, LocalNodeDescriptor> node2Representation, Map<LocalNodeDescriptor, Integer> representation2Amount) {
                return new NeighbourhoodWithTraces(
-                        representation2Amount.hashCode,node2Representation.mapValues[it.hashCode],
+                        representation2Amount.hashCode,node2Representation.hashValues,
                        null)
        }
        
        override protected createFurtherRepresentation(Map<FurtherNodeDescriptor<Integer>, Integer> nodeDescriptors, Map<DefinedElement, FurtherNodeDescriptor<Integer>> node2Representation, NeighbourhoodWithTraces<Integer, Integer> previous, boolean deepRepresentation) {
                return new NeighbourhoodWithTraces(
                        nodeDescriptors.hashCode,
-                        node2Representation.mapValues[it.hashCode],
+                        node2Representation.hashValues,
                        if(deepRepresentation) {previous} else {null})
        }
        
+        private def <T> hashValues(Map<DefinedElement, T> map) {
+                val hashedMap = Maps.mutable.ofInitialCapacity(map.size)
+                for (entry : map.entrySet) {
+                        hashedMap.put(entry.key, entry.value.hashCode)
+                }
+                hashedMap
+        }
 }
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend
index 6dc40705..93eab816 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend
@@ -4,32 +4,34 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement
 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.partialinterpretationlanguage.partialinterpretation.BinaryElementRelationLink
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialComplexTypeInterpretation
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
-import java.util.HashMap
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialPrimitiveInterpretation
-import java.util.HashSet
+import java.util.ArrayList
-import java.util.LinkedList
 import java.util.List
 import java.util.Map
 import java.util.Set
+import org.eclipse.collections.api.factory.Maps
+import org.eclipse.collections.impl.factory.Sets
 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialPrimitiveInterpretation
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialComplexTypeInterpretation
-abstract class PartialInterpretation2NeighbourhoodRepresentation<ModelRepresentation,NodeRepresentation> {
+abstract class PartialInterpretation2NeighbourhoodRepresentation<ModelRepresentation, NodeRepresentation> {
-        private val boolean deepRepresentation
+        val boolean deepRepresentation
-        private val boolean mergeSimilarNeighbourhood
+        val boolean mergeSimilarNeighbourhood
        protected new(boolean deeprepresentation, boolean mergeSimilarNeighbourhood) {
                this.deepRepresentation = deeprepresentation
                this.mergeSimilarNeighbourhood = mergeSimilarNeighbourhood
        }
-        
-        public static val FixPointRage = -1
+        public static val FixPointRange = NeighbourhoodOptions.FixPointRange
-        public static val GraphWidthRange = -2
+        public static val GraphWidthRange = NeighbourhoodOptions.GraphWidthRange
-        public static val FullParallels = Integer.MAX_VALUE
+        public static val FullParallels = NeighbourhoodOptions.FullParallels
-        public static val MaxNumbers = Integer.MAX_VALUE
+        public static val MaxNumbers = NeighbourhoodOptions.MaxNumbers
-        
+        static val FOCUSED_ELEMENT_NAME = "<<THIS>>"
        /**
         * Creates a neighbourhood representation with traces
         * @param model The model to be represented.
@@ -37,10 +39,15 @@ abstract class PartialInterpretation2NeighbourhoodRepresentation<ModelRepresenta
         * @param parallels The maximal number of parallel references to be differentiated.
         * @param maxNumber The maximal number of elements in a equivalence class that chan be differentiated.
         */
-        def public createRepresentation(PartialInterpretation model, int range, int parallels, int maxNumber) {
+        def createRepresentation(PartialInterpretation model, int range, int parallels, int maxNumber) {
-                return createRepresentation(model,range,parallels,maxNumber,null,null)
+                return createRepresentation(model, range, parallels, maxNumber, null, null)
+        }
+        def createRepresentation(PartialInterpretation model, NeighbourhoodOptions options) {
+                createRepresentation(model, options.range, options.parallels, options.maxNumber, options.relevantTypes,
+                        options.relevantRelations)
        }
-        
        /**
         * Creates a neighbourhood representation with traces
         * @param model The model to be represented.
@@ -48,72 +55,87 @@ abstract class PartialInterpretation2NeighbourhoodRepresentation<ModelRepresenta
         * @param parallels The maximal number of parallel references to be differentiated.
         * @param maxNumber The maximal number of elements in a equivalence class that chan be differentiated.
         */
-        def public createRepresentation(
+        def createRepresentation(PartialInterpretation model, int range, int parallels, int maxNumber,
-                PartialInterpretation model,
+                Set<TypeDeclaration> relevantTypes, Set<RelationDeclaration> relevantRelations) {
-                int range, int parallels, int maxNumber,
+                createRepresentationWithFocus(model, range, parallels, maxNumber, relevantTypes, relevantRelations, null)
-                Set<TypeDeclaration> relevantTypes, Set<RelationDeclaration> relevantRelations) 
+        }
-        {
-                val Map<DefinedElement, Set<String>> types = new HashMap
+        def createRepresentationWithFocus(PartialInterpretation model, NeighbourhoodOptions options,
-                fillTypes(model,types,relevantTypes)
+                DefinedElement focusedElement) {
-                val Map<DefinedElement, List<IncomingRelation<DefinedElement>>> IncomingRelations = new HashMap;
+                createRepresentationWithFocus(model, options.range, options.parallels, options.maxNumber, options.relevantTypes,
-                val Map<DefinedElement, List<OutgoingRelation<DefinedElement>>> OutgoingRelations = new HashMap;
+                        options.relevantRelations, focusedElement)
-                fillReferences(model,IncomingRelations,OutgoingRelations,relevantRelations)
+        }
-                
-                val res = doRecursiveNeighbourCalculation(model,types,IncomingRelations,OutgoingRelations,range,parallels,maxNumber);
+        def createRepresentationWithFocus(PartialInterpretation model, int range, int parallels, int maxNumber,
-                
+                Set<TypeDeclaration> relevantTypes, Set<RelationDeclaration> relevantRelations, DefinedElement focusedElement) {
+                val initialSize = model.elements.size
+                val Map<DefinedElement, Set<String>> types = Maps.mutable.ofInitialCapacity(initialSize)
+                fillTypes(model, types, relevantTypes)
+                val Map<DefinedElement, List<IncomingRelation<DefinedElement>>> IncomingRelations = Maps.mutable.ofInitialCapacity(initialSize);
+                val Map<DefinedElement, List<OutgoingRelation<DefinedElement>>> OutgoingRelations = Maps.mutable.ofInitialCapacity(initialSize);
+                fillReferences(model, IncomingRelations, OutgoingRelations, relevantRelations)
+                val res = doRecursiveNeighbourCalculation(model, types, IncomingRelations, OutgoingRelations, range, parallels,
+                        maxNumber, focusedElement);
                return res;
        }
-        
        def private isRelevant(TypeDeclaration t, Set<TypeDeclaration> relevantTypes) {
-                if(relevantTypes === null) {
+                if (relevantTypes === null) {
                        return true
                } else {
                        return relevantTypes.contains(t)
                }
        }
        def private isRelevant(RelationDeclaration r, Set<RelationDeclaration> relevantRelations) {
-                if(relevantRelations === null) {
+                if (relevantRelations === null) {
                        return true
                } else {
                        return relevantRelations.contains(r)
                }
        }
        /**
-         * Gets the largest 
+         * Gets the minimal neighbourhood size such that every reachable node appears in the shape of every other at least once.
         */
        def private getWidth(Map<DefinedElement, Set<String>> types,
                Map<DefinedElement, List<IncomingRelation<DefinedElement>>> IncomingRelations,
-                Map<DefinedElement, List<OutgoingRelation<DefinedElement>>> OutgoingRelations)
+                Map<DefinedElement, List<OutgoingRelation<DefinedElement>>> OutgoingRelations) {
-        {
+                val elements = types.keySet
-                val elements =  types.keySet
+                var Map<DefinedElement, Set<DefinedElement>> reachable = Maps.mutable.ofInitialCapacity(elements.size)
-                val Map<DefinedElement,Set<DefinedElement>> reachable = new HashMap
+                var Map<DefinedElement, Set<DefinedElement>> newReachable = Maps.mutable.ofInitialCapacity(elements.size)
-                for(element : elements) {
+                for (element : elements) {
-                        val set = new HashSet
+                        val set = Sets.mutable.of
                        set.add(element)
-                        reachable.put(element,set)
+                        reachable.put(element, Sets.mutable.of)
+                        newReachable.put(element, set)
                }
-                
                var int width = 0
                var boolean newAdded
                do {
+                        var tmp = reachable
+                        reachable = newReachable
+                        newReachable = tmp
                        newAdded = false
-                        for(element : elements) {
+                        for (element : elements) {
                                val elementNeigbours = element.lookup(reachable)
-                                val size = elementNeigbours.size
+                                val newElementNeigbours = element.lookup(newReachable)
-                                for(incoming : element.lookup(IncomingRelations)) {
+                                newElementNeigbours.addAll(elementNeigbours)
-                                        elementNeigbours.addAll(incoming.from.lookup(reachable))
+                                for (incoming : element.lookup(IncomingRelations)) {
+                                        newElementNeigbours.addAll(incoming.from.lookup(reachable))
                                }
-                                for(outgoing : element.lookup(OutgoingRelations)) {
+                                for (outgoing : element.lookup(OutgoingRelations)) {
-                                        elementNeigbours.addAll(outgoing.to.lookup(reachable))
+                                        newElementNeigbours.addAll(outgoing.to.lookup(reachable))
                                }
-                                newAdded = newAdded || (elementNeigbours.size > size)
+                                newAdded = newAdded || (newElementNeigbours.size > elementNeigbours.size)
                        }
-                        
+                        width += 1
-                        width +=1
+                } while (newAdded)
-                } while(newAdded)
                return width
        }
-        
        /**
         * Creates a neighbourhood representation with traces
         * @param model The model to be represented.
@@ -122,68 +144,71 @@ abstract class PartialInterpretation2NeighbourhoodRepresentation<ModelRepresenta
         * @param range The range of the neighbourhood.
         * @param parallels The maximal number of parallel references to be differentiated.
         */
-        def private NeighbourhoodWithTraces<ModelRepresentation,NodeRepresentation> doRecursiveNeighbourCalculation(
+        def private NeighbourhoodWithTraces<ModelRepresentation, NodeRepresentation> doRecursiveNeighbourCalculation(
-                PartialInterpretation model,
+                PartialInterpretation model, Map<DefinedElement, Set<String>> types,
-                Map<DefinedElement, Set<String>> types,
                Map<DefinedElement, List<IncomingRelation<DefinedElement>>> IncomingRelations,
-                Map<DefinedElement, List<OutgoingRelation<DefinedElement>>> OutgoingRelations,
+                Map<DefinedElement, List<OutgoingRelation<DefinedElement>>> OutgoingRelations, int range, int parallels,
-                int range, int parallels, int maxNumber)
+                int maxNumber, DefinedElement focusedElement) {
-        {
+                if (range == 0) {
-                if(range == 0){
+                        val r = calculateLocalNodeDescriptors(model, types, maxNumber, focusedElement)
-                        val r = calculateLocalNodeDescriptors(model,types,maxNumber)
+                        val res = this.createLocalRepresentation(r.value, r.key)
-                        val res = this.createLocalRepresentation(r.value,r.key)
+                        if (res.modelRepresentation === null) {
-                        if(res.modelRepresentation === null) {
                                throw new IllegalArgumentException('''Model representation is null''')
-                        } else if(res.nodeRepresentations === null || res.nodeRepresentations.empty) {
+                        } else if (res.nodeRepresentations === null || res.nodeRepresentations.empty) {
                                throw new IllegalArgumentException('''No node representation''')
-                        } else if(res.previousRepresentation !== null) {
+                        } else if (res.previousRepresentation !== null) {
                                throw new IllegalArgumentException('''The previous representation of the first neighbourhood have to be null''')
-                        } else return res
+                        } else
-                } else if(range > 0) {
+                                return res
-                        val previous = doRecursiveNeighbourCalculation(model,types,IncomingRelations,OutgoingRelations,range-1,parallels,maxNumber)
+                } else if (range > 0) {
-                        val r = calculateFurtherNodeDescriptors(model,previous,IncomingRelations,OutgoingRelations,parallels,maxNumber)
+                        val previous = doRecursiveNeighbourCalculation(model, types, IncomingRelations, OutgoingRelations,
-                        //println('''Level «range» finished.''')
+                                range - 1, parallels, maxNumber, focusedElement)
-                        val res = createFurtherRepresentation(r.key,r.value,previous,deepRepresentation)
+                        val r = calculateFurtherNodeDescriptors(model, previous, IncomingRelations, OutgoingRelations, parallels,
-                        if(res.modelRepresentation === null) {
+                                maxNumber)
+                        // println('''Level «range» finished.''')
+                        val res = createFurtherRepresentation(r.key, r.value, previous, deepRepresentation)
+                        if (res.modelRepresentation === null) {
                                throw new IllegalArgumentException('''Model representation is null''')
-                        } else if(res.nodeRepresentations === null || res.nodeRepresentations.empty) {
+                        } else if (res.nodeRepresentations === null || res.nodeRepresentations.empty) {
                                throw new IllegalArgumentException('''No node representation''')
-                        } else if(res.previousRepresentation === null && deepRepresentation) {
+                        } else if (res.previousRepresentation === null && deepRepresentation) {
                                throw new IllegalArgumentException('''Need previous representations''')
-                        } else return res
+                        } else
-                } else if (range == FixPointRage) {
+                                return res
-                        return refineUntilFixpoint(model,types,IncomingRelations,OutgoingRelations,parallels,maxNumber)
+                } else if (range == FixPointRange) {
+                        return refineUntilFixpoint(model, types, IncomingRelations, OutgoingRelations, parallels, maxNumber,
+                                focusedElement)
                } else if (range == GraphWidthRange) {
-                        val width = this.getWidth(types,IncomingRelations,OutgoingRelations)
+                        val width = this.getWidth(types, IncomingRelations, OutgoingRelations)
-                        //println(width)
+                        // println(width)
-                        return doRecursiveNeighbourCalculation(model,types,IncomingRelations,OutgoingRelations,width,parallels,maxNumber)
+                        return doRecursiveNeighbourCalculation(model, types, IncomingRelations, OutgoingRelations, width, parallels,
+                                maxNumber, focusedElement)
                }
        }
-        
-        def private refineUntilFixpoint(
+        def private refineUntilFixpoint(PartialInterpretation model, Map<DefinedElement, Set<String>> types,
-                PartialInterpretation model,
-                Map<DefinedElement, Set<String>> types,
                Map<DefinedElement, List<IncomingRelation<DefinedElement>>> IncomingRelations,
-                Map<DefinedElement, List<OutgoingRelation<DefinedElement>>> OutgoingRelations,
+                Map<DefinedElement, List<OutgoingRelation<DefinedElement>>> OutgoingRelations, int parallels, int maxNumbers,
-                int parallels, int maxNumbers)
+                DefinedElement focusedElement) {
-        {
                var lastRange = 0
-                val last = calculateLocalNodeDescriptors(model,types,maxNumbers)
+                val last = calculateLocalNodeDescriptors(model, types, maxNumbers, focusedElement)
-                var lastRepresentation = this.createLocalRepresentation(last.value,last.key)
+                var lastRepresentation = this.createLocalRepresentation(last.value, last.key)
-                //println('''Level 0 finished.''')
+                // println('''Level 0 finished.''')
                var boolean hasRefined
                do {
-                        val nextRange = lastRange+1
+                        val nextRange = lastRange + 1
-                        val next = calculateFurtherNodeDescriptors(model,lastRepresentation,IncomingRelations,OutgoingRelations,parallels,maxNumbers)
+                        val next = calculateFurtherNodeDescriptors(model, lastRepresentation, IncomingRelations, OutgoingRelations,
-                        val nextRepresentation = createFurtherRepresentation(next.key,next.value,lastRepresentation,deepRepresentation)
+                                parallels, maxNumbers)
-                        
+                        val nextRepresentation = createFurtherRepresentation(next.key, next.value, lastRepresentation,
-                        val previousNumberOfTypes =lastRepresentation.nodeRepresentations.values.toSet.size
+                                deepRepresentation)
-                        val nextNumberOfTypes = nextRepresentation.nodeRepresentations.values.toSet.size
-                        hasRefined =  nextNumberOfTypes > previousNumberOfTypes
+                        val previousNumberOfTypes = Sets.immutable.withAll(lastRepresentation.nodeRepresentations.values).size
-                        
+                        val nextNumberOfTypes = Sets.immutable.withAll(nextRepresentation.nodeRepresentations.values).size
+                        hasRefined = nextNumberOfTypes > previousNumberOfTypes
                        lastRange = nextRange
                        lastRepresentation = nextRepresentation
-                        
 //                      if(hasRefined) {
 //                              println('''Level «nextRange» is calculated, number of types is refined: «previousNumberOfTypes» -> «nextNumberOfTypes»''')
 //                      } else {
@@ -192,211 +217,217 @@ abstract class PartialInterpretation2NeighbourhoodRepresentation<ModelRepresenta
                } while (hasRefined)
                return lastRepresentation
        }
-        
        def private getElements(PartialInterpretation model) {
-                return
+                return model.problem.elements + model.newElements + model.openWorldElements
-                        model.problem.elements +
-                        model.newElements +
-                        model.openWorldElements
        }
-        
-        def private fillTypes(PartialInterpretation model, Map<DefinedElement, Set<String>> node2Type, Set<TypeDeclaration> relevantTypes) {
+        def private fillTypes(PartialInterpretation model, Map<DefinedElement, Set<String>> node2Type,
-                for(element : model.elements) {
+                Set<TypeDeclaration> relevantTypes) {
-                        node2Type.put(element, new HashSet)
+                for (element : model.elements) {
+                        node2Type.put(element, Sets.mutable.of)
                }
-                
 //              for(typeDefinition : model.problem.types.filter(TypeDefinition)) {
 //                      // Dont need
 //              }
-                for(typeInterpretation : model.partialtypeinterpratation) {
+                for (typeInterpretation : model.partialtypeinterpratation) {
-                        if(typeInterpretation instanceof PartialPrimitiveInterpretation) {
+                        if (typeInterpretation instanceof PartialPrimitiveInterpretation) {
-                                
+                        } else if (typeInterpretation instanceof PartialComplexTypeInterpretation) {
-                        } else if(typeInterpretation instanceof PartialComplexTypeInterpretation) {
                                val type = typeInterpretation.interpretationOf
-                                if(type.isRelevant(relevantTypes)) {
+                                if (type.isRelevant(relevantTypes)) {
-                                        for(element : typeInterpretation.elements) {
+                                        for (element : typeInterpretation.elements) {
                                                element.lookup(node2Type).add(type.name)
                                        }
                                }
                        }
                }
        }
-        
        /**
         * Indexes the references
         */
        def private fillReferences(PartialInterpretation model,
                Map<DefinedElement, List<IncomingRelation<DefinedElement>>> IncomingRelations,
                Map<DefinedElement, List<OutgoingRelation<DefinedElement>>> OutgoingRelations,
-                Set<RelationDeclaration> relevantRelations)
+                Set<RelationDeclaration> relevantRelations) {
-        {
+                for (object : model.elements) {
-                for(object : model.elements) {
+                        IncomingRelations.put(object, new ArrayList)
-                        IncomingRelations.put(object,new LinkedList)
+                        OutgoingRelations.put(object, new ArrayList)
-                        OutgoingRelations.put(object,new LinkedList)
                }
-                for(relationInterpretation : model.partialrelationinterpretation) {
+                for (relationInterpretation : model.partialrelationinterpretation) {
                        val type = relationInterpretation.interpretationOf
-                        if(type.isRelevant(relevantRelations)) {
+                        if (type.isRelevant(relevantRelations)) {
-                                for(link : relationInterpretation.relationlinks) {
+                                for (link : relationInterpretation.relationlinks) {
-                                        if(link instanceof BinaryElementRelationLink) {
+                                        if (link instanceof BinaryElementRelationLink) {
-                                                        OutgoingRelations.get(link.param1) += new OutgoingRelation(link.param2,type.name)
+                                                OutgoingRelations.get(link.param1) += new OutgoingRelation(link.param2, type.name)
-                                                        IncomingRelations.get(link.param2) += new IncomingRelation(link.param1,type.name)
+                                                IncomingRelations.get(link.param2) += new IncomingRelation(link.param1, type.name)
-                                        } else throw new UnsupportedOperationException
+                                        } else
+                                                throw new UnsupportedOperationException
                                }
                        }
                }
        }
-        
        /**
         * Creates a local representation of the objects (aka zero range neighbourhood)
         */
-        def abstract protected NeighbourhoodWithTraces<ModelRepresentation,NodeRepresentation> createLocalRepresentation(
+        def abstract protected NeighbourhoodWithTraces<ModelRepresentation, NodeRepresentation> createLocalRepresentation(
                Map<DefinedElement, LocalNodeDescriptor> node2Representation,
                Map<LocalNodeDescriptor, Integer> representation2Amount
        )
-        
        /**
         * Creates a 
         */
-        def abstract protected NeighbourhoodWithTraces<ModelRepresentation,NodeRepresentation> createFurtherRepresentation(
+        def abstract protected NeighbourhoodWithTraces<ModelRepresentation, NodeRepresentation> createFurtherRepresentation(
                Map<FurtherNodeDescriptor<NodeRepresentation>, Integer> nodeDescriptors,
                Map<DefinedElement, FurtherNodeDescriptor<NodeRepresentation>> node2Representation,
-                NeighbourhoodWithTraces<ModelRepresentation,NodeRepresentation> previous,
+                NeighbourhoodWithTraces<ModelRepresentation, NodeRepresentation> previous,
                boolean deepRepresentation
        )
-        
-        def private addOne(int original, int max) {
+        def private addOne(Integer originalObj, int max) {
+                if (originalObj === null) {
+                        return 1
+                }
+                val original = originalObj.intValue
                if(original == Integer.MAX_VALUE) return Integer.MAX_VALUE
-                if(original +1 > max) return Integer.MAX_VALUE
+                if(original + 1 > max) return Integer.MAX_VALUE else return original + 1
-                else return original+1
        }
-        
        private def calculateIncomingEdges(Map<DefinedElement, List<IncomingRelation<DefinedElement>>> IncomingRelations,
-                DefinedElement object, Map<DefinedElement, ? extends NodeRepresentation> previousNodeRepresentations, int parallel)
+                DefinedElement object, Map<DefinedElement, ? extends NodeRepresentation> previousNodeRepresentations,
-        {               
+                int parallel) {
-                val Map<IncomingRelation<NodeRepresentation>, Integer> res = new HashMap
+                val Map<IncomingRelation<NodeRepresentation>, Integer> res = Maps.mutable.of
                for (incomingConcreteEdge : IncomingRelations.get(object)) {
                        val IncomingRelation<NodeRepresentation> e = new IncomingRelation(
                                previousNodeRepresentations.get(incomingConcreteEdge.from), incomingConcreteEdge.type)
-                        if (res.containsKey(e)) {
+                        res.compute(e, [key, value | addOne(value, parallel)])
-                                res.put(e, addOne(res.get(e),parallel))
-                        } else {
-                                res.put(e, 1)
-                        }
                }
                return res
        }
-        
-        private def calcuateOutgoingEdges(Map<DefinedElement,List<OutgoingRelation<DefinedElement>>> OutgoingRelations,
+        private def calcuateOutgoingEdges(Map<DefinedElement, List<OutgoingRelation<DefinedElement>>> OutgoingRelations,
-                DefinedElement object, Map<DefinedElement, ? extends NodeRepresentation> previousNodeRepresentations, int parallel)
+                DefinedElement object, Map<DefinedElement, ? extends NodeRepresentation> previousNodeRepresentations,
-        {
+                int parallel) {
-                val Map<OutgoingRelation<NodeRepresentation>,Integer> res= new HashMap
+                val Map<OutgoingRelation<NodeRepresentation>, Integer> res = Maps.mutable.of
-                for(outgoingConcreteEdge : OutgoingRelations.get(object)) {
+                for (outgoingConcreteEdge : OutgoingRelations.get(object)) {
-                        val OutgoingRelation<NodeRepresentation> e =
+                        val OutgoingRelation<NodeRepresentation> e = new OutgoingRelation(
-                                new OutgoingRelation(
+                                previousNodeRepresentations.get(outgoingConcreteEdge.to), outgoingConcreteEdge.type)
-                                        previousNodeRepresentations.get(outgoingConcreteEdge.to),
+                        res.compute(e, [key, value | addOne(value, parallel)])
-                                        outgoingConcreteEdge.type)
-                        if(res.containsKey(e)) {
-                                res.put(e,addOne(res.get(e),parallel))
-                        } else {
-                                res.put(e,1)
-                        }
                }
-                return res;
+                return res
        }
-        
        /*def private <KEY,VALUE> void addOrCreate_Set(Map<KEY,Set<VALUE>> map, KEY key, VALUE value) {
-                var Set<VALUE> s;
+         *      var Set<VALUE> s;
-                if(map.containsKey(key)) {
+         *      if(map.containsKey(key)) {
-                        s = map.get(key);
+         *              s = map.get(key);
-                } else {
+         *      } else {
-                        s = new HashSet
+         *              s = new HashSet
-                        map.put(key,s)
+         *              map.put(key,s)
-                }
+         *      }
-                s.add(value)
+         *      s.add(value)
-        }*/
+         }*/
-        
+        private def calculateFurtherNodeDescriptors(PartialInterpretation model,
-        
-        private def calculateFurtherNodeDescriptors(
-                PartialInterpretation model,
                NeighbourhoodWithTraces<ModelRepresentation, NodeRepresentation> previous,
                Map<DefinedElement, List<IncomingRelation<DefinedElement>>> IncomingRelations,
-                Map<DefinedElement, List<OutgoingRelation<DefinedElement>>> OutgoingRelations,
+                Map<DefinedElement, List<OutgoingRelation<DefinedElement>>> OutgoingRelations, int parallels, int maxNumber) {
-                int parallels, int maxNumber)
-        {
                val previousNodeRepresentations = previous.nodeRepresentations
-                val node2Representation = new HashMap<DefinedElement,FurtherNodeDescriptor<NodeRepresentation>>
+                val size = previousNodeRepresentations.size
-                val Map<FurtherNodeDescriptor<NodeRepresentation>,Integer> descriptor2Number = 
+                val node2Representation = Maps.mutable.<DefinedElement, FurtherNodeDescriptor<NodeRepresentation>>ofInitialCapacity(size)
-                        if(this.mergeSimilarNeighbourhood){ new HashMap } else { null }
+                val Map<FurtherNodeDescriptor<NodeRepresentation>, Integer> descriptor2Number = if (this.
-                val Map<FurtherNodeDescriptor<NodeRepresentation>,FurtherNodeDescriptor<NodeRepresentation>> uniqueDescription =
+                                mergeSimilarNeighbourhood) {
-                        if(this.mergeSimilarNeighbourhood){     new HashMap } else { null }
+                                Maps.mutable.ofInitialCapacity(size)
-                
+                        } else {
-                for(object: model.elements) {
+                                null
-                        val incomingEdges = this.calculateIncomingEdges(IncomingRelations, object, previousNodeRepresentations,parallels)
+                        }
-                        val outgoingEdges = this.calcuateOutgoingEdges(OutgoingRelations,object, previousNodeRepresentations,parallels)
+                val Map<FurtherNodeDescriptor<NodeRepresentation>, FurtherNodeDescriptor<NodeRepresentation>> uniqueDescription = if (this.
-                        
+                                mergeSimilarNeighbourhood) {
+                                Maps.mutable.ofInitialCapacity(size)
+                        } else {
+                                null
+                        }
+                for (object : model.elements) {
+                        val incomingEdges = this.calculateIncomingEdges(IncomingRelations, object, previousNodeRepresentations,
+                                parallels)
+                        val outgoingEdges = this.calcuateOutgoingEdges(OutgoingRelations, object, previousNodeRepresentations,
+                                parallels)
                        val previousType = previousNodeRepresentations.get(object)
-                        
-                        if(previousType === null) {
+                        if (previousType === null) {
                                println("Error in state coder")
                        }
-                        
-                        val nodeDescriptor = new FurtherNodeDescriptor(
+                        val nodeDescriptor = new FurtherNodeDescriptor(previousType, incomingEdges, outgoingEdges)
-                                previousType,
-                                incomingEdges,
+                        if (this.mergeSimilarNeighbourhood) {
-                                outgoingEdges)
+                                if (descriptor2Number.containsKey(nodeDescriptor)) {
-                        
-                        if(this.mergeSimilarNeighbourhood) {
-                                if(descriptor2Number.containsKey(nodeDescriptor)) {
                                        descriptor2Number.put(
                                                nodeDescriptor,
-                                                addOne(descriptor2Number.get(nodeDescriptor),maxNumber)
+                                                addOne(descriptor2Number.get(nodeDescriptor), maxNumber)
                                        )
-                                        node2Representation.put(object,uniqueDescription.get(nodeDescriptor))
+                                        node2Representation.put(object, uniqueDescription.get(nodeDescriptor))
                                } else {
-                                        descriptor2Number.put(nodeDescriptor,if(1>maxNumber){Integer.MAX_VALUE}else{1})
+                                        descriptor2Number.put(nodeDescriptor, if (1 > maxNumber) {
-                                        uniqueDescription.put(nodeDescriptor,nodeDescriptor)
+                                                Integer.MAX_VALUE
-                                        node2Representation.put(object,nodeDescriptor)
+                                        } else {
+                                                1
+                                        })
+                                        uniqueDescription.put(nodeDescriptor, nodeDescriptor)
+                                        node2Representation.put(object, nodeDescriptor)
                                }
                        } else {
-                                node2Representation.put(object,nodeDescriptor)
+                                node2Representation.put(object, nodeDescriptor)
                        }
                }
-                
                return descriptor2Number -> node2Representation
        }
-        
-        private def calculateLocalNodeDescriptors(
+        private def calculateLocalNodeDescriptors(PartialInterpretation model, Map<DefinedElement, Set<String>> types,
-                PartialInterpretation model,
+                int maxNumber, DefinedElement focusedElement) {
-                Map<DefinedElement, Set<String>> types,
+                val size = types.size
-                int maxNumber)
+                val Map<DefinedElement, LocalNodeDescriptor> node2Representation = Maps.mutable.ofInitialCapacity(size)
-        {
+                val Map<LocalNodeDescriptor, Integer> representation2Amount = if (mergeSimilarNeighbourhood) {
-                val Map<DefinedElement, LocalNodeDescriptor> node2Representation = new HashMap
+                                Maps.mutable.ofInitialCapacity(size)
-                val Map<LocalNodeDescriptor, Integer> representation2Amount =
+                        } else {
-                        if(mergeSimilarNeighbourhood){ new HashMap } else { null }
+                                null
-                val Map<LocalNodeDescriptor, LocalNodeDescriptor> uniqueRepresentation =
+                        }
-                        if(this.mergeSimilarNeighbourhood){ new HashMap } else { null }
+                val Map<LocalNodeDescriptor, LocalNodeDescriptor> uniqueRepresentation = if (this.mergeSimilarNeighbourhood) {
-                
+                                Maps.mutable.ofInitialCapacity(size)
-                for(element : model.elements) {
+                        } else {
-                        var newDescriptor = new LocalNodeDescriptor(element.name,element.lookup(types))
+                                null
-                        if(this.mergeSimilarNeighbourhood){
+                        }
-                                if(uniqueRepresentation.containsKey(newDescriptor)) {
+                for (element : model.elements) {
+                        val name = if(element == focusedElement) FOCUSED_ELEMENT_NAME else element.name
+                        var newDescriptor = new LocalNodeDescriptor(name, element.lookup(types))
+                        if (this.mergeSimilarNeighbourhood) {
+                                if (uniqueRepresentation.containsKey(newDescriptor)) {
                                        newDescriptor = newDescriptor.lookup(uniqueRepresentation)
-                                        node2Representation.put(element,newDescriptor)
+                                        node2Representation.put(element, newDescriptor)
                                        representation2Amount.put(
                                                newDescriptor,
-                                                addOne(newDescriptor.lookup(representation2Amount),maxNumber)
+                                                addOne(newDescriptor.lookup(representation2Amount), maxNumber)
                                        )
                                } else {
-                                        uniqueRepresentation.put(newDescriptor,newDescriptor)
+                                        uniqueRepresentation.put(newDescriptor, newDescriptor)
-                                        node2Representation.put(element,newDescriptor)
+                                        node2Representation.put(element, newDescriptor)
-                                        representation2Amount.put(newDescriptor, if(1>maxNumber){Integer.MAX_VALUE}else{1})
+                                        representation2Amount.put(newDescriptor, if (1 > maxNumber) {
+                                                Integer.MAX_VALUE
+                                        } else {
+                                                1
+                                        })
                                }
                        } else {
-                                node2Representation.put(element,newDescriptor)
+                                node2Representation.put(element, newDescriptor)
                        }
                }
-                
                return representation2Amount -> node2Representation
        }
-}
-\ No newline at end of file
+}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2PairwiseNeighbourhoodRepresentation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2PairwiseNeighbourhoodRepresentation.xtend
new file mode 100644
index 00000000..c10457b0
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2PairwiseNeighbourhoodRepresentation.xtend
@@ -0,0 +1,68 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood
+import com.google.common.collect.Maps
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+import java.util.HashMap
+import java.util.Map
+import org.eclipse.xtend.lib.annotations.Data
+import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
+@Data
+class PairwiseNeighbourhoodRepresentation<BasicNodeRepresentation> {
+        val Map<?, Integer> modelRepresentation
+        val Map<DefinedElement, BasicNodeRepresentation> basicNodeRepresentations
+        val Map<DefinedElement, ? extends Map<DefinedElement, ? extends BasicNodeRepresentation>> pairwiseNodeRepresentations
+        def getBasicRepresentation(DefinedElement a) {
+                basicNodeRepresentations.get(a)
+        }
+        def getPairwiseRepresentation(DefinedElement a, DefinedElement b) {
+                pairwiseNodeRepresentations.get(a).get(b)
+        }
+}
+@FinalFieldsConstructor
+class PartialInterpretation2PairwiseNeighbourhoodRepresentation<BasicNodeRepresentation> {
+        val PartialInterpretation2NeighbourhoodRepresentation<? extends Map<? extends BasicNodeRepresentation, Integer>, BasicNodeRepresentation> basicNeighbourhoodRepresenter
+        def createRepresentation(PartialInterpretation model, NeighbourhoodOptions options) {
+                val basicRepresentation = basicNeighbourhoodRepresenter.createRepresentation(model, options)
+                val basicModelRepresentation = basicRepresentation.modelRepresentation
+                val basicNodeRepresentations = basicRepresentation.nodeRepresentations
+                val pairwiseNodeRepresentations = Maps.newHashMapWithExpectedSize(basicNodeRepresentations.size)
+                val modelRepresentation = new HashMap<Object, Integer>
+                for (nodeWithBasicRepresentation : basicNodeRepresentations.entrySet) {
+                        val node = nodeWithBasicRepresentation.key
+                        val basicNodeRepresentation = nodeWithBasicRepresentation.value
+                        val count = basicModelRepresentation.get(basicNodeRepresentation)
+                        if (count == 1) {
+                                pairwiseNodeRepresentations.put(node, basicNodeRepresentations)
+                                modelRepresentation.put(basicNodeRepresentation, count)
+                        } else {
+                                val neighbourhoodRepresentation = basicNeighbourhoodRepresenter.
+                                        createRepresentationWithFocus(model, options, node)
+                                pairwiseNodeRepresentations.put(node, neighbourhoodRepresentation.nodeRepresentations)
+                                modelRepresentation.compute(neighbourhoodRepresentation.modelRepresentation) [ key, value |
+                                        if (value === null) {
+                                                if (1 > options.maxNumber) {
+                                                        Integer.MAX_VALUE
+                                                } else {
+                                                        1
+                                                }
+                                        } else {
+                                                addOne(value, options.maxNumber)
+                                        }
+                                ]
+                        }
+                }
+                new PairwiseNeighbourhoodRepresentation(modelRepresentation, basicNodeRepresentations,
+                        pairwiseNodeRepresentations)
+        }
+        def private addOne(int original, int max) {
+                if(original == Integer.MAX_VALUE) return Integer.MAX_VALUE
+                if(original + 1 > max) return Integer.MAX_VALUE else return original + 1
+        }
+}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/AbstractNeighborhoodBasedStateCoderFactory.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/AbstractNeighborhoodBasedStateCoderFactory.xtend
new file mode 100644
index 00000000..089880b1
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/AbstractNeighborhoodBasedStateCoderFactory.xtend
@@ -0,0 +1,137 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.statecoder
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.NeighbourhoodOptions
+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.PartialPrimitiveInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialRelationInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage
+import java.util.LinkedList
+import java.util.List
+import org.eclipse.emf.common.notify.Notifier
+import org.eclipse.emf.ecore.EClass
+import org.eclipse.emf.ecore.EObject
+import org.eclipse.emf.ecore.EStructuralFeature
+import org.eclipse.viatra.dse.statecode.IStateCoder
+import org.eclipse.viatra.dse.statecode.IStateCoderFactory
+import org.eclipse.viatra.query.runtime.api.IPatternMatch
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine
+import org.eclipse.viatra.query.runtime.base.api.FeatureListener
+import org.eclipse.viatra.query.runtime.base.api.IndexingLevel
+import org.eclipse.viatra.query.runtime.base.api.InstanceListener
+import org.eclipse.viatra.query.runtime.emf.EMFBaseIndexWrapper
+import org.eclipse.viatra.query.runtime.emf.EMFScope
+import org.eclipse.xtend.lib.annotations.Accessors
+abstract class AbstractNeighbourhoodBasedStateCoderFactory implements IStateCoderFactory {
+        val List<AbstractNeighbourhoodBasedPartialInterpretationStateCoder> statecoders = new LinkedList
+        val NeighbourhoodOptions options
+        protected new() {
+                this(NeighbourhoodOptions.DEFAULT)
+        }
+        protected new(NeighbourhoodOptions options) {
+                this.options = options
+        }
+        synchronized override createStateCoder() {
+                val res = doCreateStateCoder(options)
+                statecoders += res
+                return res
+        }
+        protected def AbstractNeighbourhoodBasedPartialInterpretationStateCoder doCreateStateCoder(
+                NeighbourhoodOptions options)
+        def getSumStatecoderRuntime() {
+                statecoders.map[statecoderRuntime].reduce[p1, p2|p1 + p2]
+        }
+}
+abstract class AbstractNeighbourhoodBasedPartialInterpretationStateCoder implements IStateCoder {
+        val NeighbourhoodOptions options
+        var PartialInterpretation target
+        protected new(NeighbourhoodOptions options) {
+                this.options = options
+        }
+        @Accessors(PUBLIC_GETTER) var long statecoderRuntime = 0
+        synchronized private def refreshStateCodes() {
+                if (refreshNeeded) {
+                        val startTime = System.nanoTime
+                        doRefreshStateCodes(target, options)
+                        statecoderRuntime += (System.nanoTime - startTime)
+                }
+        }
+        protected def boolean isRefreshNeeded()
+        protected def void doRefreshStateCodes(PartialInterpretation target, NeighbourhoodOptions options)
+        synchronized override createActivationCode(IPatternMatch match) {
+                refreshStateCodes
+                val startTime = System.nanoTime
+                val code = doCreateActivationCode(match)
+                statecoderRuntime += (System.nanoTime - startTime)
+                code
+        }
+        protected def Object doCreateActivationCode(IPatternMatch match)
+        synchronized override createStateCode() {
+                refreshStateCodes
+                doCreateStateCode
+        }
+        protected def Object doCreateStateCode()
+        override init(Notifier notifier) {
+                this.target = notifier as PartialInterpretation
+                val queryEngine = ViatraQueryEngine.on(new EMFScope(notifier))
+                val baseIndex = queryEngine.getBaseIndex() as EMFBaseIndexWrapper
+                val navigationHelper = baseIndex.getNavigationHelper();
+                val classes = PartialinterpretationPackage.eINSTANCE.EClassifiers.filter(EClass).toSet
+                val features = classes.map[it.EAllStructuralFeatures].flatten.toSet
+                navigationHelper.registerObservedTypes(classes, null, features, IndexingLevel.FULL);
+                navigationHelper.addFeatureListener(features, new FeatureListener() {
+                        override void featureInserted(EObject host, EStructuralFeature feature, Object value) { invalidate }
+                        override void featureDeleted(EObject host, EStructuralFeature feature, Object value) { invalidate }
+                })
+                navigationHelper.addInstanceListener(classes, new InstanceListener() {
+                        override void instanceInserted(EClass clazz, EObject instance) { invalidate }
+                        override void instanceDeleted(EClass clazz, EObject instance) { invalidate }
+                })
+        }
+        synchronized def invalidate() {
+                doInvalidate
+        }
+        protected def void doInvalidate()
+        def protected getFallbackCode(Object o) {
+                switch (o) {
+                        PartialInterpretation,
+                        LogicProblem:
+                                null
+                        PartialRelationInterpretation:
+                                o.interpretationOf.name
+                        PartialPrimitiveInterpretation:
+                                o.class.simpleName.hashCode
+                        PartialComplexTypeInterpretation:
+                                o.interpretationOf.name.hashCode
+                        default:
+                                throw new UnsupportedOperationException('''Unsupported type: «o.class.simpleName»''')
+                }
+        }
+}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/IdentifierBasedStateCoderFactory.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/IdentifierBasedStateCoderFactory.xtend
index f55a501a..c7b8ee37 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/IdentifierBasedStateCoderFactory.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/IdentifierBasedStateCoderFactory.xtend
@@ -62,13 +62,13 @@ class IdentifierBasedStateCode {
        int numberOfNewElement
        SortedSet<RelationStatecoder> relationStatecoders
        
-        private static val comparator = new Comparator<RelationStatecoder>() {
+        static val comparator = new Comparator<RelationStatecoder>() {
                override compare(RelationStatecoder o1, RelationStatecoder o2) {
                        o1.relationName.compareTo(o2.relationName)
                }
        }
        
-        public new(int numberOfNewElements) {
+        new(int numberOfNewElements) {
                this.numberOfNewElement = numberOfNewElements
                this.relationStatecoders = new TreeSet(comparator)
        }
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend
index a86bcd1f..04c49506 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend
@@ -1,223 +1,109 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.statecoder
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.AbstractNodeDescriptor
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.NeighbourhoodOptions
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.PartialInterpretation2Hash
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.PartialInterpretation2ImmutableTypeLattice
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.PartialInterpretation2NeighbourhoodRepresentation
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage
 import java.util.ArrayList
-import java.util.LinkedList
-import java.util.List
 import java.util.Map
-import org.eclipse.emf.common.notify.Notifier
-import org.eclipse.emf.ecore.EClass
-import org.eclipse.emf.ecore.EObject
-import org.eclipse.emf.ecore.EStructuralFeature
-import org.eclipse.viatra.dse.statecode.IStateCoder
-import org.eclipse.viatra.dse.statecode.IStateCoderFactory
 import org.eclipse.viatra.query.runtime.api.IPatternMatch
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification
-import org.eclipse.viatra.query.runtime.base.api.FeatureListener
-import org.eclipse.viatra.query.runtime.base.api.IndexingLevel
-import org.eclipse.viatra.query.runtime.base.api.InstanceListener
-import org.eclipse.viatra.query.runtime.emf.EMFBaseIndexWrapper
-import org.eclipse.viatra.query.runtime.emf.EMFScope
-import org.eclipse.xtend.lib.annotations.Accessors
-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement
-import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialTypeInterpratation
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialRelationInterpretation
-import java.util.Set
-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration
-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.PartialInterpretation2NeighbourhoodRepresentation
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialComplexTypeInterpretation
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialPrimitiveInterpretation
-class NeighbourhoodBasedStateCoderFactory implements IStateCoderFactory {
+class NeighbourhoodBasedStateCoderFactory extends AbstractNeighbourhoodBasedStateCoderFactory {
-        val List<NeighbourhoodBasedPartialInterpretationStateCoder> statecoders = new LinkedList
+        new() {
-        
-        val int range
-        val int parallels
-        val int maxNumber
-        val Set<TypeDeclaration> relevantTypes
-        val Set<RelationDeclaration> relevantRelations
-        
-        public new() {
-                this.range = PartialInterpretation2NeighbourhoodRepresentation::GraphWidthRange
-                this.parallels = PartialInterpretation2NeighbourhoodRepresentation::FullParallels
-                this.maxNumber = PartialInterpretation2NeighbourhoodRepresentation::MaxNumbers
-                this.relevantTypes = null
-                this.relevantRelations = null
        }
-        
-        public new(int range, int parallels, int maxNumber, Set<TypeDeclaration> relevantTypes, Set<RelationDeclaration> relevantRelations) {
+        new(NeighbourhoodOptions options) {
-                this.range = range
+                super(options)
-                this.parallels = parallels
+        }
-                this.maxNumber = maxNumber
-                this.relevantTypes = relevantTypes
+        override protected doCreateStateCoder(NeighbourhoodOptions options) {
-                this.relevantRelations = relevantRelations
+                new NeighbourhoodBasedPartialInterpretationStateCoder(new PartialInterpretation2ImmutableTypeLattice, options)
        }
-        
-    synchronized override createStateCoder() {
-        val res = new NeighbourhoodBasedPartialInterpretationStateCoder(statecoders.size,
-                range,parallels,maxNumber,relevantTypes,relevantRelations)
-        statecoders += res
-        return res
-    }
-    def getSumStatecoderRuntime() {
-        statecoders.map[statecoderRuntime].reduce[p1, p2|p1+p2]
-    }
 }
-class NeighbourhoodBasedPartialInterpretationStateCoder implements IStateCoder{
+class NeighbourhoodBasedHashStateCoderFactory extends AbstractNeighbourhoodBasedStateCoderFactory {
-        val int id;
+        new() {
-        val int range
+        }
-        val int parallels
-        val int maxNumber
+        new(NeighbourhoodOptions options) {
-        val Set<TypeDeclaration> relevantTypes
+                super(options)
-        val Set<RelationDeclaration> relevantRelations
+        }
-        
-        val calculator =
+        override protected doCreateStateCoder(NeighbourhoodOptions options) {
-        new PartialInterpretation2ImmutableTypeLattice
+                new NeighbourhoodBasedPartialInterpretationStateCoder(new PartialInterpretation2Hash, options)
-    var PartialInterpretation target
+        }
-        
+}
-        private var Map<DefinedElement, ? extends AbstractNodeDescriptor> nodeRepresentations = null
-        private var Map<? extends AbstractNodeDescriptor, Integer> modelRepresentation = null
+class NeighbourhoodBasedPartialInterpretationStateCoder<ModelRep, NodeRep> extends AbstractNeighbourhoodBasedPartialInterpretationStateCoder {
-        
+        val PartialInterpretation2NeighbourhoodRepresentation<ModelRep, NodeRep> calculator
-        /*public new(int id) {
+        val Map<IQuerySpecification<?>, String> fullyQualifiedNames = newHashMap
-                this.id = id
+        var Map<DefinedElement, ? extends NodeRep> nodeRepresentations = null
-                this.range = PartialInterpretation2NeighbourhoodRepresentation::FixPointRage
+        var ModelRep modelRepresentation = null
-                this.parallels = PartialInterpretation2NeighbourhoodRepresentation::FullParallels
-                this.maxNumber = maxNumber = PartialInterpretation2NeighbourhoodRepresentation::MaxNumbers
+        new(PartialInterpretation2NeighbourhoodRepresentation<ModelRep, NodeRep> calculator, NeighbourhoodOptions options) {
-                this.relevantTypes = relevantTypes
+                super(options)
-                this.relevantRelations = relevantRelations
+                this.calculator = calculator
-        }*/
+        }
+        override protected isRefreshNeeded() {
+                nodeRepresentations === null || modelRepresentation === null
+        }
+        override doRefreshStateCodes(PartialInterpretation target, NeighbourhoodOptions options) {
+                val code = calculator.createRepresentation(target, options)
+                modelRepresentation = code.modelRepresentation
+                nodeRepresentations = code.nodeRepresentations
+        }
        
-        public new(int id, int range, int parallels, int maxNumber, Set<TypeDeclaration> relevantTypes, Set<RelationDeclaration> relevantRelations) {
+        private def getFullyQualifiedNameCached(IQuerySpecification<?> specification) {
-                this.id = id
+                fullyQualifiedNames.computeIfAbsent(specification, [fullyQualifiedName])
-                this.range = range
-                this.parallels = parallels
-                this.maxNumber = maxNumber
-                this.relevantTypes = relevantTypes
-                this.relevantRelations = relevantRelations
        }
-    
-    @Accessors(PUBLIC_GETTER) var long statecoderRuntime = 0
+        override doCreateActivationCode(IPatternMatch match) {
-         
+                val size = match.specification.parameters.size
-//    val range = -1
+                var int hash = 0
-//    val par = Integer.MAX_VALUE
+                val prime = 31
-    //val deeprepresentation = false
+                for (var int index = 0; index < size; index++) {
-    /////////
+                        val matchArgument = match.get(index)
-    // Caching version
+                        val code = getCode(matchArgument)
-    /////////
+                        val codeNumber = if (code === null) {
-    synchronized private def refreshStateCodes() {
+                                0
-        if(this.nodeRepresentations === null || this.modelRepresentation === null) {
-                val startTime = System.nanoTime
-                //relevantObjects.forEach[println(it)]
-                val code = calculator.createRepresentation(target,range,parallels,maxNumber,relevantTypes,relevantRelations)
-                this.modelRepresentation = code.modelRepresentation
-                this.nodeRepresentations = code.nodeRepresentations
-                statecoderRuntime += (System.nanoTime - startTime)
-        }
-    }
-    synchronized override createActivationCode(IPatternMatch match) {
-        refreshStateCodes
-        
-        val startTime = System.nanoTime
-        val size = match.specification.parameters.size
-        val res = new ArrayList(size)
-        var int index = 0
-        var int equivalenceHash = 0
-        val prime = 31
-                
-        while(index < size) {
-                res.add(getCode(match.get(index)))
-                index++
-                for(var i = 0; i<index; i++) {
-                        val number = if(match.get(index) === match.get(i)){1}else{0}
-                        equivalenceHash = prime * equivalenceHash + number
-                }
-        }
-        
-        statecoderRuntime += (System.nanoTime - startTime)
-        return match.specification.fullyQualifiedName->(res->equivalenceHash).hashCode
-    }
-    
-    
-    def private getCode(Object o) {
-        if(o instanceof DefinedElement) {
-                this.nodeRepresentations.get(o)
-        } else if(o instanceof PartialInterpretation || o instanceof LogicProblem) {
-                        return null
-                } else if(o instanceof PartialRelationInterpretation) {
-                        return o.interpretationOf.name
-                } else if(o instanceof PartialTypeInterpratation) {
-                        if(o instanceof PartialPrimitiveInterpretation) {
-                                o.class.simpleName.hashCode
-                        } else if (o instanceof PartialComplexTypeInterpretation){
-                                return o.interpretationOf.name.hashCode
                        } else {
-                                throw new UnsupportedOperationException('''Unsupported type: «o.class.simpleName»''')
+                                code.hashCode
+                        }
+                        hash = prime * hash + codeNumber
+                        for (var i = 0; i < index; i++) {
+                                val number = if (matchArgument === match.get(i)) {
+                                                1
+                                        } else {
+                                                0
+                                        }
+                                hash = prime * hash + number
                        }
-                } else {
-                        throw new UnsupportedOperationException('''Unsupported type: «o.class.simpleName»''')
                }
-    }
-    
+                match.specification.fullyQualifiedNameCached -> hash
-    synchronized override createStateCode() {
+        }
-        refreshStateCodes
-        return this.modelRepresentation.hashCode
+        def private getCode(Object o) {
-    }
+                switch (o) {
-        /////////
+                        DefinedElement:
-    // Caching version
+                                nodeRepresentations.get(o)
-    /////////
+                        default:
+                                getFallbackCode(o)
-    /////////
+                }
-    // Recalculating version
+        }
-    /////////
-//    synchronized override createActivationCode(IPatternMatch match) {
+        override doCreateStateCode() {
-//      val nodes = calculator.createRepresentation(getRelevantObjects().toList,range,par).nodeRepresentations
+                modelRepresentation.hashCode
-//        val res = match.toArray.map[objectInMatch |
+        }
-//              nodes.get(objectInMatch)
-//        ]
+        override doInvalidate() {
-//        return res
+                nodeRepresentations = null
-//    }
+                modelRepresentation = null
-//    
-//    override createStateCode() {
-//      return this.calculator.createRepresentation(getRelevantObjects().toList,range,par).modelRepresentation
-//    }
-    /////////
-    // Recalculating version
-    /////////
-    
-    override init(Notifier notifier) {
-        this.target = notifier as PartialInterpretation
-        val queryEngine = ViatraQueryEngine.on(new EMFScope(notifier))
-        val baseIndex = queryEngine.getBaseIndex() as EMFBaseIndexWrapper
-        val navigationHelper = baseIndex.getNavigationHelper();
-        
-        val classes = PartialinterpretationPackage.eINSTANCE.EClassifiers.filter(EClass).toSet
-        val features = classes.map[it.EAllStructuralFeatures].flatten.toSet
-        navigationHelper.registerObservedTypes(
-                classes,
-                null,
-                features,
-                IndexingLevel.FULL);
-        navigationHelper.addFeatureListener(features, new FeatureListener() {
-            override public void featureInserted(EObject host, EStructuralFeature feature, Object value) { invalidate }
-            override public void featureDeleted(EObject host, EStructuralFeature feature, Object value) { invalidate }
-        });
-        navigationHelper.addInstanceListener(classes, new InstanceListener() {
-            override public void instanceInserted(EClass clazz, EObject instance) { invalidate }
-            override public void instanceDeleted(EClass clazz, EObject instance) { invalidate }
-        });
-    }
-        
-        synchronized def public invalidate() {
-                this.nodeRepresentations = null
-        this.modelRepresentation = null
        }
 }
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/PairwiseNeighbourhoodBasedStateCoderFactory.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/PairwiseNeighbourhoodBasedStateCoderFactory.xtend
new file mode 100644
index 00000000..84e798f2
--- /dev/null
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/PairwiseNeighbourhoodBasedStateCoderFactory.xtend
@@ -0,0 +1,75 @@
+package hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.statecoder
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.AbstractNodeDescriptor
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.NeighbourhoodOptions
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.PairwiseNeighbourhoodRepresentation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.PartialInterpretation2ImmutableTypeLattice
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.neighbourhood.PartialInterpretation2PairwiseNeighbourhoodRepresentation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+import java.util.ArrayList
+import org.eclipse.viatra.query.runtime.api.IPatternMatch
+class PairwiseNeighbourhoodBasedStateCoderFactory extends AbstractNeighbourhoodBasedStateCoderFactory {
+        new() {
+        }
+        new(NeighbourhoodOptions options) {
+                super(options)
+        }
+        override protected doCreateStateCoder(NeighbourhoodOptions options) {
+                new PairwiseNeighbourhoodBasedPartialInterpretationStateCoder(options)
+        }
+}
+class PairwiseNeighbourhoodBasedPartialInterpretationStateCoder extends AbstractNeighbourhoodBasedPartialInterpretationStateCoder {
+        val calculator = new PartialInterpretation2PairwiseNeighbourhoodRepresentation(
+                new PartialInterpretation2ImmutableTypeLattice)
+        var PairwiseNeighbourhoodRepresentation<? extends AbstractNodeDescriptor> representation
+        new(NeighbourhoodOptions options) {
+                super(options)
+        }
+        override protected isRefreshNeeded() {
+                representation === null
+        }
+        override protected doRefreshStateCodes(PartialInterpretation target, NeighbourhoodOptions options) {
+                representation = calculator.createRepresentation(target, options)
+        }
+        override protected doCreateActivationCode(IPatternMatch match) {
+                val size = match.specification.parameters.size
+                val res = new ArrayList(size * size)
+                for (var int i = 0; i < size; i++) {
+                        val a = match.get(i)
+                        for (var int j = 0; j < size; j++) {
+                                val b = match.get(j)
+                                res.add(getPairwiseRepresentation(a, b))
+                        }
+                }
+                match.specification.fullyQualifiedName -> res.hashCode
+        }
+        private def getPairwiseRepresentation(Object a, Object b) {
+                if (b instanceof DefinedElement) {
+                        if (a instanceof DefinedElement) {
+                                representation.getPairwiseRepresentation(a, b)
+                        } else {
+                                representation.getBasicRepresentation(b)
+                        }
+                } else {
+                        getFallbackCode(b)
+                }
+        }
+        override protected doCreateStateCode() {
+                representation.modelRepresentation.hashCode
+        }
+        override protected doInvalidate() {
+                representation = null
+        }
+}
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/visualisation/PartialInterpretation2Gml.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/visualisation/PartialInterpretation2Gml.xtend
index 2b42a8b1..bdf402f3 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/visualisation/PartialInterpretation2Gml.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/visualisation/PartialInterpretation2Gml.xtend
@@ -5,9 +5,13 @@ 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.logic.model.logiclanguage.TypeDefinition
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BinaryElementRelationLink
+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.PartialComplexTypeInterpretation
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialRelationInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RealElement
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.StringElement
 import java.util.HashMap
 import java.util.Map
 import java.util.Set
@@ -106,10 +110,38 @@ class PartialInterpretation2Gml {
                '''
        }
        
-        def protected transormTitle(DefinedElement object) {
+        def protected dispatch transormTitle(DefinedElement object) {
-                if(object.name!= null)object.name
+                if(object.name !== null) object.name.replace("\"", "")
                else "null"
        }
+        def protected dispatch transormTitle(BooleanElement object) {
+                if(object.valueSet) {
+                        object.value.toString
+                } else {
+                        "?"
+                }
+        }
+        def protected dispatch transormTitle(IntegerElement object) {
+                if(object.valueSet) {
+                        object.value.toString
+                } else {
+                        "?"
+                }
+        }
+        def protected dispatch transormTitle(RealElement object) {
+                if(object.valueSet) {
+                        object.value.toString
+                } else {
+                        "?"
+                }
+        }
+        def protected dispatch transormTitle(StringElement object) {
+                if(object.valueSet) {
+                        object.value.toString
+                } else {
+                        "?"
+                }
+        }
        
        def protected transformLink(
                PartialRelationInterpretation reference,