Trying to simplify Satellite case study

29 files changed, 664 insertions, 737 deletions

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/AntennaGain.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/AntennaGain.java
index 75bc548d..c4cdfbf6 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/AntennaGain.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/AntennaGain.java
@@ -51,10 +51,6 @@ public enum AntennaGain implements Enumerator {
         /**
          * The '<em><b>LOW</b></em>' literal value.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of '<em><b>LOW</b></em>' literal object isn't clear,
-         * there really should be more of a description here...
-         * </p>
          * <!-- end-user-doc -->
          * @see #LOW
          * @model
@@ -66,10 +62,6 @@ public enum AntennaGain implements Enumerator {
         /**
          * The '<em><b>MEDIUM</b></em>' literal value.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of '<em><b>MEDIUM</b></em>' literal object isn't clear,
-         * there really should be more of a description here...
-         * </p>
          * <!-- end-user-doc -->
          * @see #MEDIUM
          * @model
@@ -81,10 +73,6 @@ public enum AntennaGain implements Enumerator {
         /**
          * The '<em><b>HIGH</b></em>' literal value.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of '<em><b>HIGH</b></em>' literal object isn't clear,
-         * there really should be more of a description here...
-         * </p>
          * <!-- end-user-doc -->
          * @see #HIGH
          * @model
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..2c9a5e2c 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
@@ -9,75 +9,11 @@ import org.eclipse.emf.ecore.EObject;
  * A representation of the model object '<em><b>Comm Subsystem</b></em>'.
  * <!-- end-user-doc -->
  *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link satellite.CommSubsystem#getBand <em>Band</em>}</li>
- *   <li>{@link satellite.CommSubsystem#getGain <em>Gain</em>}</li>
- * </ul>
  *
  * @see satellite.SatellitePackage#getCommSubsystem()
- * @model
+ * @model abstract="true"
  * @generated
  */
 public interface CommSubsystem extends EObject {
-        /**
-         * Returns the value of the '<em><b>Band</b></em>' attribute.
-         * The literals are from the enumeration {@link satellite.TransceiverBand}.
-         * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of the '<em>Band</em>' attribute isn't clear,
-         * there really should be more of a description here...
-         * </p>
-         * <!-- end-user-doc -->
-         * @return the value of the '<em>Band</em>' attribute.
-         * @see satellite.TransceiverBand
-         * @see #setBand(TransceiverBand)
-         * @see satellite.SatellitePackage#getCommSubsystem_Band()
-         * @model required="true"
-         * @generated
-         */
-        TransceiverBand getBand();
-
-        /**
-         * Sets the value of the '{@link satellite.CommSubsystem#getBand <em>Band</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param value the new value of the '<em>Band</em>' attribute.
-         * @see satellite.TransceiverBand
-         * @see #getBand()
-         * @generated
-         */
-        void setBand(TransceiverBand value);
-
-        /**
-         * Returns the value of the '<em><b>Gain</b></em>' attribute.
-         * The literals are from the enumeration {@link satellite.AntennaGain}.
-         * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of the '<em>Gain</em>' attribute isn't clear,
-         * there really should be more of a description here...
-         * </p>
-         * <!-- end-user-doc -->
-         * @return the value of the '<em>Gain</em>' attribute.
-         * @see satellite.AntennaGain
-         * @see #setGain(AntennaGain)
-         * @see satellite.SatellitePackage#getCommSubsystem_Gain()
-         * @model required="true"
-         * @generated
-         */
-        AntennaGain getGain();
-
-        /**
-         * Sets the value of the '{@link satellite.CommSubsystem#getGain <em>Gain</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param value the new value of the '<em>Gain</em>' attribute.
-         * @see satellite.AntennaGain
-         * @see #getGain()
-         * @generated
-         */
-        void setGain(AntennaGain 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..d2f1e984 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
@@ -28,10 +28,6 @@ public interface CommunicatingElement extends EObject {
          * Returns the value of the '<em><b>Comm Subsystem</b></em>' containment reference list.
          * The list contents are of type {@link satellite.CommSubsystem}.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of the '<em>Comm Subsystem</em>' containment reference list isn't clear,
-         * there really should be more of a description here...
-         * </p>
          * <!-- end-user-doc -->
          * @return the value of the '<em>Comm Subsystem</em>' containment reference list.
          * @see satellite.SatellitePackage#getCommunicatingElement_CommSubsystem()
@@ -43,10 +39,6 @@ public interface CommunicatingElement extends EObject {
         /**
          * 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)
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/ConstellationMission.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/ConstellationMission.java
index 9402232d..6182d7ad 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/ConstellationMission.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/ConstellationMission.java
@@ -27,10 +27,6 @@ public interface ConstellationMission extends EObject {
         /**
          * Returns the value of the '<em><b>Ground Station Network</b></em>' containment reference.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of the '<em>Ground Station Network</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>Ground Station Network</em>' containment reference.
          * @see #setGroundStationNetwork(GroundStationNetwork)
@@ -54,10 +50,6 @@ public interface ConstellationMission extends EObject {
          * Returns the value of the '<em><b>Spacecraft</b></em>' containment reference list.
          * The list contents are of type {@link satellite.Spacecraft}.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of the '<em>Spacecraft</em>' containment reference list isn't clear,
-         * there really should be more of a description here...
-         * </p>
          * <!-- end-user-doc -->
          * @return the value of the '<em>Spacecraft</em>' containment reference list.
          * @see satellite.SatellitePackage#getConstellationMission_Spacecraft()
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/DirectedCommunicationLink.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/DirectedCommunicationLink.java
index 67c8fcc8..dc76d466 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/DirectedCommunicationLink.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/DirectedCommunicationLink.java
@@ -25,10 +25,6 @@ public interface DirectedCommunicationLink extends EObject {
         /**
          * Returns the value of the '<em><b>Source</b></em>' reference.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of the '<em>Source</em>' reference isn't clear,
-         * there really should be more of a description here...
-         * </p>
          * <!-- end-user-doc -->
          * @return the value of the '<em>Source</em>' reference.
          * @see #setSource(CommSubsystem)
@@ -51,10 +47,6 @@ public interface DirectedCommunicationLink extends EObject {
         /**
          * Returns the value of the '<em><b>Target</b></em>' reference.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of the '<em>Target</em>' reference isn't clear,
-         * there really should be more of a description here...
-         * </p>
          * <!-- end-user-doc -->
          * @return the value of the '<em>Target</em>' reference.
          * @see #setTarget(CommSubsystem)
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/InterferometryMission.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/InterferometryMission.java
index 967923d4..eb4ea064 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/InterferometryMission.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/InterferometryMission.java
@@ -23,10 +23,6 @@ public interface InterferometryMission extends ConstellationMission {
          * Returns the value of the '<em><b>Observation Time</b></em>' attribute.
          * The default value is <code>"2.0"</code>.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of the '<em>Observation Time</em>' attribute isn't clear,
-         * there really should be more of a description here...
-         * </p>
          * <!-- end-user-doc -->
          * @return the value of the '<em>Observation Time</em>' attribute.
          * @see #setObservationTime(float)
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/KaCommSubsystem.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/KaCommSubsystem.java
new file mode 100644
index 00000000..458831cf
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/KaCommSubsystem.java
@@ -0,0 +1,16 @@
+/**
+ */
+package satellite;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Ka Comm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getKaCommSubsystem()
+ * @model
+ * @generated
+ */
+public interface KaCommSubsystem extends CommSubsystem {
+} // KaCommSubsystem
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatelliteFactory.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatelliteFactory.java
index 04cb80ce..26182881 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatelliteFactory.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatelliteFactory.java
@@ -40,15 +40,6 @@ public interface SatelliteFactory extends EFactory {
         GroundStationNetwork createGroundStationNetwork();
 
         /**
-         * Returns a new object of class '<em>Comm Subsystem</em>'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return a new object of class '<em>Comm Subsystem</em>'.
-         * @generated
-         */
-        CommSubsystem createCommSubsystem();
-
-        /**
          * Returns a new object of class '<em>Directed Communication Link</em>'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -94,6 +85,33 @@ public interface SatelliteFactory extends EFactory {
         SmallSat createSmallSat();
 
         /**
+         * Returns a new object of class '<em>UHF Comm Subsystem</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>UHF Comm Subsystem</em>'.
+         * @generated
+         */
+        UHFCommSubsystem createUHFCommSubsystem();
+
+        /**
+         * Returns a new object of class '<em>XComm Subsystem</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>XComm Subsystem</em>'.
+         * @generated
+         */
+        XCommSubsystem createXCommSubsystem();
+
+        /**
+         * Returns a new object of class '<em>Ka Comm Subsystem</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Ka Comm Subsystem</em>'.
+         * @generated
+         */
+        KaCommSubsystem createKaCommSubsystem();
+
+        /**
          * Returns the package supported by this factory.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
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..8a9328f6 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
@@ -4,7 +4,6 @@ package satellite;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
@@ -22,7 +21,6 @@ import org.eclipse.emf.ecore.EReference;
  * <!-- end-user-doc -->
  * @see satellite.SatelliteFactory
  * @model kind="package"
- *        annotation="http://www.eclipse.org/emf/2002/Ecore settingDelegates='org.eclipse.viatra.query.querybasedfeature'"
  * @generated
  */
 public interface SatellitePackage extends EPackage {
@@ -289,22 +287,13 @@ public interface SatellitePackage extends EPackage {
         int SPACECRAFT__PAYLOAD = COMMUNICATING_ELEMENT_FEATURE_COUNT + 0;
 
         /**
-         * The feature id for the '<em><b>Kind</b></em>' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int SPACECRAFT__KIND = COMMUNICATING_ELEMENT_FEATURE_COUNT + 1;
-
-        /**
          * The number of structural features of the '<em>Spacecraft</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int SPACECRAFT_FEATURE_COUNT = COMMUNICATING_ELEMENT_FEATURE_COUNT + 2;
+        int SPACECRAFT_FEATURE_COUNT = COMMUNICATING_ELEMENT_FEATURE_COUNT + 1;
 
         /**
          * The number of operations of the '<em>Spacecraft</em>' class.
@@ -326,31 +315,13 @@ public interface SatellitePackage extends EPackage {
         int COMM_SUBSYSTEM = 5;
 
         /**
-         * The feature id for the '<em><b>Band</b></em>' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int COMM_SUBSYSTEM__BAND = 0;
-
-        /**
-         * The feature id for the '<em><b>Gain</b></em>' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int COMM_SUBSYSTEM__GAIN = 1;
-
-        /**
          * 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 = 0;
 
         /**
          * The number of operations of the '<em>Comm Subsystem</em>' class.
@@ -464,14 +435,14 @@ public interface SatellitePackage extends EPackage {
         int INTERFEROMETRY_PAYLOAD_OPERATION_COUNT = PAYLOAD_OPERATION_COUNT + 0;
 
         /**
-         * The meta object id for the '{@link satellite.impl.CubeSat3UImpl <em>Cube Sat3 U</em>}' class.
+         * The meta object id for the '{@link satellite.impl.CubeSatImpl <em>Cube Sat</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see satellite.impl.CubeSat3UImpl
-         * @see satellite.impl.SatellitePackageImpl#getCubeSat3U()
+         * @see satellite.impl.CubeSatImpl
+         * @see satellite.impl.SatellitePackageImpl#getCubeSat()
          * @generated
          */
-        int CUBE_SAT3_U = 9;
+        int CUBE_SAT = 12;
 
         /**
          * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
@@ -480,7 +451,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
+        int CUBE_SAT__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
 
         /**
          * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
@@ -489,7 +460,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__COMMUNICATION_LINK = SPACECRAFT__COMMUNICATION_LINK;
+        int CUBE_SAT__COMMUNICATION_LINK = SPACECRAFT__COMMUNICATION_LINK;
 
         /**
          * The feature id for the '<em><b>Payload</b></em>' containment reference.
@@ -498,16 +469,62 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__PAYLOAD = SPACECRAFT__PAYLOAD;
+        int CUBE_SAT__PAYLOAD = SPACECRAFT__PAYLOAD;
+
+        /**
+         * 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 feature id for the '<em><b>Kind</b></em>' attribute.
+         * The number of operations of the '<em>Cube Sat</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__KIND = SPACECRAFT__KIND;
+        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 -->
+         * @see satellite.impl.CubeSat3UImpl
+         * @see satellite.impl.SatellitePackageImpl#getCubeSat3U()
+         * @generated
+         */
+        int CUBE_SAT3_U = 9;
+
+        /**
+         * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CUBE_SAT3_U__COMM_SUBSYSTEM = CUBE_SAT__COMM_SUBSYSTEM;
+
+        /**
+         * 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;
+
+        /**
+         * The feature id for the '<em><b>Payload</b></em>' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CUBE_SAT3_U__PAYLOAD = CUBE_SAT__PAYLOAD;
 
         /**
          * The number of structural features of the '<em>Cube Sat3 U</em>' class.
@@ -516,7 +533,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 +542,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,7 +561,7 @@ 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.
@@ -553,7 +570,7 @@ public interface SatellitePackage extends EPackage {
          * @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,16 +579,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U__PAYLOAD = SPACECRAFT__PAYLOAD;
-
-        /**
-         * The feature id for the '<em><b>Kind</b></em>' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT6_U__KIND = SPACECRAFT__KIND;
+        int CUBE_SAT6_U__PAYLOAD = CUBE_SAT__PAYLOAD;
 
         /**
          * The number of structural features of the '<em>Cube Sat6 U</em>' class.
@@ -580,7 +588,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 +597,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.
@@ -629,61 +637,106 @@ public interface SatellitePackage extends EPackage {
         int SMALL_SAT__PAYLOAD = SPACECRAFT__PAYLOAD;
 
         /**
-         * The feature id for the '<em><b>Kind</b></em>' attribute.
+         * The number of structural features of the '<em>Small Sat</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int SMALL_SAT__KIND = SPACECRAFT__KIND;
+        int SMALL_SAT_FEATURE_COUNT = SPACECRAFT_FEATURE_COUNT + 0;
 
         /**
-         * The number of structural features of the '<em>Small Sat</em>' class.
+         * The number of operations of the '<em>Small Sat</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int SMALL_SAT_FEATURE_COUNT = SPACECRAFT_FEATURE_COUNT + 0;
+        int SMALL_SAT_OPERATION_COUNT = SPACECRAFT_OPERATION_COUNT + 0;
 
         /**
-         * The number of operations of the '<em>Small Sat</em>' class.
+         * The meta object id for the '{@link satellite.impl.UHFCommSubsystemImpl <em>UHF Comm Subsystem</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see satellite.impl.UHFCommSubsystemImpl
+         * @see satellite.impl.SatellitePackageImpl#getUHFCommSubsystem()
+         * @generated
+         */
+        int UHF_COMM_SUBSYSTEM = 13;
+
+        /**
+         * The number of structural features of the '<em>UHF Comm Subsystem</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int SMALL_SAT_OPERATION_COUNT = SPACECRAFT_OPERATION_COUNT + 0;
+        int UHF_COMM_SUBSYSTEM_FEATURE_COUNT = COMM_SUBSYSTEM_FEATURE_COUNT + 0;
 
         /**
-         * The meta object id for the '{@link satellite.TransceiverBand <em>Transceiver Band</em>}' enum.
+         * The number of operations of the '<em>UHF Comm Subsystem</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see satellite.TransceiverBand
-         * @see satellite.impl.SatellitePackageImpl#getTransceiverBand()
          * @generated
+         * @ordered
          */
-        int TRANSCEIVER_BAND = 12;
+        int UHF_COMM_SUBSYSTEM_OPERATION_COUNT = COMM_SUBSYSTEM_OPERATION_COUNT + 0;
 
         /**
-         * The meta object id for the '{@link satellite.AntennaGain <em>Antenna Gain</em>}' enum.
+         * The meta object id for the '{@link satellite.impl.XCommSubsystemImpl <em>XComm Subsystem</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see satellite.AntennaGain
-         * @see satellite.impl.SatellitePackageImpl#getAntennaGain()
+         * @see satellite.impl.XCommSubsystemImpl
+         * @see satellite.impl.SatellitePackageImpl#getXCommSubsystem()
          * @generated
          */
-        int ANTENNA_GAIN = 13;
+        int XCOMM_SUBSYSTEM = 14;
 
         /**
-         * The meta object id for the '{@link satellite.SpacecraftKind <em>Spacecraft Kind</em>}' enum.
+         * The number of structural features of the '<em>XComm Subsystem</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see satellite.SpacecraftKind
-         * @see satellite.impl.SatellitePackageImpl#getSpacecraftKind()
          * @generated
+         * @ordered
          */
-        int SPACECRAFT_KIND = 14;
+        int XCOMM_SUBSYSTEM_FEATURE_COUNT = COMM_SUBSYSTEM_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>XComm Subsystem</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int XCOMM_SUBSYSTEM_OPERATION_COUNT = COMM_SUBSYSTEM_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link satellite.impl.KaCommSubsystemImpl <em>Ka Comm Subsystem</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see satellite.impl.KaCommSubsystemImpl
+         * @see satellite.impl.SatellitePackageImpl#getKaCommSubsystem()
+         * @generated
+         */
+        int KA_COMM_SUBSYSTEM = 15;
+
+        /**
+         * The number of structural features of the '<em>Ka Comm Subsystem</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KA_COMM_SUBSYSTEM_FEATURE_COUNT = COMM_SUBSYSTEM_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>Ka Comm Subsystem</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KA_COMM_SUBSYSTEM_OPERATION_COUNT = COMM_SUBSYSTEM_OPERATION_COUNT + 0;
 
         /**
          * Returns the meta object for class '{@link satellite.ConstellationMission <em>Constellation Mission</em>}'.
@@ -802,17 +855,6 @@ public interface SatellitePackage extends EPackage {
         EReference getSpacecraft_Payload();
 
         /**
-         * Returns the meta object for the attribute '{@link satellite.Spacecraft#getKind <em>Kind</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the attribute '<em>Kind</em>'.
-         * @see satellite.Spacecraft#getKind()
-         * @see #getSpacecraft()
-         * @generated
-         */
-        EAttribute getSpacecraft_Kind();
-
-        /**
          * Returns the meta object for class '{@link satellite.CommSubsystem <em>Comm Subsystem</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -823,28 +865,6 @@ public interface SatellitePackage extends EPackage {
         EClass getCommSubsystem();
 
         /**
-         * Returns the meta object for the attribute '{@link satellite.CommSubsystem#getBand <em>Band</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the attribute '<em>Band</em>'.
-         * @see satellite.CommSubsystem#getBand()
-         * @see #getCommSubsystem()
-         * @generated
-         */
-        EAttribute getCommSubsystem_Band();
-
-        /**
-         * Returns the meta object for the attribute '{@link satellite.CommSubsystem#getGain <em>Gain</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the attribute '<em>Gain</em>'.
-         * @see satellite.CommSubsystem#getGain()
-         * @see #getCommSubsystem()
-         * @generated
-         */
-        EAttribute getCommSubsystem_Gain();
-
-        /**
          * Returns the meta object for class '{@link satellite.DirectedCommunicationLink <em>Directed Communication Link</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -927,34 +947,44 @@ public interface SatellitePackage extends EPackage {
         EClass getSmallSat();
 
         /**
-         * Returns the meta object for enum '{@link satellite.TransceiverBand <em>Transceiver Band</em>}'.
+         * Returns the meta object for class '{@link satellite.CubeSat <em>Cube Sat</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @return the meta object for enum '<em>Transceiver Band</em>'.
-         * @see satellite.TransceiverBand
+         * @return the meta object for class '<em>Cube Sat</em>'.
+         * @see satellite.CubeSat
          * @generated
          */
-        EEnum getTransceiverBand();
+        EClass getCubeSat();
 
         /**
-         * Returns the meta object for enum '{@link satellite.AntennaGain <em>Antenna Gain</em>}'.
+         * Returns the meta object for class '{@link satellite.UHFCommSubsystem <em>UHF Comm Subsystem</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @return the meta object for enum '<em>Antenna Gain</em>'.
-         * @see satellite.AntennaGain
+         * @return the meta object for class '<em>UHF Comm Subsystem</em>'.
+         * @see satellite.UHFCommSubsystem
          * @generated
          */
-        EEnum getAntennaGain();
+        EClass getUHFCommSubsystem();
 
         /**
-         * Returns the meta object for enum '{@link satellite.SpacecraftKind <em>Spacecraft Kind</em>}'.
+         * Returns the meta object for class '{@link satellite.XCommSubsystem <em>XComm Subsystem</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @return the meta object for enum '<em>Spacecraft Kind</em>'.
-         * @see satellite.SpacecraftKind
+         * @return the meta object for class '<em>XComm Subsystem</em>'.
+         * @see satellite.XCommSubsystem
          * @generated
          */
-        EEnum getSpacecraftKind();
+        EClass getXCommSubsystem();
+
+        /**
+         * Returns the meta object for class '{@link satellite.KaCommSubsystem <em>Ka Comm Subsystem</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Ka Comm Subsystem</em>'.
+         * @see satellite.KaCommSubsystem
+         * @generated
+         */
+        EClass getKaCommSubsystem();
 
         /**
          * Returns the factory that creates the instances of the model.
@@ -1079,14 +1109,6 @@ public interface SatellitePackage extends EPackage {
                 EReference SPACECRAFT__PAYLOAD = eINSTANCE.getSpacecraft_Payload();
 
                 /**
-                 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EAttribute SPACECRAFT__KIND = eINSTANCE.getSpacecraft_Kind();
-
-                /**
                  * The meta object literal for the '{@link satellite.impl.CommSubsystemImpl <em>Comm Subsystem</em>}' class.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
@@ -1097,22 +1119,6 @@ public interface SatellitePackage extends EPackage {
                 EClass COMM_SUBSYSTEM = eINSTANCE.getCommSubsystem();
 
                 /**
-                 * The meta object literal for the '<em><b>Band</b></em>' attribute feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EAttribute COMM_SUBSYSTEM__BAND = eINSTANCE.getCommSubsystem_Band();
-
-                /**
-                 * The meta object literal for the '<em><b>Gain</b></em>' attribute feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EAttribute COMM_SUBSYSTEM__GAIN = eINSTANCE.getCommSubsystem_Gain();
-
-                /**
                  * The meta object literal for the '{@link satellite.impl.DirectedCommunicationLinkImpl <em>Directed Communication Link</em>}' class.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
@@ -1189,34 +1195,44 @@ public interface SatellitePackage extends EPackage {
                 EClass SMALL_SAT = eINSTANCE.getSmallSat();
 
                 /**
-                 * The meta object literal for the '{@link satellite.TransceiverBand <em>Transceiver Band</em>}' enum.
+                 * 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.impl.UHFCommSubsystemImpl <em>UHF Comm Subsystem</em>}' class.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
-                 * @see satellite.TransceiverBand
-                 * @see satellite.impl.SatellitePackageImpl#getTransceiverBand()
+                 * @see satellite.impl.UHFCommSubsystemImpl
+                 * @see satellite.impl.SatellitePackageImpl#getUHFCommSubsystem()
                  * @generated
                  */
-                EEnum TRANSCEIVER_BAND = eINSTANCE.getTransceiverBand();
+                EClass UHF_COMM_SUBSYSTEM = eINSTANCE.getUHFCommSubsystem();
 
                 /**
-                 * The meta object literal for the '{@link satellite.AntennaGain <em>Antenna Gain</em>}' enum.
+                 * The meta object literal for the '{@link satellite.impl.XCommSubsystemImpl <em>XComm Subsystem</em>}' class.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
-                 * @see satellite.AntennaGain
-                 * @see satellite.impl.SatellitePackageImpl#getAntennaGain()
+                 * @see satellite.impl.XCommSubsystemImpl
+                 * @see satellite.impl.SatellitePackageImpl#getXCommSubsystem()
                  * @generated
                  */
-                EEnum ANTENNA_GAIN = eINSTANCE.getAntennaGain();
+                EClass XCOMM_SUBSYSTEM = eINSTANCE.getXCommSubsystem();
 
                 /**
-                 * The meta object literal for the '{@link satellite.SpacecraftKind <em>Spacecraft Kind</em>}' enum.
+                 * The meta object literal for the '{@link satellite.impl.KaCommSubsystemImpl <em>Ka Comm Subsystem</em>}' class.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
-                 * @see satellite.SpacecraftKind
-                 * @see satellite.impl.SatellitePackageImpl#getSpacecraftKind()
+                 * @see satellite.impl.KaCommSubsystemImpl
+                 * @see satellite.impl.SatellitePackageImpl#getKaCommSubsystem()
                  * @generated
                  */
-                EEnum SPACECRAFT_KIND = eINSTANCE.getSpacecraftKind();
+                EClass KA_COMM_SUBSYSTEM = eINSTANCE.getKaCommSubsystem();
 
         }
 
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..b0a2754e 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
@@ -12,7 +12,6 @@ package satellite;
  * </p>
  * <ul>
  *   <li>{@link satellite.Spacecraft#getPayload <em>Payload</em>}</li>
- *   <li>{@link satellite.Spacecraft#getKind <em>Kind</em>}</li>
  * </ul>
  *
  * @see satellite.SatellitePackage#getSpacecraft()
@@ -23,10 +22,6 @@ public interface Spacecraft extends CommunicatingElement {
         /**
          * Returns the value of the '<em><b>Payload</b></em>' containment reference.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of the '<em>Payload</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>Payload</em>' containment reference.
          * @see #setPayload(Payload)
@@ -46,22 +41,4 @@ public interface Spacecraft extends CommunicatingElement {
          */
         void setPayload(Payload value);
 
-        /**
-         * Returns the value of the '<em><b>Kind</b></em>' attribute.
-         * The literals are from the enumeration {@link satellite.SpacecraftKind}.
-         * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of the '<em>Kind</em>' attribute isn't clear,
-         * there really should be more of a description here...
-         * </p>
-         * <!-- end-user-doc -->
-         * @return the value of the '<em>Kind</em>' attribute.
-         * @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();
-
 } // Spacecraft
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SpacecraftKind.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SpacecraftKind.java
index 40bb432d..76232414 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SpacecraftKind.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SpacecraftKind.java
@@ -51,10 +51,6 @@ public enum SpacecraftKind implements Enumerator {
         /**
          * The '<em><b>Cube Sat3 U</b></em>' literal value.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of '<em><b>Cube Sat3 U</b></em>' literal object isn't clear,
-         * there really should be more of a description here...
-         * </p>
          * <!-- end-user-doc -->
          * @see #CUBE_SAT3_U
          * @model name="CubeSat3U"
@@ -66,10 +62,6 @@ public enum SpacecraftKind implements Enumerator {
         /**
          * The '<em><b>Cube Sat6 U</b></em>' literal value.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of '<em><b>Cube Sat6 U</b></em>' literal object isn't clear,
-         * there really should be more of a description here...
-         * </p>
          * <!-- end-user-doc -->
          * @see #CUBE_SAT6_U
          * @model name="CubeSat6U"
@@ -81,10 +73,6 @@ public enum SpacecraftKind implements Enumerator {
         /**
          * The '<em><b>Small Sat</b></em>' literal value.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of '<em><b>Small Sat</b></em>' literal object isn't clear,
-         * there really should be more of a description here...
-         * </p>
          * <!-- end-user-doc -->
          * @see #SMALL_SAT
          * @model name="SmallSat"
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/TransceiverBand.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/TransceiverBand.java
index b6be75bf..9d8d5697 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/TransceiverBand.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/TransceiverBand.java
@@ -51,10 +51,6 @@ public enum TransceiverBand implements Enumerator {
         /**
          * The '<em><b>UHF</b></em>' literal value.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of '<em><b>UHF</b></em>' literal object isn't clear,
-         * there really should be more of a description here...
-         * </p>
          * <!-- end-user-doc -->
          * @see #UHF
          * @model
@@ -66,10 +62,6 @@ public enum TransceiverBand implements Enumerator {
         /**
          * The '<em><b>X</b></em>' literal value.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of '<em><b>X</b></em>' literal object isn't clear,
-         * there really should be more of a description here...
-         * </p>
          * <!-- end-user-doc -->
          * @see #X
          * @model
@@ -81,10 +73,6 @@ public enum TransceiverBand implements Enumerator {
         /**
          * The '<em><b>Ka</b></em>' literal value.
          * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of '<em><b>Ka</b></em>' literal object isn't clear,
-         * there really should be more of a description here...
-         * </p>
          * <!-- end-user-doc -->
          * @see #KA
          * @model name="Ka"
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/UHFCommSubsystem.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/UHFCommSubsystem.java
new file mode 100644
index 00000000..5b36d6c7
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/UHFCommSubsystem.java
@@ -0,0 +1,16 @@
+/**
+ */
+package satellite;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>UHF Comm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getUHFCommSubsystem()
+ * @model
+ * @generated
+ */
+public interface UHFCommSubsystem extends CommSubsystem {
+} // UHFCommSubsystem
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/XCommSubsystem.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/XCommSubsystem.java
new file mode 100644
index 00000000..c2b0ecd5
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/XCommSubsystem.java
@@ -0,0 +1,16 @@
+/**
+ */
+package satellite;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>XComm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getXCommSubsystem()
+ * @model
+ * @generated
+ */
+public interface XCommSubsystem extends CommSubsystem {
+} // XCommSubsystem
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..cae35a0c 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
@@ -2,73 +2,19 @@
  */
 package satellite.impl;
 
-import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import satellite.AntennaGain;
 import satellite.CommSubsystem;
 import satellite.SatellitePackage;
-import satellite.TransceiverBand;
 
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Comm Subsystem</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link satellite.impl.CommSubsystemImpl#getBand <em>Band</em>}</li>
- *   <li>{@link satellite.impl.CommSubsystemImpl#getGain <em>Gain</em>}</li>
- * </ul>
  *
  * @generated
  */
-public class CommSubsystemImpl extends MinimalEObjectImpl.Container implements CommSubsystem {
-        /**
-         * The default value of the '{@link #getBand() <em>Band</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getBand()
-         * @generated
-         * @ordered
-         */
-        protected static final TransceiverBand BAND_EDEFAULT = TransceiverBand.UHF;
-
-        /**
-         * The cached value of the '{@link #getBand() <em>Band</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getBand()
-         * @generated
-         * @ordered
-         */
-        protected TransceiverBand band = BAND_EDEFAULT;
-
-        /**
-         * The default value of the '{@link #getGain() <em>Gain</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getGain()
-         * @generated
-         * @ordered
-         */
-        protected static final AntennaGain GAIN_EDEFAULT = AntennaGain.LOW;
-
-        /**
-         * The cached value of the '{@link #getGain() <em>Gain</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getGain()
-         * @generated
-         * @ordered
-         */
-        protected AntennaGain gain = GAIN_EDEFAULT;
-
+public abstract class CommSubsystemImpl extends MinimalEObjectImpl.Container implements CommSubsystem {
         /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -88,139 +34,4 @@ public class CommSubsystemImpl extends MinimalEObjectImpl.Container implements C
                 return SatellitePackage.Literals.COMM_SUBSYSTEM;
         }
 
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public TransceiverBand getBand() {
-                return band;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void setBand(TransceiverBand newBand) {
-                TransceiverBand oldBand = band;
-                band = newBand == null ? BAND_EDEFAULT : newBand;
-                if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.COMM_SUBSYSTEM__BAND, oldBand,
-                                        band));
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public AntennaGain getGain() {
-                return gain;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void setGain(AntennaGain newGain) {
-                AntennaGain oldGain = gain;
-                gain = newGain == null ? GAIN_EDEFAULT : newGain;
-                if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.COMM_SUBSYSTEM__GAIN, oldGain,
-                                        gain));
-        }
-
-        /**
-         * <!-- 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();
-                }
-                return super.eGet(featureID, resolve, coreType);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void eSet(int featureID, Object newValue) {
-                switch (featureID) {
-                case SatellitePackage.COMM_SUBSYSTEM__BAND:
-                        setBand((TransceiverBand) newValue);
-                        return;
-                case SatellitePackage.COMM_SUBSYSTEM__GAIN:
-                        setGain((AntennaGain) newValue);
-                        return;
-                }
-                super.eSet(featureID, newValue);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void eUnset(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.COMM_SUBSYSTEM__BAND:
-                        setBand(BAND_EDEFAULT);
-                        return;
-                case SatellitePackage.COMM_SUBSYSTEM__GAIN:
-                        setGain(GAIN_EDEFAULT);
-                        return;
-                }
-                super.eUnset(featureID);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public boolean eIsSet(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.COMM_SUBSYSTEM__BAND:
-                        return band != BAND_EDEFAULT;
-                case SatellitePackage.COMM_SUBSYSTEM__GAIN:
-                        return gain != GAIN_EDEFAULT;
-                }
-                return super.eIsSet(featureID);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public String toString() {
-                if (eIsProxy())
-                        return super.toString();
-
-                StringBuilder result = new StringBuilder(super.toString());
-                result.append(" (band: ");
-                result.append(band);
-                result.append(", gain: ");
-                result.append(gain);
-                result.append(')');
-                return result.toString();
-        }
-
 } //CommSubsystemImpl
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/KaCommSubsystemImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/KaCommSubsystemImpl.java
new file mode 100644
index 00000000..3f4fc432
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/KaCommSubsystemImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.KaCommSubsystem;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Ka Comm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class KaCommSubsystemImpl extends CommSubsystemImpl implements KaCommSubsystem {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected KaCommSubsystemImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SatellitePackage.Literals.KA_COMM_SUBSYSTEM;
+        }
+
+} //KaCommSubsystemImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatelliteFactoryImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatelliteFactoryImpl.java
index e899dc79..135527c6 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatelliteFactoryImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatelliteFactoryImpl.java
@@ -3,7 +3,6 @@
 package satellite.impl;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
@@ -61,8 +60,6 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
                         return createInterferometryMission();
                 case SatellitePackage.GROUND_STATION_NETWORK:
                         return createGroundStationNetwork();
-                case SatellitePackage.COMM_SUBSYSTEM:
-                        return createCommSubsystem();
                 case SatellitePackage.DIRECTED_COMMUNICATION_LINK:
                         return createDirectedCommunicationLink();
                 case SatellitePackage.INTERFEROMETRY_PAYLOAD:
@@ -73,6 +70,12 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
                         return createCubeSat6U();
                 case SatellitePackage.SMALL_SAT:
                         return createSmallSat();
+                case SatellitePackage.UHF_COMM_SUBSYSTEM:
+                        return createUHFCommSubsystem();
+                case SatellitePackage.XCOMM_SUBSYSTEM:
+                        return createXCommSubsystem();
+                case SatellitePackage.KA_COMM_SUBSYSTEM:
+                        return createKaCommSubsystem();
                 default:
                         throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
                 }
@@ -84,44 +87,6 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
          * @generated
          */
         @Override
-        public Object createFromString(EDataType eDataType, String initialValue) {
-                switch (eDataType.getClassifierID()) {
-                case SatellitePackage.TRANSCEIVER_BAND:
-                        return createTransceiverBandFromString(eDataType, initialValue);
-                case SatellitePackage.ANTENNA_GAIN:
-                        return createAntennaGainFromString(eDataType, initialValue);
-                case SatellitePackage.SPACECRAFT_KIND:
-                        return createSpacecraftKindFromString(eDataType, initialValue);
-                default:
-                        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-                }
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public String convertToString(EDataType eDataType, Object instanceValue) {
-                switch (eDataType.getClassifierID()) {
-                case SatellitePackage.TRANSCEIVER_BAND:
-                        return convertTransceiverBandToString(eDataType, instanceValue);
-                case SatellitePackage.ANTENNA_GAIN:
-                        return convertAntennaGainToString(eDataType, instanceValue);
-                case SatellitePackage.SPACECRAFT_KIND:
-                        return convertSpacecraftKindToString(eDataType, instanceValue);
-                default:
-                        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-                }
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public InterferometryMission createInterferometryMission() {
                 InterferometryMissionImpl interferometryMission = new InterferometryMissionImpl();
                 return interferometryMission;
@@ -144,17 +109,6 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
          * @generated
          */
         @Override
-        public CommSubsystem createCommSubsystem() {
-                CommSubsystemImpl commSubsystem = new CommSubsystemImpl();
-                return commSubsystem;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public DirectedCommunicationLink createDirectedCommunicationLink() {
                 DirectedCommunicationLinkImpl directedCommunicationLink = new DirectedCommunicationLinkImpl();
                 return directedCommunicationLink;
@@ -209,43 +163,10 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
          * <!-- end-user-doc -->
          * @generated
          */
-        public TransceiverBand createTransceiverBandFromString(EDataType eDataType, String initialValue) {
-                TransceiverBand result = TransceiverBand.get(initialValue);
-                if (result == null)
-                        throw new IllegalArgumentException(
-                                        "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-                return result;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public String convertTransceiverBandToString(EDataType eDataType, Object instanceValue) {
-                return instanceValue == null ? null : instanceValue.toString();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public AntennaGain createAntennaGainFromString(EDataType eDataType, String initialValue) {
-                AntennaGain result = AntennaGain.get(initialValue);
-                if (result == null)
-                        throw new IllegalArgumentException(
-                                        "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-                return result;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public String convertAntennaGainToString(EDataType eDataType, Object instanceValue) {
-                return instanceValue == null ? null : instanceValue.toString();
+        @Override
+        public UHFCommSubsystem createUHFCommSubsystem() {
+                UHFCommSubsystemImpl uhfCommSubsystem = new UHFCommSubsystemImpl();
+                return uhfCommSubsystem;
         }
 
         /**
@@ -253,12 +174,10 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
          * <!-- end-user-doc -->
          * @generated
          */
-        public SpacecraftKind createSpacecraftKindFromString(EDataType eDataType, String initialValue) {
-                SpacecraftKind result = SpacecraftKind.get(initialValue);
-                if (result == null)
-                        throw new IllegalArgumentException(
-                                        "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-                return result;
+        @Override
+        public XCommSubsystem createXCommSubsystem() {
+                XCommSubsystemImpl xCommSubsystem = new XCommSubsystemImpl();
+                return xCommSubsystem;
         }
 
         /**
@@ -266,8 +185,10 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
          * <!-- end-user-doc -->
          * @generated
          */
-        public String convertSpacecraftKindToString(EDataType eDataType, Object instanceValue) {
-                return instanceValue == null ? null : instanceValue.toString();
+        @Override
+        public KaCommSubsystem createKaCommSubsystem() {
+                KaCommSubsystemImpl kaCommSubsystem = new KaCommSubsystemImpl();
+                return kaCommSubsystem;
         }
 
         /**
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..daec68a9 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
@@ -4,29 +4,28 @@ package satellite.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import satellite.AntennaGain;
 import satellite.CommSubsystem;
 import satellite.CommunicatingElement;
 import satellite.ConstellationMission;
+import satellite.CubeSat;
 import satellite.CubeSat3U;
 import satellite.CubeSat6U;
 import satellite.DirectedCommunicationLink;
 import satellite.GroundStationNetwork;
 import satellite.InterferometryMission;
 import satellite.InterferometryPayload;
+import satellite.KaCommSubsystem;
 import satellite.Payload;
 import satellite.SatelliteFactory;
 import satellite.SatellitePackage;
 import satellite.SmallSat;
 import satellite.Spacecraft;
-import satellite.SpacecraftKind;
-import satellite.TransceiverBand;
+import satellite.UHFCommSubsystem;
+import satellite.XCommSubsystem;
 
 /**
  * <!-- begin-user-doc -->
@@ -124,21 +123,28 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * <!-- end-user-doc -->
          * @generated
          */
-        private EEnum transceiverBandEEnum = null;
+        private EClass cubeSatEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass uhfCommSubsystemEClass = null;
 
         /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          */
-        private EEnum antennaGainEEnum = null;
+        private EClass xCommSubsystemEClass = null;
 
         /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          */
-        private EEnum spacecraftKindEEnum = null;
+        private EClass kaCommSubsystemEClass = null;
 
         /**
          * Creates an instance of the model <b>Package</b>, registered with
@@ -320,16 +326,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EAttribute getSpacecraft_Kind() {
-                return (EAttribute) spacecraftEClass.getEStructuralFeatures().get(1);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public EClass getCommSubsystem() {
                 return commSubsystemEClass;
         }
@@ -340,26 +336,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EAttribute getCommSubsystem_Band() {
-                return (EAttribute) commSubsystemEClass.getEStructuralFeatures().get(0);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EAttribute getCommSubsystem_Gain() {
-                return (EAttribute) commSubsystemEClass.getEStructuralFeatures().get(1);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public EClass getDirectedCommunicationLink() {
                 return directedCommunicationLinkEClass;
         }
@@ -440,8 +416,8 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EEnum getTransceiverBand() {
-                return transceiverBandEEnum;
+        public EClass getCubeSat() {
+                return cubeSatEClass;
         }
 
         /**
@@ -450,8 +426,8 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EEnum getAntennaGain() {
-                return antennaGainEEnum;
+        public EClass getUHFCommSubsystem() {
+                return uhfCommSubsystemEClass;
         }
 
         /**
@@ -460,8 +436,18 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EEnum getSpacecraftKind() {
-                return spacecraftKindEEnum;
+        public EClass getXCommSubsystem() {
+                return xCommSubsystemEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getKaCommSubsystem() {
+                return kaCommSubsystemEClass;
         }
 
         /**
@@ -509,11 +495,8 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 
                 spacecraftEClass = createEClass(SPACECRAFT);
                 createEReference(spacecraftEClass, SPACECRAFT__PAYLOAD);
-                createEAttribute(spacecraftEClass, SPACECRAFT__KIND);
 
                 commSubsystemEClass = createEClass(COMM_SUBSYSTEM);
-                createEAttribute(commSubsystemEClass, COMM_SUBSYSTEM__BAND);
-                createEAttribute(commSubsystemEClass, COMM_SUBSYSTEM__GAIN);
 
                 directedCommunicationLinkEClass = createEClass(DIRECTED_COMMUNICATION_LINK);
                 createEReference(directedCommunicationLinkEClass, DIRECTED_COMMUNICATION_LINK__SOURCE);
@@ -529,10 +512,13 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 
                 smallSatEClass = createEClass(SMALL_SAT);
 
-                // Create enums
-                transceiverBandEEnum = createEEnum(TRANSCEIVER_BAND);
-                antennaGainEEnum = createEEnum(ANTENNA_GAIN);
-                spacecraftKindEEnum = createEEnum(SPACECRAFT_KIND);
+                cubeSatEClass = createEClass(CUBE_SAT);
+
+                uhfCommSubsystemEClass = createEClass(UHF_COMM_SUBSYSTEM);
+
+                xCommSubsystemEClass = createEClass(XCOMM_SUBSYSTEM);
+
+                kaCommSubsystemEClass = createEClass(KA_COMM_SUBSYSTEM);
         }
 
         /**
@@ -568,9 +554,13 @@ 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());
+                uhfCommSubsystemEClass.getESuperTypes().add(this.getCommSubsystem());
+                xCommSubsystemEClass.getESuperTypes().add(this.getCommSubsystem());
+                kaCommSubsystemEClass.getESuperTypes().add(this.getCommSubsystem());
 
                 // Initialize classes, features, and operations; add parameters
                 initEClass(constellationMissionEClass, ConstellationMission.class, "ConstellationMission", IS_ABSTRACT,
@@ -605,15 +595,9 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 initEReference(getSpacecraft_Payload(), this.getPayload(), null, "payload", null, 0, 1, Spacecraft.class,
                                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
                                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-                initEAttribute(getSpacecraft_Kind(), this.getSpacecraftKind(), "kind", null, 1, 1, Spacecraft.class,
-                                IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
-                initEClass(commSubsystemEClass, CommSubsystem.class, "CommSubsystem", !IS_ABSTRACT, !IS_INTERFACE,
+                initEClass(commSubsystemEClass, CommSubsystem.class, "CommSubsystem", IS_ABSTRACT, !IS_INTERFACE,
                                 IS_GENERATED_INSTANCE_CLASS);
-                initEAttribute(getCommSubsystem_Band(), this.getTransceiverBand(), "band", null, 1, 1, CommSubsystem.class,
-                                !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);
 
                 initEClass(directedCommunicationLinkEClass, DirectedCommunicationLink.class, "DirectedCommunicationLink",
                                 !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -638,53 +622,19 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 initEClass(smallSatEClass, SmallSat.class, "SmallSat", !IS_ABSTRACT, !IS_INTERFACE,
                                 IS_GENERATED_INSTANCE_CLASS);
 
-                // Initialize enums and add enum literals
-                initEEnum(transceiverBandEEnum, TransceiverBand.class, "TransceiverBand");
-                addEEnumLiteral(transceiverBandEEnum, TransceiverBand.UHF);
-                addEEnumLiteral(transceiverBandEEnum, TransceiverBand.X);
-                addEEnumLiteral(transceiverBandEEnum, TransceiverBand.KA);
+                initEClass(cubeSatEClass, CubeSat.class, "CubeSat", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-                initEEnum(antennaGainEEnum, AntennaGain.class, "AntennaGain");
-                addEEnumLiteral(antennaGainEEnum, AntennaGain.LOW);
-                addEEnumLiteral(antennaGainEEnum, AntennaGain.MEDIUM);
-                addEEnumLiteral(antennaGainEEnum, AntennaGain.HIGH);
+                initEClass(uhfCommSubsystemEClass, UHFCommSubsystem.class, "UHFCommSubsystem", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
 
-                initEEnum(spacecraftKindEEnum, SpacecraftKind.class, "SpacecraftKind");
-                addEEnumLiteral(spacecraftKindEEnum, SpacecraftKind.CUBE_SAT3_U);
-                addEEnumLiteral(spacecraftKindEEnum, SpacecraftKind.CUBE_SAT6_U);
-                addEEnumLiteral(spacecraftKindEEnum, SpacecraftKind.SMALL_SAT);
+                initEClass(xCommSubsystemEClass, XCommSubsystem.class, "XCommSubsystem", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(kaCommSubsystemEClass, KaCommSubsystem.class, "KaCommSubsystem", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
 
                 // Create resource
                 createResource(eNS_URI);
-
-                // Create annotations
-                // http://www.eclipse.org/emf/2002/Ecore
-                createEcoreAnnotations();
-                // org.eclipse.viatra.query.querybasedfeature
-                createOrgAnnotations();
-        }
-
-        /**
-         * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected void createEcoreAnnotations() {
-                String source = "http://www.eclipse.org/emf/2002/Ecore";
-                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..58f5d069 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;
@@ -14,7 +13,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import satellite.Payload;
 import satellite.SatellitePackage;
 import satellite.Spacecraft;
-import satellite.SpacecraftKind;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,7 +23,6 @@ import satellite.SpacecraftKind;
  * </p>
  * <ul>
  *   <li>{@link satellite.impl.SpacecraftImpl#getPayload <em>Payload</em>}</li>
- *   <li>{@link satellite.impl.SpacecraftImpl#getKind <em>Kind</em>}</li>
  * </ul>
  *
  * @generated
@@ -42,17 +39,6 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
         protected Payload payload;
 
         /**
-         * The cached setting delegate for 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();
-
-        /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -129,16 +115,6 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
          * @generated
          */
         @Override
-        public SpacecraftKind getKind() {
-                return (SpacecraftKind) KIND__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
                 switch (featureID) {
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
@@ -157,8 +133,6 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
                 switch (featureID) {
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
                         return getPayload();
-                case SatellitePackage.SPACECRAFT__KIND:
-                        return getKind();
                 }
                 return super.eGet(featureID, resolve, coreType);
         }
@@ -203,8 +177,6 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
                 switch (featureID) {
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
                         return payload != null;
-                case SatellitePackage.SPACECRAFT__KIND:
-                        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/impl/UHFCommSubsystemImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/UHFCommSubsystemImpl.java
new file mode 100644
index 00000000..df21b9e1
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/UHFCommSubsystemImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.SatellitePackage;
+import satellite.UHFCommSubsystem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>UHF Comm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class UHFCommSubsystemImpl extends CommSubsystemImpl implements UHFCommSubsystem {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected UHFCommSubsystemImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SatellitePackage.Literals.UHF_COMM_SUBSYSTEM;
+        }
+
+} //UHFCommSubsystemImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/XCommSubsystemImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/XCommSubsystemImpl.java
new file mode 100644
index 00000000..c686a50e
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/XCommSubsystemImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.SatellitePackage;
+import satellite.XCommSubsystem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>XComm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class XCommSubsystemImpl extends CommSubsystemImpl implements XCommSubsystem {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected XCommSubsystemImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SatellitePackage.Literals.XCOMM_SUBSYSTEM;
+        }
+
+} //XCommSubsystemImpl
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..84ddf263 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,26 @@ public class SatelliteAdapterFactory extends AdapterFactoryImpl {
                 }
 
                 @Override
+                public Adapter caseCubeSat(CubeSat object) {
+                        return createCubeSatAdapter();
+                }
+
+                @Override
+                public Adapter caseUHFCommSubsystem(UHFCommSubsystem object) {
+                        return createUHFCommSubsystemAdapter();
+                }
+
+                @Override
+                public Adapter caseXCommSubsystem(XCommSubsystem object) {
+                        return createXCommSubsystemAdapter();
+                }
+
+                @Override
+                public Adapter caseKaCommSubsystem(KaCommSubsystem object) {
+                        return createKaCommSubsystemAdapter();
+                }
+
+                @Override
                 public Adapter defaultCase(EObject object) {
                         return createEObjectAdapter();
                 }
@@ -314,6 +334,62 @@ 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 an object of class '{@link satellite.UHFCommSubsystem <em>UHF Comm Subsystem</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.UHFCommSubsystem
+         * @generated
+         */
+        public Adapter createUHFCommSubsystemAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link satellite.XCommSubsystem <em>XComm Subsystem</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.XCommSubsystem
+         * @generated
+         */
+        public Adapter createXCommSubsystemAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link satellite.KaCommSubsystem <em>Ka Comm Subsystem</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.KaCommSubsystem
+         * @generated
+         */
+        public Adapter createKaCommSubsystemAdapter() {
+                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..6975d851 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,44 @@ 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;
+                }
+                case SatellitePackage.UHF_COMM_SUBSYSTEM: {
+                        UHFCommSubsystem uhfCommSubsystem = (UHFCommSubsystem) theEObject;
+                        T result = caseUHFCommSubsystem(uhfCommSubsystem);
+                        if (result == null)
+                                result = caseCommSubsystem(uhfCommSubsystem);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case SatellitePackage.XCOMM_SUBSYSTEM: {
+                        XCommSubsystem xCommSubsystem = (XCommSubsystem) theEObject;
+                        T result = caseXCommSubsystem(xCommSubsystem);
+                        if (result == null)
+                                result = caseCommSubsystem(xCommSubsystem);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case SatellitePackage.KA_COMM_SUBSYSTEM: {
+                        KaCommSubsystem kaCommSubsystem = (KaCommSubsystem) theEObject;
+                        T result = caseKaCommSubsystem(kaCommSubsystem);
+                        if (result == null)
+                                result = caseCommSubsystem(kaCommSubsystem);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
                 default:
                         return defaultCase(theEObject);
                 }
@@ -356,6 +398,66 @@ 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>UHF Comm Subsystem</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>UHF Comm Subsystem</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseUHFCommSubsystem(UHFCommSubsystem object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>XComm Subsystem</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>XComm Subsystem</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseXCommSubsystem(XCommSubsystem object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Ka Comm Subsystem</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>Ka Comm Subsystem</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseKaCommSubsystem(KaCommSubsystem object) {
+                return null;
+        }
+
+        /**
          * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
          * <!-- begin-user-doc -->
          * This implementation returns null;