Revert "Try to restructure satellite case study"

This reverts commit 9b83e33c055660f6de218d1b672f67734675f1f6.

57 files changed, 1096 insertions, 2311 deletions

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/configs/generation.vsconfig b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/configs/generation.vsconfig
index 726f838f..1942980c 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/configs/generation.vsconfig
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/configs/generation.vsconfig
@@ -7,7 +7,7 @@ generate {
         partial-model = { "inputs/SatelliteInstance.xmi"}

         solver = ViatraSolver

         scope = {

-                #node += 8..16

+                #node += 16..32

         }

 

         config = {

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommSubsystem.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommSubsystem.java
index 1cee0c0d..072a9705 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommSubsystem.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommSubsystem.java
@@ -15,7 +15,6 @@ import org.eclipse.emf.ecore.EObject;
  * <ul>
  *   <li>{@link satellite.CommSubsystem#getBand <em>Band</em>}</li>
  *   <li>{@link satellite.CommSubsystem#getGain <em>Gain</em>}</li>
- *   <li>{@link satellite.CommSubsystem#getCommunicationLink <em>Communication Link</em>}</li>
  * </ul>
  *
  * @see satellite.SatellitePackage#getCommSubsystem()
@@ -81,30 +80,4 @@ public interface CommSubsystem extends EObject {
          */
         void setGain(AntennaGain value);
 
-        /**
-         * Returns the value of the '<em><b>Communication Link</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of the '<em>Communication Link</em>' containment reference isn't clear,
-         * there really should be more of a description here...
-         * </p>
-         * <!-- end-user-doc -->
-         * @return the value of the '<em>Communication Link</em>' containment reference.
-         * @see #setCommunicationLink(DirectedCommunicationLink)
-         * @see satellite.SatellitePackage#getCommSubsystem_CommunicationLink()
-         * @model containment="true"
-         * @generated
-         */
-        DirectedCommunicationLink getCommunicationLink();
-
-        /**
-         * Sets the value of the '{@link satellite.CommSubsystem#getCommunicationLink <em>Communication Link</em>}' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param value the new value of the '<em>Communication Link</em>' containment reference.
-         * @see #getCommunicationLink()
-         * @generated
-         */
-        void setCommunicationLink(DirectedCommunicationLink value);
-
 } // CommSubsystem
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommunicatingElement.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommunicatingElement.java
index 6e12fd9f..b96b281f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommunicatingElement.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommunicatingElement.java
@@ -41,18 +41,29 @@ public interface CommunicatingElement extends EObject {
         EList<CommSubsystem> getCommSubsystem();
 
         /**
-         * Returns the value of the '<em><b>Communication Link</b></em>' reference.
+         * Returns the value of the '<em><b>Communication Link</b></em>' containment reference.
          * <!-- begin-user-doc -->
          * <p>
          * If the meaning of the '<em>Communication Link</em>' containment reference isn't clear,
          * there really should be more of a description here...
          * </p>
          * <!-- end-user-doc -->
-         * @return the value of the '<em>Communication Link</em>' reference.
+         * @return the value of the '<em>Communication Link</em>' containment reference.
+         * @see #setCommunicationLink(DirectedCommunicationLink)
          * @see satellite.SatellitePackage#getCommunicatingElement_CommunicationLink()
-         * @model transient="true" changeable="false" volatile="true" derived="true"
+         * @model containment="true"
          * @generated
          */
         DirectedCommunicationLink getCommunicationLink();
 
+        /**
+         * Sets the value of the '{@link satellite.CommunicatingElement#getCommunicationLink <em>Communication Link</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Communication Link</em>' containment reference.
+         * @see #getCommunicationLink()
+         * @generated
+         */
+        void setCommunicationLink(DirectedCommunicationLink value);
+
 } // CommunicatingElement
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat.java
deleted file mode 100644
index a38926d4..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- */
-package satellite;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Cube Sat</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see satellite.SatellitePackage#getCubeSat()
- * @model abstract="true"
- * @generated
- */
-public interface CubeSat extends Spacecraft {
-} // CubeSat
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat3U.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat3U.java
index c68bf52c..5758e165 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat3U.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat3U.java
@@ -12,5 +12,5 @@ package satellite;
  * @model
  * @generated
  */
-public interface CubeSat3U extends CubeSat {
+public interface CubeSat3U extends Spacecraft {
 } // CubeSat3U
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat6U.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat6U.java
index 5ade601a..a8d8830f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat6U.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat6U.java
@@ -12,5 +12,5 @@ package satellite;
  * @model
  * @generated
  */
-public interface CubeSat6U extends CubeSat {
+public interface CubeSat6U extends Spacecraft {
 } // CubeSat6U
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatellitePackage.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatellitePackage.java
index 6e8723ae..f0d80ac2 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatellitePackage.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatellitePackage.java
@@ -179,7 +179,7 @@ public interface SatellitePackage extends EPackage {
         int COMMUNICATING_ELEMENT__COMM_SUBSYSTEM = 0;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -225,7 +225,7 @@ public interface SatellitePackage extends EPackage {
         int GROUND_STATION_NETWORK__COMM_SUBSYSTEM = COMMUNICATING_ELEMENT__COMM_SUBSYSTEM;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -271,7 +271,7 @@ public interface SatellitePackage extends EPackage {
         int SPACECRAFT__COMM_SUBSYSTEM = COMMUNICATING_ELEMENT__COMM_SUBSYSTEM;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -344,22 +344,13 @@ public interface SatellitePackage extends EPackage {
         int COMM_SUBSYSTEM__GAIN = 1;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int COMM_SUBSYSTEM__COMMUNICATION_LINK = 2;
-
-        /**
          * The number of structural features of the '<em>Comm Subsystem</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int COMM_SUBSYSTEM_FEATURE_COUNT = 3;
+        int COMM_SUBSYSTEM_FEATURE_COUNT = 2;
 
         /**
          * The number of operations of the '<em>Comm Subsystem</em>' class.
@@ -473,70 +464,6 @@ public interface SatellitePackage extends EPackage {
         int INTERFEROMETRY_PAYLOAD_OPERATION_COUNT = PAYLOAD_OPERATION_COUNT + 0;
 
         /**
-         * The meta object id for the '{@link satellite.impl.CubeSatImpl <em>Cube Sat</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see satellite.impl.CubeSatImpl
-         * @see satellite.impl.SatellitePackageImpl#getCubeSat()
-         * @generated
-         */
-        int CUBE_SAT = 12;
-
-        /**
-         * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
-
-        /**
-         * The feature id for the '<em><b>Communication Link</b></em>' reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT__COMMUNICATION_LINK = SPACECRAFT__COMMUNICATION_LINK;
-
-        /**
-         * The feature id for the '<em><b>Payload</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT__PAYLOAD = SPACECRAFT__PAYLOAD;
-
-        /**
-         * The feature id for the '<em><b>Kind</b></em>' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT__KIND = SPACECRAFT__KIND;
-
-        /**
-         * The number of structural features of the '<em>Cube Sat</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT_FEATURE_COUNT = SPACECRAFT_FEATURE_COUNT + 0;
-
-        /**
-         * The number of operations of the '<em>Cube Sat</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT_OPERATION_COUNT = SPACECRAFT_OPERATION_COUNT + 0;
-
-        /**
          * The meta object id for the '{@link satellite.impl.CubeSat3UImpl <em>Cube Sat3 U</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -553,16 +480,16 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__COMM_SUBSYSTEM = CUBE_SAT__COMM_SUBSYSTEM;
+        int CUBE_SAT3_U__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__COMMUNICATION_LINK = CUBE_SAT__COMMUNICATION_LINK;
+        int CUBE_SAT3_U__COMMUNICATION_LINK = SPACECRAFT__COMMUNICATION_LINK;
 
         /**
          * The feature id for the '<em><b>Payload</b></em>' containment reference.
@@ -571,7 +498,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__PAYLOAD = CUBE_SAT__PAYLOAD;
+        int CUBE_SAT3_U__PAYLOAD = SPACECRAFT__PAYLOAD;
 
         /**
          * The feature id for the '<em><b>Kind</b></em>' attribute.
@@ -580,7 +507,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__KIND = CUBE_SAT__KIND;
+        int CUBE_SAT3_U__KIND = SPACECRAFT__KIND;
 
         /**
          * The number of structural features of the '<em>Cube Sat3 U</em>' class.
@@ -589,7 +516,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U_FEATURE_COUNT = CUBE_SAT_FEATURE_COUNT + 0;
+        int CUBE_SAT3_U_FEATURE_COUNT = SPACECRAFT_FEATURE_COUNT + 0;
 
         /**
          * The number of operations of the '<em>Cube Sat3 U</em>' class.
@@ -598,7 +525,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U_OPERATION_COUNT = CUBE_SAT_OPERATION_COUNT + 0;
+        int CUBE_SAT3_U_OPERATION_COUNT = SPACECRAFT_OPERATION_COUNT + 0;
 
         /**
          * The meta object id for the '{@link satellite.impl.CubeSat6UImpl <em>Cube Sat6 U</em>}' class.
@@ -617,16 +544,16 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U__COMM_SUBSYSTEM = CUBE_SAT__COMM_SUBSYSTEM;
+        int CUBE_SAT6_U__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U__COMMUNICATION_LINK = CUBE_SAT__COMMUNICATION_LINK;
+        int CUBE_SAT6_U__COMMUNICATION_LINK = SPACECRAFT__COMMUNICATION_LINK;
 
         /**
          * The feature id for the '<em><b>Payload</b></em>' containment reference.
@@ -635,7 +562,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U__PAYLOAD = CUBE_SAT__PAYLOAD;
+        int CUBE_SAT6_U__PAYLOAD = SPACECRAFT__PAYLOAD;
 
         /**
          * The feature id for the '<em><b>Kind</b></em>' attribute.
@@ -644,7 +571,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U__KIND = CUBE_SAT__KIND;
+        int CUBE_SAT6_U__KIND = SPACECRAFT__KIND;
 
         /**
          * The number of structural features of the '<em>Cube Sat6 U</em>' class.
@@ -653,7 +580,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U_FEATURE_COUNT = CUBE_SAT_FEATURE_COUNT + 0;
+        int CUBE_SAT6_U_FEATURE_COUNT = SPACECRAFT_FEATURE_COUNT + 0;
 
         /**
          * The number of operations of the '<em>Cube Sat6 U</em>' class.
@@ -662,7 +589,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U_OPERATION_COUNT = CUBE_SAT_OPERATION_COUNT + 0;
+        int CUBE_SAT6_U_OPERATION_COUNT = SPACECRAFT_OPERATION_COUNT + 0;
 
         /**
          * The meta object id for the '{@link satellite.impl.SmallSatImpl <em>Small Sat</em>}' class.
@@ -684,7 +611,7 @@ public interface SatellitePackage extends EPackage {
         int SMALL_SAT__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -736,7 +663,7 @@ public interface SatellitePackage extends EPackage {
          * @see satellite.impl.SatellitePackageImpl#getTransceiverBand()
          * @generated
          */
-        int TRANSCEIVER_BAND = 13;
+        int TRANSCEIVER_BAND = 12;
 
         /**
          * The meta object id for the '{@link satellite.AntennaGain <em>Antenna Gain</em>}' enum.
@@ -746,7 +673,7 @@ public interface SatellitePackage extends EPackage {
          * @see satellite.impl.SatellitePackageImpl#getAntennaGain()
          * @generated
          */
-        int ANTENNA_GAIN = 14;
+        int ANTENNA_GAIN = 13;
 
         /**
          * The meta object id for the '{@link satellite.SpacecraftKind <em>Spacecraft Kind</em>}' enum.
@@ -756,7 +683,7 @@ public interface SatellitePackage extends EPackage {
          * @see satellite.impl.SatellitePackageImpl#getSpacecraftKind()
          * @generated
          */
-        int SPACECRAFT_KIND = 15;
+        int SPACECRAFT_KIND = 14;
 
         /**
          * Returns the meta object for class '{@link satellite.ConstellationMission <em>Constellation Mission</em>}'.
@@ -833,10 +760,10 @@ public interface SatellitePackage extends EPackage {
         EReference getCommunicatingElement_CommSubsystem();
 
         /**
-         * Returns the meta object for the reference '{@link satellite.CommunicatingElement#getCommunicationLink <em>Communication Link</em>}'.
+         * Returns the meta object for the containment reference '{@link satellite.CommunicatingElement#getCommunicationLink <em>Communication Link</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @return the meta object for the reference '<em>Communication Link</em>'.
+         * @return the meta object for the containment reference '<em>Communication Link</em>'.
          * @see satellite.CommunicatingElement#getCommunicationLink()
          * @see #getCommunicatingElement()
          * @generated
@@ -918,17 +845,6 @@ public interface SatellitePackage extends EPackage {
         EAttribute getCommSubsystem_Gain();
 
         /**
-         * Returns the meta object for the containment reference '{@link satellite.CommSubsystem#getCommunicationLink <em>Communication Link</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the containment reference '<em>Communication Link</em>'.
-         * @see satellite.CommSubsystem#getCommunicationLink()
-         * @see #getCommSubsystem()
-         * @generated
-         */
-        EReference getCommSubsystem_CommunicationLink();
-
-        /**
          * Returns the meta object for class '{@link satellite.DirectedCommunicationLink <em>Directed Communication Link</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -1011,16 +927,6 @@ public interface SatellitePackage extends EPackage {
         EClass getSmallSat();
 
         /**
-         * Returns the meta object for class '{@link satellite.CubeSat <em>Cube Sat</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for class '<em>Cube Sat</em>'.
-         * @see satellite.CubeSat
-         * @generated
-         */
-        EClass getCubeSat();
-
-        /**
          * Returns the meta object for enum '{@link satellite.TransceiverBand <em>Transceiver Band</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -1137,7 +1043,7 @@ public interface SatellitePackage extends EPackage {
                 EReference COMMUNICATING_ELEMENT__COMM_SUBSYSTEM = eINSTANCE.getCommunicatingElement_CommSubsystem();
 
                 /**
-                 * The meta object literal for the '<em><b>Communication Link</b></em>' reference feature.
+                 * The meta object literal for the '<em><b>Communication Link</b></em>' containment reference feature.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
                  * @generated
@@ -1207,14 +1113,6 @@ public interface SatellitePackage extends EPackage {
                 EAttribute COMM_SUBSYSTEM__GAIN = eINSTANCE.getCommSubsystem_Gain();
 
                 /**
-                 * The meta object literal for the '<em><b>Communication Link</b></em>' containment reference feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EReference COMM_SUBSYSTEM__COMMUNICATION_LINK = eINSTANCE.getCommSubsystem_CommunicationLink();
-
-                /**
                  * The meta object literal for the '{@link satellite.impl.DirectedCommunicationLinkImpl <em>Directed Communication Link</em>}' class.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
@@ -1291,16 +1189,6 @@ public interface SatellitePackage extends EPackage {
                 EClass SMALL_SAT = eINSTANCE.getSmallSat();
 
                 /**
-                 * The meta object literal for the '{@link satellite.impl.CubeSatImpl <em>Cube Sat</em>}' class.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see satellite.impl.CubeSatImpl
-                 * @see satellite.impl.SatellitePackageImpl#getCubeSat()
-                 * @generated
-                 */
-                EClass CUBE_SAT = eINSTANCE.getCubeSat();
-
-                /**
                  * The meta object literal for the '{@link satellite.TransceiverBand <em>Transceiver Band</em>}' enum.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/Spacecraft.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/Spacecraft.java
index 6f72322e..d8775572 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/Spacecraft.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/Spacecraft.java
@@ -59,6 +59,7 @@ public interface Spacecraft extends CommunicatingElement {
          * @see satellite.SpacecraftKind
          * @see satellite.SatellitePackage#getSpacecraft_Kind()
          * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
+         *        annotation="org.eclipse.viatra.query.querybasedfeature patternFQN='hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind'"
          * @generated
          */
         SpacecraftKind getKind();
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommSubsystemImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommSubsystemImpl.java
index 70ee268e..cf8f1fe8 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommSubsystemImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommSubsystemImpl.java
@@ -4,16 +4,13 @@ package satellite.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
-import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
 
-import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import satellite.AntennaGain;
 import satellite.CommSubsystem;
-import satellite.DirectedCommunicationLink;
 import satellite.SatellitePackage;
 import satellite.TransceiverBand;
 
@@ -27,7 +24,6 @@ import satellite.TransceiverBand;
  * <ul>
  *   <li>{@link satellite.impl.CommSubsystemImpl#getBand <em>Band</em>}</li>
  *   <li>{@link satellite.impl.CommSubsystemImpl#getGain <em>Gain</em>}</li>
- *   <li>{@link satellite.impl.CommSubsystemImpl#getCommunicationLink <em>Communication Link</em>}</li>
  * </ul>
  *
  * @generated
@@ -74,16 +70,6 @@ public class CommSubsystemImpl extends MinimalEObjectImpl.Container implements C
         protected AntennaGain gain = GAIN_EDEFAULT;
 
         /**
-         * The cached value of the '{@link #getCommunicationLink() <em>Communication Link</em>}' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getCommunicationLink()
-         * @generated
-         * @ordered
-         */
-        protected DirectedCommunicationLink communicationLink;
-
-        /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -156,81 +142,12 @@ public class CommSubsystemImpl extends MinimalEObjectImpl.Container implements C
          * @generated
          */
         @Override
-        public DirectedCommunicationLink getCommunicationLink() {
-                return communicationLink;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public NotificationChain basicSetCommunicationLink(DirectedCommunicationLink newCommunicationLink,
-                        NotificationChain msgs) {
-                DirectedCommunicationLink oldCommunicationLink = communicationLink;
-                communicationLink = newCommunicationLink;
-                if (eNotificationRequired()) {
-                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-                                        SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK, oldCommunicationLink, newCommunicationLink);
-                        if (msgs == null)
-                                msgs = notification;
-                        else
-                                msgs.add(notification);
-                }
-                return msgs;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void setCommunicationLink(DirectedCommunicationLink newCommunicationLink) {
-                if (newCommunicationLink != communicationLink) {
-                        NotificationChain msgs = null;
-                        if (communicationLink != null)
-                                msgs = ((InternalEObject) communicationLink).eInverseRemove(this,
-                                                EOPPOSITE_FEATURE_BASE - SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK, null, msgs);
-                        if (newCommunicationLink != null)
-                                msgs = ((InternalEObject) newCommunicationLink).eInverseAdd(this,
-                                                EOPPOSITE_FEATURE_BASE - SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK, null, msgs);
-                        msgs = basicSetCommunicationLink(newCommunicationLink, msgs);
-                        if (msgs != null)
-                                msgs.dispatch();
-                } else if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK,
-                                        newCommunicationLink, newCommunicationLink));
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-                switch (featureID) {
-                case SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK:
-                        return basicSetCommunicationLink(null, msgs);
-                }
-                return super.eInverseRemove(otherEnd, featureID, msgs);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public Object eGet(int featureID, boolean resolve, boolean coreType) {
                 switch (featureID) {
                 case SatellitePackage.COMM_SUBSYSTEM__BAND:
                         return getBand();
                 case SatellitePackage.COMM_SUBSYSTEM__GAIN:
                         return getGain();
-                case SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK:
-                        return getCommunicationLink();
                 }
                 return super.eGet(featureID, resolve, coreType);
         }
@@ -249,9 +166,6 @@ public class CommSubsystemImpl extends MinimalEObjectImpl.Container implements C
                 case SatellitePackage.COMM_SUBSYSTEM__GAIN:
                         setGain((AntennaGain) newValue);
                         return;
-                case SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK:
-                        setCommunicationLink((DirectedCommunicationLink) newValue);
-                        return;
                 }
                 super.eSet(featureID, newValue);
         }
@@ -270,9 +184,6 @@ public class CommSubsystemImpl extends MinimalEObjectImpl.Container implements C
                 case SatellitePackage.COMM_SUBSYSTEM__GAIN:
                         setGain(GAIN_EDEFAULT);
                         return;
-                case SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK:
-                        setCommunicationLink((DirectedCommunicationLink) null);
-                        return;
                 }
                 super.eUnset(featureID);
         }
@@ -289,8 +200,6 @@ public class CommSubsystemImpl extends MinimalEObjectImpl.Container implements C
                         return band != BAND_EDEFAULT;
                 case SatellitePackage.COMM_SUBSYSTEM__GAIN:
                         return gain != GAIN_EDEFAULT;
-                case SatellitePackage.COMM_SUBSYSTEM__COMMUNICATION_LINK:
-                        return communicationLink != null;
                 }
                 return super.eIsSet(featureID);
         }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommunicatingElementImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommunicatingElementImpl.java
index f472580b..1f79da3b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommunicatingElementImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommunicatingElementImpl.java
@@ -3,12 +3,16 @@
 package satellite.impl;
 
 import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
@@ -45,6 +49,16 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
         protected EList<CommSubsystem> commSubsystem;
 
         /**
+         * The cached value of the '{@link #getCommunicationLink() <em>Communication Link</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getCommunicationLink()
+         * @generated
+         * @ordered
+         */
+        protected DirectedCommunicationLink communicationLink;
+
+        /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -84,10 +98,7 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
          */
         @Override
         public DirectedCommunicationLink getCommunicationLink() {
-                DirectedCommunicationLink communicationLink = basicGetCommunicationLink();
-                return communicationLink != null && communicationLink.eIsProxy()
-                                ? (DirectedCommunicationLink) eResolveProxy((InternalEObject) communicationLink)
-                                : communicationLink;
+                return communicationLink;
         }
 
         /**
@@ -95,11 +106,46 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
          * <!-- end-user-doc -->
          * @generated
          */
-        public DirectedCommunicationLink basicGetCommunicationLink() {
-                // TODO: implement this method to return the 'Communication Link' reference
-                // -> do not perform proxy resolution
-                // Ensure that you remove @generated or mark it @generated NOT
-                throw new UnsupportedOperationException();
+        public NotificationChain basicSetCommunicationLink(DirectedCommunicationLink newCommunicationLink,
+                        NotificationChain msgs) {
+                DirectedCommunicationLink oldCommunicationLink = communicationLink;
+                communicationLink = newCommunicationLink;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK, oldCommunicationLink,
+                                        newCommunicationLink);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setCommunicationLink(DirectedCommunicationLink newCommunicationLink) {
+                if (newCommunicationLink != communicationLink) {
+                        NotificationChain msgs = null;
+                        if (communicationLink != null)
+                                msgs = ((InternalEObject) communicationLink).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK, null,
+                                                msgs);
+                        if (newCommunicationLink != null)
+                                msgs = ((InternalEObject) newCommunicationLink).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK, null,
+                                                msgs);
+                        msgs = basicSetCommunicationLink(newCommunicationLink, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK, newCommunicationLink,
+                                        newCommunicationLink));
         }
 
         /**
@@ -112,6 +158,8 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
                 switch (featureID) {
                 case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
                         return ((InternalEList<?>) getCommSubsystem()).basicRemove(otherEnd, msgs);
+                case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
+                        return basicSetCommunicationLink(null, msgs);
                 }
                 return super.eInverseRemove(otherEnd, featureID, msgs);
         }
@@ -127,9 +175,7 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
                 case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
                         return getCommSubsystem();
                 case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
-                        if (resolve)
-                                return getCommunicationLink();
-                        return basicGetCommunicationLink();
+                        return getCommunicationLink();
                 }
                 return super.eGet(featureID, resolve, coreType);
         }
@@ -147,6 +193,9 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
                         getCommSubsystem().clear();
                         getCommSubsystem().addAll((Collection<? extends CommSubsystem>) newValue);
                         return;
+                case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
+                        setCommunicationLink((DirectedCommunicationLink) newValue);
+                        return;
                 }
                 super.eSet(featureID, newValue);
         }
@@ -162,6 +211,9 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
                 case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
                         getCommSubsystem().clear();
                         return;
+                case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
+                        setCommunicationLink((DirectedCommunicationLink) null);
+                        return;
                 }
                 super.eUnset(featureID);
         }
@@ -177,7 +229,7 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
                 case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
                         return commSubsystem != null && !commSubsystem.isEmpty();
                 case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
-                        return basicGetCommunicationLink() != null;
+                        return communicationLink != null;
                 }
                 return super.eIsSet(featureID);
         }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat3UImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat3UImpl.java
index 350a9bcc..a7ba37a7 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat3UImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat3UImpl.java
@@ -14,7 +14,7 @@ import satellite.SatellitePackage;
  *
  * @generated
  */
-public class CubeSat3UImpl extends CubeSatImpl implements CubeSat3U {
+public class CubeSat3UImpl extends SpacecraftImpl implements CubeSat3U {
         /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat6UImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat6UImpl.java
index 3b9c5988..d4f42e6c 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat6UImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat6UImpl.java
@@ -14,7 +14,7 @@ import satellite.SatellitePackage;
  *
  * @generated
  */
-public class CubeSat6UImpl extends CubeSatImpl implements CubeSat6U {
+public class CubeSat6UImpl extends SpacecraftImpl implements CubeSat6U {
         /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSatImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSatImpl.java
deleted file mode 100644
index 660bd062..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSatImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- */
-package satellite.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import satellite.CubeSat;
-import satellite.SatellitePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Cube Sat</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public abstract class CubeSatImpl extends SpacecraftImpl implements CubeSat {
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected CubeSatImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.CUBE_SAT;
-        }
-
-} //CubeSatImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatellitePackageImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatellitePackageImpl.java
index 68e4ce30..2347fe07 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatellitePackageImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatellitePackageImpl.java
@@ -14,7 +14,6 @@ import satellite.AntennaGain;
 import satellite.CommSubsystem;
 import satellite.CommunicatingElement;
 import satellite.ConstellationMission;
-import satellite.CubeSat;
 import satellite.CubeSat3U;
 import satellite.CubeSat6U;
 import satellite.DirectedCommunicationLink;
@@ -125,13 +124,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * <!-- end-user-doc -->
          * @generated
          */
-        private EClass cubeSatEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
         private EEnum transceiverBandEEnum = null;
 
         /**
@@ -368,16 +360,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EReference getCommSubsystem_CommunicationLink() {
-                return (EReference) commSubsystemEClass.getEStructuralFeatures().get(2);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public EClass getDirectedCommunicationLink() {
                 return directedCommunicationLinkEClass;
         }
@@ -458,16 +440,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EClass getCubeSat() {
-                return cubeSatEClass;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public EEnum getTransceiverBand() {
                 return transceiverBandEEnum;
         }
@@ -542,7 +514,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 commSubsystemEClass = createEClass(COMM_SUBSYSTEM);
                 createEAttribute(commSubsystemEClass, COMM_SUBSYSTEM__BAND);
                 createEAttribute(commSubsystemEClass, COMM_SUBSYSTEM__GAIN);
-                createEReference(commSubsystemEClass, COMM_SUBSYSTEM__COMMUNICATION_LINK);
 
                 directedCommunicationLinkEClass = createEClass(DIRECTED_COMMUNICATION_LINK);
                 createEReference(directedCommunicationLinkEClass, DIRECTED_COMMUNICATION_LINK__SOURCE);
@@ -558,8 +529,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 
                 smallSatEClass = createEClass(SMALL_SAT);
 
-                cubeSatEClass = createEClass(CUBE_SAT);
-
                 // Create enums
                 transceiverBandEEnum = createEEnum(TRANSCEIVER_BAND);
                 antennaGainEEnum = createEEnum(ANTENNA_GAIN);
@@ -599,10 +568,9 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 groundStationNetworkEClass.getESuperTypes().add(this.getCommunicatingElement());
                 spacecraftEClass.getESuperTypes().add(this.getCommunicatingElement());
                 interferometryPayloadEClass.getESuperTypes().add(this.getPayload());
-                cubeSat3UEClass.getESuperTypes().add(this.getCubeSat());
-                cubeSat6UEClass.getESuperTypes().add(this.getCubeSat());
+                cubeSat3UEClass.getESuperTypes().add(this.getSpacecraft());
+                cubeSat6UEClass.getESuperTypes().add(this.getSpacecraft());
                 smallSatEClass.getESuperTypes().add(this.getSpacecraft());
-                cubeSatEClass.getESuperTypes().add(this.getSpacecraft());
 
                 // Initialize classes, features, and operations; add parameters
                 initEClass(constellationMissionEClass, ConstellationMission.class, "ConstellationMission", IS_ABSTRACT,
@@ -626,8 +594,8 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                                 2, CommunicatingElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
                                 !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getCommunicatingElement_CommunicationLink(), this.getDirectedCommunicationLink(), null,
-                                "communicationLink", null, 0, 1, CommunicatingElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE,
-                                !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+                                "communicationLink", null, 0, 1, CommunicatingElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+                                IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(groundStationNetworkEClass, GroundStationNetwork.class, "GroundStationNetwork", !IS_ABSTRACT,
                                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -646,9 +614,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEAttribute(getCommSubsystem_Gain(), this.getAntennaGain(), "gain", null, 1, 1, CommSubsystem.class,
                                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-                initEReference(getCommSubsystem_CommunicationLink(), this.getDirectedCommunicationLink(), null,
-                                "communicationLink", null, 0, 1, CommSubsystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                                IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(directedCommunicationLinkEClass, DirectedCommunicationLink.class, "DirectedCommunicationLink",
                                 !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -673,8 +638,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 initEClass(smallSatEClass, SmallSat.class, "SmallSat", !IS_ABSTRACT, !IS_INTERFACE,
                                 IS_GENERATED_INSTANCE_CLASS);
 
-                initEClass(cubeSatEClass, CubeSat.class, "CubeSat", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
                 // Initialize enums and add enum literals
                 initEEnum(transceiverBandEEnum, TransceiverBand.class, "TransceiverBand");
                 addEEnumLiteral(transceiverBandEEnum, TransceiverBand.UHF);
@@ -697,6 +660,8 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 // Create annotations
                 // http://www.eclipse.org/emf/2002/Ecore
                 createEcoreAnnotations();
+                // org.eclipse.viatra.query.querybasedfeature
+                createOrgAnnotations();
         }
 
         /**
@@ -710,4 +675,16 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 addAnnotation(this, source, new String[] { "settingDelegates", "org.eclipse.viatra.query.querybasedfeature" });
         }
 
+        /**
+         * Initializes the annotations for <b>org.eclipse.viatra.query.querybasedfeature</b>.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected void createOrgAnnotations() {
+                String source = "org.eclipse.viatra.query.querybasedfeature";
+                addAnnotation(getSpacecraft_Kind(), source,
+                                new String[] { "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind" });
+        }
+
 } //SatellitePackageImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SpacecraftImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SpacecraftImpl.java
index ef98fb07..73609fbd 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SpacecraftImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SpacecraftImpl.java
@@ -6,6 +6,7 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
@@ -41,14 +42,15 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
         protected Payload payload;
 
         /**
-         * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
+         * The cached setting delegate for the '{@link #getKind() <em>Kind</em>}' attribute.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @see #getKind()
          * @generated
          * @ordered
          */
-        protected static final SpacecraftKind KIND_EDEFAULT = SpacecraftKind.CUBE_SAT3_U;
+        protected EStructuralFeature.Internal.SettingDelegate KIND__ESETTING_DELEGATE = ((EStructuralFeature.Internal) SatellitePackage.Literals.SPACECRAFT__KIND)
+                        .getSettingDelegate();
 
         /**
          * <!-- begin-user-doc -->
@@ -128,9 +130,7 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
          */
         @Override
         public SpacecraftKind getKind() {
-                // TODO: implement this method to return the 'Kind' attribute
-                // Ensure that you remove @generated or mark it @generated NOT
-                throw new UnsupportedOperationException();
+                return (SpacecraftKind) KIND__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false);
         }
 
         /**
@@ -204,7 +204,7 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
                         return payload != null;
                 case SatellitePackage.SPACECRAFT__KIND:
-                        return getKind() != KIND_EDEFAULT;
+                        return KIND__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);
                 }
                 return super.eIsSet(featureID);
         }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/util/SatelliteAdapterFactory.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/util/SatelliteAdapterFactory.java
index f71d8da5..1ecf7b19 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/util/SatelliteAdapterFactory.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/util/SatelliteAdapterFactory.java
@@ -127,11 +127,6 @@ public class SatelliteAdapterFactory extends AdapterFactoryImpl {
                 }
 
                 @Override
-                public Adapter caseCubeSat(CubeSat object) {
-                        return createCubeSatAdapter();
-                }
-
-                @Override
                 public Adapter defaultCase(EObject object) {
                         return createEObjectAdapter();
                 }
@@ -319,20 +314,6 @@ public class SatelliteAdapterFactory extends AdapterFactoryImpl {
         }
 
         /**
-         * Creates a new adapter for an object of class '{@link satellite.CubeSat <em>Cube Sat</em>}'.
-         * <!-- begin-user-doc -->
-         * This default implementation returns null so that we can easily ignore cases;
-         * it's useful to ignore a case when inheritance will catch all the cases anyway.
-         * <!-- end-user-doc -->
-         * @return the new adapter.
-         * @see satellite.CubeSat
-         * @generated
-         */
-        public Adapter createCubeSatAdapter() {
-                return null;
-        }
-
-        /**
          * Creates a new adapter for the default case.
          * <!-- begin-user-doc -->
          * This default implementation returns null.
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/util/SatelliteSwitch.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/util/SatelliteSwitch.java
index 1e2fb04b..3eb78d75 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/util/SatelliteSwitch.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/util/SatelliteSwitch.java
@@ -141,8 +141,6 @@ public class SatelliteSwitch<T> extends Switch<T> {
                         CubeSat3U cubeSat3U = (CubeSat3U) theEObject;
                         T result = caseCubeSat3U(cubeSat3U);
                         if (result == null)
-                                result = caseCubeSat(cubeSat3U);
-                        if (result == null)
                                 result = caseSpacecraft(cubeSat3U);
                         if (result == null)
                                 result = caseCommunicatingElement(cubeSat3U);
@@ -154,8 +152,6 @@ public class SatelliteSwitch<T> extends Switch<T> {
                         CubeSat6U cubeSat6U = (CubeSat6U) theEObject;
                         T result = caseCubeSat6U(cubeSat6U);
                         if (result == null)
-                                result = caseCubeSat(cubeSat6U);
-                        if (result == null)
                                 result = caseSpacecraft(cubeSat6U);
                         if (result == null)
                                 result = caseCommunicatingElement(cubeSat6U);
@@ -174,17 +170,6 @@ public class SatelliteSwitch<T> extends Switch<T> {
                                 result = defaultCase(theEObject);
                         return result;
                 }
-                case SatellitePackage.CUBE_SAT: {
-                        CubeSat cubeSat = (CubeSat) theEObject;
-                        T result = caseCubeSat(cubeSat);
-                        if (result == null)
-                                result = caseSpacecraft(cubeSat);
-                        if (result == null)
-                                result = caseCommunicatingElement(cubeSat);
-                        if (result == null)
-                                result = defaultCase(theEObject);
-                        return result;
-                }
                 default:
                         return defaultCase(theEObject);
                 }
@@ -371,21 +356,6 @@ public class SatelliteSwitch<T> extends Switch<T> {
         }
 
         /**
-         * Returns the result of interpreting the object as an instance of '<em>Cube Sat</em>'.
-         * <!-- begin-user-doc -->
-         * This implementation returns null;
-         * returning a non-null result will terminate the switch.
-         * <!-- end-user-doc -->
-         * @param object the target of the switch.
-         * @return the result of interpreting the object as an instance of '<em>Cube Sat</em>'.
-         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-         * @generated
-         */
-        public T caseCubeSat(CubeSat object) {
-                return null;
-        }
-
-        /**
          * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
          * <!-- begin-user-doc -->
          * This implementation returns null;
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.aird b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.aird
index 4ffc0ea3..31575c3c 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.aird
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.aird
@@ -1307,16 +1307,6 @@
     <semanticResources>../src/hu/bme/mit/inf/dslreasoner/domains/satellite/metrics/SatelliteMetrics.vql</semanticResources>
     <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.aggregators.max</semanticResources>
     <semanticResources>java:/Objects/hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind</semanticResources>
-    <semanticResources>java:/Objects/satellite.Payload</semanticResources>
-    <semanticResources>java:/Objects/hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat</semanticResources>
-    <semanticResources>java:/Objects/satellite.CubeSat</semanticResources>
-    <semanticResources>java:/Objects/satellite.Spacecraft</semanticResources>
-    <semanticResources>java:/Objects/satellite.CommunicatingElement</semanticResources>
-    <semanticResources>java:/Objects/satellite.SpacecraftKind</semanticResources>
-    <semanticResources>java:/Objects/satellite.CommSubsystem</semanticResources>
-    <semanticResources>java:/Objects/satellite.DirectedCommunicationLink</semanticResources>
-    <semanticResources>java:/Objects/satellite.TransceiverBand</semanticResources>
-    <semanticResources>java:/Objects/satellite.AntennaGain</semanticResources>
     <ownedViews xmi:type="viewpoint:DView" uid="_reOHEF0qEemRYLyXht2IrQ">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
       <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_re1yIF0qEemRYLyXht2IrQ" name="satellite" repPath="#_rel6gF0qEemRYLyXht2IrQ">
@@ -1369,24 +1359,6 @@
           <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
           <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
         </computedStyleDescriptions>
-        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_3FfX4HCAEemkIbiETO8SXA" routingStyle="manhattan">
-          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_3FfX4XCAEemkIbiETO8SXA" showIcon="false" labelExpression="service:render">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-          </centerLabelStyleDescription>
-          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_3FfX4nCAEemkIbiETO8SXA" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-          </endLabelStyleDescription>
-        </computedStyleDescriptions>
-        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_6zCAoHCAEemkIbiETO8SXA" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_6zCAoXCAEemkIbiETO8SXA" showIcon="false" labelExpression="service:renderEOpposite">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </beginLabelStyleDescription>
-          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_6zCAonCAEemkIbiETO8SXA" showIcon="false" labelExpression="service:render">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </endLabelStyleDescription>
-        </computedStyleDescriptions>
       </data>
     </ownedAnnotationEntries>
     <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_rfAxQF0qEemRYLyXht2IrQ" source="GMF_DIAGRAMS">
@@ -1643,6 +1615,38 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4CE29F0vEemRYLyXht2IrQ" id="(1.0,0.5306122448979592)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4CE29V0vEemRYLyXht2IrQ" id="(0.0,0.7959183673469388)"/>
         </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_ccT_YF0wEemRYLyXht2IrQ" type="4001" element="_ccF89l0wEemRYLyXht2IrQ" source="_3UIIoF0rEemRYLyXht2IrQ" target="_Ct-Y8F0wEemRYLyXht2IrQ">
+          <children xmi:type="notation:Node" xmi:id="_ccT_ZF0wEemRYLyXht2IrQ" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ccT_ZV0wEemRYLyXht2IrQ" x="-32" y="39"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ccUmcF0wEemRYLyXht2IrQ" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ccUmcV0wEemRYLyXht2IrQ" x="48" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ccUmcl0wEemRYLyXht2IrQ" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ccUmc10wEemRYLyXht2IrQ" x="22" y="-8"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_ccT_YV0wEemRYLyXht2IrQ" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_ccT_Yl0wEemRYLyXht2IrQ" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ccT_Y10wEemRYLyXht2IrQ" points="[27, -33, -194, -143]$[182, -33, -39, -143]$[182, 110, -39, 0]$[221, 110, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ccUmdF0wEemRYLyXht2IrQ" id="(0.8411764705882353,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ccUmdV0wEemRYLyXht2IrQ" id="(0.0,0.6632653061224489)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_db1tQF0xEemRYLyXht2IrQ" type="4001" element="_dbuYhl0xEemRYLyXht2IrQ" source="_Ct-Y8F0wEemRYLyXht2IrQ" target="_j0vs4F0tEemRYLyXht2IrQ">
+          <children xmi:type="notation:Node" xmi:id="_db2UUF0xEemRYLyXht2IrQ" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_db2UUV0xEemRYLyXht2IrQ" x="-5" y="-44"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_db2UUl0xEemRYLyXht2IrQ" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_db2UU10xEemRYLyXht2IrQ" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_db2UVF0xEemRYLyXht2IrQ" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_db2UVV0xEemRYLyXht2IrQ" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_db1tQV0xEemRYLyXht2IrQ" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_db1tQl0xEemRYLyXht2IrQ" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_db1tQ10xEemRYLyXht2IrQ" points="[14, 0, 14, 45]$[14, -45, 14, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_db2UVl0xEemRYLyXht2IrQ" id="(0.19387755102040816,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_db2UV10xEemRYLyXht2IrQ" id="(0.19387755102040816,1.0)"/>
+        </edges>
         <edges xmi:type="notation:Edge" xmi:id="_i2ZRcF0xEemRYLyXht2IrQ" type="4001" element="_i2PgeV0xEemRYLyXht2IrQ" source="_Ct-Y8F0wEemRYLyXht2IrQ" target="_j0vs4F0tEemRYLyXht2IrQ">
           <children xmi:type="notation:Node" xmi:id="_i2ZRdF0xEemRYLyXht2IrQ" type="6001">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i2ZRdV0xEemRYLyXht2IrQ" x="-5" y="46"/>
@@ -1655,7 +1659,7 @@
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_i2ZRcV0xEemRYLyXht2IrQ" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_i2ZRcl0xEemRYLyXht2IrQ" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i2ZRc10xEemRYLyXht2IrQ" points="[29, 0, 29, 45]$[29, -45, 29, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_i2ZRc10xEemRYLyXht2IrQ" points="[0, 0, 0, 45]$[0, -45, 0, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i2ZRel0xEemRYLyXht2IrQ" id="(0.7193877551020408,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_i2ZRe10xEemRYLyXht2IrQ" id="(0.7193877551020408,1.0)"/>
         </edges>
@@ -1771,38 +1775,6 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_37gXgHBMEempc7JjePmuNw" id="(0.559322033898305,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_37gXgXBMEempc7JjePmuNw" id="(0.3305084745762712,0.0)"/>
         </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_VptTgHBSEemNI_R9YUxM4w" type="4001" element="_VpHdoHBSEemNI_R9YUxM4w" source="_3UIIoF0rEemRYLyXht2IrQ" target="_Ct-Y8F0wEemRYLyXht2IrQ">
-          <children xmi:type="notation:Node" xmi:id="_Vpt6kHBSEemNI_R9YUxM4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vpt6kXBSEemNI_R9YUxM4w" x="-33" y="27"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_Vpt6knBSEemNI_R9YUxM4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vpt6k3BSEemNI_R9YUxM4w" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_Vpt6lHBSEemNI_R9YUxM4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vpt6lXBSEemNI_R9YUxM4w" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_VptTgXBSEemNI_R9YUxM4w" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_VptTgnBSEemNI_R9YUxM4w" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VptTg3BSEemNI_R9YUxM4w" points="[0, 0, -194, -132]$[144, 0, -50, -132]$[144, 132, -50, 0]$[194, 132, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VpuhoHBSEemNI_R9YUxM4w" id="(1.0,0.7244897959183674)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VpuhoXBSEemNI_R9YUxM4w" id="(0.0,0.6122448979591837)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_60FwkHCAEemkIbiETO8SXA" type="4001" element="_6y-9UHCAEemkIbiETO8SXA" source="_j0vs4F0tEemRYLyXht2IrQ" target="_Ct-Y8F0wEemRYLyXht2IrQ">
-          <children xmi:type="notation:Node" xmi:id="_60HlwHCAEemkIbiETO8SXA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_60HlwXCAEemkIbiETO8SXA" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_60HlwnCAEemkIbiETO8SXA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_60Hlw3CAEemkIbiETO8SXA" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_60IM0HCAEemkIbiETO8SXA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_60IM0XCAEemkIbiETO8SXA" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_60FwkXCAEemkIbiETO8SXA" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_60FwknCAEemkIbiETO8SXA" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_60Fwk3CAEemkIbiETO8SXA" points="[0, 50, 0, -93]$[0, 93, 0, -50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_60Iz4HCAEemkIbiETO8SXA" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_60Iz4XCAEemkIbiETO8SXA" id="(0.5,0.5)"/>
-        </edges>
       </data>
     </ownedAnnotationEntries>
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tM4oUF0qEemRYLyXht2IrQ" name="ConstellationMission" tooltipText="" outgoingEdges="_KzljXl0yEemRYLyXht2IrQ _PdH6PF0yEemRYLyXht2IrQ" incomingEdges="_0jIdIF0qEemRYLyXht2IrQ" width="12" height="10">
@@ -1848,7 +1820,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_3T7UUF0rEemRYLyXht2IrQ" name="CommunicatingElement" tooltipText="" outgoingEdges="_4B9iMF0vEemRYLyXht2IrQ _VpHdoHBSEemNI_R9YUxM4w" incomingEdges="_NpQ-pl0sEemRYLyXht2IrQ _PEp-k10sEemRYLyXht2IrQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_3T7UUF0rEemRYLyXht2IrQ" name="CommunicatingElement" tooltipText="" outgoingEdges="_4B9iMF0vEemRYLyXht2IrQ _ccF89l0wEemRYLyXht2IrQ" incomingEdges="_NpQ-pl0sEemRYLyXht2IrQ _PEp-k10sEemRYLyXht2IrQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="satellite.ecore#//CommunicatingElement"/>
       <semanticElements xmi:type="ecore:EClass" href="satellite.ecore#//CommunicatingElement"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1915,7 +1887,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_j0eAEF0tEemRYLyXht2IrQ" name="CommSubsystem" tooltipText="" outgoingEdges="_6y-9UHCAEemkIbiETO8SXA" incomingEdges="_4B9iMF0vEemRYLyXht2IrQ _i2PgeV0xEemRYLyXht2IrQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_j0eAEF0tEemRYLyXht2IrQ" name="CommSubsystem" tooltipText="" incomingEdges="_4B9iMF0vEemRYLyXht2IrQ _dbuYhl0xEemRYLyXht2IrQ _i2PgeV0xEemRYLyXht2IrQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="satellite.ecore#//CommSubsystem"/>
       <semanticElements xmi:type="ecore:EClass" href="satellite.ecore#//CommSubsystem"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1988,7 +1960,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Ctw9kF0wEemRYLyXht2IrQ" name="DirectedCommunicationLink" tooltipText="" outgoingEdges="_i2PgeV0xEemRYLyXht2IrQ" incomingEdges="_VpHdoHBSEemNI_R9YUxM4w _6y-9UHCAEemkIbiETO8SXA" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Ctw9kF0wEemRYLyXht2IrQ" name="DirectedCommunicationLink" tooltipText="" outgoingEdges="_dbuYhl0xEemRYLyXht2IrQ _i2PgeV0xEemRYLyXht2IrQ" incomingEdges="_ccF89l0wEemRYLyXht2IrQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="satellite.ecore#//DirectedCommunicationLink"/>
       <semanticElements xmi:type="ecore:EClass" href="satellite.ecore#//DirectedCommunicationLink"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -2034,6 +2006,30 @@
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
       </ownedElements>
     </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ccF89l0wEemRYLyXht2IrQ" name="[0..1] communicationLink" sourceNode="_3T7UUF0rEemRYLyXht2IrQ" targetNode="_Ctw9kF0wEemRYLyXht2IrQ">
+      <target xmi:type="ecore:EReference" href="satellite.ecore#//CommunicatingElement/communicationLink"/>
+      <semanticElements xmi:type="ecore:EReference" href="satellite.ecore#//CommunicatingElement/communicationLink"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ccHLE10wEemRYLyXht2IrQ" description="_ccHLEF0wEemRYLyXht2IrQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ccHLFV0wEemRYLyXht2IrQ" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_ccHLFF0wEemRYLyXht2IrQ" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_dbuYhl0xEemRYLyXht2IrQ" name="[1..1] source" sourceNode="_Ctw9kF0wEemRYLyXht2IrQ" targetNode="_j0eAEF0tEemRYLyXht2IrQ">
+      <target xmi:type="ecore:EReference" href="satellite.ecore#//DirectedCommunicationLink/source"/>
+      <semanticElements xmi:type="ecore:EReference" href="satellite.ecore#//DirectedCommunicationLink/source"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_fDAfY10xEemRYLyXht2IrQ" description="_fDAfYF0xEemRYLyXht2IrQ" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_fDAfZV0xEemRYLyXht2IrQ" showIcon="false">
+          <labelFormat>bold</labelFormat>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_fDAfZF0xEemRYLyXht2IrQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
     <ownedDiagramElements xmi:type="diagram:DEdge" uid="_i2PgeV0xEemRYLyXht2IrQ" name="[1..1] target" sourceNode="_Ctw9kF0wEemRYLyXht2IrQ" targetNode="_j0eAEF0tEemRYLyXht2IrQ">
       <target xmi:type="ecore:EReference" href="satellite.ecore#//DirectedCommunicationLink/target"/>
       <semanticElements xmi:type="ecore:EReference" href="satellite.ecore#//DirectedCommunicationLink/target"/>
@@ -2219,25 +2215,6 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_VpHdoHBSEemNI_R9YUxM4w" name="[0..1] /communicationLink" sourceNode="_3T7UUF0rEemRYLyXht2IrQ" targetNode="_Ctw9kF0wEemRYLyXht2IrQ">
-      <target xmi:type="ecore:EReference" href="satellite.ecore#//CommunicatingElement/communicationLink"/>
-      <semanticElements xmi:type="ecore:EReference" href="satellite.ecore#//CommunicatingElement/communicationLink"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_3FfX43CAEemkIbiETO8SXA" description="_3FfX4HCAEemkIbiETO8SXA" routingStyle="manhattan" strokeColor="114,159,207">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_3FfX5XCAEemkIbiETO8SXA" showIcon="false" labelColor="39,76,114"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_3FfX5HCAEemkIbiETO8SXA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_6y-9UHCAEemkIbiETO8SXA" sourceNode="_j0eAEF0tEemRYLyXht2IrQ" targetNode="_Ctw9kF0wEemRYLyXht2IrQ" beginLabel="[1..1] source" endLabel="[0..1] communicationLink">
-      <target xmi:type="ecore:EReference" href="satellite.ecore#//CommSubsystem/communicationLink"/>
-      <semanticElements xmi:type="ecore:EReference" href="satellite.ecore#//CommSubsystem/communicationLink"/>
-      <semanticElements xmi:type="ecore:EReference" href="satellite.ecore#//DirectedCommunicationLink/source"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_6zCnsHCAEemkIbiETO8SXA" description="_6zCAoHCAEemkIbiETO8SXA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_6zCnsXCAEemkIbiETO8SXA" showIcon="false"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_6zCnsnCAEemkIbiETO8SXA" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
-    </ownedDiagramElements>
     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
     <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_reoWwF0qEemRYLyXht2IrQ"/>
     <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore
index 002c8fd8..ae9197da 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore
@@ -18,11 +18,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="commSubsystem" lowerBound="1"
         upperBound="2" eType="#//CommSubsystem" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="communicationLink" eType="#//DirectedCommunicationLink"
-        changeable="false" volatile="true" transient="true" derived="true">
-      <eAnnotations source="org.eclipse.viatra.query.querybasedfeature">
-        <details key="patternFQN" value="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkOfElement"/>
-      </eAnnotations>
-    </eStructuralFeatures>
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GroundStationNetwork" eSuperTypes="#//CommunicatingElement"/>
   <eClassifiers xsi:type="ecore:EClass" name="Spacecraft" abstract="true" eSuperTypes="#//CommunicatingElement">
@@ -38,8 +34,6 @@
   <eClassifiers xsi:type="ecore:EClass" name="CommSubsystem">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="band" lowerBound="1" eType="#//TransceiverBand"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="gain" lowerBound="1" eType="#//AntennaGain"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="communicationLink" eType="#//DirectedCommunicationLink"
-        containment="true" eOpposite="#//DirectedCommunicationLink/source"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="TransceiverBand">
     <eLiterals name="UHF"/>
@@ -48,7 +42,7 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="DirectedCommunicationLink">
     <eStructuralFeatures xsi:type="ecore:EReference" name="source" lowerBound="1"
-        eType="#//CommSubsystem" eOpposite="#//CommSubsystem/communicationLink"/>
+        eType="#//CommSubsystem"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
         eType="#//CommSubsystem"/>
   </eClassifiers>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel
index b570f05e..f8b6d75b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel
@@ -35,7 +35,7 @@
     </genClasses>
     <genClasses image="false" ecoreClass="satellite.ecore#//CommunicatingElement">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//CommunicatingElement/commSubsystem"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference satellite.ecore#//CommunicatingElement/communicationLink"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//CommunicatingElement/communicationLink"/>
     </genClasses>
     <genClasses ecoreClass="satellite.ecore#//GroundStationNetwork"/>
     <genClasses image="false" ecoreClass="satellite.ecore#//Spacecraft">
@@ -45,7 +45,6 @@
     <genClasses ecoreClass="satellite.ecore#//CommSubsystem">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute satellite.ecore#//CommSubsystem/band"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute satellite.ecore#//CommSubsystem/gain"/>
-      <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference satellite.ecore#//CommSubsystem/communicationLink"/>
     </genClasses>
     <genClasses ecoreClass="satellite.ecore#//DirectedCommunicationLink">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference satellite.ecore#//DirectedCommunicationLink/source"/>
@@ -56,6 +55,5 @@
     <genClasses ecoreClass="satellite.ecore#//CubeSat3U"/>
     <genClasses ecoreClass="satellite.ecore#//CubeSat6U"/>
     <genClasses ecoreClass="satellite.ecore#//SmallSat"/>
-    <genClasses image="false" ecoreClass="satellite.ecore#//CubeSat"/>
   </genPackages>
 </genmodel:GenModel>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generated3valued.vql_deactivated b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generated3valued.vql_deactivated
index d28c0d4d..853b7b54 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generated3valued.vql_deactivated
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generated3valued.vql_deactivated
@@ -110,22 +110,22 @@ private pattern mayInstanceOfConstellationMission_class(problem:LogicProblem, in
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfConstellationMission_class_UndefinedPart(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfInterferometryMission_class(problem,interpretation,element);
+        neg find mustInstanceOfConstellationMission_class_UndefinedPart(problem,interpretation,element);
         neg find scopeDisallowsNewConstellationMission_class(problem, interpretation);
         neg find isPrimitive(element);
 } or {
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfConstellationMission_class_UndefinedPart(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfInterferometryMission_class(problem,interpretation,element);
+        neg find mustInstanceOfConstellationMission_class_UndefinedPart(problem,interpretation,element);
         neg find scopeDisallowsNewConstellationMission_class(problem, interpretation);
         neg find isPrimitive(element);
 } or
@@ -154,20 +154,20 @@ private pattern mayInstanceOfInterferometryMission_class(problem:LogicProblem, i
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfConstellationMission_class_UndefinedPart(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+        neg find mustInstanceOfConstellationMission_class_UndefinedPart(problem,interpretation,element);
         neg find scopeDisallowsNewInterferometryMission_class(problem, interpretation);
         neg find isPrimitive(element);
 } or {
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfConstellationMission_class_UndefinedPart(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+        neg find mustInstanceOfConstellationMission_class_UndefinedPart(problem,interpretation,element);
         neg find scopeDisallowsNewInterferometryMission_class(problem, interpretation);
         neg find isPrimitive(element);
 } or
@@ -196,10 +196,10 @@ private pattern mayInstanceOfCommunicatingElement_class(problem:LogicProblem, in
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
+        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfCommunicatingElement_class_UndefinedPart(problem,interpretation,element);
         neg find scopeDisallowsNewCommunicatingElement_class(problem, interpretation);
         neg find isPrimitive(element);
@@ -207,10 +207,10 @@ private pattern mayInstanceOfCommunicatingElement_class(problem:LogicProblem, in
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
+        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfCommunicatingElement_class_UndefinedPart(problem,interpretation,element);
         neg find scopeDisallowsNewCommunicatingElement_class(problem, interpretation);
         neg find isPrimitive(element);
@@ -240,9 +240,9 @@ private pattern mayInstanceOfGroundStationNetwork_class(problem:LogicProblem, in
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfCommunicatingElement_class_UndefinedPart(problem,interpretation,element);
         neg find scopeDisallowsNewGroundStationNetwork_class(problem, interpretation);
         neg find isPrimitive(element);
@@ -250,9 +250,9 @@ private pattern mayInstanceOfGroundStationNetwork_class(problem:LogicProblem, in
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfCommunicatingElement_class_UndefinedPart(problem,interpretation,element);
         neg find scopeDisallowsNewGroundStationNetwork_class(problem, interpretation);
         neg find isPrimitive(element);
@@ -282,24 +282,24 @@ private pattern mayInstanceOfSpacecraft_class(problem:LogicProblem, interpretati
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
-        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfCubeSat_class(problem,interpretation,element);
+        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
         neg find scopeDisallowsNewSpacecraft_class(problem, interpretation);
         neg find isPrimitive(element);
 } or {
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
-        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfCubeSat_class(problem,interpretation,element);
+        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
         neg find scopeDisallowsNewSpacecraft_class(problem, interpretation);
         neg find isPrimitive(element);
 } or
@@ -328,20 +328,20 @@ private pattern mayInstanceOfCommSubsystem_class(problem:LogicProblem, interpret
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,element);
         neg find scopeDisallowsNewCommSubsystem_class(problem, interpretation);
         neg find isPrimitive(element);
 } or {
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,element);
         neg find scopeDisallowsNewCommSubsystem_class(problem, interpretation);
         neg find isPrimitive(element);
 } or
@@ -369,19 +369,19 @@ private pattern mayInstanceOfDirectedCommunicationLink_class(problem:LogicProble
 {
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find scopeDisallowsNewDirectedCommunicationLink_class(problem, interpretation);
         neg find isPrimitive(element);
 } or {
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find scopeDisallowsNewDirectedCommunicationLink_class(problem, interpretation);
         neg find isPrimitive(element);
 } or
@@ -410,20 +410,20 @@ private pattern mayInstanceOfPayload_class(problem:LogicProblem, interpretation:
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfInterferometryPayload_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find scopeDisallowsNewPayload_class(problem, interpretation);
         neg find isPrimitive(element);
 } or {
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfInterferometryPayload_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find scopeDisallowsNewPayload_class(problem, interpretation);
         neg find isPrimitive(element);
 } or
@@ -452,18 +452,18 @@ private pattern mayInstanceOfInterferometryPayload_class(problem:LogicProblem, i
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find scopeDisallowsNewInterferometryPayload_class(problem, interpretation);
         neg find isPrimitive(element);
 } or {
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find scopeDisallowsNewInterferometryPayload_class(problem, interpretation);
         neg find isPrimitive(element);
 } or
@@ -491,25 +491,25 @@ private pattern mayInstanceOfCubeSat3U_class(problem:LogicProblem, interpretatio
 {
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
-        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
         neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfPayload_class(problem,interpretation,element);
+        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
         neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
-        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
         neg find scopeDisallowsNewCubeSat3U_class(problem, interpretation);
         neg find isPrimitive(element);
 } or {
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
-        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
         neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfPayload_class(problem,interpretation,element);
+        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
         neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
-        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
         neg find scopeDisallowsNewCubeSat3U_class(problem, interpretation);
         neg find isPrimitive(element);
 } or
@@ -538,24 +538,24 @@ private pattern mayInstanceOfCubeSat6U_class(problem:LogicProblem, interpretatio
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
+        neg find mustInstanceOfPayload_class(problem,interpretation,element);
+        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
         neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
         neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
-        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
         neg find scopeDisallowsNewCubeSat6U_class(problem, interpretation);
         neg find isPrimitive(element);
 } or {
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
+        neg find mustInstanceOfPayload_class(problem,interpretation,element);
+        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
         neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
         neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
-        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
         neg find scopeDisallowsNewCubeSat6U_class(problem, interpretation);
         neg find isPrimitive(element);
 } or
@@ -584,22 +584,22 @@ private pattern mayInstanceOfSmallSat_class(problem:LogicProblem, interpretation
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfCubeSat_class(problem,interpretation,element);
+        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find scopeDisallowsNewSmallSat_class(problem, interpretation);
         neg find isPrimitive(element);
 } or {
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfCubeSat_class(problem,interpretation,element);
+        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find scopeDisallowsNewSmallSat_class(problem, interpretation);
         neg find isPrimitive(element);
 } or
@@ -628,26 +628,26 @@ private pattern mayInstanceOfCubeSat_class(problem:LogicProblem, interpretation:
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
+        neg find mustInstanceOfPayload_class(problem,interpretation,element);
+        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
         neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
         neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
+        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
         neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
-        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
         neg find scopeDisallowsNewCubeSat_class(problem, interpretation);
         neg find isPrimitive(element);
 } or {
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
+        neg find mustInstanceOfPayload_class(problem,interpretation,element);
+        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
         neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
         neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
+        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
         neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
-        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
         neg find scopeDisallowsNewCubeSat_class(problem, interpretation);
         neg find isPrimitive(element);
 } or
@@ -760,9 +760,9 @@ private pattern mayInstanceOfConstellationMission_class_UndefinedPart(problem:Lo
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfInterferometryMission_class(problem,interpretation,element);
         neg find scopeDisallowsNewConstellationMission_class_UndefinedPart(problem, interpretation);
         neg find isPrimitive(element);
@@ -770,9 +770,9 @@ private pattern mayInstanceOfConstellationMission_class_UndefinedPart(problem:Lo
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfInterferometryMission_class(problem,interpretation,element);
         neg find scopeDisallowsNewConstellationMission_class_UndefinedPart(problem, interpretation);
         neg find isPrimitive(element);
@@ -823,18 +823,18 @@ private pattern mayInstanceOfInterferometryMission_class_UndefinedPart(problem:L
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find scopeDisallowsNewInterferometryMission_class_UndefinedPart(problem, interpretation);
         neg find isPrimitive(element);
 } or {
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find scopeDisallowsNewInterferometryMission_class_UndefinedPart(problem, interpretation);
         neg find isPrimitive(element);
 } or
@@ -884,10 +884,10 @@ private pattern mayInstanceOfCommunicatingElement_class_UndefinedPart(problem:Lo
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
         neg find scopeDisallowsNewCommunicatingElement_class_UndefinedPart(problem, interpretation);
         neg find isPrimitive(element);
@@ -895,10 +895,10 @@ private pattern mayInstanceOfCommunicatingElement_class_UndefinedPart(problem:Lo
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
         neg find scopeDisallowsNewCommunicatingElement_class_UndefinedPart(problem, interpretation);
         neg find isPrimitive(element);
@@ -949,9 +949,9 @@ private pattern mayInstanceOfGroundStationNetwork_class_UndefinedPart(problem:Lo
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
         neg find scopeDisallowsNewGroundStationNetwork_class_UndefinedPart(problem, interpretation);
         neg find isPrimitive(element);
@@ -959,9 +959,9 @@ private pattern mayInstanceOfGroundStationNetwork_class_UndefinedPart(problem:Lo
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
         neg find scopeDisallowsNewGroundStationNetwork_class_UndefinedPart(problem, interpretation);
         neg find isPrimitive(element);
@@ -1012,18 +1012,18 @@ private pattern mayInstanceOfCommSubsystem_class_UndefinedPart(problem:LogicProb
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find scopeDisallowsNewCommSubsystem_class_UndefinedPart(problem, interpretation);
         neg find isPrimitive(element);
 } or {
         find interpretation(problem,interpretation);
         PartialInterpretation.openWorldElements(interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find scopeDisallowsNewCommSubsystem_class_UndefinedPart(problem, interpretation);
         neg find isPrimitive(element);
 } or
@@ -1155,39 +1155,21 @@ private pattern mayInRelationcommSubsystem_reference_CommunicatingElement(
 /**
  * Matcher for detecting tuples t where []communicationLink reference CommunicatingElement(source,target)
  */
- private pattern mustInRelationcommunicationLink_reference_CommunicatingElement(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        source: DefinedElement, target:DefinedElement)
- {
-        find mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkOfElement(problem,interpretation,source,target);
- }
-/**
- * Matcher for detecting tuples t where []communicationLink reference CommunicatingElement(source,target)
- */
- private pattern mayInRelationcommunicationLink_reference_CommunicatingElement(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        source: DefinedElement, target:DefinedElement)
- {
-        find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkOfElement(problem,interpretation,source,target);
- }
-/**
- * Matcher for detecting tuples t where []payload reference Spacecraft(source,target)
- */
-private pattern mustInRelationpayload_reference_Spacecraft(
+private pattern mustInRelationcommunicationLink_reference_CommunicatingElement(
         problem:LogicProblem, interpretation:PartialInterpretation,
         source: DefinedElement, target:DefinedElement)
 {
         find interpretation(problem,interpretation);
         PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"payload reference Spacecraft");
+        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"communicationLink reference CommunicatingElement");
         PartialRelationInterpretation.relationlinks(relationIterpretation,link);
         BinaryElementRelationLink.param1(link,source);
         BinaryElementRelationLink.param2(link,target);
 }
 /**
- * Matcher for detecting tuples t where <>payload reference Spacecraft(source,target)
+ * Matcher for detecting tuples t where <>communicationLink reference CommunicatingElement(source,target)
  */
-private pattern mayInRelationpayload_reference_Spacecraft(
+private pattern mayInRelationcommunicationLink_reference_CommunicatingElement(
         problem:LogicProblem, interpretation:PartialInterpretation,
         source: DefinedElement, target:DefinedElement)
 {
@@ -1196,11 +1178,11 @@ private pattern mayInRelationpayload_reference_Spacecraft(
         find mayExist(problem, interpretation, source);
         find mayExist(problem, interpretation, target);
         // Type consistency
-        find mayInstanceOfSpacecraft_class(problem,interpretation,source);
-        find mayInstanceOfPayload_class(problem,interpretation,target);
+        find mayInstanceOfCommunicatingElement_class(problem,interpretation,source);
+        find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,target);
         // There are "numberOfExistingReferences" currently existing instances of the reference from the source,
         // the upper bound of the multiplicity should be considered.
-        numberOfExistingReferences == count find mustInRelationpayload_reference_Spacecraft(problem,interpretation,source,_);
+        numberOfExistingReferences == count find mustInRelationcommunicationLink_reference_CommunicatingElement(problem,interpretation,source,_);
         check(numberOfExistingReferences < 1);
         // The reference is containment, then a new reference cannot be create if:
         // 1. Multiple parents
@@ -1208,26 +1190,26 @@ private pattern mayInRelationpayload_reference_Spacecraft(
         // 2. Circle in the containment hierarchy
         neg find mustTransitiveContains(source,target);
 } or {
-        find mustInRelationpayload_reference_Spacecraft(problem,interpretation,source,target);
+        find mustInRelationcommunicationLink_reference_CommunicatingElement(problem,interpretation,source,target);
 }
 /**
- * Matcher for detecting tuples t where []communicationLink reference CommSubsystem(source,target)
+ * Matcher for detecting tuples t where []payload reference Spacecraft(source,target)
  */
-private pattern mustInRelationcommunicationLink_reference_CommSubsystem(
+private pattern mustInRelationpayload_reference_Spacecraft(
         problem:LogicProblem, interpretation:PartialInterpretation,
         source: DefinedElement, target:DefinedElement)
 {
         find interpretation(problem,interpretation);
         PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"communicationLink reference CommSubsystem");
+        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"payload reference Spacecraft");
         PartialRelationInterpretation.relationlinks(relationIterpretation,link);
         BinaryElementRelationLink.param1(link,source);
         BinaryElementRelationLink.param2(link,target);
 }
 /**
- * Matcher for detecting tuples t where <>communicationLink reference CommSubsystem(source,target)
+ * Matcher for detecting tuples t where <>payload reference Spacecraft(source,target)
  */
-private pattern mayInRelationcommunicationLink_reference_CommSubsystem(
+private pattern mayInRelationpayload_reference_Spacecraft(
         problem:LogicProblem, interpretation:PartialInterpretation,
         source: DefinedElement, target:DefinedElement)
 {
@@ -1236,11 +1218,11 @@ private pattern mayInRelationcommunicationLink_reference_CommSubsystem(
         find mayExist(problem, interpretation, source);
         find mayExist(problem, interpretation, target);
         // Type consistency
-        find mayInstanceOfCommSubsystem_class(problem,interpretation,source);
-        find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,target);
+        find mayInstanceOfSpacecraft_class(problem,interpretation,source);
+        find mayInstanceOfPayload_class(problem,interpretation,target);
         // There are "numberOfExistingReferences" currently existing instances of the reference from the source,
         // the upper bound of the multiplicity should be considered.
-        numberOfExistingReferences == count find mustInRelationcommunicationLink_reference_CommSubsystem(problem,interpretation,source,_);
+        numberOfExistingReferences == count find mustInRelationpayload_reference_Spacecraft(problem,interpretation,source,_);
         check(numberOfExistingReferences < 1);
         // The reference is containment, then a new reference cannot be create if:
         // 1. Multiple parents
@@ -1248,7 +1230,7 @@ private pattern mayInRelationcommunicationLink_reference_CommSubsystem(
         // 2. Circle in the containment hierarchy
         neg find mustTransitiveContains(source,target);
 } or {
-        find mustInRelationcommunicationLink_reference_CommSubsystem(problem,interpretation,source,target);
+        find mustInRelationpayload_reference_Spacecraft(problem,interpretation,source,target);
 }
 /**
  * Matcher for detecting tuples t where []source reference DirectedCommunicationLink(source,target)
@@ -1412,118 +1394,69 @@ private pattern mayInRelationgain_attribute_CommSubsystem(
 //////////
 // 1.3 Relation Definition Indexers
 //////////
-// Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries multipleCommunicationLinks
-private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_multipleCommunicationLinks(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        var_Element)
-{
-        find interpretation(problem,interpretation);
-        find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
-        // Element is exported
-        find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
-        find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Element,var_virtual0);
-        find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
-        find mustInRelationcommunicationLink_reference_CommSubsystem(problem,interpretation,var_virtual0,var_virtual1);
-        find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_virtual1);
-        find mustEquivalent(problem, interpretation, var_virtual1, var_Link1);
-        find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
-        find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Element,var_virtual2);
-        find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
-        find mustInRelationcommunicationLink_reference_CommSubsystem(problem,interpretation,var_virtual2,var_virtual3);
-        find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_virtual3);
-        find mustEquivalent(problem, interpretation, var_virtual3, var_Link2);
-        neg find mayEquivalent(problem, interpretation, var_Link1, var_Link2);
-}
-private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_multipleCommunicationLinks(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        var_Element)
-{
-        find interpretation(problem,interpretation);
-        find mayInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
-        // Element is exported
-        find mayInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
-        find mayInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Element,var_virtual0);
-        find mayInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
-        find mayInRelationcommunicationLink_reference_CommSubsystem(problem,interpretation,var_virtual0,var_virtual1);
-        find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_virtual1);
-        find mayEquivalent(problem, interpretation, var_virtual1, var_Link1);
-        find mayInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
-        find mayInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Element,var_virtual2);
-        find mayInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
-        find mayInRelationcommunicationLink_reference_CommSubsystem(problem,interpretation,var_virtual2,var_virtual3);
-        find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_virtual3);
-        find mayEquivalent(problem, interpretation, var_virtual3, var_Link2);
-        neg find mustEquivalent(problem, interpretation, var_Link1, var_Link2);
-}
-private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_multipleCommunicationLinks(
+// Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries communicationLinkDoesNotStartAtContainingElement
+private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkDoesNotStartAtContainingElement(
         problem:LogicProblem, interpretation:PartialInterpretation,
-        var_Element)
-{
-        find interpretation(problem,interpretation);
-        find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
-        // Element is exported
-        find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
-        find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Element,var_virtual0);
-        find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
-        find mustInRelationcommunicationLink_reference_CommSubsystem(problem,interpretation,var_virtual0,var_virtual1);
-        find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_virtual1);
-        find mustEquivalent(problem, interpretation, var_virtual1, var_Link1);
-        find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
-        find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Element,var_virtual2);
-        find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
-        find mustInRelationcommunicationLink_reference_CommSubsystem(problem,interpretation,var_virtual2,var_virtual3);
-        find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_virtual3);
-        find mustEquivalent(problem, interpretation, var_virtual3, var_Link2);
-        neg find mustEquivalent(problem, interpretation, var_Link1, var_Link2);
-}
-// Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries communicationLinkOfElement
-private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkOfElement(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        var_Element, var_Link)
+        var_Link)
 {
         find interpretation(problem,interpretation);
-        find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
         find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
-        // Element is exported
         // Link is exported
         find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
-        find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Element,var_virtual0);
-        find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
-        find mustInRelationcommunicationLink_reference_CommSubsystem(problem,interpretation,var_virtual0,var_virtual1);
-        find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_virtual1);
-        find mustEquivalent(problem, interpretation, var_virtual1, var_Link);
+        find mustInRelationcommunicationLink_reference_CommunicatingElement(problem,interpretation,var_Element,var_virtual0);
+        find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_virtual0);
+        find mustEquivalent(problem, interpretation, var_virtual0, var_Link);
+        find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
+        find mustInRelationsource_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual1);
+        find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual1);
+        find mustEquivalent(problem, interpretation, var_virtual1, var_SourceComm);
+        find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_SourceElement);
+        find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_SourceElement,var_virtual2);
+        find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
+        find mustEquivalent(problem, interpretation, var_virtual2, var_SourceComm);
+        neg find mayEquivalent(problem, interpretation, var_Element, var_SourceElement);
 }
-private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkOfElement(
+private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkDoesNotStartAtContainingElement(
         problem:LogicProblem, interpretation:PartialInterpretation,
-        var_Element, var_Link)
+        var_Link)
 {
         find interpretation(problem,interpretation);
-        find mayInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
         find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
-        // Element is exported
         // Link is exported
         find mayInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
-        find mayInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Element,var_virtual0);
-        find mayInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
-        find mayInRelationcommunicationLink_reference_CommSubsystem(problem,interpretation,var_virtual0,var_virtual1);
-        find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_virtual1);
-        find mayEquivalent(problem, interpretation, var_virtual1, var_Link);
+        find mayInRelationcommunicationLink_reference_CommunicatingElement(problem,interpretation,var_Element,var_virtual0);
+        find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_virtual0);
+        find mayEquivalent(problem, interpretation, var_virtual0, var_Link);
+        find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
+        find mayInRelationsource_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual1);
+        find mayInstanceOfCommSubsystem_class(problem,interpretation,var_virtual1);
+        find mayEquivalent(problem, interpretation, var_virtual1, var_SourceComm);
+        find mayInstanceOfCommunicatingElement_class(problem,interpretation,var_SourceElement);
+        find mayInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_SourceElement,var_virtual2);
+        find mayInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
+        find mayEquivalent(problem, interpretation, var_virtual2, var_SourceComm);
+        neg find mustEquivalent(problem, interpretation, var_Element, var_SourceElement);
 }
-private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkOfElement(
+private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkDoesNotStartAtContainingElement(
         problem:LogicProblem, interpretation:PartialInterpretation,
-        var_Element, var_Link)
+        var_Link)
 {
         find interpretation(problem,interpretation);
-        find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
         find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
-        // Element is exported
         // Link is exported
         find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
-        find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Element,var_virtual0);
-        find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
-        find mustInRelationcommunicationLink_reference_CommSubsystem(problem,interpretation,var_virtual0,var_virtual1);
-        find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_virtual1);
-        find mustEquivalent(problem, interpretation, var_virtual1, var_Link);
+        find mustInRelationcommunicationLink_reference_CommunicatingElement(problem,interpretation,var_Element,var_virtual0);
+        find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_virtual0);
+        find mustEquivalent(problem, interpretation, var_virtual0, var_Link);
+        find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
+        find mustInRelationsource_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual1);
+        find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual1);
+        find mustEquivalent(problem, interpretation, var_virtual1, var_SourceComm);
+        find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_SourceElement);
+        find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_SourceElement,var_virtual2);
+        find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
+        find mustEquivalent(problem, interpretation, var_virtual2, var_SourceComm);
+        neg find mustEquivalent(problem, interpretation, var_Element, var_SourceElement);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries notEnoughInterferometryPayloads
 private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_notEnoughInterferometryPayloads(
@@ -2942,9 +2875,9 @@ private pattern mustContains4(problem:LogicProblem, interpretation:PartialInterp
         
         { find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,source,target); }or
         
-        { find mustInRelationpayload_reference_Spacecraft(problem,interpretation,source,target); }or
+        { find mustInRelationcommunicationLink_reference_CommunicatingElement(problem,interpretation,source,target); }or
         
-        { find mustInRelationcommunicationLink_reference_CommSubsystem(problem,interpretation,source,target); }
+        { find mustInRelationpayload_reference_Spacecraft(problem,interpretation,source,target); }
 
 private pattern mustTransitiveContains(source,target) {
         find mustContains2+(source,target);
@@ -2955,10 +2888,10 @@ private pattern mustTransitiveContains(source,target) {
 //////////
 // 2.1 Invalidated by WF Queries
 //////////
-pattern invalidatedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_multipleCommunicationLinks(problem:LogicProblem, interpretation:PartialInterpretation,
-        var_Element)
+pattern invalidatedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkDoesNotStartAtContainingElement(problem:LogicProblem, interpretation:PartialInterpretation,
+        var_Link)
 {
-        find mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_multipleCommunicationLinks(problem,interpretation,var_Element);
+        find mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkDoesNotStartAtContainingElement(problem,interpretation,var_Link);
 }
 pattern invalidatedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_notEnoughInterferometryPayloads(problem:LogicProblem, interpretation:PartialInterpretation,
         var_Mission)
@@ -3088,10 +3021,10 @@ pattern unfinishedLowerMultiplicity_gain_attribute_CommSubsystem(problem:LogicPr
 //////////
 // 3.2 Unfinishedness Measured by WF Queries
 //////////
-pattern unfinishedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_multipleCommunicationLinks(problem:LogicProblem, interpretation:PartialInterpretation,
-        var_Element)
+pattern unfinishedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkDoesNotStartAtContainingElement(problem:LogicProblem, interpretation:PartialInterpretation,
+        var_Link)
 {
-        find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_multipleCommunicationLinks(problem,interpretation,var_Element);
+        find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkDoesNotStartAtContainingElement(problem,interpretation,var_Link);
 }
 pattern unfinishedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_notEnoughInterferometryPayloads(problem:LogicProblem, interpretation:PartialInterpretation,
         var_Mission)
@@ -3157,55 +3090,55 @@ pattern unfinishedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_querie
 private pattern hasElementInContainment(problem:LogicProblem, interpretation:PartialInterpretation)
 {
         find interpretation(problem,interpretation);
-        find mustInstanceOfSpacecraft_class(problem,interpretation,root);
+        find mustInstanceOfInterferometryPayload_class(problem,interpretation,root);
         find mustExist(problem, interpretation, root);
 }or{
         find interpretation(problem,interpretation);
-        find mustInstanceOfCubeSat6U_class(problem,interpretation,root);
+        find mustInstanceOfSpacecraft_class(problem,interpretation,root);
         find mustExist(problem, interpretation, root);
 }or{
         find interpretation(problem,interpretation);
-        find mustInstanceOfSmallSat_class(problem,interpretation,root);
+        find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,root);
         find mustExist(problem, interpretation, root);
 }or{
         find interpretation(problem,interpretation);
-        find mustInstanceOfGroundStationNetwork_class(problem,interpretation,root);
+        find mustInstanceOfCubeSat_class(problem,interpretation,root);
         find mustExist(problem, interpretation, root);
 }or{
         find interpretation(problem,interpretation);
-        find mustInstanceOfPayload_class(problem,interpretation,root);
+        find mustInstanceOfConstellationMission_class(problem,interpretation,root);
         find mustExist(problem, interpretation, root);
 }or{
         find interpretation(problem,interpretation);
-        find mustInstanceOfCommunicatingElement_class(problem,interpretation,root);
+        find mustInstanceOfInterferometryMission_class(problem,interpretation,root);
         find mustExist(problem, interpretation, root);
 }or{
         find interpretation(problem,interpretation);
-        find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,root);
+        find mustInstanceOfCubeSat3U_class(problem,interpretation,root);
         find mustExist(problem, interpretation, root);
 }or{
         find interpretation(problem,interpretation);
-        find mustInstanceOfCubeSat_class(problem,interpretation,root);
+        find mustInstanceOfCommunicatingElement_class(problem,interpretation,root);
         find mustExist(problem, interpretation, root);
 }or{
         find interpretation(problem,interpretation);
-        find mustInstanceOfCubeSat3U_class(problem,interpretation,root);
+        find mustInstanceOfCubeSat6U_class(problem,interpretation,root);
         find mustExist(problem, interpretation, root);
 }or{
         find interpretation(problem,interpretation);
-        find mustInstanceOfInterferometryPayload_class(problem,interpretation,root);
+        find mustInstanceOfSmallSat_class(problem,interpretation,root);
         find mustExist(problem, interpretation, root);
 }or{
         find interpretation(problem,interpretation);
-        find mustInstanceOfConstellationMission_class(problem,interpretation,root);
+        find mustInstanceOfCommSubsystem_class(problem,interpretation,root);
         find mustExist(problem, interpretation, root);
 }or{
         find interpretation(problem,interpretation);
-        find mustInstanceOfInterferometryMission_class(problem,interpretation,root);
+        find mustInstanceOfGroundStationNetwork_class(problem,interpretation,root);
         find mustExist(problem, interpretation, root);
 }or{
         find interpretation(problem,interpretation);
-        find mustInstanceOfCommSubsystem_class(problem,interpretation,root);
+        find mustInstanceOfPayload_class(problem,interpretation,root);
         find mustExist(problem, interpretation, root);
 }or{
         find interpretation(problem,interpretation);
@@ -3248,87 +3181,99 @@ private pattern hasElementInContainment(problem:LogicProblem, interpretation:Par
         find mustInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,root);
         find mustExist(problem, interpretation, root);
 }
-pattern createObject_GroundStationNetwork_class_UndefinedPart_by_groundStationNetwork_reference_ConstellationMission(
+pattern createObject_DirectedCommunicationLink_class_by_communicationLink_reference_CommunicatingElement(
         problem:LogicProblem, interpretation:PartialInterpretation,
         relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialComplexTypeInterpretation,
         container:DefinedElement)
 {
         find interpretation(problem,interpretation);
         PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"GroundStationNetwork class UndefinedPart");
+        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"DirectedCommunicationLink class");
         PartialInterpretation.partialrelationinterpretation(interpretation,relationInterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"groundStationNetwork reference ConstellationMission");
-        find mustInstanceOfConstellationMission_class(problem,interpretation,container);
-        find mayInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,newObject);
-        find mayInRelationgroundStationNetwork_reference_ConstellationMission(problem,interpretation,container,newObject);
+        PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"communicationLink reference CommunicatingElement");
+        find mustInstanceOfCommunicatingElement_class(problem,interpretation,container);
+        find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,newObject);
+        find mayInRelationcommunicationLink_reference_CommunicatingElement(problem,interpretation,container,newObject);
         find mustExist(problem, interpretation, container);
         neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_GroundStationNetwork_class_UndefinedPart(
+pattern createObject_DirectedCommunicationLink_class(
         problem:LogicProblem, interpretation:PartialInterpretation,
         typeInterpretation:PartialComplexTypeInterpretation)
 {
         find interpretation(problem,interpretation);
         neg find hasElementInContainment(problem,interpretation);
         PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"GroundStationNetwork class UndefinedPart");
-        find mayInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,newObject);
+        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"DirectedCommunicationLink class");
+        find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,newObject);
         find mayExist(problem, interpretation, newObject);
         neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_SmallSat_class_by_spacecraft_reference_ConstellationMission(
+pattern createObject_InterferometryMission_class_UndefinedPart(
+        problem:LogicProblem, interpretation:PartialInterpretation,
+        typeInterpretation:PartialComplexTypeInterpretation)
+{
+        find interpretation(problem,interpretation);
+        neg find hasElementInContainment(problem,interpretation);
+        PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
+        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"InterferometryMission class UndefinedPart");
+        find mayInstanceOfInterferometryMission_class_UndefinedPart(problem,interpretation,newObject);
+        find mayExist(problem, interpretation, newObject);
+        neg find mustExist(problem, interpretation, newObject);
+}
+pattern createObject_InterferometryPayload_class_by_payload_reference_Spacecraft(
         problem:LogicProblem, interpretation:PartialInterpretation,
         relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialComplexTypeInterpretation,
         container:DefinedElement)
 {
         find interpretation(problem,interpretation);
         PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"SmallSat class");
+        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"InterferometryPayload class");
         PartialInterpretation.partialrelationinterpretation(interpretation,relationInterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"spacecraft reference ConstellationMission");
-        find mustInstanceOfConstellationMission_class(problem,interpretation,container);
-        find mayInstanceOfSmallSat_class(problem,interpretation,newObject);
-        find mayInRelationspacecraft_reference_ConstellationMission(problem,interpretation,container,newObject);
+        PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"payload reference Spacecraft");
+        find mustInstanceOfSpacecraft_class(problem,interpretation,container);
+        find mayInstanceOfInterferometryPayload_class(problem,interpretation,newObject);
+        find mayInRelationpayload_reference_Spacecraft(problem,interpretation,container,newObject);
         find mustExist(problem, interpretation, container);
         neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_SmallSat_class(
+pattern createObject_InterferometryPayload_class(
         problem:LogicProblem, interpretation:PartialInterpretation,
         typeInterpretation:PartialComplexTypeInterpretation)
 {
         find interpretation(problem,interpretation);
         neg find hasElementInContainment(problem,interpretation);
         PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"SmallSat class");
-        find mayInstanceOfSmallSat_class(problem,interpretation,newObject);
+        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"InterferometryPayload class");
+        find mayInstanceOfInterferometryPayload_class(problem,interpretation,newObject);
         find mayExist(problem, interpretation, newObject);
         neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_DirectedCommunicationLink_class_by_communicationLink_reference_CommSubsystem(
+pattern createObject_GroundStationNetwork_class_UndefinedPart_by_groundStationNetwork_reference_ConstellationMission(
         problem:LogicProblem, interpretation:PartialInterpretation,
         relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialComplexTypeInterpretation,
         container:DefinedElement)
 {
         find interpretation(problem,interpretation);
         PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"DirectedCommunicationLink class");
+        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"GroundStationNetwork class UndefinedPart");
         PartialInterpretation.partialrelationinterpretation(interpretation,relationInterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"communicationLink reference CommSubsystem");
-        find mustInstanceOfCommSubsystem_class(problem,interpretation,container);
-        find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,newObject);
-        find mayInRelationcommunicationLink_reference_CommSubsystem(problem,interpretation,container,newObject);
+        PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"groundStationNetwork reference ConstellationMission");
+        find mustInstanceOfConstellationMission_class(problem,interpretation,container);
+        find mayInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,newObject);
+        find mayInRelationgroundStationNetwork_reference_ConstellationMission(problem,interpretation,container,newObject);
         find mustExist(problem, interpretation, container);
         neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_DirectedCommunicationLink_class(
+pattern createObject_GroundStationNetwork_class_UndefinedPart(
         problem:LogicProblem, interpretation:PartialInterpretation,
         typeInterpretation:PartialComplexTypeInterpretation)
 {
         find interpretation(problem,interpretation);
         neg find hasElementInContainment(problem,interpretation);
         PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"DirectedCommunicationLink class");
-        find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,newObject);
+        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"GroundStationNetwork class UndefinedPart");
+        find mayInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,newObject);
         find mayExist(problem, interpretation, newObject);
         neg find mustExist(problem, interpretation, newObject);
 }
@@ -3360,31 +3305,31 @@ pattern createObject_CubeSat3U_class(
         find mayExist(problem, interpretation, newObject);
         neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_CubeSat6U_class_by_spacecraft_reference_ConstellationMission(
+pattern createObject_SmallSat_class_by_spacecraft_reference_ConstellationMission(
         problem:LogicProblem, interpretation:PartialInterpretation,
         relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialComplexTypeInterpretation,
         container:DefinedElement)
 {
         find interpretation(problem,interpretation);
         PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"CubeSat6U class");
+        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"SmallSat class");
         PartialInterpretation.partialrelationinterpretation(interpretation,relationInterpretation);
         PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"spacecraft reference ConstellationMission");
         find mustInstanceOfConstellationMission_class(problem,interpretation,container);
-        find mayInstanceOfCubeSat6U_class(problem,interpretation,newObject);
+        find mayInstanceOfSmallSat_class(problem,interpretation,newObject);
         find mayInRelationspacecraft_reference_ConstellationMission(problem,interpretation,container,newObject);
         find mustExist(problem, interpretation, container);
         neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_CubeSat6U_class(
+pattern createObject_SmallSat_class(
         problem:LogicProblem, interpretation:PartialInterpretation,
         typeInterpretation:PartialComplexTypeInterpretation)
 {
         find interpretation(problem,interpretation);
         neg find hasElementInContainment(problem,interpretation);
         PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"CubeSat6U class");
-        find mayInstanceOfCubeSat6U_class(problem,interpretation,newObject);
+        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"SmallSat class");
+        find mayInstanceOfSmallSat_class(problem,interpretation,newObject);
         find mayExist(problem, interpretation, newObject);
         neg find mustExist(problem, interpretation, newObject);
 }
@@ -3416,43 +3361,31 @@ pattern createObject_CommSubsystem_class_UndefinedPart(
         find mayExist(problem, interpretation, newObject);
         neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_InterferometryMission_class_UndefinedPart(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        typeInterpretation:PartialComplexTypeInterpretation)
-{
-        find interpretation(problem,interpretation);
-        neg find hasElementInContainment(problem,interpretation);
-        PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"InterferometryMission class UndefinedPart");
-        find mayInstanceOfInterferometryMission_class_UndefinedPart(problem,interpretation,newObject);
-        find mayExist(problem, interpretation, newObject);
-        neg find mustExist(problem, interpretation, newObject);
-}
-pattern createObject_InterferometryPayload_class_by_payload_reference_Spacecraft(
+pattern createObject_CubeSat6U_class_by_spacecraft_reference_ConstellationMission(
         problem:LogicProblem, interpretation:PartialInterpretation,
         relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialComplexTypeInterpretation,
         container:DefinedElement)
 {
         find interpretation(problem,interpretation);
         PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"InterferometryPayload class");
+        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"CubeSat6U class");
         PartialInterpretation.partialrelationinterpretation(interpretation,relationInterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"payload reference Spacecraft");
-        find mustInstanceOfSpacecraft_class(problem,interpretation,container);
-        find mayInstanceOfInterferometryPayload_class(problem,interpretation,newObject);
-        find mayInRelationpayload_reference_Spacecraft(problem,interpretation,container,newObject);
+        PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"spacecraft reference ConstellationMission");
+        find mustInstanceOfConstellationMission_class(problem,interpretation,container);
+        find mayInstanceOfCubeSat6U_class(problem,interpretation,newObject);
+        find mayInRelationspacecraft_reference_ConstellationMission(problem,interpretation,container,newObject);
         find mustExist(problem, interpretation, container);
         neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_InterferometryPayload_class(
+pattern createObject_CubeSat6U_class(
         problem:LogicProblem, interpretation:PartialInterpretation,
         typeInterpretation:PartialComplexTypeInterpretation)
 {
         find interpretation(problem,interpretation);
         neg find hasElementInContainment(problem,interpretation);
         PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"InterferometryPayload class");
-        find mayInstanceOfInterferometryPayload_class(problem,interpretation,newObject);
+        PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"CubeSat6U class");
+        find mayInstanceOfCubeSat6U_class(problem,interpretation,newObject);
         find mayExist(problem, interpretation, newObject);
         neg find mustExist(problem, interpretation, newObject);
 }
@@ -3460,114 +3393,99 @@ pattern createObject_InterferometryPayload_class(
 //////////
 // 4.2 Type refinement
 //////////
-pattern refineTypeTo_GroundStationNetwork_class_UndefinedPart(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
+pattern refineTypeTo_DirectedCommunicationLink_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
-        find mayInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,element);
-        neg find mustInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,element);
+        find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-        neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
 }
-pattern refineTypeTo_SmallSat_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
+pattern refineTypeTo_InterferometryMission_class_UndefinedPart(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
-        find mayInstanceOfSmallSat_class(problem,interpretation,element);
-        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
+        find mayInstanceOfInterferometryMission_class_UndefinedPart(problem,interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
-        neg find mustInstanceOfCubeSat_class(problem,interpretation,element);
-        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfInterferometryMission_class_UndefinedPart(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
 }
-pattern refineTypeTo_DirectedCommunicationLink_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
+pattern refineTypeTo_InterferometryPayload_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
-        find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+        find mayInstanceOfInterferometryPayload_class(problem,interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
         neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+        neg find mustInstanceOfInterferometryPayload_class(problem,interpretation,element);
+}
+pattern refineTypeTo_GroundStationNetwork_class_UndefinedPart(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
+        find interpretation(problem,interpretation);
+        PartialInterpretation.newElements(interpretation,element);
+        find mayInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,element);
+        neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+        neg find mustInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,element);
+        neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
 }
 pattern refineTypeTo_CubeSat3U_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         find mayInstanceOfCubeSat3U_class(problem,interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
+        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
         neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
+        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
         neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
-        neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
 }
-pattern refineTypeTo_CubeSat6U_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
+pattern refineTypeTo_SmallSat_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
-        find mayInstanceOfCubeSat6U_class(problem,interpretation,element);
+        find mayInstanceOfSmallSat_class(problem,interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
-        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
-        neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
-        neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
+        neg find mustInstanceOfCubeSat_class(problem,interpretation,element);
+        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
 }
 pattern refineTypeTo_CommSubsystem_class_UndefinedPart(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
         find mayInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
         neg find mustInstanceOfPayload_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-}
-pattern refineTypeTo_InterferometryMission_class_UndefinedPart(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
-        find interpretation(problem,interpretation);
-        PartialInterpretation.newElements(interpretation,element);
-        find mayInstanceOfInterferometryMission_class_UndefinedPart(problem,interpretation,element);
-        neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
         neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-        neg find mustInstanceOfPayload_class(problem,interpretation,element);
-        neg find mustInstanceOfInterferometryMission_class_UndefinedPart(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,element);
 }
-pattern refineTypeTo_InterferometryPayload_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
+pattern refineTypeTo_CubeSat6U_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
         find interpretation(problem,interpretation);
         PartialInterpretation.newElements(interpretation,element);
-        find mayInstanceOfInterferometryPayload_class(problem,interpretation,element);
+        find mayInstanceOfCubeSat6U_class(problem,interpretation,element);
         neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-        neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+        neg find mustInstanceOfPayload_class(problem,interpretation,element);
         neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-        neg find mustInstanceOfInterferometryPayload_class(problem,interpretation,element);
+        neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+        neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+        neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
+        neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
+        neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
 }
 
 //////////
 // 4.3 Relation refinement
 //////////
-pattern refineRelation_communicationLink_reference_CommunicatingElement(
-        problem:LogicProblem, interpretation:PartialInterpretation,
-        relationIterpretation:PartialRelationInterpretation,
-        from: DefinedElement, to: DefinedElement)
-{
-        find interpretation(problem,interpretation);
-        PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);
-        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"communicationLink reference CommunicatingElement");
-        find mustExist(problem, interpretation, from);
-        find mustExist(problem, interpretation, to);
-        find mustInstanceOfCommunicatingElement_class(problem,interpretation,from);
-        find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,to);
-        find mayInRelationcommunicationLink_reference_CommunicatingElement(problem,interpretation,from,to);
-        neg find mustInRelationcommunicationLink_reference_CommunicatingElement(problem,interpretation,from,to);
-}
 pattern refineRelation_source_reference_DirectedCommunicationLink(
         problem:LogicProblem, interpretation:PartialInterpretation,
         relationIterpretation:PartialRelationInterpretation,
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generation.logicproblem b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generation.logicproblem
index 2164c23c..2a54174a 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generation.logicproblem
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generation.logicproblem
@@ -648,38 +648,7 @@
       </expression>
     </value>
   </assertions>
-  <assertions name="upperMultiplicity communicationLink CommSubsystem" annotations="//@annotations.8">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 2">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Impl">
-        <leftOperand xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.8/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.8/@value/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.8/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.8/@value/@quantifiedVariables.2"/>
-          </operands>
-        </leftOperand>
-        <rightOperand xsi:type="language_1:Not">
-          <operand xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.8/@value/@quantifiedVariables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.8/@value/@quantifiedVariables.2"/>
-          </operand>
-        </rightOperand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="lowerMultiplicity source DirectedCommunicationLink" annotations="//@annotations.9">
+  <assertions name="lowerMultiplicity source DirectedCommunicationLink" annotations="//@annotations.8">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
@@ -689,15 +658,15 @@
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.9/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.9/@value/@expression/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.8/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.8/@value/@expression/@quantifiedVariables.0"/>
           </operands>
         </expression>
       </expression>
     </value>
   </assertions>
-  <assertions name="upperMultiplicity source DirectedCommunicationLink" annotations="//@annotations.10">
+  <assertions name="upperMultiplicity source DirectedCommunicationLink" annotations="//@annotations.9">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
@@ -710,25 +679,25 @@
       </quantifiedVariables>
       <expression xsi:type="language_1:Impl">
         <leftOperand xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.10/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.10/@value/@quantifiedVariables.1"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.9/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.9/@value/@quantifiedVariables.1"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.10/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.10/@value/@quantifiedVariables.2"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.9/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.9/@value/@quantifiedVariables.2"/>
           </operands>
         </leftOperand>
         <rightOperand xsi:type="language_1:Not">
           <operand xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.10/@value/@quantifiedVariables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.10/@value/@quantifiedVariables.2"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.9/@value/@quantifiedVariables.1"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.9/@value/@quantifiedVariables.2"/>
           </operand>
         </rightOperand>
       </expression>
     </value>
   </assertions>
-  <assertions name="lowerMultiplicity target DirectedCommunicationLink" annotations="//@annotations.11">
+  <assertions name="lowerMultiplicity target DirectedCommunicationLink" annotations="//@annotations.10">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
@@ -738,15 +707,15 @@
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.11/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.11/@value/@expression/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.10/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.10/@value/@expression/@quantifiedVariables.0"/>
           </operands>
         </expression>
       </expression>
     </value>
   </assertions>
-  <assertions name="upperMultiplicity target DirectedCommunicationLink" annotations="//@annotations.12">
+  <assertions name="upperMultiplicity target DirectedCommunicationLink" annotations="//@annotations.11">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
@@ -759,25 +728,25 @@
       </quantifiedVariables>
       <expression xsi:type="language_1:Impl">
         <leftOperand xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.12/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.12/@value/@quantifiedVariables.1"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.11/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.11/@value/@quantifiedVariables.1"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.12/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.12/@value/@quantifiedVariables.2"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.11/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.11/@value/@quantifiedVariables.2"/>
           </operands>
         </leftOperand>
         <rightOperand xsi:type="language_1:Not">
           <operand xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.12/@value/@quantifiedVariables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.12/@value/@quantifiedVariables.2"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.11/@value/@quantifiedVariables.1"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.11/@value/@quantifiedVariables.2"/>
           </operand>
         </rightOperand>
       </expression>
     </value>
   </assertions>
-  <assertions name="lowerMultiplicity kind Spacecraft" annotations="//@annotations.13">
+  <assertions name="lowerMultiplicity kind Spacecraft" annotations="//@annotations.12">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
@@ -787,15 +756,15 @@
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.15"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.13/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.13/@value/@expression/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.12/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.12/@value/@expression/@quantifiedVariables.0"/>
           </operands>
         </expression>
       </expression>
     </value>
   </assertions>
-  <assertions name="upperMultiplicity kind Spacecraft" annotations="//@annotations.14">
+  <assertions name="upperMultiplicity kind Spacecraft" annotations="//@annotations.13">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
@@ -808,25 +777,25 @@
       </quantifiedVariables>
       <expression xsi:type="language_1:Impl">
         <leftOperand xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.14/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.14/@value/@quantifiedVariables.1"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.13/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.13/@value/@quantifiedVariables.1"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.14/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.14/@value/@quantifiedVariables.2"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.13/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.13/@value/@quantifiedVariables.2"/>
           </operands>
         </leftOperand>
         <rightOperand xsi:type="language_1:Not">
           <operand xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.14/@value/@quantifiedVariables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.14/@value/@quantifiedVariables.2"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.13/@value/@quantifiedVariables.1"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.13/@value/@quantifiedVariables.2"/>
           </operand>
         </rightOperand>
       </expression>
     </value>
   </assertions>
-  <assertions name="lowerMultiplicity band CommSubsystem" annotations="//@annotations.15">
+  <assertions name="lowerMultiplicity band CommSubsystem" annotations="//@annotations.14">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
@@ -836,15 +805,15 @@
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.15/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.15/@value/@expression/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.14/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.14/@value/@expression/@quantifiedVariables.0"/>
           </operands>
         </expression>
       </expression>
     </value>
   </assertions>
-  <assertions name="upperMultiplicity band CommSubsystem" annotations="//@annotations.16">
+  <assertions name="upperMultiplicity band CommSubsystem" annotations="//@annotations.15">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
@@ -857,25 +826,25 @@
       </quantifiedVariables>
       <expression xsi:type="language_1:Impl">
         <leftOperand xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.16/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.16/@value/@quantifiedVariables.1"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.15/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.15/@value/@quantifiedVariables.1"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.16/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.16/@value/@quantifiedVariables.2"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.15/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.15/@value/@quantifiedVariables.2"/>
           </operands>
         </leftOperand>
         <rightOperand xsi:type="language_1:Not">
           <operand xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.16/@value/@quantifiedVariables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.16/@value/@quantifiedVariables.2"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.15/@value/@quantifiedVariables.1"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.15/@value/@quantifiedVariables.2"/>
           </operand>
         </rightOperand>
       </expression>
     </value>
   </assertions>
-  <assertions name="lowerMultiplicity gain CommSubsystem" annotations="//@annotations.17">
+  <assertions name="lowerMultiplicity gain CommSubsystem" annotations="//@annotations.16">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
@@ -885,15 +854,15 @@
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.14"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.17/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.17/@value/@expression/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.16/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.16/@value/@expression/@quantifiedVariables.0"/>
           </operands>
         </expression>
       </expression>
     </value>
   </assertions>
-  <assertions name="upperMultiplicity gain CommSubsystem" annotations="//@annotations.18">
+  <assertions name="upperMultiplicity gain CommSubsystem" annotations="//@annotations.17">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
@@ -906,31 +875,31 @@
       </quantifiedVariables>
       <expression xsi:type="language_1:Impl">
         <leftOperand xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.18/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.18/@value/@quantifiedVariables.1"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.17/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.17/@value/@quantifiedVariables.1"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.18/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.18/@value/@quantifiedVariables.2"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.17/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.17/@value/@quantifiedVariables.2"/>
           </operands>
         </leftOperand>
         <rightOperand xsi:type="language_1:Not">
           <operand xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.18/@value/@quantifiedVariables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.18/@value/@quantifiedVariables.2"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.17/@value/@quantifiedVariables.1"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.17/@value/@quantifiedVariables.2"/>
           </operand>
         </rightOperand>
       </expression>
     </value>
   </assertions>
-  <assertions name="PartialInterpretation groundStationNetwork reference ConstellationMission" annotations="//@annotations.19">
+  <assertions name="PartialInterpretation groundStationNetwork reference ConstellationMission" annotations="//@annotations.18">
     <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
       <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.9"/>
       <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.10"/>
     </value>
   </assertions>
-  <assertions name="PartialInterpretation commSubsystem reference CommunicatingElement" annotations="//@annotations.20">
+  <assertions name="PartialInterpretation commSubsystem reference CommunicatingElement" annotations="//@annotations.19">
     <value xsi:type="language_1:And">
       <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
         <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.10"/>
@@ -942,34 +911,46 @@
       </operands>
     </value>
   </assertions>
-  <assertions name="PartialInterpretation band attribute CommSubsystem" annotations="//@annotations.21">
+  <assertions name="PartialInterpretation band attribute CommSubsystem" annotations="//@annotations.20">
     <value xsi:type="language_1:And">
-      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
         <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.11"/>
         <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.1"/>
       </operands>
-      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
         <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.12"/>
         <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.2"/>
       </operands>
     </value>
   </assertions>
-  <assertions name="PartialInterpretation gain attribute CommSubsystem" annotations="//@annotations.22">
+  <assertions name="PartialInterpretation gain attribute CommSubsystem" annotations="//@annotations.21">
     <value xsi:type="language_1:And">
-      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
+      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
         <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.11"/>
         <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.4"/>
       </operands>
-      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
+      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
         <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.12"/>
         <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.5"/>
       </operands>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries multipleCommunicationLinks" annotations="//@annotations.52">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries communicationLinkDoesNotStartAtContainingElement" annotations="//@annotations.50">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
+      </quantifiedVariables>
+      <expression xsi:type="language_1:Not">
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.22/@value/@quantifiedVariables.0"/>
+        </operand>
+      </expression>
+    </value>
+  </assertions>
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries notEnoughInterferometryPayloads" annotations="//@annotations.51">
+    <value xsi:type="language_1:Forall">
+      <quantifiedVariables name="p0">
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
         <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11">
@@ -978,55 +959,55 @@
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries notEnoughInterferometryPayloads" annotations="//@annotations.53">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries noLinkToGroundStation" annotations="//@annotations.52">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13">
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14">
           <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.24/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries noLinkToGroundStation" annotations="//@annotations.54">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries noPotentialLinkToGroundStation" annotations="//@annotations.53">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16">
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15">
           <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.25/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries noPotentialLinkToGroundStation" annotations="//@annotations.55">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries communicationLoop" annotations="//@annotations.54">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17">
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20">
           <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.26/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries communicationLoop" annotations="//@annotations.56">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetBand" annotations="//@annotations.55">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22">
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23">
           <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.27/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetBand" annotations="//@annotations.57">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetGain" annotations="//@annotations.56">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
@@ -1038,10 +1019,10 @@
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetGain" annotations="//@annotations.58">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries uhfAntennaGainNotLow" annotations="//@annotations.57">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
         <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27">
@@ -1050,7 +1031,7 @@
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries uhfAntennaGainNotLow" annotations="//@annotations.59">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries xAntennaGainNotMedium" annotations="//@annotations.58">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
@@ -1062,7 +1043,7 @@
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries xAntennaGainNotMedium" annotations="//@annotations.60">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries kaAntennaGainLow" annotations="//@annotations.59">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
@@ -1074,38 +1055,26 @@
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries kaAntennaGainLow" annotations="//@annotations.61">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.33">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.32/@value/@quantifiedVariables.0"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries threeUCubeSatWithNonUhfCrossLink" annotations="//@annotations.62">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries threeUCubeSatWithNonUhfCrossLink" annotations="//@annotations.60">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.33/@value/@quantifiedVariables.0"/>
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.32/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries cubeSatWithKaAntenna" annotations="//@annotations.63">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries cubeSatWithKaAntenna" annotations="//@annotations.61">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.34/@value/@quantifiedVariables.0"/>
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.33/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
@@ -1122,7 +1091,7 @@
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
   </relations>
-  <relations xsi:type="language_1:RelationDeclaration" name="communicationLink reference CommunicatingElement" annotations="//@annotations.64">
+  <relations xsi:type="language_1:RelationDeclaration" name="communicationLink reference CommunicatingElement">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
   </relations>
@@ -1130,10 +1099,6 @@
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.7"/>
   </relations>
-  <relations xsi:type="language_1:RelationDeclaration" name="communicationLink reference CommSubsystem">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
-  </relations>
   <relations xsi:type="language_1:RelationDeclaration" name="source reference DirectedCommunicationLink">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
@@ -1142,7 +1107,7 @@
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
   </relations>
-  <relations xsi:type="language_1:RelationDeclaration" name="kind attribute Spacecraft" annotations="//@annotations.65">
+  <relations xsi:type="language_1:RelationDeclaration" name="kind attribute Spacecraft" annotations="//@annotations.62">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.15"/>
   </relations>
@@ -1154,90 +1119,48 @@
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.14"/>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries multipleCommunicationLinks" annotations="//@annotations.23">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <variables name="parameter Element">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries communicationLinkDoesNotStartAtContainingElement" annotations="//@annotations.22">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
+    <variables name="parameter Link">
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:Exists">
-        <quantifiedVariables name="variable Link1">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="variable Link2">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
+        <quantifiedVariables name="variable Element">
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
         </quantifiedVariables>
-        <quantifiedVariables name="variable virtual0">
+        <quantifiedVariables name="variable SourceComm">
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
-        <quantifiedVariables name="variable virtual2">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+        <quantifiedVariables name="variable SourceElement">
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.2"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.3">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@variables.0"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.2"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.0"/>
-          </operands>
-          <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.0"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.3"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.3"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@value/@operands.0/@quantifiedVariables.2"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.1"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@value/@operands.0/@quantifiedVariables.1"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
           </operands>
           <operands xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.0"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.1"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@value/@operands.0/@quantifiedVariables.0"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@value/@operands.0/@quantifiedVariables.2"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries communicationLinkOfElement" annotations="//@annotations.24" defines="//@relations.3">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
-    <variables name="parameter Element">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    </variables>
-    <variables name="parameter Link">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:Exists">
-        <quantifiedVariables name="variable virtual0">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.1"/>
-          </operands>
-          <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.1"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
-          </operands>
-        </expression>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries notEnoughInterferometryPayloads" annotations="//@annotations.25">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries notEnoughInterferometryPayloads" annotations="//@annotations.23">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
     <variables name="parameter Mission">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
@@ -1245,18 +1168,18 @@
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
         <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@variables.0"/>
+          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@variables.0"/>
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
         </operands>
         <operands xsi:type="language_1:Not">
-          <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@variables.0"/>
+          <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@variables.0"/>
           </operand>
         </operands>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries atLeastTwoInterferometryPayloads" annotations="//@annotations.26">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries atLeastTwoInterferometryPayloads" annotations="//@annotations.24">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
     <variables name="parameter Mission">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
@@ -1271,26 +1194,26 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@variables.0"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.0"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.1"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.0"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.1"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries spacecraftWithInterferometryPayload" annotations="//@annotations.27">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries spacecraftWithInterferometryPayload" annotations="//@annotations.25">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
     <variables name="parameter Mission">
@@ -1306,22 +1229,22 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.1">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@variables.1"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.4">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@variables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@value/@operands.0/@quantifiedVariables.0"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@value/@operands.0/@quantifiedVariables.0"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries noLinkToGroundStation" annotations="//@annotations.28">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries noLinkToGroundStation" annotations="//@annotations.26">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
     <variables name="parameter Spacecraft">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
@@ -1336,32 +1259,32 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@value/@operands.0/@quantifiedVariables.1"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.1"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.1">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@variables.0"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@variables.0"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@variables.0"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@variables.0"/>
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@value/@operands.0/@quantifiedVariables.1"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.21">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@variables.0"/>
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.1"/>
             </operand>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries noPotentialLinkToGroundStation" annotations="//@annotations.29">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries noPotentialLinkToGroundStation" annotations="//@annotations.27">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
     <variables name="parameter Spacecraft">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
@@ -1376,32 +1299,32 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.0/@quantifiedVariables.1"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@value/@operands.0/@quantifiedVariables.1"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.1">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@variables.0"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@variables.0"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.0/@quantifiedVariables.1"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@variables.0"/>
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@value/@operands.0/@quantifiedVariables.1"/>
             </operand>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries indirectLinkAllowed" annotations="//@annotations.30">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries indirectLinkAllowed" annotations="//@annotations.28">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     <variables name="parameter From">
@@ -1412,11 +1335,11 @@
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:TransitiveClosure" relation="//@relations.19"/>
+        <operands xsi:type="language_1:TransitiveClosure" relation="//@relations.17"/>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries linkAllowed" annotations="//@annotations.31">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries linkAllowed" annotations="//@annotations.29">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     <variables name="parameter From">
@@ -1431,14 +1354,14 @@
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.21">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.0"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
             </operand>
           </operands>
         </expression>
@@ -1449,16 +1372,16 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.1/@quantifiedVariables.0"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.1/@quantifiedVariables.0"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.0"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.1/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.1/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.0"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
           </operands>
         </expression>
@@ -1468,24 +1391,24 @@
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.2/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.2/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.0"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.1"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.1"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries matchingAntenna" annotations="//@annotations.32">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries matchingAntenna" annotations="//@annotations.30">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
@@ -1517,46 +1440,46 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@variables.0"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.0"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@value/@operands.0/@quantifiedVariables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@variables.2"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.2"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@variables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@value/@operands.0/@quantifiedVariables.2"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.2"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@value/@operands.0/@quantifiedVariables.2"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@variables.2"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.2"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.2"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@value/@operands.0/@quantifiedVariables.3"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.3"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@value/@operands.0/@quantifiedVariables.3"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.3"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@variables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@value/@operands.0/@quantifiedVariables.4"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.4"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@value/@operands.0/@quantifiedVariables.4"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.4"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries cubeSat3U" annotations="//@annotations.33">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries cubeSat3U" annotations="//@annotations.31">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
     <variables name="parameter Sat">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
@@ -1564,27 +1487,27 @@
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
         <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.21/@variables.0"/>
+          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.0"/>
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
         </operands>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries communicationLoop" annotations="//@annotations.34">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries communicationLoop" annotations="//@annotations.32">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     <variables name="parameter Element">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@variables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@variables.0"/>
+        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.21">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@variables.0"/>
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@variables.0"/>
         </operands>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries indirectCommunicationLink" annotations="//@annotations.35">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries indirectCommunicationLink" annotations="//@annotations.33">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     <variables name="parameter Source">
@@ -1595,11 +1518,11 @@
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:TransitiveClosure" relation="//@relations.24"/>
+        <operands xsi:type="language_1:TransitiveClosure" relation="//@relations.22"/>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries directCommunicationLink" annotations="//@annotations.36">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries directCommunicationLink" annotations="//@annotations.34">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     <variables name="parameter Source">
@@ -1620,35 +1543,35 @@
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@value/@operands.0/@quantifiedVariables.1"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@value/@operands.0/@quantifiedVariables.2"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.2"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@value/@operands.0/@quantifiedVariables.1"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.1"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@variables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@value/@operands.0/@quantifiedVariables.2"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.2"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@value/@operands.0/@quantifiedVariables.2"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.2"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetBand" annotations="//@annotations.37">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetBand" annotations="//@annotations.35">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
     <variables name="parameter Link">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
@@ -1665,33 +1588,33 @@
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.1"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.1"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.1"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.2"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.2"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.1"/>
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.2"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.1"/>
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.2"/>
             </operand>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemBand" annotations="//@annotations.38">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemBand" annotations="//@annotations.36">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
     <variables name="parameter Comm">
@@ -1702,14 +1625,14 @@
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@variables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@variables.1"/>
+        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@variables.0"/>
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@variables.1"/>
         </operands>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetGain" annotations="//@annotations.39">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetGain" annotations="//@annotations.37">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
     <variables name="parameter Link">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
@@ -1726,33 +1649,33 @@
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.14"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@value/@operands.0/@quantifiedVariables.1"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@value/@operands.0/@quantifiedVariables.1"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.1"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@value/@operands.0/@quantifiedVariables.2"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.2"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.28">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@value/@operands.0/@quantifiedVariables.1"/>
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@value/@operands.0/@quantifiedVariables.2"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.1"/>
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.2"/>
             </operand>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemGain" annotations="//@annotations.40">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemGain" annotations="//@annotations.38">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.14"/>
     <variables name="parameter Comm">
@@ -1763,14 +1686,14 @@
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.28/@variables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.28/@variables.1"/>
+        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@variables.0"/>
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@variables.1"/>
         </operands>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries uhfAntennaGainNotLow" annotations="//@annotations.41">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries uhfAntennaGainNotLow" annotations="//@annotations.39">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     <variables name="parameter Comm">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
@@ -1782,23 +1705,23 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@value/@operands.0/@quantifiedVariables.0"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@value/@operands.0/@quantifiedVariables.0"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.0"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.30">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@variables.0"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.28">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@variables.0"/>
             </operand>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemGainLow" annotations="//@annotations.42">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemGainLow" annotations="//@annotations.40">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     <variables name="parameter Comm">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
@@ -1810,18 +1733,18 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.30/@value/@operands.0/@quantifiedVariables.0"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.28/@value/@operands.0/@quantifiedVariables.0"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.3"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.30/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.30/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.28/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.28/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries xAntennaGainNotMedium" annotations="//@annotations.43">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries xAntennaGainNotMedium" annotations="//@annotations.41">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     <variables name="parameter Comm">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
@@ -1833,23 +1756,23 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@value/@operands.0/@quantifiedVariables.0"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@value/@operands.0/@quantifiedVariables.0"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.1"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@variables.0"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.30">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@variables.0"/>
             </operand>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemGainMedium" annotations="//@annotations.44">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemGainMedium" annotations="//@annotations.42">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     <variables name="parameter Comm">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
@@ -1861,18 +1784,18 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.0"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.30/@value/@operands.0/@quantifiedVariables.0"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.4"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.30/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.30/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries kaAntennaGainLow" annotations="//@annotations.45">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries kaAntennaGainLow" annotations="//@annotations.43">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     <variables name="parameter Comm">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
@@ -1887,26 +1810,26 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.33/@value/@operands.0/@quantifiedVariables.0"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@value/@operands.0/@quantifiedVariables.0"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.2"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.33/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.33/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.33/@value/@operands.0/@quantifiedVariables.1"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@value/@operands.0/@quantifiedVariables.1"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.3"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.33/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.33/@value/@operands.0/@quantifiedVariables.1"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries threeUCubeSatWithNonUhfCrossLink" annotations="//@annotations.46">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries threeUCubeSatWithNonUhfCrossLink" annotations="//@annotations.44">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
     <variables name="parameter Sat">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
@@ -1927,48 +1850,48 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34/@variables.0"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@variables.0"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34/@value/@operands.0/@quantifiedVariables.0"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.33">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.0"/>
             </operand>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34/@value/@operands.0/@quantifiedVariables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34/@value/@operands.0/@quantifiedVariables.0"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.0"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34/@value/@operands.0/@quantifiedVariables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34/@value/@operands.0/@quantifiedVariables.2"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.2"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34/@value/@operands.0/@quantifiedVariables.3"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34/@value/@operands.0/@quantifiedVariables.2"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.3"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.2"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34/@value/@operands.0/@quantifiedVariables.2"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.2"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.36">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34/@value/@operands.0/@quantifiedVariables.3"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.3"/>
             </operand>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemBandUhf" annotations="//@annotations.47">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemBandUhf" annotations="//@annotations.45">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     <variables name="parameter Comm">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
@@ -1980,18 +1903,18 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@value/@operands.0/@quantifiedVariables.0"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.33/@value/@operands.0/@quantifiedVariables.0"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.0"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.33/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.33/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries groundStationNetwork" annotations="//@annotations.48">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries groundStationNetwork" annotations="//@annotations.46">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
     <variables name="parameter Network">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
@@ -1999,13 +1922,13 @@
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
         <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.36/@variables.0"/>
+          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34/@variables.0"/>
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
         </operands>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries cubeSatWithKaAntenna" annotations="//@annotations.49">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries cubeSatWithKaAntenna" annotations="//@annotations.47">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
     <variables name="parameter Spacecraft">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
@@ -2020,31 +1943,31 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@variables.0"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@variables.0"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
           </operands>
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@value/@operands.0/@quantifiedVariables.0"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@value/@operands.0/@quantifiedVariables.0"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.2"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@value/@operands.0/@quantifiedVariables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.38">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@variables.0"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.36">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@variables.0"/>
             </operand>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries smallSat" annotations="//@annotations.50">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries smallSat" annotations="//@annotations.48">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.11"/>
     <variables name="parameter Sat">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.11"/>
@@ -2052,13 +1975,13 @@
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
         <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.38/@variables.0"/>
+          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.36/@variables.0"/>
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.11"/>
         </operands>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries spacecraftOfKind" annotations="//@annotations.51" defines="//@relations.8">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries spacecraftOfKind" annotations="//@annotations.49" defines="//@relations.7">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.15"/>
     <variables name="parameter Spacecraft">
@@ -2070,31 +1993,31 @@
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
         <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.39/@variables.0"/>
+          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@variables.0"/>
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
         </operands>
         <operands xsi:type="language_1:Equals">
-          <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.39/@variables.1"/>
+          <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@variables.1"/>
           <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.6"/>
         </operands>
       </operands>
       <operands xsi:type="language_1:And">
         <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.39/@variables.0"/>
+          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@variables.0"/>
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.10"/>
         </operands>
         <operands xsi:type="language_1:Equals">
-          <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.39/@variables.1"/>
+          <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@variables.1"/>
           <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.7"/>
         </operands>
       </operands>
       <operands xsi:type="language_1:And">
         <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.39/@variables.0"/>
+          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@variables.0"/>
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.11"/>
         </operands>
         <operands xsi:type="language_1:Equals">
-          <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.39/@variables.1"/>
+          <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@variables.1"/>
           <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.8"/>
         </operands>
       </operands>
@@ -2113,7 +2036,7 @@
   <elements name="o 2" definedInType="//@types.20 //@types.22"/>
   <elements name="o 3" definedInType="//@types.24"/>
   <elements name="o 4" definedInType="//@types.24"/>
-  <containmentHierarchies typesOrderedInHierarchy="//@types.4 //@types.10 //@types.11 //@types.3 //@types.7 //@types.2 //@types.6 //@types.12 //@types.9 //@types.8 //@types.0 //@types.1 //@types.5 //@types.16 //@types.17 //@types.18 //@types.19 //@types.20 //@types.21 //@types.22 //@types.23 //@types.24 //@types.25" containmentRelations="//@relations.0 //@relations.1 //@relations.2 //@relations.4 //@relations.5"/>
+  <containmentHierarchies typesOrderedInHierarchy="//@types.8 //@types.4 //@types.6 //@types.12 //@types.0 //@types.1 //@types.9 //@types.2 //@types.10 //@types.11 //@types.5 //@types.3 //@types.7 //@types.16 //@types.17 //@types.18 //@types.19 //@types.20 //@types.21 //@types.22 //@types.23 //@types.24 //@types.25" containmentRelations="//@relations.0 //@relations.1 //@relations.2 //@relations.3 //@relations.4"/>
   <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.0" relation="//@relations.0" lower="1"/>
   <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.1" relation="//@relations.0" upper="1"/>
   <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.2" relation="//@relations.1" lower="2"/>
@@ -2122,62 +2045,59 @@
   <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.5" relation="//@relations.2" upper="2"/>
   <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.6" relation="//@relations.3" upper="1"/>
   <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.7" relation="//@relations.4" upper="1"/>
-  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.8" relation="//@relations.5" upper="1"/>
-  <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.9" relation="//@relations.6" lower="1"/>
-  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.10" relation="//@relations.6" upper="1"/>
-  <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.11" relation="//@relations.7" lower="1"/>
-  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.12" relation="//@relations.7" upper="1"/>
-  <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.13" relation="//@relations.8" lower="1"/>
-  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.14" relation="//@relations.8" upper="1"/>
-  <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.15" relation="//@relations.9" lower="1"/>
-  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.16" relation="//@relations.9" upper="1"/>
-  <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.17" relation="//@relations.10" lower="1"/>
-  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.18" relation="//@relations.10" upper="1"/>
-  <annotations xsi:type="partial2logicannotations:PartialModelRelation2Assertion" target="//@assertions.19" targetRelation="//@relations.0"/>
-  <annotations xsi:type="partial2logicannotations:PartialModelRelation2Assertion" target="//@assertions.20" targetRelation="//@relations.2"/>
+  <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.8" relation="//@relations.5" lower="1"/>
+  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.9" relation="//@relations.5" upper="1"/>
+  <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.10" relation="//@relations.6" lower="1"/>
+  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.11" relation="//@relations.6" upper="1"/>
+  <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.12" relation="//@relations.7" lower="1"/>
+  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.13" relation="//@relations.7" upper="1"/>
+  <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.14" relation="//@relations.8" lower="1"/>
+  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.15" relation="//@relations.8" upper="1"/>
+  <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.16" relation="//@relations.9" lower="1"/>
+  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.17" relation="//@relations.9" upper="1"/>
+  <annotations xsi:type="partial2logicannotations:PartialModelRelation2Assertion" target="//@assertions.18" targetRelation="//@relations.0"/>
+  <annotations xsi:type="partial2logicannotations:PartialModelRelation2Assertion" target="//@assertions.19" targetRelation="//@relations.2"/>
+  <annotations xsi:type="partial2logicannotations:PartialModelRelation2Assertion" target="//@assertions.20" targetRelation="//@relations.8"/>
   <annotations xsi:type="partial2logicannotations:PartialModelRelation2Assertion" target="//@assertions.21" targetRelation="//@relations.9"/>
-  <annotations xsi:type="partial2logicannotations:PartialModelRelation2Assertion" target="//@assertions.22" targetRelation="//@relations.10"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.11" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.multipleCommunicationLinks"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.12" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkOfElement"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.13" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.notEnoughInterferometryPayloads"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.14" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.atLeastTwoInterferometryPayloads"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.15" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftWithInterferometryPayload"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.16" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noLinkToGroundStation"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.17" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noPotentialLinkToGroundStation"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.18" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.indirectLinkAllowed"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.19" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.linkAllowed"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.20" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.matchingAntenna"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.21" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.cubeSat3U"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.22" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLoop"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.23" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.indirectCommunicationLink"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.24" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.directCommunicationLink"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.25" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.incompatibleSourceAndTargetBand"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.26" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemBand"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.27" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.incompatibleSourceAndTargetGain"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.28" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemGain"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.29" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.uhfAntennaGainNotLow"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.30" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemGainLow"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.31" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.xAntennaGainNotMedium"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.32" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemGainMedium"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.33" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.kaAntennaGainLow"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.34" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.threeUCubeSatWithNonUhfCrossLink"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.35" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemBandUhf"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.36" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.groundStationNetwork"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.37" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.cubeSatWithKaAntenna"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.38" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.smallSat"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.39" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.10" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkDoesNotStartAtContainingElement"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.11" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.notEnoughInterferometryPayloads"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.12" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.atLeastTwoInterferometryPayloads"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.13" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftWithInterferometryPayload"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.14" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noLinkToGroundStation"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.15" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noPotentialLinkToGroundStation"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.16" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.indirectLinkAllowed"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.17" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.linkAllowed"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.18" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.matchingAntenna"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.19" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.cubeSat3U"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.20" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLoop"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.21" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.indirectCommunicationLink"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.22" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.directCommunicationLink"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.23" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.incompatibleSourceAndTargetBand"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.24" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemBand"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.25" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.incompatibleSourceAndTargetGain"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.26" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemGain"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.27" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.uhfAntennaGainNotLow"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.28" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemGainLow"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.29" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.xAntennaGainNotMedium"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.30" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemGainMedium"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.31" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.kaAntennaGainLow"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.32" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.threeUCubeSatWithNonUhfCrossLink"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.33" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemBandUhf"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.34" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.groundStationNetwork"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.35" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.cubeSatWithKaAntenna"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.36" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.smallSat"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.37" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.22" query="//@annotations.22"/>
   <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.23" query="//@annotations.23"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.24" query="//@annotations.25"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.25" query="//@annotations.28"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.26" query="//@annotations.29"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.27" query="//@annotations.34"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.24" query="//@annotations.26"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.25" query="//@annotations.27"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.26" query="//@annotations.32"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.27" query="//@annotations.35"/>
   <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.28" query="//@annotations.37"/>
   <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.29" query="//@annotations.39"/>
   <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.30" query="//@annotations.41"/>
   <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.31" query="//@annotations.43"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.32" query="//@annotations.45"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.33" query="//@annotations.46"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.34" query="//@annotations.49"/>
-  <annotations xsi:type="viatra2logicannotations:DefinedByDerivedFeature" target="//@relations.3" query="//@annotations.24"/>
-  <annotations xsi:type="viatra2logicannotations:DefinedByDerivedFeature" target="//@relations.8" query="//@annotations.51"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.32" query="//@annotations.44"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.33" query="//@annotations.47"/>
+  <annotations xsi:type="viatra2logicannotations:DefinedByDerivedFeature" target="//@relations.7" query="//@annotations.49"/>
 </language:LogicProblem>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/init.partialmodel b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/init.partialmodel
index f7827e03..6589a3ca 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/init.partialmodel
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/init.partialmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<partialinterpretation:PartialInterpretation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:language="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language" xmlns:partialinterpretation="http://www.bme.hu/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage" minNewElements="8" maxNewElements="16">
+<partialinterpretation:PartialInterpretation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:language="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language" xmlns:partialinterpretation="http://www.bme.hu/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage" minNewElements="16" maxNewElements="32">
   <problem href="outputs/debug/generation.logicproblem#/"/>
   <partialrelationinterpretation>
     <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.0"/>
@@ -55,11 +55,6 @@
   </partialrelationinterpretation>
   <partialrelationinterpretation>
     <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.8"/>
-    <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.8/@parameters.0"/>
-    <param2 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.8/@parameters.1"/>
-  </partialrelationinterpretation>
-  <partialrelationinterpretation>
-    <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.9"/>
     <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink">
       <param1 href="outputs/debug/generation.logicproblem#//@elements.11"/>
       <param2 href="outputs/debug/generation.logicproblem#//@elements.1"/>
@@ -68,11 +63,11 @@
       <param1 href="outputs/debug/generation.logicproblem#//@elements.12"/>
       <param2 href="outputs/debug/generation.logicproblem#//@elements.2"/>
     </relationlinks>
-    <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.9/@parameters.0"/>
-    <param2 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.9/@parameters.1"/>
+    <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.8/@parameters.0"/>
+    <param2 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.8/@parameters.1"/>
   </partialrelationinterpretation>
   <partialrelationinterpretation>
-    <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.10"/>
+    <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.9"/>
     <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink">
       <param1 href="outputs/debug/generation.logicproblem#//@elements.11"/>
       <param2 href="outputs/debug/generation.logicproblem#//@elements.4"/>
@@ -81,8 +76,8 @@
       <param1 href="outputs/debug/generation.logicproblem#//@elements.12"/>
       <param2 href="outputs/debug/generation.logicproblem#//@elements.5"/>
     </relationlinks>
-    <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.10/@parameters.0"/>
-    <param2 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.10/@parameters.1"/>
+    <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.9/@parameters.0"/>
+    <param2 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.9/@parameters.1"/>
   </partialrelationinterpretation>
   <newElements xsi:type="partialinterpretation:BooleanElement" name="true" valueSet="true" value="true"/>
   <newElements xsi:type="partialinterpretation:BooleanElement" name="false" valueSet="true"/>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml
index d019e891..5d75b948 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?><?eclipse version="3.0"?><!--
 --><plugin>
+  <extension id="extension.derived.hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">
+    <wellbehaving-derived-feature classifier-name="Spacecraft" feature-name="kind" package-nsUri="http://www.example.org/satellite"/>
+  </extension>
   <extension point="org.eclipse.emf.ecore.generated_package">
     <!-- @generated satellite -->
     <package class="satellite.SatellitePackage" genModel="model/satellite.genmodel" uri="http://www.example.org/satellite"/>
   </extension>
-  <extension id="extension.derived.hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkOfElement" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">
-    <wellbehaving-derived-feature classifier-name="CommunicatingElement" feature-name="communicationLink" package-nsUri="http://www.example.org/satellite"/>
-  </extension>
-  <extension id="extension.derived.hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">
-    <wellbehaving-derived-feature classifier-name="Spacecraft" feature-name="kind" package-nsUri="http://www.example.org/satellite"/>
-  </extension>
   <extension id="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SatelliteQueries" point="org.eclipse.viatra.query.runtime.queryspecification">
     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SatelliteQueries" id="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SatelliteQueries">
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.multipleCommunicationLinks"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkOfElement"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkDoesNotStartAtContainingElement"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.notEnoughInterferometryPayloads"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noLinkToGroundStation"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noPotentialLinkToGroundStation"/>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/.gitignore
index 4354da2c..6f361334 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/.gitignore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/.gitignore
@@ -23,5 +23,3 @@
 /.SpacecraftOfKind.java._trace
 /.NoPotentialLinkToGroundStation.java._trace
 /.SmallSat.java._trace
-/.CommunicationLinkOfElement.java._trace
-/.MultipleCommunicationLinks.java._trace
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/MultipleCommunicationLinks.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLinkDoesNotStartAtContainingElement.java
index ad82ead9..dde3c20f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/MultipleCommunicationLinks.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLinkDoesNotStartAtContainingElement.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashSet;
@@ -39,19 +40,19 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.CommunicatingElement;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
  * 
  * <p>Original source:
  *         <code><pre>
- *         {@literal @}Constraint(severity = "error", key = {Element},
- *              message = "Only one communication link is allowed per element.")
- *         pattern multipleCommunicationLinks(Element : CommunicatingElement) {
- *              CommunicatingElement.commSubsystem.communicationLink(Element, Link1);
- *              CommunicatingElement.commSubsystem.communicationLink(Element, Link2);
- *              Link1 != Link2;
+ *         {@literal @}Constraint(severity = "error", key = {Link},
+ *              message = "Communication links must start from the containing element.")
+ *         pattern communicationLinkDoesNotStartAtContainingElement(Link : DirectedCommunicationLink) {
+ *              CommunicatingElement.communicationLink(Element, Link);
+ *              DirectedCommunicationLink.source(Link, SourceComm);
+ *              CommunicatingElement.commSubsystem(SourceElement, SourceComm);
+ *              Element != SourceElement;
  *         }
  * </pre></code>
  * 
@@ -60,9 +61,9 @@ import satellite.CommunicatingElement;
  * 
  */
 @SuppressWarnings("all")
-public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpecification<MultipleCommunicationLinks.Matcher> {
+public final class CommunicationLinkDoesNotStartAtContainingElement extends BaseGeneratedEMFQuerySpecification<CommunicationLinkDoesNotStartAtContainingElement.Matcher> {
   /**
-   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.multipleCommunicationLinks pattern,
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkDoesNotStartAtContainingElement pattern,
    * to be used in conjunction with {@link Matcher}.
    * 
    * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
@@ -74,69 +75,69 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
    * 
    */
   public static abstract class Match extends BasePatternMatch {
-    private CommunicatingElement fElement;
+    private DirectedCommunicationLink fLink;
     
-    private static List<String> parameterNames = makeImmutableList("Element");
+    private static List<String> parameterNames = makeImmutableList("Link");
     
-    private Match(final CommunicatingElement pElement) {
-      this.fElement = pElement;
+    private Match(final DirectedCommunicationLink pLink) {
+      this.fLink = pLink;
     }
     
     @Override
     public Object get(final String parameterName) {
-      if ("Element".equals(parameterName)) return this.fElement;
+      if ("Link".equals(parameterName)) return this.fLink;
       return null;
     }
     
-    public CommunicatingElement getElement() {
-      return this.fElement;
+    public DirectedCommunicationLink getLink() {
+      return this.fLink;
     }
     
     @Override
     public boolean set(final String parameterName, final Object newValue) {
       if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      if ("Element".equals(parameterName) ) {
-          this.fElement = (CommunicatingElement) newValue;
+      if ("Link".equals(parameterName) ) {
+          this.fLink = (DirectedCommunicationLink) newValue;
           return true;
       }
       return false;
     }
     
-    public void setElement(final CommunicatingElement pElement) {
+    public void setLink(final DirectedCommunicationLink pLink) {
       if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fElement = pElement;
+      this.fLink = pLink;
     }
     
     @Override
     public String patternName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.multipleCommunicationLinks";
+      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkDoesNotStartAtContainingElement";
     }
     
     @Override
     public List<String> parameterNames() {
-      return MultipleCommunicationLinks.Match.parameterNames;
+      return CommunicationLinkDoesNotStartAtContainingElement.Match.parameterNames;
     }
     
     @Override
     public Object[] toArray() {
-      return new Object[]{fElement};
+      return new Object[]{fLink};
     }
     
     @Override
-    public MultipleCommunicationLinks.Match toImmutable() {
-      return isMutable() ? newMatch(fElement) : this;
+    public CommunicationLinkDoesNotStartAtContainingElement.Match toImmutable() {
+      return isMutable() ? newMatch(fLink) : this;
     }
     
     @Override
     public String prettyPrint() {
       StringBuilder result = new StringBuilder();
-      result.append("\"Element\"=" + prettyPrintValue(fElement));
+      result.append("\"Link\"=" + prettyPrintValue(fLink));
       return result.toString();
     }
     
     @Override
     public int hashCode() {
-      return Objects.hash(fElement);
+      return Objects.hash(fLink);
     }
     
     @Override
@@ -146,9 +147,9 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
       if (obj == null) {
           return false;
       }
-      if ((obj instanceof MultipleCommunicationLinks.Match)) {
-          MultipleCommunicationLinks.Match other = (MultipleCommunicationLinks.Match) obj;
-          return Objects.equals(fElement, other.fElement);
+      if ((obj instanceof CommunicationLinkDoesNotStartAtContainingElement.Match)) {
+          CommunicationLinkDoesNotStartAtContainingElement.Match other = (CommunicationLinkDoesNotStartAtContainingElement.Match) obj;
+          return Objects.equals(fLink, other.fLink);
       } else {
           // this should be infrequent
           if (!(obj instanceof IPatternMatch)) {
@@ -160,8 +161,8 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
     }
     
     @Override
-    public MultipleCommunicationLinks specification() {
-      return MultipleCommunicationLinks.instance();
+    public CommunicationLinkDoesNotStartAtContainingElement specification() {
+      return CommunicationLinkDoesNotStartAtContainingElement.instance();
     }
     
     /**
@@ -171,7 +172,7 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
      * @return the empty match.
      * 
      */
-    public static MultipleCommunicationLinks.Match newEmptyMatch() {
+    public static CommunicationLinkDoesNotStartAtContainingElement.Match newEmptyMatch() {
       return new Mutable(null);
     }
     
@@ -179,29 +180,29 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
      * Returns a mutable (partial) match.
      * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
      * 
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
+     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
      * @return the new, mutable (partial) match object.
      * 
      */
-    public static MultipleCommunicationLinks.Match newMutableMatch(final CommunicatingElement pElement) {
-      return new Mutable(pElement);
+    public static CommunicationLinkDoesNotStartAtContainingElement.Match newMutableMatch(final DirectedCommunicationLink pLink) {
+      return new Mutable(pLink);
     }
     
     /**
      * Returns a new (partial) match.
      * This can be used e.g. to call the matcher with a partial match.
      * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
+     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
      * @return the (partial) match object.
      * 
      */
-    public static MultipleCommunicationLinks.Match newMatch(final CommunicatingElement pElement) {
-      return new Immutable(pElement);
+    public static CommunicationLinkDoesNotStartAtContainingElement.Match newMatch(final DirectedCommunicationLink pLink) {
+      return new Immutable(pLink);
     }
     
-    private static final class Mutable extends MultipleCommunicationLinks.Match {
-      Mutable(final CommunicatingElement pElement) {
-        super(pElement);
+    private static final class Mutable extends CommunicationLinkDoesNotStartAtContainingElement.Match {
+      Mutable(final DirectedCommunicationLink pLink) {
+        super(pLink);
       }
       
       @Override
@@ -210,9 +211,9 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
       }
     }
     
-    private static final class Immutable extends MultipleCommunicationLinks.Match {
-      Immutable(final CommunicatingElement pElement) {
-        super(pElement);
+    private static final class Immutable extends CommunicationLinkDoesNotStartAtContainingElement.Match {
+      Immutable(final DirectedCommunicationLink pLink) {
+        super(pLink);
       }
       
       @Override
@@ -223,7 +224,7 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
   }
   
   /**
-   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.multipleCommunicationLinks pattern,
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkDoesNotStartAtContainingElement pattern,
    * providing pattern-specific query methods.
    * 
    * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
@@ -233,20 +234,21 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
    * 
    * <p>Original source:
    * <code><pre>
-   * {@literal @}Constraint(severity = "error", key = {Element},
-   *    message = "Only one communication link is allowed per element.")
-   * pattern multipleCommunicationLinks(Element : CommunicatingElement) {
-   *    CommunicatingElement.commSubsystem.communicationLink(Element, Link1);
-   *    CommunicatingElement.commSubsystem.communicationLink(Element, Link2);
-   *    Link1 != Link2;
+   * {@literal @}Constraint(severity = "error", key = {Link},
+   *    message = "Communication links must start from the containing element.")
+   * pattern communicationLinkDoesNotStartAtContainingElement(Link : DirectedCommunicationLink) {
+   *    CommunicatingElement.communicationLink(Element, Link);
+   *    DirectedCommunicationLink.source(Link, SourceComm);
+   *    CommunicatingElement.commSubsystem(SourceElement, SourceComm);
+   *    Element != SourceElement;
    * }
    * </pre></code>
    * 
    * @see Match
-   * @see MultipleCommunicationLinks
+   * @see CommunicationLinkDoesNotStartAtContainingElement
    * 
    */
-  public static class Matcher extends BaseMatcher<MultipleCommunicationLinks.Match> {
+  public static class Matcher extends BaseMatcher<CommunicationLinkDoesNotStartAtContainingElement.Match> {
     /**
      * Initializes the pattern matcher within an existing VIATRA Query engine.
      * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
@@ -255,7 +257,7 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
      * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
      * 
      */
-    public static MultipleCommunicationLinks.Matcher on(final ViatraQueryEngine engine) {
+    public static CommunicationLinkDoesNotStartAtContainingElement.Matcher on(final ViatraQueryEngine engine) {
       // check if matcher already exists
       Matcher matcher = engine.getExistingMatcher(querySpecification());
       if (matcher == null) {
@@ -270,13 +272,13 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
      * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
      * 
      */
-    public static MultipleCommunicationLinks.Matcher create() {
+    public static CommunicationLinkDoesNotStartAtContainingElement.Matcher create() {
       return new Matcher();
     }
     
-    private static final int POSITION_ELEMENT = 0;
+    private static final int POSITION_LINK = 0;
     
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(MultipleCommunicationLinks.Matcher.class);
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(CommunicationLinkDoesNotStartAtContainingElement.Matcher.class);
     
     /**
      * Initializes the pattern matcher within an existing VIATRA Query engine.
@@ -292,12 +294,12 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
     
     /**
      * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
+     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
      * @return matches represented as a Match object.
      * 
      */
-    public Collection<MultipleCommunicationLinks.Match> getAllMatches(final CommunicatingElement pElement) {
-      return rawStreamAllMatches(new Object[]{pElement}).collect(Collectors.toSet());
+    public Collection<CommunicationLinkDoesNotStartAtContainingElement.Match> getAllMatches(final DirectedCommunicationLink pLink) {
+      return rawStreamAllMatches(new Object[]{pLink}).collect(Collectors.toSet());
     }
     
     /**
@@ -306,101 +308,101 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
      * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
      * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
      * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
+     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
      * @return a stream of matches represented as a Match object.
      * 
      */
-    public Stream<MultipleCommunicationLinks.Match> streamAllMatches(final CommunicatingElement pElement) {
-      return rawStreamAllMatches(new Object[]{pElement});
+    public Stream<CommunicationLinkDoesNotStartAtContainingElement.Match> streamAllMatches(final DirectedCommunicationLink pLink) {
+      return rawStreamAllMatches(new Object[]{pLink});
     }
     
     /**
      * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
      * Neither determinism nor randomness of selection is guaranteed.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
+     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
      * @return a match represented as a Match object, or null if no match is found.
      * 
      */
-    public Optional<MultipleCommunicationLinks.Match> getOneArbitraryMatch(final CommunicatingElement pElement) {
-      return rawGetOneArbitraryMatch(new Object[]{pElement});
+    public Optional<CommunicationLinkDoesNotStartAtContainingElement.Match> getOneArbitraryMatch(final DirectedCommunicationLink pLink) {
+      return rawGetOneArbitraryMatch(new Object[]{pLink});
     }
     
     /**
      * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
      * under any possible substitution of the unspecified parameters (if any).
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
+     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
      * @return true if the input is a valid (partial) match of the pattern.
      * 
      */
-    public boolean hasMatch(final CommunicatingElement pElement) {
-      return rawHasMatch(new Object[]{pElement});
+    public boolean hasMatch(final DirectedCommunicationLink pLink) {
+      return rawHasMatch(new Object[]{pLink});
     }
     
     /**
      * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
+     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
      * @return the number of pattern matches found.
      * 
      */
-    public int countMatches(final CommunicatingElement pElement) {
-      return rawCountMatches(new Object[]{pElement});
+    public int countMatches(final DirectedCommunicationLink pLink) {
+      return rawCountMatches(new Object[]{pLink});
     }
     
     /**
      * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
      * Neither determinism nor randomness of selection is guaranteed.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
+     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
      * @param processor the action that will process the selected match.
      * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
      * 
      */
-    public boolean forOneArbitraryMatch(final CommunicatingElement pElement, final Consumer<? super MultipleCommunicationLinks.Match> processor) {
-      return rawForOneArbitraryMatch(new Object[]{pElement}, processor);
+    public boolean forOneArbitraryMatch(final DirectedCommunicationLink pLink, final Consumer<? super CommunicationLinkDoesNotStartAtContainingElement.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pLink}, processor);
     }
     
     /**
      * Returns a new (partial) match.
      * This can be used e.g. to call the matcher with a partial match.
      * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
+     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
      * @return the (partial) match object.
      * 
      */
-    public MultipleCommunicationLinks.Match newMatch(final CommunicatingElement pElement) {
-      return MultipleCommunicationLinks.Match.newMatch(pElement);
+    public CommunicationLinkDoesNotStartAtContainingElement.Match newMatch(final DirectedCommunicationLink pLink) {
+      return CommunicationLinkDoesNotStartAtContainingElement.Match.newMatch(pLink);
     }
     
     /**
-     * Retrieve the set of values that occur in matches for Element.
+     * Retrieve the set of values that occur in matches for Link.
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    protected Stream<CommunicatingElement> rawStreamAllValuesOfElement(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_ELEMENT, parameters).map(CommunicatingElement.class::cast);
+    protected Stream<DirectedCommunicationLink> rawStreamAllValuesOfLink(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_LINK, parameters).map(DirectedCommunicationLink.class::cast);
     }
     
     /**
-     * Retrieve the set of values that occur in matches for Element.
+     * Retrieve the set of values that occur in matches for Link.
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<CommunicatingElement> getAllValuesOfElement() {
-      return rawStreamAllValuesOfElement(emptyArray()).collect(Collectors.toSet());
+    public Set<DirectedCommunicationLink> getAllValuesOfLink() {
+      return rawStreamAllValuesOfLink(emptyArray()).collect(Collectors.toSet());
     }
     
     /**
-     * Retrieve the set of values that occur in matches for Element.
+     * Retrieve the set of values that occur in matches for Link.
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Stream<CommunicatingElement> streamAllValuesOfElement() {
-      return rawStreamAllValuesOfElement(emptyArray());
+    public Stream<DirectedCommunicationLink> streamAllValuesOfLink() {
+      return rawStreamAllValuesOfLink(emptyArray());
     }
     
     @Override
-    protected MultipleCommunicationLinks.Match tupleToMatch(final Tuple t) {
+    protected CommunicationLinkDoesNotStartAtContainingElement.Match tupleToMatch(final Tuple t) {
       try {
-          return MultipleCommunicationLinks.Match.newMatch((CommunicatingElement) t.get(POSITION_ELEMENT));
+          return CommunicationLinkDoesNotStartAtContainingElement.Match.newMatch((DirectedCommunicationLink) t.get(POSITION_LINK));
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in tuple not properly typed!",e);
           return null;
@@ -408,9 +410,9 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
     }
     
     @Override
-    protected MultipleCommunicationLinks.Match arrayToMatch(final Object[] match) {
+    protected CommunicationLinkDoesNotStartAtContainingElement.Match arrayToMatch(final Object[] match) {
       try {
-          return MultipleCommunicationLinks.Match.newMatch((CommunicatingElement) match[POSITION_ELEMENT]);
+          return CommunicationLinkDoesNotStartAtContainingElement.Match.newMatch((DirectedCommunicationLink) match[POSITION_LINK]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -418,9 +420,9 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
     }
     
     @Override
-    protected MultipleCommunicationLinks.Match arrayToMatchMutable(final Object[] match) {
+    protected CommunicationLinkDoesNotStartAtContainingElement.Match arrayToMatchMutable(final Object[] match) {
       try {
-          return MultipleCommunicationLinks.Match.newMutableMatch((CommunicatingElement) match[POSITION_ELEMENT]);
+          return CommunicationLinkDoesNotStartAtContainingElement.Match.newMutableMatch((DirectedCommunicationLink) match[POSITION_LINK]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -432,12 +434,12 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
      * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
      * 
      */
-    public static IQuerySpecification<MultipleCommunicationLinks.Matcher> querySpecification() {
-      return MultipleCommunicationLinks.instance();
+    public static IQuerySpecification<CommunicationLinkDoesNotStartAtContainingElement.Matcher> querySpecification() {
+      return CommunicationLinkDoesNotStartAtContainingElement.instance();
     }
   }
   
-  private MultipleCommunicationLinks() {
+  private CommunicationLinkDoesNotStartAtContainingElement() {
     super(GeneratedPQuery.INSTANCE);
   }
   
@@ -446,7 +448,7 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
    * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
    * 
    */
-  public static MultipleCommunicationLinks instance() {
+  public static CommunicationLinkDoesNotStartAtContainingElement instance() {
     try{
         return LazyHolder.INSTANCE;
     } catch (ExceptionInInitializerError err) {
@@ -455,35 +457,35 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
   }
   
   @Override
-  protected MultipleCommunicationLinks.Matcher instantiate(final ViatraQueryEngine engine) {
-    return MultipleCommunicationLinks.Matcher.on(engine);
+  protected CommunicationLinkDoesNotStartAtContainingElement.Matcher instantiate(final ViatraQueryEngine engine) {
+    return CommunicationLinkDoesNotStartAtContainingElement.Matcher.on(engine);
   }
   
   @Override
-  public MultipleCommunicationLinks.Matcher instantiate() {
-    return MultipleCommunicationLinks.Matcher.create();
+  public CommunicationLinkDoesNotStartAtContainingElement.Matcher instantiate() {
+    return CommunicationLinkDoesNotStartAtContainingElement.Matcher.create();
   }
   
   @Override
-  public MultipleCommunicationLinks.Match newEmptyMatch() {
-    return MultipleCommunicationLinks.Match.newEmptyMatch();
+  public CommunicationLinkDoesNotStartAtContainingElement.Match newEmptyMatch() {
+    return CommunicationLinkDoesNotStartAtContainingElement.Match.newEmptyMatch();
   }
   
   @Override
-  public MultipleCommunicationLinks.Match newMatch(final Object... parameters) {
-    return MultipleCommunicationLinks.Match.newMatch((satellite.CommunicatingElement) parameters[0]);
+  public CommunicationLinkDoesNotStartAtContainingElement.Match newMatch(final Object... parameters) {
+    return CommunicationLinkDoesNotStartAtContainingElement.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink) parameters[0]);
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.MultipleCommunicationLinks (visibility: PUBLIC, simpleName: MultipleCommunicationLinks, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.MultipleCommunicationLinks, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement (visibility: PUBLIC, simpleName: CommunicationLinkDoesNotStartAtContainingElement, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.MultipleCommunicationLinks (visibility: PUBLIC, simpleName: MultipleCommunicationLinks, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.MultipleCommunicationLinks, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement (visibility: PUBLIC, simpleName: CommunicationLinkDoesNotStartAtContainingElement, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
    */
   private static class LazyHolder {
-    private static final MultipleCommunicationLinks INSTANCE = new MultipleCommunicationLinks();
+    private static final CommunicationLinkDoesNotStartAtContainingElement INSTANCE = new CommunicationLinkDoesNotStartAtContainingElement();
     
     /**
      * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
@@ -501,11 +503,11 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
   }
   
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final MultipleCommunicationLinks.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    private static final CommunicationLinkDoesNotStartAtContainingElement.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Element = new PParameter("Element", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_Link = new PParameter("Link", "hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "DirectedCommunicationLink")), PParameterDirection.INOUT);
     
-    private final List<PParameter> parameters = Arrays.asList(parameter_Element);
+    private final List<PParameter> parameters = Arrays.asList(parameter_Link);
     
     private GeneratedPQuery() {
       super(PVisibility.PUBLIC);
@@ -513,12 +515,12 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
     
     @Override
     public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.multipleCommunicationLinks";
+      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkDoesNotStartAtContainingElement";
     }
     
     @Override
     public List<String> getParameterNames() {
-      return Arrays.asList("Element");
+      return Arrays.asList("Link");
     }
     
     @Override
@@ -532,42 +534,43 @@ public final class MultipleCommunicationLinks extends BaseGeneratedEMFQuerySpeci
       Set<PBody> bodies = new LinkedHashSet<>();
       {
           PBody body = new PBody(this);
+          PVariable var_Link = body.getOrCreateVariableByName("Link");
           PVariable var_Element = body.getOrCreateVariableByName("Element");
-          PVariable var_Link1 = body.getOrCreateVariableByName("Link1");
-          PVariable var_Link2 = body.getOrCreateVariableByName("Link2");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Element), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
+          PVariable var_SourceComm = body.getOrCreateVariableByName("SourceComm");
+          PVariable var_SourceElement = body.getOrCreateVariableByName("SourceElement");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Link), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
           body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Element, parameter_Element)
+             new ExportedParameter(body, var_Link, parameter_Link)
           ));
-          //    CommunicatingElement.commSubsystem.communicationLink(Element, Link1)
+          //    CommunicatingElement.communicationLink(Element, Link)
           new TypeConstraint(body, Tuples.flatTupleOf(var_Element), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
           PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Element, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Element, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "communicationLink")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
+          new Equality(body, var__virtual_0_, var_Link);
+          //    DirectedCommunicationLink.source(Link, SourceComm)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Link), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
           PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommSubsystem", "communicationLink")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
-          new Equality(body, var__virtual_1_, var_Link1);
-          //    CommunicatingElement.commSubsystem.communicationLink(Element, Link2)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Element), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Link, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "DirectedCommunicationLink", "source")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
+          new Equality(body, var__virtual_1_, var_SourceComm);
+          //    CommunicatingElement.commSubsystem(SourceElement, SourceComm)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_SourceElement), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
           PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Element, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_SourceElement, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
           new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
-          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommSubsystem", "communicationLink")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
-          new Equality(body, var__virtual_3_, var_Link2);
-          //    Link1 != Link2
-          new Inequality(body, var_Link1, var_Link2);
+          new Equality(body, var__virtual_2_, var_SourceComm);
+          //    Element != SourceElement
+          new Inequality(body, var_Element, var_SourceElement);
           bodies.add(body);
       }
       {
           PAnnotation annotation = new PAnnotation("Constraint");
           annotation.addAttribute("severity", "error");
           annotation.addAttribute("key", Arrays.asList(new Object[] {
-                              new ParameterReference("Element")
+                              new ParameterReference("Link")
                               }));
-          annotation.addAttribute("message", "Only one communication link is allowed per element.");
+          annotation.addAttribute("message", "Communication links must start from the containing element.");
           addAnnotation(annotation);
       }
       return bodies;
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLinkOfElement.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLinkOfElement.java
deleted file mode 100644
index 1327c6bf..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLinkOfElement.java
+++ /dev/null
@@ -1,705 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.log4j.Logger;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.CommunicatingElement;
-import satellite.DirectedCommunicationLink;
-
-/**
- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         {@literal @}QueryBasedFeature(feature = "communicationLink")
- *         pattern communicationLinkOfElement(Element : CommunicatingElement, Link : DirectedCommunicationLink) {
- *              CommunicatingElement.commSubsystem.communicationLink(Element, Link);
- *         }
- * </pre></code>
- * 
- * @see Matcher
- * @see Match
- * 
- */
-@SuppressWarnings("all")
-public final class CommunicationLinkOfElement extends BaseGeneratedEMFQuerySpecification<CommunicationLinkOfElement.Matcher> {
-  /**
-   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkOfElement pattern,
-   * to be used in conjunction with {@link Matcher}.
-   * 
-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
-   * Each instance is a (possibly partial) substitution of pattern parameters,
-   * usable to represent a match of the pattern in the result of a query,
-   * or to specify the bound (fixed) input parameters when issuing a query.
-   * 
-   * @see Matcher
-   * 
-   */
-  public static abstract class Match extends BasePatternMatch {
-    private CommunicatingElement fElement;
-    
-    private DirectedCommunicationLink fLink;
-    
-    private static List<String> parameterNames = makeImmutableList("Element", "Link");
-    
-    private Match(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      this.fElement = pElement;
-      this.fLink = pLink;
-    }
-    
-    @Override
-    public Object get(final String parameterName) {
-      if ("Element".equals(parameterName)) return this.fElement;
-      if ("Link".equals(parameterName)) return this.fLink;
-      return null;
-    }
-    
-    public CommunicatingElement getElement() {
-      return this.fElement;
-    }
-    
-    public DirectedCommunicationLink getLink() {
-      return this.fLink;
-    }
-    
-    @Override
-    public boolean set(final String parameterName, final Object newValue) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      if ("Element".equals(parameterName) ) {
-          this.fElement = (CommunicatingElement) newValue;
-          return true;
-      }
-      if ("Link".equals(parameterName) ) {
-          this.fLink = (DirectedCommunicationLink) newValue;
-          return true;
-      }
-      return false;
-    }
-    
-    public void setElement(final CommunicatingElement pElement) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fElement = pElement;
-    }
-    
-    public void setLink(final DirectedCommunicationLink pLink) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fLink = pLink;
-    }
-    
-    @Override
-    public String patternName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkOfElement";
-    }
-    
-    @Override
-    public List<String> parameterNames() {
-      return CommunicationLinkOfElement.Match.parameterNames;
-    }
-    
-    @Override
-    public Object[] toArray() {
-      return new Object[]{fElement, fLink};
-    }
-    
-    @Override
-    public CommunicationLinkOfElement.Match toImmutable() {
-      return isMutable() ? newMatch(fElement, fLink) : this;
-    }
-    
-    @Override
-    public String prettyPrint() {
-      StringBuilder result = new StringBuilder();
-      result.append("\"Element\"=" + prettyPrintValue(fElement) + ", ");
-      result.append("\"Link\"=" + prettyPrintValue(fLink));
-      return result.toString();
-    }
-    
-    @Override
-    public int hashCode() {
-      return Objects.hash(fElement, fLink);
-    }
-    
-    @Override
-    public boolean equals(final Object obj) {
-      if (this == obj)
-          return true;
-      if (obj == null) {
-          return false;
-      }
-      if ((obj instanceof CommunicationLinkOfElement.Match)) {
-          CommunicationLinkOfElement.Match other = (CommunicationLinkOfElement.Match) obj;
-          return Objects.equals(fElement, other.fElement) && Objects.equals(fLink, other.fLink);
-      } else {
-          // this should be infrequent
-          if (!(obj instanceof IPatternMatch)) {
-              return false;
-          }
-          IPatternMatch otherSig  = (IPatternMatch) obj;
-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-      }
-    }
-    
-    @Override
-    public CommunicationLinkOfElement specification() {
-      return CommunicationLinkOfElement.instance();
-    }
-    
-    /**
-     * Returns an empty, mutable match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @return the empty match.
-     * 
-     */
-    public static CommunicationLinkOfElement.Match newEmptyMatch() {
-      return new Mutable(null, null);
-    }
-    
-    /**
-     * Returns a mutable (partial) match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return the new, mutable (partial) match object.
-     * 
-     */
-    public static CommunicationLinkOfElement.Match newMutableMatch(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return new Mutable(pElement, pLink);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public static CommunicationLinkOfElement.Match newMatch(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return new Immutable(pElement, pLink);
-    }
-    
-    private static final class Mutable extends CommunicationLinkOfElement.Match {
-      Mutable(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-        super(pElement, pLink);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return true;
-      }
-    }
-    
-    private static final class Immutable extends CommunicationLinkOfElement.Match {
-      Immutable(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-        super(pElement, pLink);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return false;
-      }
-    }
-  }
-  
-  /**
-   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkOfElement pattern,
-   * providing pattern-specific query methods.
-   * 
-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
-   * 
-   * <p>Matches of the pattern will be represented as {@link Match}.
-   * 
-   * <p>Original source:
-   * <code><pre>
-   * {@literal @}QueryBasedFeature(feature = "communicationLink")
-   * pattern communicationLinkOfElement(Element : CommunicatingElement, Link : DirectedCommunicationLink) {
-   *    CommunicatingElement.commSubsystem.communicationLink(Element, Link);
-   * }
-   * </pre></code>
-   * 
-   * @see Match
-   * @see CommunicationLinkOfElement
-   * 
-   */
-  public static class Matcher extends BaseMatcher<CommunicationLinkOfElement.Match> {
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    public static CommunicationLinkOfElement.Matcher on(final ViatraQueryEngine engine) {
-      // check if matcher already exists
-      Matcher matcher = engine.getExistingMatcher(querySpecification());
-      if (matcher == null) {
-          matcher = (Matcher)engine.getMatcher(querySpecification());
-      }
-      return matcher;
-    }
-    
-    /**
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * @return an initialized matcher
-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-     * 
-     */
-    public static CommunicationLinkOfElement.Matcher create() {
-      return new Matcher();
-    }
-    
-    private static final int POSITION_ELEMENT = 0;
-    
-    private static final int POSITION_LINK = 1;
-    
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(CommunicationLinkOfElement.Matcher.class);
-    
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    private Matcher() {
-      super(querySpecification());
-    }
-    
-    /**
-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return matches represented as a Match object.
-     * 
-     */
-    public Collection<CommunicationLinkOfElement.Match> getAllMatches(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return rawStreamAllMatches(new Object[]{pElement, pLink}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return a stream of matches represented as a Match object.
-     * 
-     */
-    public Stream<CommunicationLinkOfElement.Match> streamAllMatches(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return rawStreamAllMatches(new Object[]{pElement, pLink});
-    }
-    
-    /**
-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return a match represented as a Match object, or null if no match is found.
-     * 
-     */
-    public Optional<CommunicationLinkOfElement.Match> getOneArbitraryMatch(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return rawGetOneArbitraryMatch(new Object[]{pElement, pLink});
-    }
-    
-    /**
-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-     * under any possible substitution of the unspecified parameters (if any).
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return true if the input is a valid (partial) match of the pattern.
-     * 
-     */
-    public boolean hasMatch(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return rawHasMatch(new Object[]{pElement, pLink});
-    }
-    
-    /**
-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return the number of pattern matches found.
-     * 
-     */
-    public int countMatches(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return rawCountMatches(new Object[]{pElement, pLink});
-    }
-    
-    /**
-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @param processor the action that will process the selected match.
-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-     * 
-     */
-    public boolean forOneArbitraryMatch(final CommunicatingElement pElement, final DirectedCommunicationLink pLink, final Consumer<? super CommunicationLinkOfElement.Match> processor) {
-      return rawForOneArbitraryMatch(new Object[]{pElement, pLink}, processor);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pElement the fixed value of pattern parameter Element, or null if not bound.
-     * @param pLink the fixed value of pattern parameter Link, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public CommunicationLinkOfElement.Match newMatch(final CommunicatingElement pElement, final DirectedCommunicationLink pLink) {
-      return CommunicationLinkOfElement.Match.newMatch(pElement, pLink);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<CommunicatingElement> rawStreamAllValuesOfElement(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_ELEMENT, parameters).map(CommunicatingElement.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<CommunicatingElement> getAllValuesOfElement() {
-      return rawStreamAllValuesOfElement(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<CommunicatingElement> streamAllValuesOfElement() {
-      return rawStreamAllValuesOfElement(emptyArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<CommunicatingElement> streamAllValuesOfElement(final CommunicationLinkOfElement.Match partialMatch) {
-      return rawStreamAllValuesOfElement(partialMatch.toArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<CommunicatingElement> streamAllValuesOfElement(final DirectedCommunicationLink pLink) {
-      return rawStreamAllValuesOfElement(new Object[]{null, pLink});
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<CommunicatingElement> getAllValuesOfElement(final CommunicationLinkOfElement.Match partialMatch) {
-      return rawStreamAllValuesOfElement(partialMatch.toArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Element.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<CommunicatingElement> getAllValuesOfElement(final DirectedCommunicationLink pLink) {
-      return rawStreamAllValuesOfElement(new Object[]{null, pLink}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Link.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<DirectedCommunicationLink> rawStreamAllValuesOfLink(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_LINK, parameters).map(DirectedCommunicationLink.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Link.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<DirectedCommunicationLink> getAllValuesOfLink() {
-      return rawStreamAllValuesOfLink(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Link.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<DirectedCommunicationLink> streamAllValuesOfLink() {
-      return rawStreamAllValuesOfLink(emptyArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Link.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<DirectedCommunicationLink> streamAllValuesOfLink(final CommunicationLinkOfElement.Match partialMatch) {
-      return rawStreamAllValuesOfLink(partialMatch.toArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Link.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<DirectedCommunicationLink> streamAllValuesOfLink(final CommunicatingElement pElement) {
-      return rawStreamAllValuesOfLink(new Object[]{pElement, null});
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Link.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<DirectedCommunicationLink> getAllValuesOfLink(final CommunicationLinkOfElement.Match partialMatch) {
-      return rawStreamAllValuesOfLink(partialMatch.toArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Link.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<DirectedCommunicationLink> getAllValuesOfLink(final CommunicatingElement pElement) {
-      return rawStreamAllValuesOfLink(new Object[]{pElement, null}).collect(Collectors.toSet());
-    }
-    
-    @Override
-    protected CommunicationLinkOfElement.Match tupleToMatch(final Tuple t) {
-      try {
-          return CommunicationLinkOfElement.Match.newMatch((CommunicatingElement) t.get(POSITION_ELEMENT), (DirectedCommunicationLink) t.get(POSITION_LINK));
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in tuple not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected CommunicationLinkOfElement.Match arrayToMatch(final Object[] match) {
-      try {
-          return CommunicationLinkOfElement.Match.newMatch((CommunicatingElement) match[POSITION_ELEMENT], (DirectedCommunicationLink) match[POSITION_LINK]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected CommunicationLinkOfElement.Match arrayToMatchMutable(final Object[] match) {
-      try {
-          return CommunicationLinkOfElement.Match.newMutableMatch((CommunicatingElement) match[POSITION_ELEMENT], (DirectedCommunicationLink) match[POSITION_LINK]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    /**
-     * @return the singleton instance of the query specification of this pattern
-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-     * 
-     */
-    public static IQuerySpecification<CommunicationLinkOfElement.Matcher> querySpecification() {
-      return CommunicationLinkOfElement.instance();
-    }
-  }
-  
-  private CommunicationLinkOfElement() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static CommunicationLinkOfElement instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected CommunicationLinkOfElement.Matcher instantiate(final ViatraQueryEngine engine) {
-    return CommunicationLinkOfElement.Matcher.on(engine);
-  }
-  
-  @Override
-  public CommunicationLinkOfElement.Matcher instantiate() {
-    return CommunicationLinkOfElement.Matcher.create();
-  }
-  
-  @Override
-  public CommunicationLinkOfElement.Match newEmptyMatch() {
-    return CommunicationLinkOfElement.Match.newEmptyMatch();
-  }
-  
-  @Override
-  public CommunicationLinkOfElement.Match newMatch(final Object... parameters) {
-    return CommunicationLinkOfElement.Match.newMatch((satellite.CommunicatingElement) parameters[0], (satellite.DirectedCommunicationLink) parameters[1]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkOfElement (visibility: PUBLIC, simpleName: CommunicationLinkOfElement, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkOfElement, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkOfElement (visibility: PUBLIC, simpleName: CommunicationLinkOfElement, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkOfElement, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final CommunicationLinkOfElement INSTANCE = new CommunicationLinkOfElement();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final CommunicationLinkOfElement.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Element = new PParameter("Element", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Link = new PParameter("Link", "satellite.DirectedCommunicationLink", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "DirectedCommunicationLink")), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Element, parameter_Link);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PUBLIC);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkOfElement";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Element","Link");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Element = body.getOrCreateVariableByName("Element");
-          PVariable var_Link = body.getOrCreateVariableByName("Link");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Element), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Link), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Element, parameter_Element),
-             new ExportedParameter(body, var_Link, parameter_Link)
-          ));
-          //    CommunicatingElement.commSubsystem.communicationLink(Element, Link)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Element), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Element, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommSubsystem", "communicationLink")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
-          new Equality(body, var__virtual_1_, var_Link);
-          bodies.add(body);
-      }
-      {
-          PAnnotation annotation = new PAnnotation("QueryBasedFeature");
-          annotation.addAttribute("feature", "communicationLink");
-          addAnnotation(annotation);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLoop.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLoop.java
index ede57df8..f5835baf 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLoop.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CommunicationLoop.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectCommunicationLink;
 import java.util.Arrays;
 import java.util.Collection;
@@ -38,7 +39,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.CommunicatingElement;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -472,7 +472,7 @@ public final class CommunicationLoop extends BaseGeneratedEMFQuerySpecification<
   
   @Override
   public CommunicationLoop.Match newMatch(final Object... parameters) {
-    return CommunicationLoop.Match.newMatch((satellite.CommunicatingElement) parameters[0]);
+    return CommunicationLoop.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement) parameters[0]);
   }
   
   /**
@@ -504,7 +504,7 @@ public final class CommunicationLoop extends BaseGeneratedEMFQuerySpecification<
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CommunicationLoop.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Element = new PParameter("Element", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_Element = new PParameter("Element", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Element);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CubeSatWithKaAntenna.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CubeSatWithKaAntenna.java
index b73cb23f..ba69943a 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CubeSatWithKaAntenna.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CubeSatWithKaAntenna.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SmallSat;
 import java.util.Arrays;
 import java.util.Collection;
@@ -43,7 +44,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.Spacecraft;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -477,7 +477,7 @@ public final class CubeSatWithKaAntenna extends BaseGeneratedEMFQuerySpecificati
   
   @Override
   public CubeSatWithKaAntenna.Match newMatch(final Object... parameters) {
-    return CubeSatWithKaAntenna.Match.newMatch((satellite.Spacecraft) parameters[0]);
+    return CubeSatWithKaAntenna.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft) parameters[0]);
   }
   
   /**
@@ -509,7 +509,7 @@ public final class CubeSatWithKaAntenna extends BaseGeneratedEMFQuerySpecificati
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CubeSatWithKaAntenna.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetBand.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetBand.java
index f2713f45..4cacc34b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetBand.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetBand.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemBand;
 import java.util.Arrays;
 import java.util.Collection;
@@ -42,7 +43,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.DirectedCommunicationLink;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -480,7 +480,7 @@ public final class IncompatibleSourceAndTargetBand extends BaseGeneratedEMFQuery
   
   @Override
   public IncompatibleSourceAndTargetBand.Match newMatch(final Object... parameters) {
-    return IncompatibleSourceAndTargetBand.Match.newMatch((satellite.DirectedCommunicationLink) parameters[0]);
+    return IncompatibleSourceAndTargetBand.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink) parameters[0]);
   }
   
   /**
@@ -512,7 +512,7 @@ public final class IncompatibleSourceAndTargetBand extends BaseGeneratedEMFQuery
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final IncompatibleSourceAndTargetBand.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Link = new PParameter("Link", "satellite.DirectedCommunicationLink", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "DirectedCommunicationLink")), PParameterDirection.INOUT);
+    private final PParameter parameter_Link = new PParameter("Link", "hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "DirectedCommunicationLink")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Link);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetGain.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetGain.java
index 33a4b067..3f247613 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetGain.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/IncompatibleSourceAndTargetGain.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemGain;
 import java.util.Arrays;
 import java.util.Collection;
@@ -42,7 +43,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.DirectedCommunicationLink;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -476,7 +476,7 @@ public final class IncompatibleSourceAndTargetGain extends BaseGeneratedEMFQuery
   
   @Override
   public IncompatibleSourceAndTargetGain.Match newMatch(final Object... parameters) {
-    return IncompatibleSourceAndTargetGain.Match.newMatch((satellite.DirectedCommunicationLink) parameters[0]);
+    return IncompatibleSourceAndTargetGain.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink) parameters[0]);
   }
   
   /**
@@ -508,7 +508,7 @@ public final class IncompatibleSourceAndTargetGain extends BaseGeneratedEMFQuery
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final IncompatibleSourceAndTargetGain.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Link = new PParameter("Link", "satellite.DirectedCommunicationLink", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "DirectedCommunicationLink")), PParameterDirection.INOUT);
+    private final PParameter parameter_Link = new PParameter("Link", "hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "DirectedCommunicationLink")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Link);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/KaAntennaGainLow.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/KaAntennaGainLow.java
index 37c35bfe..18f6c32f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/KaAntennaGainLow.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/KaAntennaGainLow.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashSet;
@@ -41,7 +42,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.CommSubsystem;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -475,7 +475,7 @@ public final class KaAntennaGainLow extends BaseGeneratedEMFQuerySpecification<K
   
   @Override
   public KaAntennaGainLow.Match newMatch(final Object... parameters) {
-    return KaAntennaGainLow.Match.newMatch((satellite.CommSubsystem) parameters[0]);
+    return KaAntennaGainLow.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem) parameters[0]);
   }
   
   /**
@@ -507,7 +507,7 @@ public final class KaAntennaGainLow extends BaseGeneratedEMFQuerySpecification<K
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final KaAntennaGainLow.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoLinkToGroundStation.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoLinkToGroundStation.java
index 45952f33..598f3a6b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoLinkToGroundStation.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoLinkToGroundStation.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectCommunicationLink;
 import java.util.Arrays;
 import java.util.Collection;
@@ -40,7 +41,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.Spacecraft;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -476,7 +476,7 @@ public final class NoLinkToGroundStation extends BaseGeneratedEMFQuerySpecificat
   
   @Override
   public NoLinkToGroundStation.Match newMatch(final Object... parameters) {
-    return NoLinkToGroundStation.Match.newMatch((satellite.Spacecraft) parameters[0]);
+    return NoLinkToGroundStation.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft) parameters[0]);
   }
   
   /**
@@ -508,7 +508,7 @@ public final class NoLinkToGroundStation extends BaseGeneratedEMFQuerySpecificat
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final NoLinkToGroundStation.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoPotentialLinkToGroundStation.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoPotentialLinkToGroundStation.java
index 3366de46..1e8f8502 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoPotentialLinkToGroundStation.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoPotentialLinkToGroundStation.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectLinkAllowed;
 import java.util.Arrays;
 import java.util.Collection;
@@ -40,7 +41,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.Spacecraft;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -472,7 +472,7 @@ public final class NoPotentialLinkToGroundStation extends BaseGeneratedEMFQueryS
   
   @Override
   public NoPotentialLinkToGroundStation.Match newMatch(final Object... parameters) {
-    return NoPotentialLinkToGroundStation.Match.newMatch((satellite.Spacecraft) parameters[0]);
+    return NoPotentialLinkToGroundStation.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft) parameters[0]);
   }
   
   /**
@@ -504,7 +504,7 @@ public final class NoPotentialLinkToGroundStation extends BaseGeneratedEMFQueryS
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final NoPotentialLinkToGroundStation.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NotEnoughInterferometryPayloads.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NotEnoughInterferometryPayloads.java
index bdd97100..d75dea5f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NotEnoughInterferometryPayloads.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NotEnoughInterferometryPayloads.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.AtLeastTwoInterferometryPayloads;
 import java.util.Arrays;
 import java.util.Collection;
@@ -38,7 +39,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.InterferometryMission;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -472,7 +472,7 @@ public final class NotEnoughInterferometryPayloads extends BaseGeneratedEMFQuery
   
   @Override
   public NotEnoughInterferometryPayloads.Match newMatch(final Object... parameters) {
-    return NotEnoughInterferometryPayloads.Match.newMatch((satellite.InterferometryMission) parameters[0]);
+    return NotEnoughInterferometryPayloads.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission) parameters[0]);
   }
   
   /**
@@ -504,7 +504,7 @@ public final class NotEnoughInterferometryPayloads extends BaseGeneratedEMFQuery
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final NotEnoughInterferometryPayloads.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Mission = new PParameter("Mission", "satellite.InterferometryMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "InterferometryMission")), PParameterDirection.INOUT);
+    private final PParameter parameter_Mission = new PParameter("Mission", "hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "InterferometryMission")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Mission);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java
index d7378783..c86761ce 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java
@@ -3,13 +3,12 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkOfElement;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLoop;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CubeSatWithKaAntenna;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.IncompatibleSourceAndTargetBand;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.IncompatibleSourceAndTargetGain;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.KaAntennaGainLow;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.MultipleCommunicationLinks;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoLinkToGroundStation;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoPotentialLinkToGroundStation;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NotEnoughInterferometryPayloads;
@@ -29,8 +28,7 @@ import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
  * in order to achieve better performance than one-by-one on-demand matcher initialization.
  * 
  * <p> From package hu.bme.mit.inf.dslreasoner.domains.satellite.queries, the group contains the definition of the following patterns: <ul>
- * <li>multipleCommunicationLinks</li>
- * <li>communicationLinkOfElement</li>
+ * <li>communicationLinkDoesNotStartAtContainingElement</li>
  * <li>notEnoughInterferometryPayloads</li>
  * <li>noLinkToGroundStation</li>
  * <li>noPotentialLinkToGroundStation</li>
@@ -68,8 +66,7 @@ public final class SatelliteQueries extends BaseGeneratedPatternGroup {
   private static SatelliteQueries INSTANCE;
   
   private SatelliteQueries() {
-    querySpecifications.add(MultipleCommunicationLinks.instance());
-    querySpecifications.add(CommunicationLinkOfElement.instance());
+    querySpecifications.add(CommunicationLinkDoesNotStartAtContainingElement.instance());
     querySpecifications.add(NotEnoughInterferometryPayloads.instance());
     querySpecifications.add(NoLinkToGroundStation.instance());
     querySpecifications.add(NoPotentialLinkToGroundStation.instance());
@@ -85,20 +82,12 @@ public final class SatelliteQueries extends BaseGeneratedPatternGroup {
     querySpecifications.add(SpacecraftOfKind.instance());
   }
   
-  public MultipleCommunicationLinks getMultipleCommunicationLinks() {
-    return MultipleCommunicationLinks.instance();
+  public CommunicationLinkDoesNotStartAtContainingElement getCommunicationLinkDoesNotStartAtContainingElement() {
+    return CommunicationLinkDoesNotStartAtContainingElement.instance();
   }
   
-  public MultipleCommunicationLinks.Matcher getMultipleCommunicationLinks(final ViatraQueryEngine engine) {
-    return MultipleCommunicationLinks.Matcher.on(engine);
-  }
-  
-  public CommunicationLinkOfElement getCommunicationLinkOfElement() {
-    return CommunicationLinkOfElement.instance();
-  }
-  
-  public CommunicationLinkOfElement.Matcher getCommunicationLinkOfElement(final ViatraQueryEngine engine) {
-    return CommunicationLinkOfElement.Matcher.on(engine);
+  public CommunicationLinkDoesNotStartAtContainingElement.Matcher getCommunicationLinkDoesNotStartAtContainingElement(final ViatraQueryEngine engine) {
+    return CommunicationLinkDoesNotStartAtContainingElement.Matcher.on(engine);
   }
   
   public NotEnoughInterferometryPayloads getNotEnoughInterferometryPayloads() {
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SmallSat.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SmallSat.java
index 4791740e..7bc497ab 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SmallSat.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SmallSat.java
@@ -64,11 +64,11 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
    * 
    */
   public static abstract class Match extends BasePatternMatch {
-    private satellite.SmallSat fSat;
+    private hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat fSat;
     
     private static List<String> parameterNames = makeImmutableList("Sat");
     
-    private Match(final satellite.SmallSat pSat) {
+    private Match(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       this.fSat = pSat;
     }
     
@@ -78,7 +78,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
       return null;
     }
     
-    public satellite.SmallSat getSat() {
+    public hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat getSat() {
       return this.fSat;
     }
     
@@ -86,13 +86,13 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
     public boolean set(final String parameterName, final Object newValue) {
       if (!isMutable()) throw new java.lang.UnsupportedOperationException();
       if ("Sat".equals(parameterName) ) {
-          this.fSat = (satellite.SmallSat) newValue;
+          this.fSat = (hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat) newValue;
           return true;
       }
       return false;
     }
     
-    public void setSat(final satellite.SmallSat pSat) {
+    public void setSat(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       if (!isMutable()) throw new java.lang.UnsupportedOperationException();
       this.fSat = pSat;
     }
@@ -173,7 +173,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return the new, mutable (partial) match object.
      * 
      */
-    public static SmallSat.Match newMutableMatch(final satellite.SmallSat pSat) {
+    public static SmallSat.Match newMutableMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return new Mutable(pSat);
     }
     
@@ -185,12 +185,12 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return the (partial) match object.
      * 
      */
-    public static SmallSat.Match newMatch(final satellite.SmallSat pSat) {
+    public static SmallSat.Match newMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return new Immutable(pSat);
     }
     
     private static final class Mutable extends SmallSat.Match {
-      Mutable(final satellite.SmallSat pSat) {
+      Mutable(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
         super(pSat);
       }
       
@@ -201,7 +201,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
     }
     
     private static final class Immutable extends SmallSat.Match {
-      Immutable(final satellite.SmallSat pSat) {
+      Immutable(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
         super(pSat);
       }
       
@@ -282,7 +282,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return matches represented as a Match object.
      * 
      */
-    public Collection<SmallSat.Match> getAllMatches(final satellite.SmallSat pSat) {
+    public Collection<SmallSat.Match> getAllMatches(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return rawStreamAllMatches(new Object[]{pSat}).collect(Collectors.toSet());
     }
     
@@ -296,7 +296,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return a stream of matches represented as a Match object.
      * 
      */
-    public Stream<SmallSat.Match> streamAllMatches(final satellite.SmallSat pSat) {
+    public Stream<SmallSat.Match> streamAllMatches(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return rawStreamAllMatches(new Object[]{pSat});
     }
     
@@ -307,7 +307,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return a match represented as a Match object, or null if no match is found.
      * 
      */
-    public Optional<SmallSat.Match> getOneArbitraryMatch(final satellite.SmallSat pSat) {
+    public Optional<SmallSat.Match> getOneArbitraryMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return rawGetOneArbitraryMatch(new Object[]{pSat});
     }
     
@@ -318,7 +318,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return true if the input is a valid (partial) match of the pattern.
      * 
      */
-    public boolean hasMatch(final satellite.SmallSat pSat) {
+    public boolean hasMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return rawHasMatch(new Object[]{pSat});
     }
     
@@ -328,7 +328,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return the number of pattern matches found.
      * 
      */
-    public int countMatches(final satellite.SmallSat pSat) {
+    public int countMatches(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return rawCountMatches(new Object[]{pSat});
     }
     
@@ -340,7 +340,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
      * 
      */
-    public boolean forOneArbitraryMatch(final satellite.SmallSat pSat, final Consumer<? super SmallSat.Match> processor) {
+    public boolean forOneArbitraryMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat, final Consumer<? super SmallSat.Match> processor) {
       return rawForOneArbitraryMatch(new Object[]{pSat}, processor);
     }
     
@@ -352,7 +352,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return the (partial) match object.
      * 
      */
-    public SmallSat.Match newMatch(final satellite.SmallSat pSat) {
+    public SmallSat.Match newMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
       return SmallSat.Match.newMatch(pSat);
     }
     
@@ -361,8 +361,8 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    protected Stream<satellite.SmallSat> rawStreamAllValuesOfSat(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_SAT, parameters).map(satellite.SmallSat.class::cast);
+    protected Stream<hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat> rawStreamAllValuesOfSat(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_SAT, parameters).map(hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat.class::cast);
     }
     
     /**
@@ -370,7 +370,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<satellite.SmallSat> getAllValuesOfSat() {
+    public Set<hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat> getAllValuesOfSat() {
       return rawStreamAllValuesOfSat(emptyArray()).collect(Collectors.toSet());
     }
     
@@ -379,14 +379,14 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Stream<satellite.SmallSat> streamAllValuesOfSat() {
+    public Stream<hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat> streamAllValuesOfSat() {
       return rawStreamAllValuesOfSat(emptyArray());
     }
     
     @Override
     protected SmallSat.Match tupleToMatch(final Tuple t) {
       try {
-          return SmallSat.Match.newMatch((satellite.SmallSat) t.get(POSITION_SAT));
+          return SmallSat.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat) t.get(POSITION_SAT));
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in tuple not properly typed!",e);
           return null;
@@ -396,7 +396,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
     @Override
     protected SmallSat.Match arrayToMatch(final Object[] match) {
       try {
-          return SmallSat.Match.newMatch((satellite.SmallSat) match[POSITION_SAT]);
+          return SmallSat.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat) match[POSITION_SAT]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -406,7 +406,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
     @Override
     protected SmallSat.Match arrayToMatchMutable(final Object[] match) {
       try {
-          return SmallSat.Match.newMutableMatch((satellite.SmallSat) match[POSITION_SAT]);
+          return SmallSat.Match.newMutableMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat) match[POSITION_SAT]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -457,7 +457,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
   
   @Override
   public SmallSat.Match newMatch(final Object... parameters) {
-    return SmallSat.Match.newMatch((satellite.SmallSat) parameters[0]);
+    return SmallSat.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat) parameters[0]);
   }
   
   /**
@@ -489,7 +489,7 @@ public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final SmallSat.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Sat = new PParameter("Sat", "satellite.SmallSat", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "SmallSat")), PParameterDirection.INOUT);
+    private final PParameter parameter_Sat = new PParameter("Sat", "hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "SmallSat")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Sat);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SpacecraftOfKind.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SpacecraftOfKind.java
index ed0bd7dc..52602bb5 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SpacecraftOfKind.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SpacecraftOfKind.java
@@ -3,6 +3,8 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashSet;
@@ -39,8 +41,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.Spacecraft;
-import satellite.SpacecraftKind;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -628,7 +628,7 @@ public final class SpacecraftOfKind extends BaseGeneratedEMFQuerySpecification<S
   
   @Override
   public SpacecraftOfKind.Match newMatch(final Object... parameters) {
-    return SpacecraftOfKind.Match.newMatch((satellite.Spacecraft) parameters[0], (satellite.SpacecraftKind) parameters[1]);
+    return SpacecraftOfKind.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft) parameters[0], (hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind) parameters[1]);
   }
   
   /**
@@ -660,9 +660,9 @@ public final class SpacecraftOfKind extends BaseGeneratedEMFQuerySpecification<S
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final SpacecraftOfKind.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_Kind = new PParameter("Kind", "satellite.SpacecraftKind", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "SpacecraftKind")), PParameterDirection.INOUT);
+    private final PParameter parameter_Kind = new PParameter("Kind", "hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "SpacecraftKind")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft, parameter_Kind);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/ThreeUCubeSatWithNonUhfCrossLink.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/ThreeUCubeSatWithNonUhfCrossLink.java
index 51b224b1..6408033b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/ThreeUCubeSatWithNonUhfCrossLink.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/ThreeUCubeSatWithNonUhfCrossLink.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemBandUhf;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.GroundStationNetwork;
 import java.util.Arrays;
@@ -41,7 +42,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.CubeSat3U;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -485,7 +485,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
   
   @Override
   public ThreeUCubeSatWithNonUhfCrossLink.Match newMatch(final Object... parameters) {
-    return ThreeUCubeSatWithNonUhfCrossLink.Match.newMatch((satellite.CubeSat3U) parameters[0]);
+    return ThreeUCubeSatWithNonUhfCrossLink.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U) parameters[0]);
   }
   
   /**
@@ -517,7 +517,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final ThreeUCubeSatWithNonUhfCrossLink.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Sat = new PParameter("Sat", "satellite.CubeSat3U", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CubeSat3U")), PParameterDirection.INOUT);
+    private final PParameter parameter_Sat = new PParameter("Sat", "hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CubeSat3U")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Sat);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/UhfAntennaGainNotLow.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/UhfAntennaGainNotLow.java
index 99e472ea..62222ded 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/UhfAntennaGainNotLow.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/UhfAntennaGainNotLow.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemGainLow;
 import java.util.Arrays;
 import java.util.Collection;
@@ -43,7 +44,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.CommSubsystem;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -483,7 +483,7 @@ public final class UhfAntennaGainNotLow extends BaseGeneratedEMFQuerySpecificati
   
   @Override
   public UhfAntennaGainNotLow.Match newMatch(final Object... parameters) {
-    return UhfAntennaGainNotLow.Match.newMatch((satellite.CommSubsystem) parameters[0]);
+    return UhfAntennaGainNotLow.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem) parameters[0]);
   }
   
   /**
@@ -515,7 +515,7 @@ public final class UhfAntennaGainNotLow extends BaseGeneratedEMFQuerySpecificati
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final UhfAntennaGainNotLow.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/XAntennaGainNotMedium.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/XAntennaGainNotMedium.java
index b50962c5..dbe6d26e 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/XAntennaGainNotMedium.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/XAntennaGainNotMedium.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemGainMedium;
 import java.util.Arrays;
 import java.util.Collection;
@@ -43,7 +44,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-import satellite.CommSubsystem;
 
 /**
  * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
@@ -477,7 +477,7 @@ public final class XAntennaGainNotMedium extends BaseGeneratedEMFQuerySpecificat
   
   @Override
   public XAntennaGainNotMedium.Match newMatch(final Object... parameters) {
-    return XAntennaGainNotMedium.Match.newMatch((satellite.CommSubsystem) parameters[0]);
+    return XAntennaGainNotMedium.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem) parameters[0]);
   }
   
   /**
@@ -509,7 +509,7 @@ public final class XAntennaGainNotMedium extends BaseGeneratedEMFQuerySpecificat
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final XAntennaGainNotMedium.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/AtLeastTwoInterferometryPayloads.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/AtLeastTwoInterferometryPayloads.java
index 58e7e183..d560ac93 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/AtLeastTwoInterferometryPayloads.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/AtLeastTwoInterferometryPayloads.java
@@ -88,7 +88,7 @@ public final class AtLeastTwoInterferometryPayloads extends BaseGeneratedEMFQuer
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final AtLeastTwoInterferometryPayloads.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Mission = new PParameter("Mission", "satellite.InterferometryMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "InterferometryMission")), PParameterDirection.INOUT);
+    private final PParameter parameter_Mission = new PParameter("Mission", "hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "InterferometryMission")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Mission);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBand.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBand.java
index 609e0b93..a0009587 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBand.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBand.java
@@ -87,9 +87,9 @@ public final class CommSubsystemBand extends BaseGeneratedEMFQuerySpecificationW
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CommSubsystemBand.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_Band = new PParameter("Band", "satellite.TransceiverBand", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "TransceiverBand")), PParameterDirection.INOUT);
+    private final PParameter parameter_Band = new PParameter("Band", "hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "TransceiverBand")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm, parameter_Band);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBandUhf.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBandUhf.java
index bc25ea59..51175ce3 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBandUhf.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemBandUhf.java
@@ -88,7 +88,7 @@ public final class CommSubsystemBandUhf extends BaseGeneratedEMFQuerySpecificati
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CommSubsystemBandUhf.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGain.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGain.java
index 69793a96..e2e0e2a1 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGain.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGain.java
@@ -87,9 +87,9 @@ public final class CommSubsystemGain extends BaseGeneratedEMFQuerySpecificationW
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CommSubsystemGain.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_Gain = new PParameter("Gain", "satellite.AntennaGain", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "AntennaGain")), PParameterDirection.INOUT);
+    private final PParameter parameter_Gain = new PParameter("Gain", "hu.bme.mit.inf.dslreasoner.domains.satellite.AntennaGain", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "AntennaGain")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm, parameter_Gain);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainLow.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainLow.java
index fd24f163..04ee67da 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainLow.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainLow.java
@@ -88,7 +88,7 @@ public final class CommSubsystemGainLow extends BaseGeneratedEMFQuerySpecificati
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CommSubsystemGainLow.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainMedium.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainMedium.java
index 82b77bbc..4b3bc03b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainMedium.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CommSubsystemGainMedium.java
@@ -88,7 +88,7 @@ public final class CommSubsystemGainMedium extends BaseGeneratedEMFQuerySpecific
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CommSubsystemGainMedium.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Comm = new PParameter("Comm", "satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
+    private final PParameter parameter_Comm = new PParameter("Comm", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommSubsystem")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Comm);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CubeSat3U.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CubeSat3U.java
index acc60475..fe789893 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CubeSat3U.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CubeSat3U.java
@@ -83,7 +83,7 @@ public final class CubeSat3U extends BaseGeneratedEMFQuerySpecificationWithGener
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final CubeSat3U.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Sat = new PParameter("Sat", "satellite.CubeSat3U", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CubeSat3U")), PParameterDirection.INOUT);
+    private final PParameter parameter_Sat = new PParameter("Sat", "hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CubeSat3U")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Sat);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/DirectCommunicationLink.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/DirectCommunicationLink.java
index a2123354..d6f5c53b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/DirectCommunicationLink.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/DirectCommunicationLink.java
@@ -88,9 +88,9 @@ public final class DirectCommunicationLink extends BaseGeneratedEMFQuerySpecific
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final DirectCommunicationLink.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Source = new PParameter("Source", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_Source = new PParameter("Source", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_Target = new PParameter("Target", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_Target = new PParameter("Target", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Source, parameter_Target);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/GroundStationNetwork.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/GroundStationNetwork.java
index 606cdfed..93b1a01b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/GroundStationNetwork.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/GroundStationNetwork.java
@@ -83,7 +83,7 @@ public final class GroundStationNetwork extends BaseGeneratedEMFQuerySpecificati
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final GroundStationNetwork.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Network = new PParameter("Network", "satellite.GroundStationNetwork", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "GroundStationNetwork")), PParameterDirection.INOUT);
+    private final PParameter parameter_Network = new PParameter("Network", "hu.bme.mit.inf.dslreasoner.domains.satellite.GroundStationNetwork", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "GroundStationNetwork")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Network);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectCommunicationLink.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectCommunicationLink.java
index dee8a83c..6d5e475c 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectCommunicationLink.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectCommunicationLink.java
@@ -85,9 +85,9 @@ public final class IndirectCommunicationLink extends BaseGeneratedEMFQuerySpecif
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final IndirectCommunicationLink.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Source = new PParameter("Source", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_Source = new PParameter("Source", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_Target = new PParameter("Target", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_Target = new PParameter("Target", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Source, parameter_Target);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectLinkAllowed.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectLinkAllowed.java
index 31381a09..27648bf3 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectLinkAllowed.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectLinkAllowed.java
@@ -85,9 +85,9 @@ public final class IndirectLinkAllowed extends BaseGeneratedEMFQuerySpecificatio
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final IndirectLinkAllowed.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_From = new PParameter("From", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_From = new PParameter("From", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_To = new PParameter("To", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_To = new PParameter("To", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_From, parameter_To);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/LinkAllowed.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/LinkAllowed.java
index 7118d657..e7529aa2 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/LinkAllowed.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/LinkAllowed.java
@@ -96,9 +96,9 @@ public final class LinkAllowed extends BaseGeneratedEMFQuerySpecificationWithGen
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final LinkAllowed.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_From = new PParameter("From", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_From = new PParameter("From", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_To = new PParameter("To", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_To = new PParameter("To", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_From, parameter_To);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MatchingAntenna.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MatchingAntenna.java
index 3a52ad1d..b4f0d9e9 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MatchingAntenna.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MatchingAntenna.java
@@ -90,11 +90,11 @@ public final class MatchingAntenna extends BaseGeneratedEMFQuerySpecificationWit
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final MatchingAntenna.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_From = new PParameter("From", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_From = new PParameter("From", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_To = new PParameter("To", "satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    private final PParameter parameter_To = new PParameter("To", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_Band = new PParameter("Band", "satellite.TransceiverBand", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "TransceiverBand")), PParameterDirection.INOUT);
+    private final PParameter parameter_Band = new PParameter("Band", "hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "TransceiverBand")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_From, parameter_To, parameter_Band);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java
index 591215cd..36fa4557 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java
@@ -3,13 +3,12 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
 
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkOfElement;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLoop;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CubeSatWithKaAntenna;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.IncompatibleSourceAndTargetBand;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.IncompatibleSourceAndTargetGain;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.KaAntennaGainLow;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.MultipleCommunicationLinks;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoLinkToGroundStation;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoPotentialLinkToGroundStation;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NotEnoughInterferometryPayloads;
@@ -40,8 +39,7 @@ import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
  * <p>A private group that includes private patterns as well. Only intended use case is for pattern testing.
  * 
  * <p> From package hu.bme.mit.inf.dslreasoner.domains.satellite.queries, the group contains the definition of the following patterns: <ul>
- * <li>multipleCommunicationLinks</li>
- * <li>communicationLinkOfElement</li>
+ * <li>communicationLinkDoesNotStartAtContainingElement</li>
  * <li>notEnoughInterferometryPayloads</li>
  * <li>atLeastTwoInterferometryPayloads</li>
  * <li>spacecraftWithInterferometryPayload</li>
@@ -93,8 +91,7 @@ public final class SatelliteQueriesAll extends BaseGeneratedPatternGroup {
   private static SatelliteQueriesAll INSTANCE;
   
   private SatelliteQueriesAll() {
-    querySpecifications.add(MultipleCommunicationLinks.instance());
-    querySpecifications.add(CommunicationLinkOfElement.instance());
+    querySpecifications.add(CommunicationLinkDoesNotStartAtContainingElement.instance());
     querySpecifications.add(NotEnoughInterferometryPayloads.instance());
     querySpecifications.add(AtLeastTwoInterferometryPayloads.instance());
     querySpecifications.add(SpacecraftWithInterferometryPayload.instance());
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftWithInterferometryPayload.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftWithInterferometryPayload.java
index 9566c4c5..f8e6ca4f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftWithInterferometryPayload.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftWithInterferometryPayload.java
@@ -87,9 +87,9 @@ public final class SpacecraftWithInterferometryPayload extends BaseGeneratedEMFQ
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final SpacecraftWithInterferometryPayload.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Mission = new PParameter("Mission", "satellite.ConstellationMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "ConstellationMission")), PParameterDirection.INOUT);
+    private final PParameter parameter_Mission = new PParameter("Mission", "hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "ConstellationMission")), PParameterDirection.INOUT);
     
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Mission, parameter_Spacecraft);
     
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
index edffd941..40553e29 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
@@ -2,17 +2,13 @@ package hu.bme.mit.inf.dslreasoner.domains.satellite.queries
 
 import "http://www.example.org/satellite"
 
-@Constraint(severity = "error", key = {Element},
-        message = "Only one communication link is allowed per element.")
-pattern multipleCommunicationLinks(Element : CommunicatingElement) {
-        CommunicatingElement.commSubsystem.communicationLink(Element, Link1);
-        CommunicatingElement.commSubsystem.communicationLink(Element, Link2);
-        Link1 != Link2;
-}
-
-@QueryBasedFeature(feature = "communicationLink")
-pattern communicationLinkOfElement(Element : CommunicatingElement, Link : DirectedCommunicationLink) {
-        CommunicatingElement.commSubsystem.communicationLink(Element, Link);
+@Constraint(severity = "error", key = {Link},
+        message = "Communication links must start from the containing element.")
+pattern communicationLinkDoesNotStartAtContainingElement(Link : DirectedCommunicationLink) {
+        CommunicatingElement.communicationLink(Element, Link);
+        DirectedCommunicationLink.source(Link, SourceComm);
+        CommunicatingElement.commSubsystem(SourceElement, SourceComm);
+        Element != SourceElement;
 }
 
 // At least two spacecraft must have the interferometry payload configured