Trying to simplify Satellite case study

62 files changed, 617 insertions, 6648 deletions

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/AntennaGain.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/AntennaGain.java
deleted file mode 100644
index 20a2c59f..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/AntennaGain.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Antenna Gain</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getAntennaGain()
- * @model
- * @generated
- */
-public enum AntennaGain implements Enumerator {
-        /**
-         * The '<em><b>LOW</b></em>' literal object.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #LOW_VALUE
-         * @generated
-         * @ordered
-         */
-        LOW(0, "LOW", "LOW"),
-
-        /**
-         * The '<em><b>MEDIUM</b></em>' literal object.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #MEDIUM_VALUE
-         * @generated
-         * @ordered
-         */
-        MEDIUM(1, "MEDIUM", "MEDIUM"),
-
-        /**
-         * The '<em><b>HIGH</b></em>' literal object.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #HIGH_VALUE
-         * @generated
-         * @ordered
-         */
-        HIGH(2, "HIGH", "HIGH");
-
-        /**
-         * 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
-         * @generated
-         * @ordered
-         */
-        public static final int LOW_VALUE = 0;
-
-        /**
-         * 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
-         * @generated
-         * @ordered
-         */
-        public static final int MEDIUM_VALUE = 1;
-
-        /**
-         * 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
-         * @generated
-         * @ordered
-         */
-        public static final int HIGH_VALUE = 2;
-
-        /**
-         * An array of all the '<em><b>Antenna Gain</b></em>' enumerators.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private static final AntennaGain[] VALUES_ARRAY = new AntennaGain[] { LOW, MEDIUM, HIGH, };
-
-        /**
-         * A public read-only list of all the '<em><b>Antenna Gain</b></em>' enumerators.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final List<AntennaGain> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-        /**
-         * Returns the '<em><b>Antenna Gain</b></em>' literal with the specified literal value.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param literal the literal.
-         * @return the matching enumerator or <code>null</code>.
-         * @generated
-         */
-        public static AntennaGain get(String literal) {
-                for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-                        AntennaGain result = VALUES_ARRAY[i];
-                        if (result.toString().equals(literal)) {
-                                return result;
-                        }
-                }
-                return null;
-        }
-
-        /**
-         * Returns the '<em><b>Antenna Gain</b></em>' literal with the specified name.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param name the name.
-         * @return the matching enumerator or <code>null</code>.
-         * @generated
-         */
-        public static AntennaGain getByName(String name) {
-                for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-                        AntennaGain result = VALUES_ARRAY[i];
-                        if (result.getName().equals(name)) {
-                                return result;
-                        }
-                }
-                return null;
-        }
-
-        /**
-         * Returns the '<em><b>Antenna Gain</b></em>' literal with the specified integer value.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param value the integer value.
-         * @return the matching enumerator or <code>null</code>.
-         * @generated
-         */
-        public static AntennaGain get(int value) {
-                switch (value) {
-                case LOW_VALUE:
-                        return LOW;
-                case MEDIUM_VALUE:
-                        return MEDIUM;
-                case HIGH_VALUE:
-                        return HIGH;
-                }
-                return null;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private final int value;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private final String name;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private final String literal;
-
-        /**
-         * Only this class can construct instances.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private AntennaGain(int value, String name, String literal) {
-                this.value = value;
-                this.name = name;
-                this.literal = literal;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public int getValue() {
-                return value;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public String getName() {
-                return name;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public String getLiteral() {
-                return literal;
-        }
-
-        /**
-         * Returns the literal value of the enumerator, which is its string representation.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public String toString() {
-                return literal;
-        }
-
-} //AntennaGain
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/CommSubsystem.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/CommSubsystem.java
deleted file mode 100644
index 255bfc4e..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/CommSubsystem.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * 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 hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem#getBand <em>Band</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem#getGain <em>Gain</em>}</li>
- * </ul>
- *
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getCommSubsystem()
- * @model
- * @generated
- */
-public interface CommSubsystem extends EObject {
-        /**
-         * Returns the value of the '<em><b>Band</b></em>' attribute.
-         * The literals are from the enumeration {@link hu.bme.mit.inf.dslreasoner.domains.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 hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand
-         * @see #setBand(TransceiverBand)
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getCommSubsystem_Band()
-         * @model required="true"
-         * @generated
-         */
-        TransceiverBand getBand();
-
-        /**
-         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.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 hu.bme.mit.inf.dslreasoner.domains.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 hu.bme.mit.inf.dslreasoner.domains.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 hu.bme.mit.inf.dslreasoner.domains.satellite.AntennaGain
-         * @see #setGain(AntennaGain)
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getCommSubsystem_Gain()
-         * @model required="true"
-         * @generated
-         */
-        AntennaGain getGain();
-
-        /**
-         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.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 hu.bme.mit.inf.dslreasoner.domains.satellite.AntennaGain
-         * @see #getGain()
-         * @generated
-         */
-        void setGain(AntennaGain value);
-
-} // CommSubsystem
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/CommunicatingElement.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/CommunicatingElement.java
deleted file mode 100644
index 3a4224cd..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/CommunicatingElement.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Communicating Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement#getCommSubsystem <em>Comm Subsystem</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement#getCommunicationLink <em>Communication Link</em>}</li>
- * </ul>
- *
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getCommunicatingElement()
- * @model abstract="true"
- * @generated
- */
-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 hu.bme.mit.inf.dslreasoner.domains.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 hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getCommunicatingElement_CommSubsystem()
-         * @model containment="true" required="true" upper="2"
-         * @generated
-         */
-        EList<CommSubsystem> getCommSubsystem();
-
-        /**
-         * Returns the value of the '<em><b>Communication Link</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <p>
-         * If the meaning of the '<em>Communication Link</em>' containment reference isn't clear,
-         * there really should be more of a description here...
-         * </p>
-         * <!-- end-user-doc -->
-         * @return the value of the '<em>Communication Link</em>' containment reference.
-         * @see #setCommunicationLink(DirectedCommunicationLink)
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getCommunicatingElement_CommunicationLink()
-         * @model containment="true"
-         * @generated
-         */
-        DirectedCommunicationLink getCommunicationLink();
-
-        /**
-         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement#getCommunicationLink <em>Communication Link</em>}' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param value the new value of the '<em>Communication Link</em>' containment reference.
-         * @see #getCommunicationLink()
-         * @generated
-         */
-        void setCommunicationLink(DirectedCommunicationLink value);
-
-} // CommunicatingElement
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/ConstellationMission.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/ConstellationMission.java
deleted file mode 100644
index 82fb5971..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/ConstellationMission.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Constellation Mission</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission#getGroundStationNetwork <em>Ground Station Network</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission#getSpacecraft <em>Spacecraft</em>}</li>
- * </ul>
- *
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getConstellationMission()
- * @model abstract="true"
- * @generated
- */
-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)
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getConstellationMission_GroundStationNetwork()
-         * @model containment="true" required="true"
-         * @generated
-         */
-        GroundStationNetwork getGroundStationNetwork();
-
-        /**
-         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission#getGroundStationNetwork <em>Ground Station Network</em>}' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param value the new value of the '<em>Ground Station Network</em>' containment reference.
-         * @see #getGroundStationNetwork()
-         * @generated
-         */
-        void setGroundStationNetwork(GroundStationNetwork value);
-
-        /**
-         * Returns the value of the '<em><b>Spacecraft</b></em>' containment reference list.
-         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.domains.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 hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getConstellationMission_Spacecraft()
-         * @model containment="true" lower="2" upper="50"
-         * @generated
-         */
-        EList<Spacecraft> getSpacecraft();
-
-} // ConstellationMission
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/CubeSat3U.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/CubeSat3U.java
deleted file mode 100644
index 98dea285..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/CubeSat3U.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Cube Sat3 U</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getCubeSat3U()
- * @model
- * @generated
- */
-public interface CubeSat3U extends CubeSat {
-} // CubeSat3U
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/CubeSat6U.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/CubeSat6U.java
deleted file mode 100644
index eb64fe33..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/CubeSat6U.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Cube Sat6 U</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getCubeSat6U()
- * @model
- * @generated
- */
-public interface CubeSat6U extends CubeSat {
-} // CubeSat6U
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/DirectedCommunicationLink.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/DirectedCommunicationLink.java
deleted file mode 100644
index b4eb1a82..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/DirectedCommunicationLink.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Directed Communication Link</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink#getSource <em>Source</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink#getTarget <em>Target</em>}</li>
- * </ul>
- *
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getDirectedCommunicationLink()
- * @model
- * @generated
- */
-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)
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getDirectedCommunicationLink_Source()
-         * @model required="true"
-         * @generated
-         */
-        CommSubsystem getSource();
-
-        /**
-         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink#getSource <em>Source</em>}' reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param value the new value of the '<em>Source</em>' reference.
-         * @see #getSource()
-         * @generated
-         */
-        void setSource(CommSubsystem value);
-
-        /**
-         * 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)
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getDirectedCommunicationLink_Target()
-         * @model required="true"
-         * @generated
-         */
-        CommSubsystem getTarget();
-
-        /**
-         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink#getTarget <em>Target</em>}' reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param value the new value of the '<em>Target</em>' reference.
-         * @see #getTarget()
-         * @generated
-         */
-        void setTarget(CommSubsystem value);
-
-} // DirectedCommunicationLink
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/GroundStationNetwork.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/GroundStationNetwork.java
deleted file mode 100644
index e256d24d..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/GroundStationNetwork.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Ground Station Network</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getGroundStationNetwork()
- * @model
- * @generated
- */
-public interface GroundStationNetwork extends CommunicatingElement {
-} // GroundStationNetwork
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/InterferometryMission.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/InterferometryMission.java
deleted file mode 100644
index 976ba160..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/InterferometryMission.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Interferometry Mission</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission#getObservationTime <em>Observation Time</em>}</li>
- * </ul>
- *
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getInterferometryMission()
- * @model
- * @generated
- */
-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)
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getInterferometryMission_ObservationTime()
-         * @model default="2.0" required="true"
-         * @generated
-         */
-        float getObservationTime();
-
-        /**
-         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission#getObservationTime <em>Observation Time</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param value the new value of the '<em>Observation Time</em>' attribute.
-         * @see #getObservationTime()
-         * @generated
-         */
-        void setObservationTime(float value);
-
-} // InterferometryMission
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/InterferometryPayload.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/InterferometryPayload.java
deleted file mode 100644
index 06b47f38..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/InterferometryPayload.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Interferometry Payload</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getInterferometryPayload()
- * @model
- * @generated
- */
-public interface InterferometryPayload extends Payload {
-} // InterferometryPayload
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/Payload.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/Payload.java
deleted file mode 100644
index 6f7f1418..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/Payload.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Payload</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getPayload()
- * @model abstract="true"
- * @generated
- */
-public interface Payload extends EObject {
-} // Payload
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/SatelliteFactory.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/SatelliteFactory.java
deleted file mode 100644
index 3b2bc48a..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/SatelliteFactory.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage
- * @generated
- */
-public interface SatelliteFactory extends EFactory {
-        /**
-         * The singleton instance of the factory.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        SatelliteFactory eINSTANCE = hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatelliteFactoryImpl.init();
-
-        /**
-         * Returns a new object of class '<em>Interferometry Mission</em>'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return a new object of class '<em>Interferometry Mission</em>'.
-         * @generated
-         */
-        InterferometryMission createInterferometryMission();
-
-        /**
-         * Returns a new object of class '<em>Ground Station Network</em>'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return a new object of class '<em>Ground Station Network</em>'.
-         * @generated
-         */
-        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 -->
-         * @return a new object of class '<em>Directed Communication Link</em>'.
-         * @generated
-         */
-        DirectedCommunicationLink createDirectedCommunicationLink();
-
-        /**
-         * Returns a new object of class '<em>Interferometry Payload</em>'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return a new object of class '<em>Interferometry Payload</em>'.
-         * @generated
-         */
-        InterferometryPayload createInterferometryPayload();
-
-        /**
-         * Returns a new object of class '<em>Cube Sat3 U</em>'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return a new object of class '<em>Cube Sat3 U</em>'.
-         * @generated
-         */
-        CubeSat3U createCubeSat3U();
-
-        /**
-         * Returns a new object of class '<em>Cube Sat6 U</em>'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return a new object of class '<em>Cube Sat6 U</em>'.
-         * @generated
-         */
-        CubeSat6U createCubeSat6U();
-
-        /**
-         * Returns a new object of class '<em>Small Sat</em>'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return a new object of class '<em>Small Sat</em>'.
-         * @generated
-         */
-        SmallSat createSmallSat();
-
-        /**
-         * Returns the package supported by this factory.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the package supported by this factory.
-         * @generated
-         */
-        SatellitePackage getSatellitePackage();
-
-} //SatelliteFactory
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/SatellitePackage.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/SatellitePackage.java
deleted file mode 100644
index 1e129422..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/SatellitePackage.java
+++ /dev/null
@@ -1,1306 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.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;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatelliteFactory
- * @model kind="package"
- * @generated
- */
-public interface SatellitePackage extends EPackage {
-        /**
-         * The package name.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        String eNAME = "satellite";
-
-        /**
-         * The package namespace URI.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        String eNS_URI = "http://www.example.org/satellite";
-
-        /**
-         * The package namespace name.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        String eNS_PREFIX = "satellite";
-
-        /**
-         * The singleton instance of the package.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        SatellitePackage eINSTANCE = hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl.init();
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.ConstellationMissionImpl <em>Constellation Mission</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.ConstellationMissionImpl
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getConstellationMission()
-         * @generated
-         */
-        int CONSTELLATION_MISSION = 0;
-
-        /**
-         * The feature id for the '<em><b>Ground Station Network</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CONSTELLATION_MISSION__GROUND_STATION_NETWORK = 0;
-
-        /**
-         * The feature id for the '<em><b>Spacecraft</b></em>' containment reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CONSTELLATION_MISSION__SPACECRAFT = 1;
-
-        /**
-         * The number of structural features of the '<em>Constellation Mission</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CONSTELLATION_MISSION_FEATURE_COUNT = 2;
-
-        /**
-         * The number of operations of the '<em>Constellation Mission</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CONSTELLATION_MISSION_OPERATION_COUNT = 0;
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.InterferometryMissionImpl <em>Interferometry Mission</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.InterferometryMissionImpl
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getInterferometryMission()
-         * @generated
-         */
-        int INTERFEROMETRY_MISSION = 1;
-
-        /**
-         * The feature id for the '<em><b>Ground Station Network</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int INTERFEROMETRY_MISSION__GROUND_STATION_NETWORK = CONSTELLATION_MISSION__GROUND_STATION_NETWORK;
-
-        /**
-         * The feature id for the '<em><b>Spacecraft</b></em>' containment reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int INTERFEROMETRY_MISSION__SPACECRAFT = CONSTELLATION_MISSION__SPACECRAFT;
-
-        /**
-         * The feature id for the '<em><b>Observation Time</b></em>' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int INTERFEROMETRY_MISSION__OBSERVATION_TIME = CONSTELLATION_MISSION_FEATURE_COUNT + 0;
-
-        /**
-         * The number of structural features of the '<em>Interferometry Mission</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int INTERFEROMETRY_MISSION_FEATURE_COUNT = CONSTELLATION_MISSION_FEATURE_COUNT + 1;
-
-        /**
-         * The number of operations of the '<em>Interferometry Mission</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int INTERFEROMETRY_MISSION_OPERATION_COUNT = CONSTELLATION_MISSION_OPERATION_COUNT + 0;
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CommunicatingElementImpl <em>Communicating Element</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CommunicatingElementImpl
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getCommunicatingElement()
-         * @generated
-         */
-        int COMMUNICATING_ELEMENT = 2;
-
-        /**
-         * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int COMMUNICATING_ELEMENT__COMM_SUBSYSTEM = 0;
-
-        /**
-         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int COMMUNICATING_ELEMENT__COMMUNICATION_LINK = 1;
-
-        /**
-         * The number of structural features of the '<em>Communicating Element</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int COMMUNICATING_ELEMENT_FEATURE_COUNT = 2;
-
-        /**
-         * The number of operations of the '<em>Communicating Element</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int COMMUNICATING_ELEMENT_OPERATION_COUNT = 0;
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.GroundStationNetworkImpl <em>Ground Station Network</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.GroundStationNetworkImpl
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getGroundStationNetwork()
-         * @generated
-         */
-        int GROUND_STATION_NETWORK = 3;
-
-        /**
-         * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int GROUND_STATION_NETWORK__COMM_SUBSYSTEM = COMMUNICATING_ELEMENT__COMM_SUBSYSTEM;
-
-        /**
-         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int GROUND_STATION_NETWORK__COMMUNICATION_LINK = COMMUNICATING_ELEMENT__COMMUNICATION_LINK;
-
-        /**
-         * The number of structural features of the '<em>Ground Station Network</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int GROUND_STATION_NETWORK_FEATURE_COUNT = COMMUNICATING_ELEMENT_FEATURE_COUNT + 0;
-
-        /**
-         * The number of operations of the '<em>Ground Station Network</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int GROUND_STATION_NETWORK_OPERATION_COUNT = COMMUNICATING_ELEMENT_OPERATION_COUNT + 0;
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SpacecraftImpl <em>Spacecraft</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SpacecraftImpl
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getSpacecraft()
-         * @generated
-         */
-        int SPACECRAFT = 4;
-
-        /**
-         * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int SPACECRAFT__COMM_SUBSYSTEM = COMMUNICATING_ELEMENT__COMM_SUBSYSTEM;
-
-        /**
-         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int SPACECRAFT__COMMUNICATION_LINK = COMMUNICATING_ELEMENT__COMMUNICATION_LINK;
-
-        /**
-         * The feature id for the '<em><b>Payload</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        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;
-
-        /**
-         * The number of operations of the '<em>Spacecraft</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int SPACECRAFT_OPERATION_COUNT = COMMUNICATING_ELEMENT_OPERATION_COUNT + 0;
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CommSubsystemImpl <em>Comm Subsystem</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CommSubsystemImpl
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getCommSubsystem()
-         * @generated
-         */
-        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;
-
-        /**
-         * The number of operations of the '<em>Comm Subsystem</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int COMM_SUBSYSTEM_OPERATION_COUNT = 0;
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.DirectedCommunicationLinkImpl <em>Directed Communication Link</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.DirectedCommunicationLinkImpl
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getDirectedCommunicationLink()
-         * @generated
-         */
-        int DIRECTED_COMMUNICATION_LINK = 6;
-
-        /**
-         * The feature id for the '<em><b>Source</b></em>' reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int DIRECTED_COMMUNICATION_LINK__SOURCE = 0;
-
-        /**
-         * The feature id for the '<em><b>Target</b></em>' reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int DIRECTED_COMMUNICATION_LINK__TARGET = 1;
-
-        /**
-         * The number of structural features of the '<em>Directed Communication Link</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int DIRECTED_COMMUNICATION_LINK_FEATURE_COUNT = 2;
-
-        /**
-         * The number of operations of the '<em>Directed Communication Link</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int DIRECTED_COMMUNICATION_LINK_OPERATION_COUNT = 0;
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.PayloadImpl <em>Payload</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.PayloadImpl
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getPayload()
-         * @generated
-         */
-        int PAYLOAD = 7;
-
-        /**
-         * The number of structural features of the '<em>Payload</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int PAYLOAD_FEATURE_COUNT = 0;
-
-        /**
-         * The number of operations of the '<em>Payload</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int PAYLOAD_OPERATION_COUNT = 0;
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.InterferometryPayloadImpl <em>Interferometry Payload</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.InterferometryPayloadImpl
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getInterferometryPayload()
-         * @generated
-         */
-        int INTERFEROMETRY_PAYLOAD = 8;
-
-        /**
-         * The number of structural features of the '<em>Interferometry Payload</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int INTERFEROMETRY_PAYLOAD_FEATURE_COUNT = PAYLOAD_FEATURE_COUNT + 0;
-
-        /**
-         * The number of operations of the '<em>Interferometry Payload</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int INTERFEROMETRY_PAYLOAD_OPERATION_COUNT = PAYLOAD_OPERATION_COUNT + 0;
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CubeSatImpl <em>Cube Sat</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CubeSatImpl
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getCubeSat()
-         * @generated
-         */
-        int CUBE_SAT = 12;
-
-        /**
-         * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
-
-        /**
-         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT__COMMUNICATION_LINK = SPACECRAFT__COMMUNICATION_LINK;
-
-        /**
-         * The feature id for the '<em><b>Payload</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT__PAYLOAD = SPACECRAFT__PAYLOAD;
-
-        /**
-         * The feature id for the '<em><b>Kind</b></em>' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT__KIND = SPACECRAFT__KIND;
-
-        /**
-         * The number of structural features of the '<em>Cube Sat</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT_FEATURE_COUNT = SPACECRAFT_FEATURE_COUNT + 0;
-
-        /**
-         * The number of operations of the '<em>Cube Sat</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT_OPERATION_COUNT = SPACECRAFT_OPERATION_COUNT + 0;
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CubeSat3UImpl <em>Cube Sat3 U</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CubeSat3UImpl
-         * @see hu.bme.mit.inf.dslreasoner.domains.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 feature id for the '<em><b>Kind</b></em>' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT3_U__KIND = CUBE_SAT__KIND;
-
-        /**
-         * The number of structural features of the '<em>Cube Sat3 U</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT3_U_FEATURE_COUNT = CUBE_SAT_FEATURE_COUNT + 0;
-
-        /**
-         * The number of operations of the '<em>Cube Sat3 U</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT3_U_OPERATION_COUNT = CUBE_SAT_OPERATION_COUNT + 0;
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CubeSat6UImpl <em>Cube Sat6 U</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CubeSat6UImpl
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getCubeSat6U()
-         * @generated
-         */
-        int CUBE_SAT6_U = 10;
-
-        /**
-         * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT6_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_SAT6_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_SAT6_U__PAYLOAD = CUBE_SAT__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 = CUBE_SAT__KIND;
-
-        /**
-         * The number of structural features of the '<em>Cube Sat6 U</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT6_U_FEATURE_COUNT = CUBE_SAT_FEATURE_COUNT + 0;
-
-        /**
-         * The number of operations of the '<em>Cube Sat6 U</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT6_U_OPERATION_COUNT = CUBE_SAT_OPERATION_COUNT + 0;
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SmallSatImpl <em>Small Sat</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SmallSatImpl
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getSmallSat()
-         * @generated
-         */
-        int SMALL_SAT = 11;
-
-        /**
-         * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int SMALL_SAT__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
-
-        /**
-         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int SMALL_SAT__COMMUNICATION_LINK = SPACECRAFT__COMMUNICATION_LINK;
-
-        /**
-         * The feature id for the '<em><b>Payload</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int SMALL_SAT__PAYLOAD = SPACECRAFT__PAYLOAD;
-
-        /**
-         * The feature id for the '<em><b>Kind</b></em>' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int SMALL_SAT__KIND = SPACECRAFT__KIND;
-
-        /**
-         * The number of structural features of the '<em>Small Sat</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int SMALL_SAT_FEATURE_COUNT = SPACECRAFT_FEATURE_COUNT + 0;
-
-        /**
-         * The number of operations of the '<em>Small Sat</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int SMALL_SAT_OPERATION_COUNT = SPACECRAFT_OPERATION_COUNT + 0;
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand <em>Transceiver Band</em>}' enum.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getTransceiverBand()
-         * @generated
-         */
-        int TRANSCEIVER_BAND = 13;
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.AntennaGain <em>Antenna Gain</em>}' enum.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.AntennaGain
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getAntennaGain()
-         * @generated
-         */
-        int ANTENNA_GAIN = 14;
-
-        /**
-         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind <em>Spacecraft Kind</em>}' enum.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getSpacecraftKind()
-         * @generated
-         */
-        int SPACECRAFT_KIND = 15;
-
-        /**
-         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission <em>Constellation Mission</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for class '<em>Constellation Mission</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission
-         * @generated
-         */
-        EClass getConstellationMission();
-
-        /**
-         * Returns the meta object for the containment reference '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission#getGroundStationNetwork <em>Ground Station Network</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the containment reference '<em>Ground Station Network</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission#getGroundStationNetwork()
-         * @see #getConstellationMission()
-         * @generated
-         */
-        EReference getConstellationMission_GroundStationNetwork();
-
-        /**
-         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission#getSpacecraft <em>Spacecraft</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the containment reference list '<em>Spacecraft</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission#getSpacecraft()
-         * @see #getConstellationMission()
-         * @generated
-         */
-        EReference getConstellationMission_Spacecraft();
-
-        /**
-         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission <em>Interferometry Mission</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for class '<em>Interferometry Mission</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission
-         * @generated
-         */
-        EClass getInterferometryMission();
-
-        /**
-         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission#getObservationTime <em>Observation Time</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the attribute '<em>Observation Time</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission#getObservationTime()
-         * @see #getInterferometryMission()
-         * @generated
-         */
-        EAttribute getInterferometryMission_ObservationTime();
-
-        /**
-         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement <em>Communicating Element</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for class '<em>Communicating Element</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement
-         * @generated
-         */
-        EClass getCommunicatingElement();
-
-        /**
-         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement#getCommSubsystem <em>Comm Subsystem</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the containment reference list '<em>Comm Subsystem</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement#getCommSubsystem()
-         * @see #getCommunicatingElement()
-         * @generated
-         */
-        EReference getCommunicatingElement_CommSubsystem();
-
-        /**
-         * Returns the meta object for the containment reference '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement#getCommunicationLink <em>Communication Link</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the containment reference '<em>Communication Link</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement#getCommunicationLink()
-         * @see #getCommunicatingElement()
-         * @generated
-         */
-        EReference getCommunicatingElement_CommunicationLink();
-
-        /**
-         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.GroundStationNetwork <em>Ground Station Network</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for class '<em>Ground Station Network</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.GroundStationNetwork
-         * @generated
-         */
-        EClass getGroundStationNetwork();
-
-        /**
-         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft <em>Spacecraft</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for class '<em>Spacecraft</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft
-         * @generated
-         */
-        EClass getSpacecraft();
-
-        /**
-         * Returns the meta object for the containment reference '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft#getPayload <em>Payload</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the containment reference '<em>Payload</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft#getPayload()
-         * @see #getSpacecraft()
-         * @generated
-         */
-        EReference getSpacecraft_Payload();
-
-        /**
-         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft#getKind <em>Kind</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the attribute '<em>Kind</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft#getKind()
-         * @see #getSpacecraft()
-         * @generated
-         */
-        EAttribute getSpacecraft_Kind();
-
-        /**
-         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem <em>Comm Subsystem</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for class '<em>Comm Subsystem</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem
-         * @generated
-         */
-        EClass getCommSubsystem();
-
-        /**
-         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem#getBand <em>Band</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the attribute '<em>Band</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem#getBand()
-         * @see #getCommSubsystem()
-         * @generated
-         */
-        EAttribute getCommSubsystem_Band();
-
-        /**
-         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem#getGain <em>Gain</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the attribute '<em>Gain</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem#getGain()
-         * @see #getCommSubsystem()
-         * @generated
-         */
-        EAttribute getCommSubsystem_Gain();
-
-        /**
-         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink <em>Directed Communication Link</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for class '<em>Directed Communication Link</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink
-         * @generated
-         */
-        EClass getDirectedCommunicationLink();
-
-        /**
-         * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink#getSource <em>Source</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the reference '<em>Source</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink#getSource()
-         * @see #getDirectedCommunicationLink()
-         * @generated
-         */
-        EReference getDirectedCommunicationLink_Source();
-
-        /**
-         * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink#getTarget <em>Target</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the reference '<em>Target</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink#getTarget()
-         * @see #getDirectedCommunicationLink()
-         * @generated
-         */
-        EReference getDirectedCommunicationLink_Target();
-
-        /**
-         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.Payload <em>Payload</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for class '<em>Payload</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.Payload
-         * @generated
-         */
-        EClass getPayload();
-
-        /**
-         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryPayload <em>Interferometry Payload</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for class '<em>Interferometry Payload</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryPayload
-         * @generated
-         */
-        EClass getInterferometryPayload();
-
-        /**
-         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U <em>Cube Sat3 U</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for class '<em>Cube Sat3 U</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U
-         * @generated
-         */
-        EClass getCubeSat3U();
-
-        /**
-         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat6U <em>Cube Sat6 U</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for class '<em>Cube Sat6 U</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat6U
-         * @generated
-         */
-        EClass getCubeSat6U();
-
-        /**
-         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat <em>Small Sat</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for class '<em>Small Sat</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat
-         * @generated
-         */
-        EClass getSmallSat();
-
-        /**
-         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat <em>Cube Sat</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for class '<em>Cube Sat</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat
-         * @generated
-         */
-        EClass getCubeSat();
-
-        /**
-         * Returns the meta object for enum '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand <em>Transceiver Band</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for enum '<em>Transceiver Band</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand
-         * @generated
-         */
-        EEnum getTransceiverBand();
-
-        /**
-         * Returns the meta object for enum '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.AntennaGain <em>Antenna Gain</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for enum '<em>Antenna Gain</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.AntennaGain
-         * @generated
-         */
-        EEnum getAntennaGain();
-
-        /**
-         * Returns the meta object for enum '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind <em>Spacecraft Kind</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for enum '<em>Spacecraft Kind</em>'.
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind
-         * @generated
-         */
-        EEnum getSpacecraftKind();
-
-        /**
-         * Returns the factory that creates the instances of the model.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the factory that creates the instances of the model.
-         * @generated
-         */
-        SatelliteFactory getSatelliteFactory();
-
-        /**
-         * <!-- begin-user-doc -->
-         * Defines literals for the meta objects that represent
-         * <ul>
-         *   <li>each class,</li>
-         *   <li>each feature of each class,</li>
-         *   <li>each operation of each class,</li>
-         *   <li>each enum,</li>
-         *   <li>and each data type</li>
-         * </ul>
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        interface Literals {
-                /**
-                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.ConstellationMissionImpl <em>Constellation Mission</em>}' class.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.ConstellationMissionImpl
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getConstellationMission()
-                 * @generated
-                 */
-                EClass CONSTELLATION_MISSION = eINSTANCE.getConstellationMission();
-
-                /**
-                 * The meta object literal for the '<em><b>Ground Station Network</b></em>' containment reference feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EReference CONSTELLATION_MISSION__GROUND_STATION_NETWORK = eINSTANCE
-                                .getConstellationMission_GroundStationNetwork();
-
-                /**
-                 * The meta object literal for the '<em><b>Spacecraft</b></em>' containment reference list feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EReference CONSTELLATION_MISSION__SPACECRAFT = eINSTANCE.getConstellationMission_Spacecraft();
-
-                /**
-                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.InterferometryMissionImpl <em>Interferometry Mission</em>}' class.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.InterferometryMissionImpl
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getInterferometryMission()
-                 * @generated
-                 */
-                EClass INTERFEROMETRY_MISSION = eINSTANCE.getInterferometryMission();
-
-                /**
-                 * The meta object literal for the '<em><b>Observation Time</b></em>' attribute feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EAttribute INTERFEROMETRY_MISSION__OBSERVATION_TIME = eINSTANCE.getInterferometryMission_ObservationTime();
-
-                /**
-                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CommunicatingElementImpl <em>Communicating Element</em>}' class.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CommunicatingElementImpl
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getCommunicatingElement()
-                 * @generated
-                 */
-                EClass COMMUNICATING_ELEMENT = eINSTANCE.getCommunicatingElement();
-
-                /**
-                 * The meta object literal for the '<em><b>Comm Subsystem</b></em>' containment reference list feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EReference COMMUNICATING_ELEMENT__COMM_SUBSYSTEM = eINSTANCE.getCommunicatingElement_CommSubsystem();
-
-                /**
-                 * The meta object literal for the '<em><b>Communication Link</b></em>' containment reference feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EReference COMMUNICATING_ELEMENT__COMMUNICATION_LINK = eINSTANCE.getCommunicatingElement_CommunicationLink();
-
-                /**
-                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.GroundStationNetworkImpl <em>Ground Station Network</em>}' class.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.GroundStationNetworkImpl
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getGroundStationNetwork()
-                 * @generated
-                 */
-                EClass GROUND_STATION_NETWORK = eINSTANCE.getGroundStationNetwork();
-
-                /**
-                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SpacecraftImpl <em>Spacecraft</em>}' class.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SpacecraftImpl
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getSpacecraft()
-                 * @generated
-                 */
-                EClass SPACECRAFT = eINSTANCE.getSpacecraft();
-
-                /**
-                 * The meta object literal for the '<em><b>Payload</b></em>' containment reference feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                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 hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CommSubsystemImpl <em>Comm Subsystem</em>}' class.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CommSubsystemImpl
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getCommSubsystem()
-                 * @generated
-                 */
-                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 hu.bme.mit.inf.dslreasoner.domains.satellite.impl.DirectedCommunicationLinkImpl <em>Directed Communication Link</em>}' class.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.DirectedCommunicationLinkImpl
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getDirectedCommunicationLink()
-                 * @generated
-                 */
-                EClass DIRECTED_COMMUNICATION_LINK = eINSTANCE.getDirectedCommunicationLink();
-
-                /**
-                 * The meta object literal for the '<em><b>Source</b></em>' reference feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EReference DIRECTED_COMMUNICATION_LINK__SOURCE = eINSTANCE.getDirectedCommunicationLink_Source();
-
-                /**
-                 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EReference DIRECTED_COMMUNICATION_LINK__TARGET = eINSTANCE.getDirectedCommunicationLink_Target();
-
-                /**
-                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.PayloadImpl <em>Payload</em>}' class.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.PayloadImpl
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getPayload()
-                 * @generated
-                 */
-                EClass PAYLOAD = eINSTANCE.getPayload();
-
-                /**
-                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.InterferometryPayloadImpl <em>Interferometry Payload</em>}' class.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.InterferometryPayloadImpl
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getInterferometryPayload()
-                 * @generated
-                 */
-                EClass INTERFEROMETRY_PAYLOAD = eINSTANCE.getInterferometryPayload();
-
-                /**
-                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CubeSat3UImpl <em>Cube Sat3 U</em>}' class.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CubeSat3UImpl
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getCubeSat3U()
-                 * @generated
-                 */
-                EClass CUBE_SAT3_U = eINSTANCE.getCubeSat3U();
-
-                /**
-                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CubeSat6UImpl <em>Cube Sat6 U</em>}' class.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CubeSat6UImpl
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getCubeSat6U()
-                 * @generated
-                 */
-                EClass CUBE_SAT6_U = eINSTANCE.getCubeSat6U();
-
-                /**
-                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SmallSatImpl <em>Small Sat</em>}' class.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SmallSatImpl
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getSmallSat()
-                 * @generated
-                 */
-                EClass SMALL_SAT = eINSTANCE.getSmallSat();
-
-                /**
-                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CubeSatImpl <em>Cube Sat</em>}' class.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CubeSatImpl
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getCubeSat()
-                 * @generated
-                 */
-                EClass CUBE_SAT = eINSTANCE.getCubeSat();
-
-                /**
-                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand <em>Transceiver Band</em>}' enum.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getTransceiverBand()
-                 * @generated
-                 */
-                EEnum TRANSCEIVER_BAND = eINSTANCE.getTransceiverBand();
-
-                /**
-                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.AntennaGain <em>Antenna Gain</em>}' enum.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.AntennaGain
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getAntennaGain()
-                 * @generated
-                 */
-                EEnum ANTENNA_GAIN = eINSTANCE.getAntennaGain();
-
-                /**
-                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind <em>Spacecraft Kind</em>}' enum.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind
-                 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getSpacecraftKind()
-                 * @generated
-                 */
-                EEnum SPACECRAFT_KIND = eINSTANCE.getSpacecraftKind();
-
-        }
-
-} //SatellitePackage
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/SmallSat.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/SmallSat.java
deleted file mode 100644
index b3a3d63c..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/SmallSat.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Small Sat</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getSmallSat()
- * @model
- * @generated
- */
-public interface SmallSat extends Spacecraft {
-} // SmallSat
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/Spacecraft.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/Spacecraft.java
deleted file mode 100644
index 34f9750a..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/Spacecraft.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Spacecraft</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft#getPayload <em>Payload</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft#getKind <em>Kind</em>}</li>
- * </ul>
- *
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getSpacecraft()
- * @model abstract="true"
- * @generated
- */
-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)
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getSpacecraft_Payload()
-         * @model containment="true"
-         * @generated
-         */
-        Payload getPayload();
-
-        /**
-         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft#getPayload <em>Payload</em>}' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param value the new value of the '<em>Payload</em>' containment reference.
-         * @see #getPayload()
-         * @generated
-         */
-        void setPayload(Payload value);
-
-        /**
-         * Returns the value of the '<em><b>Kind</b></em>' attribute.
-         * The literals are from the enumeration {@link hu.bme.mit.inf.dslreasoner.domains.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 hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getSpacecraft_Kind()
-         * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
-         * @generated
-         */
-        SpacecraftKind getKind();
-
-} // Spacecraft
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/SpacecraftKind.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/SpacecraftKind.java
deleted file mode 100644
index b0b6aede..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/SpacecraftKind.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Spacecraft Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getSpacecraftKind()
- * @model
- * @generated
- */
-public enum SpacecraftKind implements Enumerator {
-        /**
-         * The '<em><b>Cube Sat3 U</b></em>' literal object.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #CUBE_SAT3_U_VALUE
-         * @generated
-         * @ordered
-         */
-        CUBE_SAT3_U(0, "CubeSat3U", "CubeSat3U"),
-
-        /**
-         * The '<em><b>Cube Sat6 U</b></em>' literal object.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #CUBE_SAT6_U_VALUE
-         * @generated
-         * @ordered
-         */
-        CUBE_SAT6_U(1, "CubeSat6U", "CubeSat6U"),
-        /**
-         * The '<em><b>Small Sat</b></em>' literal object.
-         * <!-- begin-user-doc -->
-        * <!-- end-user-doc -->
-         * @see #SMALL_SAT_VALUE
-         * @generated
-         * @ordered
-         */
-        SMALL_SAT(2, "SmallSat", "SmallSat");
-
-        /**
-         * 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"
-         * @generated
-         * @ordered
-         */
-        public static final int CUBE_SAT3_U_VALUE = 0;
-
-        /**
-         * 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"
-         * @generated
-         * @ordered
-         */
-        public static final int CUBE_SAT6_U_VALUE = 1;
-
-        /**
-         * 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"
-         * @generated
-         * @ordered
-         */
-        public static final int SMALL_SAT_VALUE = 2;
-
-        /**
-         * An array of all the '<em><b>Spacecraft Kind</b></em>' enumerators.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private static final SpacecraftKind[] VALUES_ARRAY = new SpacecraftKind[] { CUBE_SAT3_U, CUBE_SAT6_U, SMALL_SAT, };
-
-        /**
-         * A public read-only list of all the '<em><b>Spacecraft Kind</b></em>' enumerators.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final List<SpacecraftKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-        /**
-         * Returns the '<em><b>Spacecraft Kind</b></em>' literal with the specified literal value.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param literal the literal.
-         * @return the matching enumerator or <code>null</code>.
-         * @generated
-         */
-        public static SpacecraftKind get(String literal) {
-                for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-                        SpacecraftKind result = VALUES_ARRAY[i];
-                        if (result.toString().equals(literal)) {
-                                return result;
-                        }
-                }
-                return null;
-        }
-
-        /**
-         * Returns the '<em><b>Spacecraft Kind</b></em>' literal with the specified name.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param name the name.
-         * @return the matching enumerator or <code>null</code>.
-         * @generated
-         */
-        public static SpacecraftKind getByName(String name) {
-                for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-                        SpacecraftKind result = VALUES_ARRAY[i];
-                        if (result.getName().equals(name)) {
-                                return result;
-                        }
-                }
-                return null;
-        }
-
-        /**
-         * Returns the '<em><b>Spacecraft Kind</b></em>' literal with the specified integer value.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param value the integer value.
-         * @return the matching enumerator or <code>null</code>.
-         * @generated
-         */
-        public static SpacecraftKind get(int value) {
-                switch (value) {
-                case CUBE_SAT3_U_VALUE:
-                        return CUBE_SAT3_U;
-                case CUBE_SAT6_U_VALUE:
-                        return CUBE_SAT6_U;
-                case SMALL_SAT_VALUE:
-                        return SMALL_SAT;
-                }
-                return null;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private final int value;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private final String name;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private final String literal;
-
-        /**
-         * Only this class can construct instances.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private SpacecraftKind(int value, String name, String literal) {
-                this.value = value;
-                this.name = name;
-                this.literal = literal;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public int getValue() {
-                return value;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public String getName() {
-                return name;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public String getLiteral() {
-                return literal;
-        }
-
-        /**
-         * Returns the literal value of the enumerator, which is its string representation.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public String toString() {
-                return literal;
-        }
-
-} //SpacecraftKind
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/TransceiverBand.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/TransceiverBand.java
deleted file mode 100644
index 62aae5f7..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/TransceiverBand.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Transceiver Band</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getTransceiverBand()
- * @model
- * @generated
- */
-public enum TransceiverBand implements Enumerator {
-        /**
-         * The '<em><b>UHF</b></em>' literal object.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #UHF_VALUE
-         * @generated
-         * @ordered
-         */
-        UHF(0, "UHF", "UHF"),
-
-        /**
-         * The '<em><b>X</b></em>' literal object.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #X_VALUE
-         * @generated
-         * @ordered
-         */
-        X(1, "X", "X"),
-
-        /**
-         * The '<em><b>Ka</b></em>' literal object.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #KA_VALUE
-         * @generated
-         * @ordered
-         */
-        KA(2, "Ka", "Ka");
-
-        /**
-         * 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
-         * @generated
-         * @ordered
-         */
-        public static final int UHF_VALUE = 0;
-
-        /**
-         * 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
-         * @generated
-         * @ordered
-         */
-        public static final int X_VALUE = 1;
-
-        /**
-         * 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"
-         * @generated
-         * @ordered
-         */
-        public static final int KA_VALUE = 2;
-
-        /**
-         * An array of all the '<em><b>Transceiver Band</b></em>' enumerators.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private static final TransceiverBand[] VALUES_ARRAY = new TransceiverBand[] { UHF, X, KA, };
-
-        /**
-         * A public read-only list of all the '<em><b>Transceiver Band</b></em>' enumerators.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final List<TransceiverBand> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-        /**
-         * Returns the '<em><b>Transceiver Band</b></em>' literal with the specified literal value.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param literal the literal.
-         * @return the matching enumerator or <code>null</code>.
-         * @generated
-         */
-        public static TransceiverBand get(String literal) {
-                for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-                        TransceiverBand result = VALUES_ARRAY[i];
-                        if (result.toString().equals(literal)) {
-                                return result;
-                        }
-                }
-                return null;
-        }
-
-        /**
-         * Returns the '<em><b>Transceiver Band</b></em>' literal with the specified name.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param name the name.
-         * @return the matching enumerator or <code>null</code>.
-         * @generated
-         */
-        public static TransceiverBand getByName(String name) {
-                for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-                        TransceiverBand result = VALUES_ARRAY[i];
-                        if (result.getName().equals(name)) {
-                                return result;
-                        }
-                }
-                return null;
-        }
-
-        /**
-         * Returns the '<em><b>Transceiver Band</b></em>' literal with the specified integer value.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param value the integer value.
-         * @return the matching enumerator or <code>null</code>.
-         * @generated
-         */
-        public static TransceiverBand get(int value) {
-                switch (value) {
-                case UHF_VALUE:
-                        return UHF;
-                case X_VALUE:
-                        return X;
-                case KA_VALUE:
-                        return KA;
-                }
-                return null;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private final int value;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private final String name;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private final String literal;
-
-        /**
-         * Only this class can construct instances.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private TransceiverBand(int value, String name, String literal) {
-                this.value = value;
-                this.name = name;
-                this.literal = literal;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public int getValue() {
-                return value;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public String getName() {
-                return name;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public String getLiteral() {
-                return literal;
-        }
-
-        /**
-         * Returns the literal value of the enumerator, which is its string representation.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public String toString() {
-                return literal;
-        }
-
-} //TransceiverBand
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CommSubsystemImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CommSubsystemImpl.java
deleted file mode 100644
index fbde1603..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CommSubsystemImpl.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.AntennaGain;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand;
-
-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;
-
-/**
- * <!-- 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 hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CommSubsystemImpl#getBand <em>Band</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.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;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected CommSubsystemImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                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/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CommunicatingElementImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CommunicatingElementImpl.java
deleted file mode 100644
index 4b51e52e..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CommunicatingElementImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Communicating Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CommunicatingElementImpl#getCommSubsystem <em>Comm Subsystem</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.CommunicatingElementImpl#getCommunicationLink <em>Communication Link</em>}</li>
- * </ul>
- *
- * @generated
- */
-public abstract class CommunicatingElementImpl extends MinimalEObjectImpl.Container implements CommunicatingElement {
-        /**
-         * The cached value of the '{@link #getCommSubsystem() <em>Comm Subsystem</em>}' containment reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getCommSubsystem()
-         * @generated
-         * @ordered
-         */
-        protected EList<CommSubsystem> commSubsystem;
-
-        /**
-         * The cached value of the '{@link #getCommunicationLink() <em>Communication Link</em>}' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getCommunicationLink()
-         * @generated
-         * @ordered
-         */
-        protected DirectedCommunicationLink communicationLink;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected CommunicatingElementImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.COMMUNICATING_ELEMENT;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EList<CommSubsystem> getCommSubsystem() {
-                if (commSubsystem == null) {
-                        commSubsystem = new EObjectContainmentEList<CommSubsystem>(CommSubsystem.class, this,
-                                        SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM);
-                }
-                return commSubsystem;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public DirectedCommunicationLink getCommunicationLink() {
-                return communicationLink;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public NotificationChain basicSetCommunicationLink(DirectedCommunicationLink newCommunicationLink,
-                        NotificationChain msgs) {
-                DirectedCommunicationLink oldCommunicationLink = communicationLink;
-                communicationLink = newCommunicationLink;
-                if (eNotificationRequired()) {
-                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-                                        SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK, oldCommunicationLink,
-                                        newCommunicationLink);
-                        if (msgs == null)
-                                msgs = notification;
-                        else
-                                msgs.add(notification);
-                }
-                return msgs;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void setCommunicationLink(DirectedCommunicationLink newCommunicationLink) {
-                if (newCommunicationLink != communicationLink) {
-                        NotificationChain msgs = null;
-                        if (communicationLink != null)
-                                msgs = ((InternalEObject) communicationLink).eInverseRemove(this,
-                                                EOPPOSITE_FEATURE_BASE - SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK, null,
-                                                msgs);
-                        if (newCommunicationLink != null)
-                                msgs = ((InternalEObject) newCommunicationLink).eInverseAdd(this,
-                                                EOPPOSITE_FEATURE_BASE - SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK, null,
-                                                msgs);
-                        msgs = basicSetCommunicationLink(newCommunicationLink, msgs);
-                        if (msgs != null)
-                                msgs.dispatch();
-                } else if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET,
-                                        SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK, newCommunicationLink,
-                                        newCommunicationLink));
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-                switch (featureID) {
-                case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
-                        return ((InternalEList<?>) getCommSubsystem()).basicRemove(otherEnd, msgs);
-                case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
-                        return basicSetCommunicationLink(null, msgs);
-                }
-                return super.eInverseRemove(otherEnd, featureID, msgs);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public Object eGet(int featureID, boolean resolve, boolean coreType) {
-                switch (featureID) {
-                case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
-                        return getCommSubsystem();
-                case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
-                        return getCommunicationLink();
-                }
-                return super.eGet(featureID, resolve, coreType);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @SuppressWarnings("unchecked")
-        @Override
-        public void eSet(int featureID, Object newValue) {
-                switch (featureID) {
-                case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
-                        getCommSubsystem().clear();
-                        getCommSubsystem().addAll((Collection<? extends CommSubsystem>) newValue);
-                        return;
-                case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
-                        setCommunicationLink((DirectedCommunicationLink) newValue);
-                        return;
-                }
-                super.eSet(featureID, newValue);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void eUnset(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
-                        getCommSubsystem().clear();
-                        return;
-                case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
-                        setCommunicationLink((DirectedCommunicationLink) null);
-                        return;
-                }
-                super.eUnset(featureID);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public boolean eIsSet(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.COMMUNICATING_ELEMENT__COMM_SUBSYSTEM:
-                        return commSubsystem != null && !commSubsystem.isEmpty();
-                case SatellitePackage.COMMUNICATING_ELEMENT__COMMUNICATION_LINK:
-                        return communicationLink != null;
-                }
-                return super.eIsSet(featureID);
-        }
-
-} //CommunicatingElementImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/ConstellationMissionImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/ConstellationMissionImpl.java
deleted file mode 100644
index 710b5982..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/ConstellationMissionImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.GroundStationNetwork;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Constellation Mission</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.ConstellationMissionImpl#getGroundStationNetwork <em>Ground Station Network</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.ConstellationMissionImpl#getSpacecraft <em>Spacecraft</em>}</li>
- * </ul>
- *
- * @generated
- */
-public abstract class ConstellationMissionImpl extends MinimalEObjectImpl.Container implements ConstellationMission {
-        /**
-         * The cached value of the '{@link #getGroundStationNetwork() <em>Ground Station Network</em>}' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getGroundStationNetwork()
-         * @generated
-         * @ordered
-         */
-        protected GroundStationNetwork groundStationNetwork;
-
-        /**
-         * The cached value of the '{@link #getSpacecraft() <em>Spacecraft</em>}' containment reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getSpacecraft()
-         * @generated
-         * @ordered
-         */
-        protected EList<Spacecraft> spacecraft;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected ConstellationMissionImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.CONSTELLATION_MISSION;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public GroundStationNetwork getGroundStationNetwork() {
-                return groundStationNetwork;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public NotificationChain basicSetGroundStationNetwork(GroundStationNetwork newGroundStationNetwork,
-                        NotificationChain msgs) {
-                GroundStationNetwork oldGroundStationNetwork = groundStationNetwork;
-                groundStationNetwork = newGroundStationNetwork;
-                if (eNotificationRequired()) {
-                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-                                        SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK, oldGroundStationNetwork,
-                                        newGroundStationNetwork);
-                        if (msgs == null)
-                                msgs = notification;
-                        else
-                                msgs.add(notification);
-                }
-                return msgs;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void setGroundStationNetwork(GroundStationNetwork newGroundStationNetwork) {
-                if (newGroundStationNetwork != groundStationNetwork) {
-                        NotificationChain msgs = null;
-                        if (groundStationNetwork != null)
-                                msgs = ((InternalEObject) groundStationNetwork).eInverseRemove(this,
-                                                EOPPOSITE_FEATURE_BASE - SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK, null,
-                                                msgs);
-                        if (newGroundStationNetwork != null)
-                                msgs = ((InternalEObject) newGroundStationNetwork).eInverseAdd(this,
-                                                EOPPOSITE_FEATURE_BASE - SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK, null,
-                                                msgs);
-                        msgs = basicSetGroundStationNetwork(newGroundStationNetwork, msgs);
-                        if (msgs != null)
-                                msgs.dispatch();
-                } else if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET,
-                                        SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK, newGroundStationNetwork,
-                                        newGroundStationNetwork));
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EList<Spacecraft> getSpacecraft() {
-                if (spacecraft == null) {
-                        spacecraft = new EObjectContainmentEList<Spacecraft>(Spacecraft.class, this,
-                                        SatellitePackage.CONSTELLATION_MISSION__SPACECRAFT);
-                }
-                return spacecraft;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-                switch (featureID) {
-                case SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK:
-                        return basicSetGroundStationNetwork(null, msgs);
-                case SatellitePackage.CONSTELLATION_MISSION__SPACECRAFT:
-                        return ((InternalEList<?>) getSpacecraft()).basicRemove(otherEnd, msgs);
-                }
-                return super.eInverseRemove(otherEnd, featureID, msgs);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public Object eGet(int featureID, boolean resolve, boolean coreType) {
-                switch (featureID) {
-                case SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK:
-                        return getGroundStationNetwork();
-                case SatellitePackage.CONSTELLATION_MISSION__SPACECRAFT:
-                        return getSpacecraft();
-                }
-                return super.eGet(featureID, resolve, coreType);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @SuppressWarnings("unchecked")
-        @Override
-        public void eSet(int featureID, Object newValue) {
-                switch (featureID) {
-                case SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK:
-                        setGroundStationNetwork((GroundStationNetwork) newValue);
-                        return;
-                case SatellitePackage.CONSTELLATION_MISSION__SPACECRAFT:
-                        getSpacecraft().clear();
-                        getSpacecraft().addAll((Collection<? extends Spacecraft>) newValue);
-                        return;
-                }
-                super.eSet(featureID, newValue);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void eUnset(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK:
-                        setGroundStationNetwork((GroundStationNetwork) null);
-                        return;
-                case SatellitePackage.CONSTELLATION_MISSION__SPACECRAFT:
-                        getSpacecraft().clear();
-                        return;
-                }
-                super.eUnset(featureID);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public boolean eIsSet(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.CONSTELLATION_MISSION__GROUND_STATION_NETWORK:
-                        return groundStationNetwork != null;
-                case SatellitePackage.CONSTELLATION_MISSION__SPACECRAFT:
-                        return spacecraft != null && !spacecraft.isEmpty();
-                }
-                return super.eIsSet(featureID);
-        }
-
-} //ConstellationMissionImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat3UImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat3UImpl.java
deleted file mode 100644
index 3e0d6f2c..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat3UImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Cube Sat3 U</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class CubeSat3UImpl extends CubeSatImpl implements CubeSat3U {
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected CubeSat3UImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.CUBE_SAT3_U;
-        }
-
-} //CubeSat3UImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat6UImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat6UImpl.java
deleted file mode 100644
index 7ad2bc87..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat6UImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat6U;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Cube Sat6 U</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class CubeSat6UImpl extends CubeSatImpl implements CubeSat6U {
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected CubeSat6UImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.CUBE_SAT6_U;
-        }
-
-} //CubeSat6UImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/DirectedCommunicationLinkImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/DirectedCommunicationLinkImpl.java
deleted file mode 100644
index b0338e2d..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/DirectedCommunicationLinkImpl.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Directed Communication Link</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.DirectedCommunicationLinkImpl#getSource <em>Source</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.DirectedCommunicationLinkImpl#getTarget <em>Target</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class DirectedCommunicationLinkImpl extends MinimalEObjectImpl.Container implements DirectedCommunicationLink {
-        /**
-         * The cached value of the '{@link #getSource() <em>Source</em>}' reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getSource()
-         * @generated
-         * @ordered
-         */
-        protected CommSubsystem source;
-
-        /**
-         * The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getTarget()
-         * @generated
-         * @ordered
-         */
-        protected CommSubsystem target;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected DirectedCommunicationLinkImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.DIRECTED_COMMUNICATION_LINK;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public CommSubsystem getSource() {
-                if (source != null && source.eIsProxy()) {
-                        InternalEObject oldSource = (InternalEObject) source;
-                        source = (CommSubsystem) eResolveProxy(oldSource);
-                        if (source != oldSource) {
-                                if (eNotificationRequired())
-                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-                                                        SatellitePackage.DIRECTED_COMMUNICATION_LINK__SOURCE, oldSource, source));
-                        }
-                }
-                return source;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public CommSubsystem basicGetSource() {
-                return source;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void setSource(CommSubsystem newSource) {
-                CommSubsystem oldSource = source;
-                source = newSource;
-                if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.DIRECTED_COMMUNICATION_LINK__SOURCE,
-                                        oldSource, source));
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public CommSubsystem getTarget() {
-                if (target != null && target.eIsProxy()) {
-                        InternalEObject oldTarget = (InternalEObject) target;
-                        target = (CommSubsystem) eResolveProxy(oldTarget);
-                        if (target != oldTarget) {
-                                if (eNotificationRequired())
-                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-                                                        SatellitePackage.DIRECTED_COMMUNICATION_LINK__TARGET, oldTarget, target));
-                        }
-                }
-                return target;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public CommSubsystem basicGetTarget() {
-                return target;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void setTarget(CommSubsystem newTarget) {
-                CommSubsystem oldTarget = target;
-                target = newTarget;
-                if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.DIRECTED_COMMUNICATION_LINK__TARGET,
-                                        oldTarget, target));
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public Object eGet(int featureID, boolean resolve, boolean coreType) {
-                switch (featureID) {
-                case SatellitePackage.DIRECTED_COMMUNICATION_LINK__SOURCE:
-                        if (resolve)
-                                return getSource();
-                        return basicGetSource();
-                case SatellitePackage.DIRECTED_COMMUNICATION_LINK__TARGET:
-                        if (resolve)
-                                return getTarget();
-                        return basicGetTarget();
-                }
-                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.DIRECTED_COMMUNICATION_LINK__SOURCE:
-                        setSource((CommSubsystem) newValue);
-                        return;
-                case SatellitePackage.DIRECTED_COMMUNICATION_LINK__TARGET:
-                        setTarget((CommSubsystem) newValue);
-                        return;
-                }
-                super.eSet(featureID, newValue);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void eUnset(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.DIRECTED_COMMUNICATION_LINK__SOURCE:
-                        setSource((CommSubsystem) null);
-                        return;
-                case SatellitePackage.DIRECTED_COMMUNICATION_LINK__TARGET:
-                        setTarget((CommSubsystem) null);
-                        return;
-                }
-                super.eUnset(featureID);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public boolean eIsSet(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.DIRECTED_COMMUNICATION_LINK__SOURCE:
-                        return source != null;
-                case SatellitePackage.DIRECTED_COMMUNICATION_LINK__TARGET:
-                        return target != null;
-                }
-                return super.eIsSet(featureID);
-        }
-
-} //DirectedCommunicationLinkImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/GroundStationNetworkImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/GroundStationNetworkImpl.java
deleted file mode 100644
index 890e807c..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/GroundStationNetworkImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.GroundStationNetwork;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Ground Station Network</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class GroundStationNetworkImpl extends CommunicatingElementImpl implements GroundStationNetwork {
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected GroundStationNetworkImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.GROUND_STATION_NETWORK;
-        }
-
-} //GroundStationNetworkImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/InterferometryMissionImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/InterferometryMissionImpl.java
deleted file mode 100644
index b2687ea3..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/InterferometryMissionImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Interferometry Mission</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.InterferometryMissionImpl#getObservationTime <em>Observation Time</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class InterferometryMissionImpl extends ConstellationMissionImpl implements InterferometryMission {
-        /**
-         * The default value of the '{@link #getObservationTime() <em>Observation Time</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getObservationTime()
-         * @generated
-         * @ordered
-         */
-        protected static final float OBSERVATION_TIME_EDEFAULT = 2.0F;
-
-        /**
-         * The cached value of the '{@link #getObservationTime() <em>Observation Time</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getObservationTime()
-         * @generated
-         * @ordered
-         */
-        protected float observationTime = OBSERVATION_TIME_EDEFAULT;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected InterferometryMissionImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.INTERFEROMETRY_MISSION;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public float getObservationTime() {
-                return observationTime;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void setObservationTime(float newObservationTime) {
-                float oldObservationTime = observationTime;
-                observationTime = newObservationTime;
-                if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET,
-                                        SatellitePackage.INTERFEROMETRY_MISSION__OBSERVATION_TIME, oldObservationTime, observationTime));
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public Object eGet(int featureID, boolean resolve, boolean coreType) {
-                switch (featureID) {
-                case SatellitePackage.INTERFEROMETRY_MISSION__OBSERVATION_TIME:
-                        return getObservationTime();
-                }
-                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.INTERFEROMETRY_MISSION__OBSERVATION_TIME:
-                        setObservationTime((Float) newValue);
-                        return;
-                }
-                super.eSet(featureID, newValue);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void eUnset(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.INTERFEROMETRY_MISSION__OBSERVATION_TIME:
-                        setObservationTime(OBSERVATION_TIME_EDEFAULT);
-                        return;
-                }
-                super.eUnset(featureID);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public boolean eIsSet(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.INTERFEROMETRY_MISSION__OBSERVATION_TIME:
-                        return observationTime != OBSERVATION_TIME_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(" (observationTime: ");
-                result.append(observationTime);
-                result.append(')');
-                return result.toString();
-        }
-
-} //InterferometryMissionImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/InterferometryPayloadImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/InterferometryPayloadImpl.java
deleted file mode 100644
index 5657c268..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/InterferometryPayloadImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryPayload;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Interferometry Payload</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class InterferometryPayloadImpl extends PayloadImpl implements InterferometryPayload {
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected InterferometryPayloadImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.INTERFEROMETRY_PAYLOAD;
-        }
-
-} //InterferometryPayloadImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/PayloadImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/PayloadImpl.java
deleted file mode 100644
index 78625d22..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/PayloadImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.Payload;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Payload</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public abstract class PayloadImpl extends MinimalEObjectImpl.Container implements Payload {
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected PayloadImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.PAYLOAD;
-        }
-
-} //PayloadImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatelliteFactoryImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatelliteFactoryImpl.java
deleted file mode 100644
index 028ba662..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatelliteFactoryImpl.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.*;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFactory {
-        /**
-         * Creates the default factory implementation.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static SatelliteFactory init() {
-                try {
-                        SatelliteFactory theSatelliteFactory = (SatelliteFactory) EPackage.Registry.INSTANCE
-                                        .getEFactory(SatellitePackage.eNS_URI);
-                        if (theSatelliteFactory != null) {
-                                return theSatelliteFactory;
-                        }
-                } catch (Exception exception) {
-                        EcorePlugin.INSTANCE.log(exception);
-                }
-                return new SatelliteFactoryImpl();
-        }
-
-        /**
-         * Creates an instance of the factory.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public SatelliteFactoryImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EObject create(EClass eClass) {
-                switch (eClass.getClassifierID()) {
-                case SatellitePackage.INTERFEROMETRY_MISSION:
-                        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:
-                        return createInterferometryPayload();
-                case SatellitePackage.CUBE_SAT3_U:
-                        return createCubeSat3U();
-                case SatellitePackage.CUBE_SAT6_U:
-                        return createCubeSat6U();
-                case SatellitePackage.SMALL_SAT:
-                        return createSmallSat();
-                default:
-                        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-                }
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @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;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public GroundStationNetwork createGroundStationNetwork() {
-                GroundStationNetworkImpl groundStationNetwork = new GroundStationNetworkImpl();
-                return groundStationNetwork;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @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;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public InterferometryPayload createInterferometryPayload() {
-                InterferometryPayloadImpl interferometryPayload = new InterferometryPayloadImpl();
-                return interferometryPayload;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public CubeSat3U createCubeSat3U() {
-                CubeSat3UImpl cubeSat3U = new CubeSat3UImpl();
-                return cubeSat3U;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public CubeSat6U createCubeSat6U() {
-                CubeSat6UImpl cubeSat6U = new CubeSat6UImpl();
-                return cubeSat6U;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public SmallSat createSmallSat() {
-                SmallSatImpl smallSat = new SmallSatImpl();
-                return smallSat;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- 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();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- 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;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public String convertSpacecraftKindToString(EDataType eDataType, Object instanceValue) {
-                return instanceValue == null ? null : instanceValue.toString();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public SatellitePackage getSatellitePackage() {
-                return (SatellitePackage) getEPackage();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @deprecated
-         * @generated
-         */
-        @Deprecated
-        public static SatellitePackage getPackage() {
-                return SatellitePackage.eINSTANCE;
-        }
-
-} //SatelliteFactoryImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatellitePackageImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatellitePackageImpl.java
deleted file mode 100644
index bbe77e4d..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatellitePackageImpl.java
+++ /dev/null
@@ -1,684 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.AntennaGain;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat6U;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.GroundStationNetwork;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryPayload;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.Payload;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatelliteFactory;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand;
-
-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;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SatellitePackageImpl extends EPackageImpl implements SatellitePackage {
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EClass constellationMissionEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EClass interferometryMissionEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EClass communicatingElementEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EClass groundStationNetworkEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EClass spacecraftEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EClass commSubsystemEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EClass directedCommunicationLinkEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EClass payloadEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EClass interferometryPayloadEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EClass cubeSat3UEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EClass cubeSat6UEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EClass smallSatEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EClass cubeSatEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EEnum transceiverBandEEnum = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EEnum antennaGainEEnum = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EEnum spacecraftKindEEnum = null;
-
-        /**
-         * Creates an instance of the model <b>Package</b>, registered with
-         * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-         * package URI value.
-         * <p>Note: the correct way to create the package is via the static
-         * factory method {@link #init init()}, which also performs
-         * initialization of the package, or returns the registered package,
-         * if one already exists.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.emf.ecore.EPackage.Registry
-         * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#eNS_URI
-         * @see #init()
-         * @generated
-         */
-        private SatellitePackageImpl() {
-                super(eNS_URI, SatelliteFactory.eINSTANCE);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private static boolean isInited = false;
-
-        /**
-         * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-         *
-         * <p>This method is used to initialize {@link SatellitePackage#eINSTANCE} when that field is accessed.
-         * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #eNS_URI
-         * @see #createPackageContents()
-         * @see #initializePackageContents()
-         * @generated
-         */
-        public static SatellitePackage init() {
-                if (isInited)
-                        return (SatellitePackage) EPackage.Registry.INSTANCE.getEPackage(SatellitePackage.eNS_URI);
-
-                // Obtain or create and register package
-                Object registeredSatellitePackage = EPackage.Registry.INSTANCE.get(eNS_URI);
-                SatellitePackageImpl theSatellitePackage = registeredSatellitePackage instanceof SatellitePackageImpl
-                                ? (SatellitePackageImpl) registeredSatellitePackage
-                                : new SatellitePackageImpl();
-
-                isInited = true;
-
-                // Create package meta-data objects
-                theSatellitePackage.createPackageContents();
-
-                // Initialize created meta-data
-                theSatellitePackage.initializePackageContents();
-
-                // Mark meta-data to indicate it can't be changed
-                theSatellitePackage.freeze();
-
-                // Update the registry and return the package
-                EPackage.Registry.INSTANCE.put(SatellitePackage.eNS_URI, theSatellitePackage);
-                return theSatellitePackage;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EClass getConstellationMission() {
-                return constellationMissionEClass;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EReference getConstellationMission_GroundStationNetwork() {
-                return (EReference) constellationMissionEClass.getEStructuralFeatures().get(0);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EReference getConstellationMission_Spacecraft() {
-                return (EReference) constellationMissionEClass.getEStructuralFeatures().get(1);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EClass getInterferometryMission() {
-                return interferometryMissionEClass;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EAttribute getInterferometryMission_ObservationTime() {
-                return (EAttribute) interferometryMissionEClass.getEStructuralFeatures().get(0);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EClass getCommunicatingElement() {
-                return communicatingElementEClass;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EReference getCommunicatingElement_CommSubsystem() {
-                return (EReference) communicatingElementEClass.getEStructuralFeatures().get(0);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EReference getCommunicatingElement_CommunicationLink() {
-                return (EReference) communicatingElementEClass.getEStructuralFeatures().get(1);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EClass getGroundStationNetwork() {
-                return groundStationNetworkEClass;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EClass getSpacecraft() {
-                return spacecraftEClass;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EReference getSpacecraft_Payload() {
-                return (EReference) spacecraftEClass.getEStructuralFeatures().get(0);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @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;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @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;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EReference getDirectedCommunicationLink_Source() {
-                return (EReference) directedCommunicationLinkEClass.getEStructuralFeatures().get(0);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EReference getDirectedCommunicationLink_Target() {
-                return (EReference) directedCommunicationLinkEClass.getEStructuralFeatures().get(1);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EClass getPayload() {
-                return payloadEClass;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EClass getInterferometryPayload() {
-                return interferometryPayloadEClass;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EClass getCubeSat3U() {
-                return cubeSat3UEClass;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EClass getCubeSat6U() {
-                return cubeSat6UEClass;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EClass getSmallSat() {
-                return smallSatEClass;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EClass getCubeSat() {
-                return cubeSatEClass;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EEnum getTransceiverBand() {
-                return transceiverBandEEnum;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EEnum getAntennaGain() {
-                return antennaGainEEnum;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EEnum getSpacecraftKind() {
-                return spacecraftKindEEnum;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public SatelliteFactory getSatelliteFactory() {
-                return (SatelliteFactory) getEFactoryInstance();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private boolean isCreated = false;
-
-        /**
-         * Creates the meta-model objects for the package.  This method is
-         * guarded to have no affect on any invocation but its first.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public void createPackageContents() {
-                if (isCreated)
-                        return;
-                isCreated = true;
-
-                // Create classes and their features
-                constellationMissionEClass = createEClass(CONSTELLATION_MISSION);
-                createEReference(constellationMissionEClass, CONSTELLATION_MISSION__GROUND_STATION_NETWORK);
-                createEReference(constellationMissionEClass, CONSTELLATION_MISSION__SPACECRAFT);
-
-                interferometryMissionEClass = createEClass(INTERFEROMETRY_MISSION);
-                createEAttribute(interferometryMissionEClass, INTERFEROMETRY_MISSION__OBSERVATION_TIME);
-
-                communicatingElementEClass = createEClass(COMMUNICATING_ELEMENT);
-                createEReference(communicatingElementEClass, COMMUNICATING_ELEMENT__COMM_SUBSYSTEM);
-                createEReference(communicatingElementEClass, COMMUNICATING_ELEMENT__COMMUNICATION_LINK);
-
-                groundStationNetworkEClass = createEClass(GROUND_STATION_NETWORK);
-
-                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);
-                createEReference(directedCommunicationLinkEClass, DIRECTED_COMMUNICATION_LINK__TARGET);
-
-                payloadEClass = createEClass(PAYLOAD);
-
-                interferometryPayloadEClass = createEClass(INTERFEROMETRY_PAYLOAD);
-
-                cubeSat3UEClass = createEClass(CUBE_SAT3_U);
-
-                cubeSat6UEClass = createEClass(CUBE_SAT6_U);
-
-                smallSatEClass = createEClass(SMALL_SAT);
-
-                cubeSatEClass = createEClass(CUBE_SAT);
-
-                // Create enums
-                transceiverBandEEnum = createEEnum(TRANSCEIVER_BAND);
-                antennaGainEEnum = createEEnum(ANTENNA_GAIN);
-                spacecraftKindEEnum = createEEnum(SPACECRAFT_KIND);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private boolean isInitialized = false;
-
-        /**
-         * Complete the initialization of the package and its meta-model.  This
-         * method is guarded to have no affect on any invocation but its first.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public void initializePackageContents() {
-                if (isInitialized)
-                        return;
-                isInitialized = true;
-
-                // Initialize package
-                setName(eNAME);
-                setNsPrefix(eNS_PREFIX);
-                setNsURI(eNS_URI);
-
-                // Create type parameters
-
-                // Set bounds for type parameters
-
-                // Add supertypes to classes
-                interferometryMissionEClass.getESuperTypes().add(this.getConstellationMission());
-                groundStationNetworkEClass.getESuperTypes().add(this.getCommunicatingElement());
-                spacecraftEClass.getESuperTypes().add(this.getCommunicatingElement());
-                interferometryPayloadEClass.getESuperTypes().add(this.getPayload());
-                cubeSat3UEClass.getESuperTypes().add(this.getCubeSat());
-                cubeSat6UEClass.getESuperTypes().add(this.getCubeSat());
-                smallSatEClass.getESuperTypes().add(this.getSpacecraft());
-                cubeSatEClass.getESuperTypes().add(this.getSpacecraft());
-
-                // Initialize classes, features, and operations; add parameters
-                initEClass(constellationMissionEClass, ConstellationMission.class, "ConstellationMission", IS_ABSTRACT,
-                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-                initEReference(getConstellationMission_GroundStationNetwork(), this.getGroundStationNetwork(), null,
-                                "groundStationNetwork", null, 1, 1, ConstellationMission.class, !IS_TRANSIENT, !IS_VOLATILE,
-                                IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-                initEReference(getConstellationMission_Spacecraft(), this.getSpacecraft(), null, "spacecraft", null, 2, 50,
-                                ConstellationMission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-                initEClass(interferometryMissionEClass, InterferometryMission.class, "InterferometryMission", !IS_ABSTRACT,
-                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-                initEAttribute(getInterferometryMission_ObservationTime(), ecorePackage.getEFloat(), "observationTime", "2.0",
-                                1, 1, InterferometryMission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-                initEClass(communicatingElementEClass, CommunicatingElement.class, "CommunicatingElement", IS_ABSTRACT,
-                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-                initEReference(getCommunicatingElement_CommSubsystem(), this.getCommSubsystem(), null, "commSubsystem", null, 1,
-                                2, CommunicatingElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-                                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-                initEReference(getCommunicatingElement_CommunicationLink(), this.getDirectedCommunicationLink(), null,
-                                "communicationLink", null, 0, 1, CommunicatingElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-                                IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-                initEClass(groundStationNetworkEClass, GroundStationNetwork.class, "GroundStationNetwork", !IS_ABSTRACT,
-                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-                initEClass(spacecraftEClass, Spacecraft.class, "Spacecraft", IS_ABSTRACT, !IS_INTERFACE,
-                                IS_GENERATED_INSTANCE_CLASS);
-                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,
-                                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);
-                initEReference(getDirectedCommunicationLink_Source(), this.getCommSubsystem(), null, "source", null, 1, 1,
-                                DirectedCommunicationLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-                                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-                initEReference(getDirectedCommunicationLink_Target(), this.getCommSubsystem(), null, "target", null, 1, 1,
-                                DirectedCommunicationLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-                                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-                initEClass(payloadEClass, Payload.class, "Payload", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-                initEClass(interferometryPayloadEClass, InterferometryPayload.class, "InterferometryPayload", !IS_ABSTRACT,
-                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-                initEClass(cubeSat3UEClass, CubeSat3U.class, "CubeSat3U", !IS_ABSTRACT, !IS_INTERFACE,
-                                IS_GENERATED_INSTANCE_CLASS);
-
-                initEClass(cubeSat6UEClass, CubeSat6U.class, "CubeSat6U", !IS_ABSTRACT, !IS_INTERFACE,
-                                IS_GENERATED_INSTANCE_CLASS);
-
-                initEClass(smallSatEClass, SmallSat.class, "SmallSat", !IS_ABSTRACT, !IS_INTERFACE,
-                                IS_GENERATED_INSTANCE_CLASS);
-
-                initEClass(cubeSatEClass, CubeSat.class, "CubeSat", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-                // Initialize enums and add enum literals
-                initEEnum(transceiverBandEEnum, TransceiverBand.class, "TransceiverBand");
-                addEEnumLiteral(transceiverBandEEnum, TransceiverBand.UHF);
-                addEEnumLiteral(transceiverBandEEnum, TransceiverBand.X);
-                addEEnumLiteral(transceiverBandEEnum, TransceiverBand.KA);
-
-                initEEnum(antennaGainEEnum, AntennaGain.class, "AntennaGain");
-                addEEnumLiteral(antennaGainEEnum, AntennaGain.LOW);
-                addEEnumLiteral(antennaGainEEnum, AntennaGain.MEDIUM);
-                addEEnumLiteral(antennaGainEEnum, AntennaGain.HIGH);
-
-                initEEnum(spacecraftKindEEnum, SpacecraftKind.class, "SpacecraftKind");
-                addEEnumLiteral(spacecraftKindEEnum, SpacecraftKind.CUBE_SAT3_U);
-                addEEnumLiteral(spacecraftKindEEnum, SpacecraftKind.CUBE_SAT6_U);
-                addEEnumLiteral(spacecraftKindEEnum, SpacecraftKind.SMALL_SAT);
-
-                // Create resource
-                createResource(eNS_URI);
-        }
-
-} //SatellitePackageImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SmallSatImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SmallSatImpl.java
deleted file mode 100644
index 522991ad..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SmallSatImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Small Sat</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class SmallSatImpl extends SpacecraftImpl implements SmallSat {
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected SmallSatImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.SMALL_SAT;
-        }
-
-} //SmallSatImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SpacecraftImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SpacecraftImpl.java
deleted file mode 100644
index 9d74270a..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SpacecraftImpl.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.Payload;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Spacecraft</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SpacecraftImpl#getPayload <em>Payload</em>}</li>
- *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SpacecraftImpl#getKind <em>Kind</em>}</li>
- * </ul>
- *
- * @generated
- */
-public abstract class SpacecraftImpl extends CommunicatingElementImpl implements Spacecraft {
-        /**
-         * The cached value of the '{@link #getPayload() <em>Payload</em>}' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getPayload()
-         * @generated
-         * @ordered
-         */
-        protected Payload payload;
-
-        /**
-         * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getKind()
-         * @generated
-         * @ordered
-         */
-        protected static final SpacecraftKind KIND_EDEFAULT = SpacecraftKind.CUBE_SAT3_U;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected SpacecraftImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.SPACECRAFT;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public Payload getPayload() {
-                return payload;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public NotificationChain basicSetPayload(Payload newPayload, NotificationChain msgs) {
-                Payload oldPayload = payload;
-                payload = newPayload;
-                if (eNotificationRequired()) {
-                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-                                        SatellitePackage.SPACECRAFT__PAYLOAD, oldPayload, newPayload);
-                        if (msgs == null)
-                                msgs = notification;
-                        else
-                                msgs.add(notification);
-                }
-                return msgs;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void setPayload(Payload newPayload) {
-                if (newPayload != payload) {
-                        NotificationChain msgs = null;
-                        if (payload != null)
-                                msgs = ((InternalEObject) payload).eInverseRemove(this,
-                                                EOPPOSITE_FEATURE_BASE - SatellitePackage.SPACECRAFT__PAYLOAD, null, msgs);
-                        if (newPayload != null)
-                                msgs = ((InternalEObject) newPayload).eInverseAdd(this,
-                                                EOPPOSITE_FEATURE_BASE - SatellitePackage.SPACECRAFT__PAYLOAD, null, msgs);
-                        msgs = basicSetPayload(newPayload, msgs);
-                        if (msgs != null)
-                                msgs.dispatch();
-                } else if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.SPACECRAFT__PAYLOAD, newPayload,
-                                        newPayload));
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public SpacecraftKind getKind() {
-                // TODO: implement this method to return the 'Kind' attribute
-                // Ensure that you remove @generated or mark it @generated NOT
-                throw new UnsupportedOperationException();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-                switch (featureID) {
-                case SatellitePackage.SPACECRAFT__PAYLOAD:
-                        return basicSetPayload(null, msgs);
-                }
-                return super.eInverseRemove(otherEnd, featureID, msgs);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public Object eGet(int featureID, boolean resolve, boolean coreType) {
-                switch (featureID) {
-                case SatellitePackage.SPACECRAFT__PAYLOAD:
-                        return getPayload();
-                case SatellitePackage.SPACECRAFT__KIND:
-                        return getKind();
-                }
-                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.SPACECRAFT__PAYLOAD:
-                        setPayload((Payload) newValue);
-                        return;
-                }
-                super.eSet(featureID, newValue);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void eUnset(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.SPACECRAFT__PAYLOAD:
-                        setPayload((Payload) null);
-                        return;
-                }
-                super.eUnset(featureID);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public boolean eIsSet(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.SPACECRAFT__PAYLOAD:
-                        return payload != null;
-                case SatellitePackage.SPACECRAFT__KIND:
-                        return getKind() != KIND_EDEFAULT;
-                }
-                return super.eIsSet(featureID);
-        }
-
-} //SpacecraftImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/util/SatelliteAdapterFactory.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/util/SatelliteAdapterFactory.java
deleted file mode 100644
index fd948334..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/util/SatelliteAdapterFactory.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.util;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.*;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage
- * @generated
- */
-public class SatelliteAdapterFactory extends AdapterFactoryImpl {
-        /**
-         * The cached model package.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected static SatellitePackage modelPackage;
-
-        /**
-         * Creates an instance of the adapter factory.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public SatelliteAdapterFactory() {
-                if (modelPackage == null) {
-                        modelPackage = SatellitePackage.eINSTANCE;
-                }
-        }
-
-        /**
-         * Returns whether this factory is applicable for the type of the object.
-         * <!-- begin-user-doc -->
-         * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-         * <!-- end-user-doc -->
-         * @return whether this factory is applicable for the type of the object.
-         * @generated
-         */
-        @Override
-        public boolean isFactoryForType(Object object) {
-                if (object == modelPackage) {
-                        return true;
-                }
-                if (object instanceof EObject) {
-                        return ((EObject) object).eClass().getEPackage() == modelPackage;
-                }
-                return false;
-        }
-
-        /**
-         * The switch that delegates to the <code>createXXX</code> methods.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected SatelliteSwitch<Adapter> modelSwitch = new SatelliteSwitch<Adapter>() {
-                @Override
-                public Adapter caseConstellationMission(ConstellationMission object) {
-                        return createConstellationMissionAdapter();
-                }
-
-                @Override
-                public Adapter caseInterferometryMission(InterferometryMission object) {
-                        return createInterferometryMissionAdapter();
-                }
-
-                @Override
-                public Adapter caseCommunicatingElement(CommunicatingElement object) {
-                        return createCommunicatingElementAdapter();
-                }
-
-                @Override
-                public Adapter caseGroundStationNetwork(GroundStationNetwork object) {
-                        return createGroundStationNetworkAdapter();
-                }
-
-                @Override
-                public Adapter caseSpacecraft(Spacecraft object) {
-                        return createSpacecraftAdapter();
-                }
-
-                @Override
-                public Adapter caseCommSubsystem(CommSubsystem object) {
-                        return createCommSubsystemAdapter();
-                }
-
-                @Override
-                public Adapter caseDirectedCommunicationLink(DirectedCommunicationLink object) {
-                        return createDirectedCommunicationLinkAdapter();
-                }
-
-                @Override
-                public Adapter casePayload(Payload object) {
-                        return createPayloadAdapter();
-                }
-
-                @Override
-                public Adapter caseInterferometryPayload(InterferometryPayload object) {
-                        return createInterferometryPayloadAdapter();
-                }
-
-                @Override
-                public Adapter caseCubeSat3U(CubeSat3U object) {
-                        return createCubeSat3UAdapter();
-                }
-
-                @Override
-                public Adapter caseCubeSat6U(CubeSat6U object) {
-                        return createCubeSat6UAdapter();
-                }
-
-                @Override
-                public Adapter caseSmallSat(SmallSat object) {
-                        return createSmallSatAdapter();
-                }
-
-                @Override
-                public Adapter caseCubeSat(CubeSat object) {
-                        return createCubeSatAdapter();
-                }
-
-                @Override
-                public Adapter defaultCase(EObject object) {
-                        return createEObjectAdapter();
-                }
-        };
-
-        /**
-         * Creates an adapter for the <code>target</code>.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param target the object to adapt.
-         * @return the adapter for the <code>target</code>.
-         * @generated
-         */
-        @Override
-        public Adapter createAdapter(Notifier target) {
-                return modelSwitch.doSwitch((EObject) target);
-        }
-
-        /**
-         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission <em>Constellation Mission</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 hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission
-         * @generated
-         */
-        public Adapter createConstellationMissionAdapter() {
-                return null;
-        }
-
-        /**
-         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission <em>Interferometry Mission</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 hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission
-         * @generated
-         */
-        public Adapter createInterferometryMissionAdapter() {
-                return null;
-        }
-
-        /**
-         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement <em>Communicating Element</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 hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement
-         * @generated
-         */
-        public Adapter createCommunicatingElementAdapter() {
-                return null;
-        }
-
-        /**
-         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.GroundStationNetwork <em>Ground Station Network</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 hu.bme.mit.inf.dslreasoner.domains.satellite.GroundStationNetwork
-         * @generated
-         */
-        public Adapter createGroundStationNetworkAdapter() {
-                return null;
-        }
-
-        /**
-         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft <em>Spacecraft</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 hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft
-         * @generated
-         */
-        public Adapter createSpacecraftAdapter() {
-                return null;
-        }
-
-        /**
-         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem <em>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 hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem
-         * @generated
-         */
-        public Adapter createCommSubsystemAdapter() {
-                return null;
-        }
-
-        /**
-         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink <em>Directed Communication Link</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 hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink
-         * @generated
-         */
-        public Adapter createDirectedCommunicationLinkAdapter() {
-                return null;
-        }
-
-        /**
-         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.Payload <em>Payload</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 hu.bme.mit.inf.dslreasoner.domains.satellite.Payload
-         * @generated
-         */
-        public Adapter createPayloadAdapter() {
-                return null;
-        }
-
-        /**
-         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryPayload <em>Interferometry Payload</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 hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryPayload
-         * @generated
-         */
-        public Adapter createInterferometryPayloadAdapter() {
-                return null;
-        }
-
-        /**
-         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U <em>Cube Sat3 U</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 hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U
-         * @generated
-         */
-        public Adapter createCubeSat3UAdapter() {
-                return null;
-        }
-
-        /**
-         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat6U <em>Cube Sat6 U</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 hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat6U
-         * @generated
-         */
-        public Adapter createCubeSat6UAdapter() {
-                return null;
-        }
-
-        /**
-         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat <em>Small 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 hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat
-         * @generated
-         */
-        public Adapter createSmallSatAdapter() {
-                return null;
-        }
-
-        /**
-         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.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 hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat
-         * @generated
-         */
-        public Adapter createCubeSatAdapter() {
-                return null;
-        }
-
-        /**
-         * Creates a new adapter for the default case.
-         * <!-- begin-user-doc -->
-         * This default implementation returns null.
-         * <!-- end-user-doc -->
-         * @return the new adapter.
-         * @generated
-         */
-        public Adapter createEObjectAdapter() {
-                return null;
-        }
-
-} //SatelliteAdapterFactory
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/util/SatelliteSwitch.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/util/SatelliteSwitch.java
deleted file mode 100644
index 08180b64..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/util/SatelliteSwitch.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.util;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.*;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage
- * @generated
- */
-public class SatelliteSwitch<T> extends Switch<T> {
-        /**
-         * The cached model package
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected static SatellitePackage modelPackage;
-
-        /**
-         * Creates an instance of the switch.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public SatelliteSwitch() {
-                if (modelPackage == null) {
-                        modelPackage = SatellitePackage.eINSTANCE;
-                }
-        }
-
-        /**
-         * Checks whether this is a switch for the given package.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param ePackage the package in question.
-         * @return whether this is a switch for the given package.
-         * @generated
-         */
-        @Override
-        protected boolean isSwitchFor(EPackage ePackage) {
-                return ePackage == modelPackage;
-        }
-
-        /**
-         * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the first non-null result returned by a <code>caseXXX</code> call.
-         * @generated
-         */
-        @Override
-        protected T doSwitch(int classifierID, EObject theEObject) {
-                switch (classifierID) {
-                case SatellitePackage.CONSTELLATION_MISSION: {
-                        ConstellationMission constellationMission = (ConstellationMission) theEObject;
-                        T result = caseConstellationMission(constellationMission);
-                        if (result == null)
-                                result = defaultCase(theEObject);
-                        return result;
-                }
-                case SatellitePackage.INTERFEROMETRY_MISSION: {
-                        InterferometryMission interferometryMission = (InterferometryMission) theEObject;
-                        T result = caseInterferometryMission(interferometryMission);
-                        if (result == null)
-                                result = caseConstellationMission(interferometryMission);
-                        if (result == null)
-                                result = defaultCase(theEObject);
-                        return result;
-                }
-                case SatellitePackage.COMMUNICATING_ELEMENT: {
-                        CommunicatingElement communicatingElement = (CommunicatingElement) theEObject;
-                        T result = caseCommunicatingElement(communicatingElement);
-                        if (result == null)
-                                result = defaultCase(theEObject);
-                        return result;
-                }
-                case SatellitePackage.GROUND_STATION_NETWORK: {
-                        GroundStationNetwork groundStationNetwork = (GroundStationNetwork) theEObject;
-                        T result = caseGroundStationNetwork(groundStationNetwork);
-                        if (result == null)
-                                result = caseCommunicatingElement(groundStationNetwork);
-                        if (result == null)
-                                result = defaultCase(theEObject);
-                        return result;
-                }
-                case SatellitePackage.SPACECRAFT: {
-                        Spacecraft spacecraft = (Spacecraft) theEObject;
-                        T result = caseSpacecraft(spacecraft);
-                        if (result == null)
-                                result = caseCommunicatingElement(spacecraft);
-                        if (result == null)
-                                result = defaultCase(theEObject);
-                        return result;
-                }
-                case SatellitePackage.COMM_SUBSYSTEM: {
-                        CommSubsystem commSubsystem = (CommSubsystem) theEObject;
-                        T result = caseCommSubsystem(commSubsystem);
-                        if (result == null)
-                                result = defaultCase(theEObject);
-                        return result;
-                }
-                case SatellitePackage.DIRECTED_COMMUNICATION_LINK: {
-                        DirectedCommunicationLink directedCommunicationLink = (DirectedCommunicationLink) theEObject;
-                        T result = caseDirectedCommunicationLink(directedCommunicationLink);
-                        if (result == null)
-                                result = defaultCase(theEObject);
-                        return result;
-                }
-                case SatellitePackage.PAYLOAD: {
-                        Payload payload = (Payload) theEObject;
-                        T result = casePayload(payload);
-                        if (result == null)
-                                result = defaultCase(theEObject);
-                        return result;
-                }
-                case SatellitePackage.INTERFEROMETRY_PAYLOAD: {
-                        InterferometryPayload interferometryPayload = (InterferometryPayload) theEObject;
-                        T result = caseInterferometryPayload(interferometryPayload);
-                        if (result == null)
-                                result = casePayload(interferometryPayload);
-                        if (result == null)
-                                result = defaultCase(theEObject);
-                        return result;
-                }
-                case SatellitePackage.CUBE_SAT3_U: {
-                        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);
-                        if (result == null)
-                                result = defaultCase(theEObject);
-                        return result;
-                }
-                case SatellitePackage.CUBE_SAT6_U: {
-                        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);
-                        if (result == null)
-                                result = defaultCase(theEObject);
-                        return result;
-                }
-                case SatellitePackage.SMALL_SAT: {
-                        SmallSat smallSat = (SmallSat) theEObject;
-                        T result = caseSmallSat(smallSat);
-                        if (result == null)
-                                result = caseSpacecraft(smallSat);
-                        if (result == null)
-                                result = caseCommunicatingElement(smallSat);
-                        if (result == null)
-                                result = defaultCase(theEObject);
-                        return result;
-                }
-                case SatellitePackage.CUBE_SAT: {
-                        CubeSat cubeSat = (CubeSat) theEObject;
-                        T result = caseCubeSat(cubeSat);
-                        if (result == null)
-                                result = caseSpacecraft(cubeSat);
-                        if (result == null)
-                                result = caseCommunicatingElement(cubeSat);
-                        if (result == null)
-                                result = defaultCase(theEObject);
-                        return result;
-                }
-                default:
-                        return defaultCase(theEObject);
-                }
-        }
-
-        /**
-         * Returns the result of interpreting the object as an instance of '<em>Constellation Mission</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>Constellation Mission</em>'.
-         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-         * @generated
-         */
-        public T caseConstellationMission(ConstellationMission object) {
-                return null;
-        }
-
-        /**
-         * Returns the result of interpreting the object as an instance of '<em>Interferometry Mission</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>Interferometry Mission</em>'.
-         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-         * @generated
-         */
-        public T caseInterferometryMission(InterferometryMission object) {
-                return null;
-        }
-
-        /**
-         * Returns the result of interpreting the object as an instance of '<em>Communicating Element</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>Communicating Element</em>'.
-         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-         * @generated
-         */
-        public T caseCommunicatingElement(CommunicatingElement object) {
-                return null;
-        }
-
-        /**
-         * Returns the result of interpreting the object as an instance of '<em>Ground Station Network</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>Ground Station Network</em>'.
-         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-         * @generated
-         */
-        public T caseGroundStationNetwork(GroundStationNetwork object) {
-                return null;
-        }
-
-        /**
-         * Returns the result of interpreting the object as an instance of '<em>Spacecraft</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>Spacecraft</em>'.
-         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-         * @generated
-         */
-        public T caseSpacecraft(Spacecraft object) {
-                return null;
-        }
-
-        /**
-         * Returns the result of interpreting the object as an instance of '<em>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>Comm Subsystem</em>'.
-         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-         * @generated
-         */
-        public T caseCommSubsystem(CommSubsystem object) {
-                return null;
-        }
-
-        /**
-         * Returns the result of interpreting the object as an instance of '<em>Directed Communication Link</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>Directed Communication Link</em>'.
-         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-         * @generated
-         */
-        public T caseDirectedCommunicationLink(DirectedCommunicationLink object) {
-                return null;
-        }
-
-        /**
-         * Returns the result of interpreting the object as an instance of '<em>Payload</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>Payload</em>'.
-         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-         * @generated
-         */
-        public T casePayload(Payload object) {
-                return null;
-        }
-
-        /**
-         * Returns the result of interpreting the object as an instance of '<em>Interferometry Payload</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>Interferometry Payload</em>'.
-         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-         * @generated
-         */
-        public T caseInterferometryPayload(InterferometryPayload object) {
-                return null;
-        }
-
-        /**
-         * Returns the result of interpreting the object as an instance of '<em>Cube Sat3 U</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 Sat3 U</em>'.
-         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-         * @generated
-         */
-        public T caseCubeSat3U(CubeSat3U object) {
-                return null;
-        }
-
-        /**
-         * Returns the result of interpreting the object as an instance of '<em>Cube Sat6 U</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 Sat6 U</em>'.
-         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-         * @generated
-         */
-        public T caseCubeSat6U(CubeSat6U object) {
-                return null;
-        }
-
-        /**
-         * Returns the result of interpreting the object as an instance of '<em>Small 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>Small Sat</em>'.
-         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-         * @generated
-         */
-        public T caseSmallSat(SmallSat object) {
-                return null;
-        }
-
-        /**
-         * Returns the result of interpreting the object as an instance of '<em>Cube Sat</em>'.
-         * <!-- begin-user-doc -->
-         * This implementation returns null;
-         * returning a non-null result will terminate the switch.
-         * <!-- end-user-doc -->
-         * @param object the target of the switch.
-         * @return the result of interpreting the object as an instance of '<em>Cube Sat</em>'.
-         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-         * @generated
-         */
-        public T caseCubeSat(CubeSat object) {
-                return null;
-        }
-
-        /**
-         * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-         * <!-- begin-user-doc -->
-         * This implementation returns null;
-         * returning a non-null result will terminate the switch, but this is the last case anyway.
-         * <!-- end-user-doc -->
-         * @param object the target of the switch.
-         * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-         * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-         * @generated
-         */
-        @Override
-        public T defaultCase(EObject object) {
-                return null;
-        }
-
-} //SatelliteSwitch
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/hu/bme/mit/inf/dslreasoner/domains/satellite/CubeSat.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat.java
index ef66dce5..a38926d4 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/CubeSat.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat.java
@@ -1,6 +1,6 @@
 /**
  */
-package hu.bme.mit.inf.dslreasoner.domains.satellite;
+package satellite;
 
 /**
  * <!-- begin-user-doc -->
@@ -8,7 +8,7 @@ package hu.bme.mit.inf.dslreasoner.domains.satellite;
  * <!-- end-user-doc -->
  *
  *
- * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getCubeSat()
+ * @see satellite.SatellitePackage#getCubeSat()
  * @model abstract="true"
  * @generated
  */
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/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSatImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSatImpl.java
index b8e364a3..660bd062 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSatImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSatImpl.java
@@ -1,12 +1,12 @@
 /**
  */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
+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>'.
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;