Try to restructure satellite case study

16 files changed, 424 insertions, 133 deletions

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 072a9705..1cee0c0d 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,6 +15,7 @@ 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()
@@ -80,4 +81,30 @@ 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 b96b281f..6e12fd9f 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,29 +41,18 @@ public interface CommunicatingElement extends EObject {
         EList<CommSubsystem> getCommSubsystem();
 
         /**
-         * Returns the value of the '<em><b>Communication Link</b></em>' containment reference.
+         * Returns the value of the '<em><b>Communication Link</b></em>' 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)
+         * @return the value of the '<em>Communication Link</em>' reference.
          * @see satellite.SatellitePackage#getCommunicatingElement_CommunicationLink()
-         * @model containment="true"
+         * @model transient="true" changeable="false" volatile="true" derived="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
new file mode 100644
index 00000000..a38926d4
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat.java
@@ -0,0 +1,16 @@
+/**
+ */
+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 5758e165..c68bf52c 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 Spacecraft {
+public interface CubeSat3U extends CubeSat {
 } // 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 a8d8830f..5ade601a 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 Spacecraft {
+public interface CubeSat6U extends CubeSat {
 } // 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 f0d80ac2..6e8723ae 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>' containment reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' 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>' containment reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' 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>' containment reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -344,13 +344,22 @@ 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 = 2;
+        int COMM_SUBSYSTEM_FEATURE_COUNT = 3;
 
         /**
          * The number of operations of the '<em>Comm Subsystem</em>' class.
@@ -464,6 +473,70 @@ 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 -->
@@ -480,16 +553,16 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
+        int CUBE_SAT3_U__COMM_SUBSYSTEM = CUBE_SAT__COMM_SUBSYSTEM;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__COMMUNICATION_LINK = SPACECRAFT__COMMUNICATION_LINK;
+        int CUBE_SAT3_U__COMMUNICATION_LINK = CUBE_SAT__COMMUNICATION_LINK;
 
         /**
          * The feature id for the '<em><b>Payload</b></em>' containment reference.
@@ -498,7 +571,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__PAYLOAD = SPACECRAFT__PAYLOAD;
+        int CUBE_SAT3_U__PAYLOAD = CUBE_SAT__PAYLOAD;
 
         /**
          * The feature id for the '<em><b>Kind</b></em>' attribute.
@@ -507,7 +580,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__KIND = SPACECRAFT__KIND;
+        int CUBE_SAT3_U__KIND = CUBE_SAT__KIND;
 
         /**
          * The number of structural features of the '<em>Cube Sat3 U</em>' class.
@@ -516,7 +589,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U_FEATURE_COUNT = SPACECRAFT_FEATURE_COUNT + 0;
+        int CUBE_SAT3_U_FEATURE_COUNT = CUBE_SAT_FEATURE_COUNT + 0;
 
         /**
          * The number of operations of the '<em>Cube Sat3 U</em>' class.
@@ -525,7 +598,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U_OPERATION_COUNT = SPACECRAFT_OPERATION_COUNT + 0;
+        int CUBE_SAT3_U_OPERATION_COUNT = CUBE_SAT_OPERATION_COUNT + 0;
 
         /**
          * The meta object id for the '{@link satellite.impl.CubeSat6UImpl <em>Cube Sat6 U</em>}' class.
@@ -544,16 +617,16 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
+        int CUBE_SAT6_U__COMM_SUBSYSTEM = CUBE_SAT__COMM_SUBSYSTEM;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U__COMMUNICATION_LINK = SPACECRAFT__COMMUNICATION_LINK;
+        int CUBE_SAT6_U__COMMUNICATION_LINK = CUBE_SAT__COMMUNICATION_LINK;
 
         /**
          * The feature id for the '<em><b>Payload</b></em>' containment reference.
@@ -562,7 +635,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U__PAYLOAD = SPACECRAFT__PAYLOAD;
+        int CUBE_SAT6_U__PAYLOAD = CUBE_SAT__PAYLOAD;
 
         /**
          * The feature id for the '<em><b>Kind</b></em>' attribute.
@@ -571,7 +644,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U__KIND = SPACECRAFT__KIND;
+        int CUBE_SAT6_U__KIND = CUBE_SAT__KIND;
 
         /**
          * The number of structural features of the '<em>Cube Sat6 U</em>' class.
@@ -580,7 +653,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U_FEATURE_COUNT = SPACECRAFT_FEATURE_COUNT + 0;
+        int CUBE_SAT6_U_FEATURE_COUNT = CUBE_SAT_FEATURE_COUNT + 0;
 
         /**
          * The number of operations of the '<em>Cube Sat6 U</em>' class.
@@ -589,7 +662,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U_OPERATION_COUNT = SPACECRAFT_OPERATION_COUNT + 0;
+        int CUBE_SAT6_U_OPERATION_COUNT = CUBE_SAT_OPERATION_COUNT + 0;
 
         /**
          * The meta object id for the '{@link satellite.impl.SmallSatImpl <em>Small Sat</em>}' class.
@@ -611,7 +684,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>' containment reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -663,7 +736,7 @@ public interface SatellitePackage extends EPackage {
          * @see satellite.impl.SatellitePackageImpl#getTransceiverBand()
          * @generated
          */
-        int TRANSCEIVER_BAND = 12;
+        int TRANSCEIVER_BAND = 13;
 
         /**
          * The meta object id for the '{@link satellite.AntennaGain <em>Antenna Gain</em>}' enum.
@@ -673,7 +746,7 @@ public interface SatellitePackage extends EPackage {
          * @see satellite.impl.SatellitePackageImpl#getAntennaGain()
          * @generated
          */
-        int ANTENNA_GAIN = 13;
+        int ANTENNA_GAIN = 14;
 
         /**
          * The meta object id for the '{@link satellite.SpacecraftKind <em>Spacecraft Kind</em>}' enum.
@@ -683,7 +756,7 @@ public interface SatellitePackage extends EPackage {
          * @see satellite.impl.SatellitePackageImpl#getSpacecraftKind()
          * @generated
          */
-        int SPACECRAFT_KIND = 14;
+        int SPACECRAFT_KIND = 15;
 
         /**
          * Returns the meta object for class '{@link satellite.ConstellationMission <em>Constellation Mission</em>}'.
@@ -760,10 +833,10 @@ public interface SatellitePackage extends EPackage {
         EReference getCommunicatingElement_CommSubsystem();
 
         /**
-         * Returns the meta object for the containment reference '{@link satellite.CommunicatingElement#getCommunicationLink <em>Communication Link</em>}'.
+         * Returns the meta object for the reference '{@link satellite.CommunicatingElement#getCommunicationLink <em>Communication Link</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @return the meta object for the containment reference '<em>Communication Link</em>'.
+         * @return the meta object for the reference '<em>Communication Link</em>'.
          * @see satellite.CommunicatingElement#getCommunicationLink()
          * @see #getCommunicatingElement()
          * @generated
@@ -845,6 +918,17 @@ 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 -->
@@ -927,6 +1011,16 @@ 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 -->
@@ -1043,7 +1137,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>' containment reference feature.
+                 * The meta object literal for the '<em><b>Communication Link</b></em>' reference feature.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
                  * @generated
@@ -1113,6 +1207,14 @@ 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 -->
@@ -1189,6 +1291,16 @@ 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 d8775572..6f72322e 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,7 +59,6 @@ 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 cf8f1fe8..70ee268e 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,13 +4,16 @@ 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;
 
@@ -24,6 +27,7 @@ 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
@@ -70,6 +74,16 @@ 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
@@ -142,12 +156,81 @@ 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);
         }
@@ -166,6 +249,9 @@ 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);
         }
@@ -184,6 +270,9 @@ 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);
         }
@@ -200,6 +289,8 @@ 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 1f79da3b..f472580b 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,16 +3,12 @@
 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;
@@ -49,16 +45,6 @@ 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
@@ -98,7 +84,10 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
          */
         @Override
         public DirectedCommunicationLink getCommunicationLink() {
-                return communicationLink;
+                DirectedCommunicationLink communicationLink = basicGetCommunicationLink();
+                return communicationLink != null && communicationLink.eIsProxy()
+                                ? (DirectedCommunicationLink) eResolveProxy((InternalEObject) communicationLink)
+                                : communicationLink;
         }
 
         /**
@@ -106,46 +95,11 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
          * <!-- 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.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));
+        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();
         }
 
         /**
@@ -158,8 +112,6 @@ 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);
         }
@@ -175,7 +127,9 @@ public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Contai
                 case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
                         return getCommSubsystem();
                 case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
-                        return getCommunicationLink();
+                        if (resolve)
+                                return getCommunicationLink();
+                        return basicGetCommunicationLink();
                 }
                 return super.eGet(featureID, resolve, coreType);
         }
@@ -193,9 +147,6 @@ 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);
         }
@@ -211,9 +162,6 @@ 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);
         }
@@ -229,7 +177,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 communicationLink != null;
+                        return basicGetCommunicationLink() != 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 a7ba37a7..350a9bcc 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 SpacecraftImpl implements CubeSat3U {
+public class CubeSat3UImpl extends CubeSatImpl 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 d4f42e6c..3b9c5988 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 SpacecraftImpl implements CubeSat6U {
+public class CubeSat6UImpl extends CubeSatImpl 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
new file mode 100644
index 00000000..660bd062
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSatImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+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 2347fe07..68e4ce30 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,6 +14,7 @@ import satellite.AntennaGain;
 import satellite.CommSubsystem;
 import satellite.CommunicatingElement;
 import satellite.ConstellationMission;
+import satellite.CubeSat;
 import satellite.CubeSat3U;
 import satellite.CubeSat6U;
 import satellite.DirectedCommunicationLink;
@@ -124,6 +125,13 @@ 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;
 
         /**
@@ -360,6 +368,16 @@ 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;
         }
@@ -440,6 +458,16 @@ 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;
         }
@@ -514,6 +542,7 @@ 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);
@@ -529,6 +558,8 @@ 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);
@@ -568,9 +599,10 @@ 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.getSpacecraft());
-                cubeSat6UEClass.getESuperTypes().add(this.getSpacecraft());
+                cubeSat3UEClass.getESuperTypes().add(this.getCubeSat());
+                cubeSat6UEClass.getESuperTypes().add(this.getCubeSat());
                 smallSatEClass.getESuperTypes().add(this.getSpacecraft());
+                cubeSatEClass.getESuperTypes().add(this.getSpacecraft());
 
                 // Initialize classes, features, and operations; add parameters
                 initEClass(constellationMissionEClass, ConstellationMission.class, "ConstellationMission", IS_ABSTRACT,
@@ -594,8 +626,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);
@@ -614,6 +646,9 @@ 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);
@@ -638,6 +673,8 @@ 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);
@@ -660,8 +697,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 // Create annotations
                 // http://www.eclipse.org/emf/2002/Ecore
                 createEcoreAnnotations();
-                // org.eclipse.viatra.query.querybasedfeature
-                createOrgAnnotations();
         }
 
         /**
@@ -675,16 +710,4 @@ 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 73609fbd..ef98fb07 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,7 +6,6 @@ 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;
@@ -42,15 +41,14 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
         protected Payload payload;
 
         /**
-         * The cached setting delegate for the '{@link #getKind() <em>Kind</em>}' attribute.
+         * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @see #getKind()
          * @generated
          * @ordered
          */
-        protected EStructuralFeature.Internal.SettingDelegate KIND__ESETTING_DELEGATE = ((EStructuralFeature.Internal) SatellitePackage.Literals.SPACECRAFT__KIND)
-                        .getSettingDelegate();
+        protected static final SpacecraftKind KIND_EDEFAULT = SpacecraftKind.CUBE_SAT3_U;
 
         /**
          * <!-- begin-user-doc -->
@@ -130,7 +128,9 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
          */
         @Override
         public SpacecraftKind getKind() {
-                return (SpacecraftKind) KIND__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false);
+                // TODO: implement this method to return the 'Kind' attribute
+                // Ensure that you remove @generated or mark it @generated NOT
+                throw new UnsupportedOperationException();
         }
 
         /**
@@ -204,7 +204,7 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
                         return payload != null;
                 case SatellitePackage.SPACECRAFT__KIND:
-                        return KIND__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);
+                        return getKind() != KIND_EDEFAULT;
                 }
                 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 1ecf7b19..f71d8da5 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,6 +127,11 @@ public class SatelliteAdapterFactory extends AdapterFactoryImpl {
                 }
 
                 @Override
+                public Adapter caseCubeSat(CubeSat object) {
+                        return createCubeSatAdapter();
+                }
+
+                @Override
                 public Adapter defaultCase(EObject object) {
                         return createEObjectAdapter();
                 }
@@ -314,6 +319,20 @@ 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 3eb78d75..1e2fb04b 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,6 +141,8 @@ 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);
@@ -152,6 +154,8 @@ 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);
@@ -170,6 +174,17 @@ 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);
                 }
@@ -356,6 +371,21 @@ 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;