From 09b1255f11ee17828da706f682e33f50316887fe Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kris7topher@gmail.com>
Date: Mon, 6 May 2019 18:42:22 -0400
Subject: Trying to implement spacecraft case study

---
 .../META-INF/MANIFEST.MF                           |    9 +-
 .../configs/generation.vsconfig                    |    2 +-
 .../inf/dslreasoner/domains/satellite/CubeSat.java |   16 +
 .../dslreasoner/domains/satellite/CubeSat3U.java   |    2 +-
 .../dslreasoner/domains/satellite/CubeSat6U.java   |    2 +-
 .../domains/satellite/SatelliteFactory.java        |   27 +
 .../domains/satellite/SatellitePackage.java        |  342 +++-
 .../dslreasoner/domains/satellite/Spacecraft.java  |   14 +-
 .../domains/satellite/SpacecraftKind.java          |   12 +-
 .../domains/satellite/impl/CubeSat3UImpl.java      |   37 +
 .../domains/satellite/impl/CubeSat6UImpl.java      |   37 +
 .../domains/satellite/impl/CubeSatImpl.java        |   37 +
 .../satellite/impl/SatelliteFactoryImpl.java       |   39 +
 .../satellite/impl/SatellitePackageImpl.java       |   97 +-
 .../domains/satellite/impl/SmallSatImpl.java       |   37 +
 .../domains/satellite/impl/SpacecraftImpl.java     |   51 +-
 .../satellite/util/SatelliteAdapterFactory.java    |   76 +
 .../domains/satellite/util/SatelliteSwitch.java    |  108 ++
 .../ecore-gen/satellite/AntennaGain.java           |  242 +++
 .../ecore-gen/satellite/CommSubsystem.java         |   83 +
 .../ecore-gen/satellite/CommunicatingElement.java  |   69 +
 .../ecore-gen/satellite/ConstellationMission.java  |   69 +
 .../ecore-gen/satellite/CubeSat3U.java             |   16 +
 .../ecore-gen/satellite/CubeSat6U.java             |   16 +
 .../satellite/DirectedCommunicationLink.java       |   77 +
 .../ecore-gen/satellite/GroundStationNetwork.java  |   16 +
 .../ecore-gen/satellite/InterferometryMission.java |   49 +
 .../ecore-gen/satellite/InterferometryPayload.java |   16 +
 .../ecore-gen/satellite/Payload.java               |   18 +
 .../ecore-gen/satellite/SatelliteFactory.java      |  105 ++
 .../ecore-gen/satellite/SatellitePackage.java      | 1223 ++++++++++++
 .../ecore-gen/satellite/SmallSat.java              |   16 +
 .../ecore-gen/satellite/Spacecraft.java            |   67 +
 .../ecore-gen/satellite/SpacecraftKind.java        |  242 +++
 .../ecore-gen/satellite/TransceiverBand.java       |  242 +++
 .../satellite/impl/CommSubsystemImpl.java          |  226 +++
 .../satellite/impl/CommunicatingElementImpl.java   |  237 +++
 .../satellite/impl/ConstellationMissionImpl.java   |  237 +++
 .../ecore-gen/satellite/impl/CubeSat3UImpl.java    |   37 +
 .../ecore-gen/satellite/impl/CubeSat6UImpl.java    |   37 +
 .../impl/DirectedCommunicationLinkImpl.java        |  227 +++
 .../satellite/impl/GroundStationNetworkImpl.java   |   37 +
 .../satellite/impl/InterferometryMissionImpl.java  |  166 ++
 .../satellite/impl/InterferometryPayloadImpl.java  |   37 +
 .../ecore-gen/satellite/impl/PayloadImpl.java      |   39 +
 .../satellite/impl/SatelliteFactoryImpl.java       |  294 +++
 .../satellite/impl/SatellitePackageImpl.java       |  690 +++++++
 .../ecore-gen/satellite/impl/SmallSatImpl.java     |   37 +
 .../ecore-gen/satellite/impl/SpacecraftImpl.java   |  212 +++
 .../satellite/util/SatelliteAdapterFactory.java    |  328 ++++
 .../ecore-gen/satellite/util/SatelliteSwitch.java  |  374 ++++
 .../model/satellite.aird                           |  173 +-
 .../model/satellite.ecore                          |   14 +-
 .../model/satellite.genmodel                       |   16 +-
 .../outputs/debug/generated3valued.vql_deactivated | 1279 +++++++++----
 .../outputs/debug/generation.logicproblem          | 1108 +++++++----
 .../outputs/debug/init.partialmodel                |   81 +-
 .../outputs/log.txt                                |    2 +-
 .../outputs/models/1.gml                           |  282 ++-
 .../outputs/models/1.png                           |  Bin 230457 -> 230838 bytes
 .../outputs/models/1.xmi                           |   12 +-
 .../outputs/models/2.gml                           | 1983 --------------------
 .../outputs/models/2.png                           |  Bin 211085 -> 0 bytes
 .../outputs/models/2.xmi                           |   31 -
 .../outputs/models/3.gml                           | 1926 -------------------
 .../outputs/models/3.png                           |  Bin 206387 -> 0 bytes
 .../outputs/models/3.xmi                           |   30 -
 .../outputs/models/4.gml                           | 1983 --------------------
 .../outputs/models/4.png                           |  Bin 209322 -> 0 bytes
 .../outputs/models/4.xmi                           |   31 -
 .../outputs/models/5.gml                           | 1926 -------------------
 .../outputs/models/5.png                           |  Bin 204074 -> 0 bytes
 .../outputs/models/5.xmi                           |   30 -
 .../outputs/statistics.csv                         |    2 +-
 .../plugin.xml                                     |   11 +-
 .../domains/satellite/metrics/.gitignore           |    2 -
 .../domains/satellite/metrics/internal/.gitignore  |    2 -
 .../domains/satellite/queries/.gitignore           |    3 +
 .../domains/satellite/queries/CostMetric.java      |  544 ------
 .../domains/satellite/queries/CoverageMetric.java  |  552 ------
 .../satellite/queries/CubeSatWithKaAntenna.java    |    2 +-
 .../queries/NoPotentialLinkToGroundStation.java    |  571 ++++++
 .../queries/NotEnoughInterferometryPayloads.java   |   19 +-
 .../satellite/queries/SatelliteQueries.java        |   50 +-
 .../domains/satellite/queries/SmallSat.java        |  533 ++++++
 .../satellite/queries/SpacecraftOfKind.java        |  754 ++++++++
 .../queries/ThreeUCubeSatWithNonUhfCrossLink.java  |  103 +-
 .../domains/satellite/queries/TimeMetric.java      |  544 ------
 .../domains/satellite/queries/internal/.gitignore  |    5 +
 .../internal/AdditionalCommSubsystemCost.java      |  173 --
 .../satellite/queries/internal/BasePrice.java      |  216 ---
 .../satellite/queries/internal/CubeSat3U.java      |  127 ++
 .../satellite/queries/internal/IncomingData.java   |  145 --
 .../queries/internal/IndirectLinkAllowed.java      |  134 ++
 .../internal/InterferometryPayloadCost.java        |  175 --
 .../satellite/queries/internal/LinkAllowed.java    |  185 ++
 .../queries/internal/MatchingAntenna.java          |  179 ++
 .../satellite/queries/internal/MissionCost.java    |  183 --
 .../queries/internal/MissionCoverage.java          |  183 --
 .../satellite/queries/internal/MissionTime.java    |  183 --
 .../queries/internal/SatelliteQueriesAll.java      |   67 +-
 .../satellite/queries/internal/ScienceData.java    |  179 --
 .../satellite/queries/internal/SmallSat.java       |  138 --
 .../satellite/queries/internal/SpacecraftCost.java |  215 ---
 .../queries/internal/SpacecraftOfKind.java         |  140 --
 .../queries/internal/SpacecraftUplink.java         |  171 --
 .../internal/SpacecraftWithTwoCommSubsystems.java  |  146 --
 .../satellite/queries/internal/TransmitRate.java   |  277 ---
 .../satellite/queries/internal/TransmitTime.java   |  200 --
 .../domains/satellite/queries/SatelliteQueries.vql |   64 +-
 .../runner/.SatelliteGeneratorMain.xtendbin        |  Bin 0 -> 2931 bytes
 .../satellite/runner/SatelliteGeneratorMain.java   |   15 +
 112 files changed, 11390 insertions(+), 13435 deletions(-)
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/CubeSat.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat3UImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat6UImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSatImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SmallSatImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/AntennaGain.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommSubsystem.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommunicatingElement.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/ConstellationMission.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat3U.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat6U.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/DirectedCommunicationLink.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/GroundStationNetwork.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/InterferometryMission.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/InterferometryPayload.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/Payload.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatelliteFactory.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatellitePackage.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SmallSat.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/Spacecraft.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SpacecraftKind.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/TransceiverBand.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommSubsystemImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommunicatingElementImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/ConstellationMissionImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat3UImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat6UImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/DirectedCommunicationLinkImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/GroundStationNetworkImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/InterferometryMissionImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/InterferometryPayloadImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/PayloadImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatelliteFactoryImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatellitePackageImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SmallSatImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SpacecraftImpl.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/util/SatelliteAdapterFactory.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/util/SatelliteSwitch.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/2.gml
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/2.png
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/2.xmi
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/3.gml
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/3.png
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/3.xmi
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/4.gml
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/4.png
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/4.xmi
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/5.gml
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/5.png
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/5.xmi
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/metrics/.gitignore
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/metrics/internal/.gitignore
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CostMetric.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CoverageMetric.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoPotentialLinkToGroundStation.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SmallSat.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SpacecraftOfKind.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/TimeMetric.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/AdditionalCommSubsystemCost.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/BasePrice.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CubeSat3U.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IncomingData.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectLinkAllowed.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/InterferometryPayloadCost.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/LinkAllowed.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MatchingAntenna.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MissionCost.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MissionCoverage.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MissionTime.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/ScienceData.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SmallSat.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftCost.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftOfKind.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftUplink.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftWithTwoCommSubsystems.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/TransmitRate.java
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/TransmitTime.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/runner/.SatelliteGeneratorMain.xtendbin
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/runner/SatelliteGeneratorMain.java

(limited to 'Domains/hu.bme.mit.inf.dslreasoner.domains.satellite')

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/META-INF/MANIFEST.MF b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/META-INF/MANIFEST.MF
index 39b038d2..21769598 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/META-INF/MANIFEST.MF
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/META-INF/MANIFEST.MF
@@ -8,11 +8,14 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: hu.bme.mit.inf.dslreasoner.domains.satellite,
  hu.bme.mit.inf.dslreasoner.domains.satellite.impl,
- hu.bme.mit.inf.dslreasoner.domains.satellite.metrics,
  hu.bme.mit.inf.dslreasoner.domains.satellite.queries,
  hu.bme.mit.inf.dslreasoner.domains.satellite.runner,
- hu.bme.mit.inf.dslreasoner.domains.satellite.util
-Require-Bundle: org.eclipse.viatra.query.runtime,
+ hu.bme.mit.inf.dslreasoner.domains.satellite.util,
+ satellite,
+ satellite.impl,
+ satellite.util
+Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime,
+ org.eclipse.viatra.query.runtime,
  org.eclipse.viatra.query.runtime.rete,
  org.eclipse.viatra.query.runtime.localsearch,
  org.eclipse.xtext.xbase.lib,
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/configs/generation.vsconfig b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/configs/generation.vsconfig
index f042826e..1942980c 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/configs/generation.vsconfig
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/configs/generation.vsconfig
@@ -7,7 +7,7 @@ generate {
 	partial-model = { "inputs/SatelliteInstance.xmi"}
 	solver = ViatraSolver
 	scope = {
-		#node += 5..10
+		#node += 16..32
 	}
 
 	config = {
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/hu/bme/mit/inf/dslreasoner/domains/satellite/CubeSat.java
new file mode 100644
index 00000000..ef66dce5
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/CubeSat.java
@@ -0,0 +1,16 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.satellite;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Cube Sat</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getCubeSat()
+ * @model abstract="true"
+ * @generated
+ */
+public interface CubeSat extends Spacecraft {
+} // CubeSat
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/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
index 39b2c2be..98dea285 100644
--- 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
@@ -12,5 +12,5 @@ package hu.bme.mit.inf.dslreasoner.domains.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/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
index 50b81a6b..eb64fe33 100644
--- 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
@@ -12,5 +12,5 @@ package hu.bme.mit.inf.dslreasoner.domains.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/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
index 958bbc08..3b2bc48a 100644
--- 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
@@ -66,6 +66,33 @@ public interface SatelliteFactory extends EFactory {
 	 */
 	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 -->
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
index 61da12a0..1e129422 100644
--- 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
@@ -462,6 +462,262 @@ public interface SatellitePackage extends EPackage {
 	 */
 	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 -->
@@ -470,7 +726,7 @@ public interface SatellitePackage extends EPackage {
 	 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getTransceiverBand()
 	 * @generated
 	 */
-	int TRANSCEIVER_BAND = 9;
+	int TRANSCEIVER_BAND = 13;
 
 	/**
 	 * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.AntennaGain <em>Antenna Gain</em>}' enum.
@@ -480,7 +736,7 @@ public interface SatellitePackage extends EPackage {
 	 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getAntennaGain()
 	 * @generated
 	 */
-	int ANTENNA_GAIN = 10;
+	int ANTENNA_GAIN = 14;
 
 	/**
 	 * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind <em>Spacecraft Kind</em>}' enum.
@@ -490,7 +746,7 @@ public interface SatellitePackage extends EPackage {
 	 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SatellitePackageImpl#getSpacecraftKind()
 	 * @generated
 	 */
-	int SPACECRAFT_KIND = 11;
+	int SPACECRAFT_KIND = 15;
 
 	/**
 	 * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission <em>Constellation Mission</em>}'.
@@ -703,6 +959,46 @@ public interface SatellitePackage extends EPackage {
 	 */
 	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 -->
@@ -935,6 +1231,46 @@ public interface SatellitePackage extends EPackage {
 		 */
 		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 -->
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
index cc4b85a1..34f9750a 100644
--- 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
@@ -57,22 +57,10 @@ public interface Spacecraft extends CommunicatingElement {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Kind</em>' attribute.
 	 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind
-	 * @see #setKind(SpacecraftKind)
 	 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage#getSpacecraft_Kind()
-	 * @model required="true"
+	 * @model required="true" transient="true" changeable="false" volatile="true" derived="true"
 	 * @generated
 	 */
 	SpacecraftKind getKind();
 
-	/**
-	 * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft#getKind <em>Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Kind</em>' attribute.
-	 * @see hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind
-	 * @see #getKind()
-	 * @generated
-	 */
-	void setKind(SpacecraftKind value);
-
 } // 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
index 8be6abc1..b0b6aede 100644
--- 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
@@ -38,13 +38,13 @@ public enum SpacecraftKind implements Enumerator {
 	 */
 	CUBE_SAT6_U(1, "CubeSat6U", "CubeSat6U"),
 	/**
-	* The '<em><b>Small Sat</b></em>' literal object.
-	* <!-- begin-user-doc -->
+	 * The '<em><b>Small Sat</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	* <!-- end-user-doc -->
-	* @see #SMALL_SAT_VALUE
-	* @generated
-	* @ordered
-	*/
+	 * @see #SMALL_SAT_VALUE
+	 * @generated
+	 * @ordered
+	 */
 	SMALL_SAT(2, "SmallSat", "SmallSat");
 
 	/**
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
new file mode 100644
index 00000000..3e0d6f2c
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat3UImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+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
new file mode 100644
index 00000000..7ad2bc87
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat6UImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+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/CubeSatImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSatImpl.java
new file mode 100644
index 00000000..b8e364a3
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSatImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+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;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cube Sat</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class CubeSatImpl extends SpacecraftImpl implements CubeSat {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CubeSatImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return SatellitePackage.Literals.CUBE_SAT;
+	}
+
+} //CubeSatImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/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
index 0cb07cfa..028ba662 100644
--- 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
@@ -67,6 +67,12 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
 			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");
 		}
@@ -165,6 +171,39 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
 		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 -->
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
index 48ba32b8..bbe77e4d 100644
--- 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
@@ -6,6 +6,9 @@ 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;
@@ -13,6 +16,7 @@ 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;
@@ -95,6 +99,34 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 	 */
 	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 -->
@@ -380,6 +412,46 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 		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 -->
@@ -469,6 +541,14 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 
 		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);
@@ -508,6 +588,10 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 		groundStationNetworkEClass.getESuperTypes().add(this.getCommunicatingElement());
 		spacecraftEClass.getESuperTypes().add(this.getCommunicatingElement());
 		interferometryPayloadEClass.getESuperTypes().add(this.getPayload());
+		cubeSat3UEClass.getESuperTypes().add(this.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,
@@ -543,7 +627,7 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 				!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);
+				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);
@@ -566,6 +650,17 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 		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);
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
new file mode 100644
index 00000000..522991ad
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SmallSatImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+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
index 2135af2c..9d74270a 100644
--- 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
@@ -49,15 +49,6 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
 	 * @ordered
 	 */
 	protected static final SpacecraftKind KIND_EDEFAULT = SpacecraftKind.CUBE_SAT3_U;
-	/**
-	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected SpacecraftKind kind = KIND_EDEFAULT;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -137,20 +128,9 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
 	 */
 	@Override
 	public SpacecraftKind getKind() {
-		return kind;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setKind(SpacecraftKind newKind) {
-		SpacecraftKind oldKind = kind;
-		kind = newKind == null ? KIND_EDEFAULT : newKind;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.SPACECRAFT__KIND, oldKind, kind));
+		// TODO: implement this method to return the 'Kind' attribute
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
 	}
 
 	/**
@@ -194,9 +174,6 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
 		case SatellitePackage.SPACECRAFT__PAYLOAD:
 			setPayload((Payload) newValue);
 			return;
-		case SatellitePackage.SPACECRAFT__KIND:
-			setKind((SpacecraftKind) newValue);
-			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -212,9 +189,6 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
 		case SatellitePackage.SPACECRAFT__PAYLOAD:
 			setPayload((Payload) null);
 			return;
-		case SatellitePackage.SPACECRAFT__KIND:
-			setKind(KIND_EDEFAULT);
-			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -230,26 +204,9 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
 		case SatellitePackage.SPACECRAFT__PAYLOAD:
 			return payload != null;
 		case SatellitePackage.SPACECRAFT__KIND:
-			return kind != KIND_EDEFAULT;
+			return getKind() != KIND_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(" (kind: ");
-		result.append(kind);
-		result.append(')');
-		return result.toString();
-	}
-
 } //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
index 639a40b7..fd948334 100644
--- 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
@@ -111,6 +111,26 @@ public class SatelliteAdapterFactory extends AdapterFactoryImpl {
 			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();
@@ -256,6 +276,62 @@ public class SatelliteAdapterFactory extends AdapterFactoryImpl {
 		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 -->
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
index e78a1cd2..08180b64 100644
--- 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
@@ -137,6 +137,54 @@ public class SatelliteSwitch<T> extends Switch<T> {
 				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);
 		}
@@ -277,6 +325,66 @@ public class SatelliteSwitch<T> extends Switch<T> {
 		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 -->
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
new file mode 100644
index 00000000..75bc548d
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/AntennaGain.java
@@ -0,0 +1,242 @@
+/**
+ */
+package 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 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/satellite/CommSubsystem.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommSubsystem.java
new file mode 100644
index 00000000..072a9705
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommSubsystem.java
@@ -0,0 +1,83 @@
+/**
+ */
+package 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 satellite.CommSubsystem#getBand <em>Band</em>}</li>
+ *   <li>{@link satellite.CommSubsystem#getGain <em>Gain</em>}</li>
+ * </ul>
+ *
+ * @see 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 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
new file mode 100644
index 00000000..b96b281f
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommunicatingElement.java
@@ -0,0 +1,69 @@
+/**
+ */
+package 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 satellite.CommunicatingElement#getCommSubsystem <em>Comm Subsystem</em>}</li>
+ *   <li>{@link satellite.CommunicatingElement#getCommunicationLink <em>Communication Link</em>}</li>
+ * </ul>
+ *
+ * @see 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 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()
+	 * @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 satellite.SatellitePackage#getCommunicatingElement_CommunicationLink()
+	 * @model containment="true"
+	 * @generated
+	 */
+	DirectedCommunicationLink getCommunicationLink();
+
+	/**
+	 * Sets the value of the '{@link satellite.CommunicatingElement#getCommunicationLink <em>Communication Link</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Communication Link</em>' containment reference.
+	 * @see #getCommunicationLink()
+	 * @generated
+	 */
+	void setCommunicationLink(DirectedCommunicationLink value);
+
+} // CommunicatingElement
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/ConstellationMission.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/ConstellationMission.java
new file mode 100644
index 00000000..9402232d
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/ConstellationMission.java
@@ -0,0 +1,69 @@
+/**
+ */
+package 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 satellite.ConstellationMission#getGroundStationNetwork <em>Ground Station Network</em>}</li>
+ *   <li>{@link satellite.ConstellationMission#getSpacecraft <em>Spacecraft</em>}</li>
+ * </ul>
+ *
+ * @see 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 satellite.SatellitePackage#getConstellationMission_GroundStationNetwork()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	GroundStationNetwork getGroundStationNetwork();
+
+	/**
+	 * Sets the value of the '{@link 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 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()
+	 * @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/satellite/CubeSat3U.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat3U.java
new file mode 100644
index 00000000..5758e165
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat3U.java
@@ -0,0 +1,16 @@
+/**
+ */
+package satellite;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Cube Sat3 U</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getCubeSat3U()
+ * @model
+ * @generated
+ */
+public interface CubeSat3U extends Spacecraft {
+} // CubeSat3U
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat6U.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat6U.java
new file mode 100644
index 00000000..a8d8830f
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CubeSat6U.java
@@ -0,0 +1,16 @@
+/**
+ */
+package satellite;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Cube Sat6 U</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getCubeSat6U()
+ * @model
+ * @generated
+ */
+public interface CubeSat6U extends Spacecraft {
+} // 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
new file mode 100644
index 00000000..67c8fcc8
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/DirectedCommunicationLink.java
@@ -0,0 +1,77 @@
+/**
+ */
+package 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 satellite.DirectedCommunicationLink#getSource <em>Source</em>}</li>
+ *   <li>{@link satellite.DirectedCommunicationLink#getTarget <em>Target</em>}</li>
+ * </ul>
+ *
+ * @see 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 satellite.SatellitePackage#getDirectedCommunicationLink_Source()
+	 * @model required="true"
+	 * @generated
+	 */
+	CommSubsystem getSource();
+
+	/**
+	 * Sets the value of the '{@link 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 satellite.SatellitePackage#getDirectedCommunicationLink_Target()
+	 * @model required="true"
+	 * @generated
+	 */
+	CommSubsystem getTarget();
+
+	/**
+	 * Sets the value of the '{@link 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/satellite/GroundStationNetwork.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/GroundStationNetwork.java
new file mode 100644
index 00000000..8df20913
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/GroundStationNetwork.java
@@ -0,0 +1,16 @@
+/**
+ */
+package satellite;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Ground Station Network</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getGroundStationNetwork()
+ * @model
+ * @generated
+ */
+public interface GroundStationNetwork extends CommunicatingElement {
+} // GroundStationNetwork
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
new file mode 100644
index 00000000..967923d4
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/InterferometryMission.java
@@ -0,0 +1,49 @@
+/**
+ */
+package 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 satellite.InterferometryMission#getObservationTime <em>Observation Time</em>}</li>
+ * </ul>
+ *
+ * @see 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 satellite.SatellitePackage#getInterferometryMission_ObservationTime()
+	 * @model default="2.0" required="true"
+	 * @generated
+	 */
+	float getObservationTime();
+
+	/**
+	 * Sets the value of the '{@link 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/satellite/InterferometryPayload.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/InterferometryPayload.java
new file mode 100644
index 00000000..67156bdb
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/InterferometryPayload.java
@@ -0,0 +1,16 @@
+/**
+ */
+package satellite;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Interferometry Payload</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getInterferometryPayload()
+ * @model
+ * @generated
+ */
+public interface InterferometryPayload extends Payload {
+} // InterferometryPayload
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/Payload.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/Payload.java
new file mode 100644
index 00000000..3222fd3b
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/Payload.java
@@ -0,0 +1,18 @@
+/**
+ */
+package 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 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/satellite/SatelliteFactory.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatelliteFactory.java
new file mode 100644
index 00000000..04cb80ce
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatelliteFactory.java
@@ -0,0 +1,105 @@
+/**
+ */
+package 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 satellite.SatellitePackage
+ * @generated
+ */
+public interface SatelliteFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	SatelliteFactory eINSTANCE = 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/satellite/SatellitePackage.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatellitePackage.java
new file mode 100644
index 00000000..f0d80ac2
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatellitePackage.java
@@ -0,0 +1,1223 @@
+/**
+ */
+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;
+
+/**
+ * <!-- 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 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 {
+	/**
+	 * 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 = satellite.impl.SatellitePackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.ConstellationMissionImpl <em>Constellation Mission</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.ConstellationMissionImpl
+	 * @see 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 satellite.impl.InterferometryMissionImpl <em>Interferometry Mission</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.InterferometryMissionImpl
+	 * @see 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 satellite.impl.CommunicatingElementImpl <em>Communicating Element</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.CommunicatingElementImpl
+	 * @see 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 satellite.impl.GroundStationNetworkImpl <em>Ground Station Network</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.GroundStationNetworkImpl
+	 * @see 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 satellite.impl.SpacecraftImpl <em>Spacecraft</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.SpacecraftImpl
+	 * @see 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 satellite.impl.CommSubsystemImpl <em>Comm Subsystem</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.CommSubsystemImpl
+	 * @see 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 satellite.impl.DirectedCommunicationLinkImpl <em>Directed Communication Link</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.DirectedCommunicationLinkImpl
+	 * @see 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 satellite.impl.PayloadImpl <em>Payload</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.PayloadImpl
+	 * @see 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 satellite.impl.InterferometryPayloadImpl <em>Interferometry Payload</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.InterferometryPayloadImpl
+	 * @see 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 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 = 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_SAT3_U__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_SAT3_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_SAT3_U__KIND = SPACECRAFT__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 = SPACECRAFT_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 = SPACECRAFT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.CubeSat6UImpl <em>Cube Sat6 U</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.CubeSat6UImpl
+	 * @see 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 = 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_SAT6_U__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_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;
+
+	/**
+	 * 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 = SPACECRAFT_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 = SPACECRAFT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link satellite.impl.SmallSatImpl <em>Small Sat</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.impl.SmallSatImpl
+	 * @see 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 satellite.TransceiverBand <em>Transceiver Band</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.TransceiverBand
+	 * @see satellite.impl.SatellitePackageImpl#getTransceiverBand()
+	 * @generated
+	 */
+	int TRANSCEIVER_BAND = 12;
+
+	/**
+	 * The meta object id for the '{@link satellite.AntennaGain <em>Antenna Gain</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.AntennaGain
+	 * @see satellite.impl.SatellitePackageImpl#getAntennaGain()
+	 * @generated
+	 */
+	int ANTENNA_GAIN = 13;
+
+	/**
+	 * The meta object id for the '{@link satellite.SpacecraftKind <em>Spacecraft Kind</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see satellite.SpacecraftKind
+	 * @see satellite.impl.SatellitePackageImpl#getSpacecraftKind()
+	 * @generated
+	 */
+	int SPACECRAFT_KIND = 14;
+
+	/**
+	 * Returns the meta object for class '{@link satellite.ConstellationMission <em>Constellation Mission</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Constellation Mission</em>'.
+	 * @see satellite.ConstellationMission
+	 * @generated
+	 */
+	EClass getConstellationMission();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link 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 satellite.ConstellationMission#getGroundStationNetwork()
+	 * @see #getConstellationMission()
+	 * @generated
+	 */
+	EReference getConstellationMission_GroundStationNetwork();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link 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 satellite.ConstellationMission#getSpacecraft()
+	 * @see #getConstellationMission()
+	 * @generated
+	 */
+	EReference getConstellationMission_Spacecraft();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.InterferometryMission <em>Interferometry Mission</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Interferometry Mission</em>'.
+	 * @see satellite.InterferometryMission
+	 * @generated
+	 */
+	EClass getInterferometryMission();
+
+	/**
+	 * Returns the meta object for the attribute '{@link 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 satellite.InterferometryMission#getObservationTime()
+	 * @see #getInterferometryMission()
+	 * @generated
+	 */
+	EAttribute getInterferometryMission_ObservationTime();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.CommunicatingElement <em>Communicating Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Communicating Element</em>'.
+	 * @see satellite.CommunicatingElement
+	 * @generated
+	 */
+	EClass getCommunicatingElement();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link 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 satellite.CommunicatingElement#getCommSubsystem()
+	 * @see #getCommunicatingElement()
+	 * @generated
+	 */
+	EReference getCommunicatingElement_CommSubsystem();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link satellite.CommunicatingElement#getCommunicationLink <em>Communication Link</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Communication Link</em>'.
+	 * @see satellite.CommunicatingElement#getCommunicationLink()
+	 * @see #getCommunicatingElement()
+	 * @generated
+	 */
+	EReference getCommunicatingElement_CommunicationLink();
+
+	/**
+	 * Returns the meta object for class '{@link 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 satellite.GroundStationNetwork
+	 * @generated
+	 */
+	EClass getGroundStationNetwork();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.Spacecraft <em>Spacecraft</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Spacecraft</em>'.
+	 * @see satellite.Spacecraft
+	 * @generated
+	 */
+	EClass getSpacecraft();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link satellite.Spacecraft#getPayload <em>Payload</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Payload</em>'.
+	 * @see satellite.Spacecraft#getPayload()
+	 * @see #getSpacecraft()
+	 * @generated
+	 */
+	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 -->
+	 * @return the meta object for class '<em>Comm Subsystem</em>'.
+	 * @see satellite.CommSubsystem
+	 * @generated
+	 */
+	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 -->
+	 * @return the meta object for class '<em>Directed Communication Link</em>'.
+	 * @see satellite.DirectedCommunicationLink
+	 * @generated
+	 */
+	EClass getDirectedCommunicationLink();
+
+	/**
+	 * Returns the meta object for the reference '{@link satellite.DirectedCommunicationLink#getSource <em>Source</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Source</em>'.
+	 * @see satellite.DirectedCommunicationLink#getSource()
+	 * @see #getDirectedCommunicationLink()
+	 * @generated
+	 */
+	EReference getDirectedCommunicationLink_Source();
+
+	/**
+	 * Returns the meta object for the reference '{@link satellite.DirectedCommunicationLink#getTarget <em>Target</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Target</em>'.
+	 * @see satellite.DirectedCommunicationLink#getTarget()
+	 * @see #getDirectedCommunicationLink()
+	 * @generated
+	 */
+	EReference getDirectedCommunicationLink_Target();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.Payload <em>Payload</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Payload</em>'.
+	 * @see satellite.Payload
+	 * @generated
+	 */
+	EClass getPayload();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.InterferometryPayload <em>Interferometry Payload</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Interferometry Payload</em>'.
+	 * @see satellite.InterferometryPayload
+	 * @generated
+	 */
+	EClass getInterferometryPayload();
+
+	/**
+	 * Returns the meta object for class '{@link 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 satellite.CubeSat3U
+	 * @generated
+	 */
+	EClass getCubeSat3U();
+
+	/**
+	 * Returns the meta object for class '{@link 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 satellite.CubeSat6U
+	 * @generated
+	 */
+	EClass getCubeSat6U();
+
+	/**
+	 * Returns the meta object for class '{@link satellite.SmallSat <em>Small Sat</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Small Sat</em>'.
+	 * @see satellite.SmallSat
+	 * @generated
+	 */
+	EClass getSmallSat();
+
+	/**
+	 * Returns the meta object for enum '{@link satellite.TransceiverBand <em>Transceiver Band</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Transceiver Band</em>'.
+	 * @see satellite.TransceiverBand
+	 * @generated
+	 */
+	EEnum getTransceiverBand();
+
+	/**
+	 * Returns the meta object for enum '{@link satellite.AntennaGain <em>Antenna Gain</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Antenna Gain</em>'.
+	 * @see satellite.AntennaGain
+	 * @generated
+	 */
+	EEnum getAntennaGain();
+
+	/**
+	 * Returns the meta object for enum '{@link satellite.SpacecraftKind <em>Spacecraft Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Spacecraft Kind</em>'.
+	 * @see 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 satellite.impl.ConstellationMissionImpl <em>Constellation Mission</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.ConstellationMissionImpl
+		 * @see 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 satellite.impl.InterferometryMissionImpl <em>Interferometry Mission</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.InterferometryMissionImpl
+		 * @see 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 satellite.impl.CommunicatingElementImpl <em>Communicating Element</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.CommunicatingElementImpl
+		 * @see 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 satellite.impl.GroundStationNetworkImpl <em>Ground Station Network</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.GroundStationNetworkImpl
+		 * @see satellite.impl.SatellitePackageImpl#getGroundStationNetwork()
+		 * @generated
+		 */
+		EClass GROUND_STATION_NETWORK = eINSTANCE.getGroundStationNetwork();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.SpacecraftImpl <em>Spacecraft</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.SpacecraftImpl
+		 * @see 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 satellite.impl.CommSubsystemImpl <em>Comm Subsystem</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.CommSubsystemImpl
+		 * @see 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 satellite.impl.DirectedCommunicationLinkImpl <em>Directed Communication Link</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.DirectedCommunicationLinkImpl
+		 * @see 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 satellite.impl.PayloadImpl <em>Payload</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.PayloadImpl
+		 * @see satellite.impl.SatellitePackageImpl#getPayload()
+		 * @generated
+		 */
+		EClass PAYLOAD = eINSTANCE.getPayload();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.InterferometryPayloadImpl <em>Interferometry Payload</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.InterferometryPayloadImpl
+		 * @see satellite.impl.SatellitePackageImpl#getInterferometryPayload()
+		 * @generated
+		 */
+		EClass INTERFEROMETRY_PAYLOAD = eINSTANCE.getInterferometryPayload();
+
+		/**
+		 * The meta object literal 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
+		 */
+		EClass CUBE_SAT3_U = eINSTANCE.getCubeSat3U();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.CubeSat6UImpl <em>Cube Sat6 U</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.CubeSat6UImpl
+		 * @see satellite.impl.SatellitePackageImpl#getCubeSat6U()
+		 * @generated
+		 */
+		EClass CUBE_SAT6_U = eINSTANCE.getCubeSat6U();
+
+		/**
+		 * The meta object literal for the '{@link satellite.impl.SmallSatImpl <em>Small Sat</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.impl.SmallSatImpl
+		 * @see satellite.impl.SatellitePackageImpl#getSmallSat()
+		 * @generated
+		 */
+		EClass SMALL_SAT = eINSTANCE.getSmallSat();
+
+		/**
+		 * The meta object literal for the '{@link satellite.TransceiverBand <em>Transceiver Band</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.TransceiverBand
+		 * @see satellite.impl.SatellitePackageImpl#getTransceiverBand()
+		 * @generated
+		 */
+		EEnum TRANSCEIVER_BAND = eINSTANCE.getTransceiverBand();
+
+		/**
+		 * The meta object literal for the '{@link satellite.AntennaGain <em>Antenna Gain</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.AntennaGain
+		 * @see satellite.impl.SatellitePackageImpl#getAntennaGain()
+		 * @generated
+		 */
+		EEnum ANTENNA_GAIN = eINSTANCE.getAntennaGain();
+
+		/**
+		 * The meta object literal for the '{@link satellite.SpacecraftKind <em>Spacecraft Kind</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see satellite.SpacecraftKind
+		 * @see satellite.impl.SatellitePackageImpl#getSpacecraftKind()
+		 * @generated
+		 */
+		EEnum SPACECRAFT_KIND = eINSTANCE.getSpacecraftKind();
+
+	}
+
+} //SatellitePackage
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SmallSat.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SmallSat.java
new file mode 100644
index 00000000..230958f6
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SmallSat.java
@@ -0,0 +1,16 @@
+/**
+ */
+package satellite;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Small Sat</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see satellite.SatellitePackage#getSmallSat()
+ * @model
+ * @generated
+ */
+public interface SmallSat extends Spacecraft {
+} // SmallSat
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
new file mode 100644
index 00000000..d8775572
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/Spacecraft.java
@@ -0,0 +1,67 @@
+/**
+ */
+package 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 satellite.Spacecraft#getPayload <em>Payload</em>}</li>
+ *   <li>{@link satellite.Spacecraft#getKind <em>Kind</em>}</li>
+ * </ul>
+ *
+ * @see 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 satellite.SatellitePackage#getSpacecraft_Payload()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Payload getPayload();
+
+	/**
+	 * Sets the value of the '{@link 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 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
new file mode 100644
index 00000000..40bb432d
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SpacecraftKind.java
@@ -0,0 +1,242 @@
+/**
+ */
+package 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 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/satellite/TransceiverBand.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/TransceiverBand.java
new file mode 100644
index 00000000..b6be75bf
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/TransceiverBand.java
@@ -0,0 +1,242 @@
+/**
+ */
+package 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 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/satellite/impl/CommSubsystemImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommSubsystemImpl.java
new file mode 100644
index 00000000..cf8f1fe8
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommSubsystemImpl.java
@@ -0,0 +1,226 @@
+/**
+ */
+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;
+
+	/**
+	 * <!-- 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/satellite/impl/CommunicatingElementImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommunicatingElementImpl.java
new file mode 100644
index 00000000..1f79da3b
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommunicatingElementImpl.java
@@ -0,0 +1,237 @@
+/**
+ */
+package satellite.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import satellite.CommSubsystem;
+import satellite.CommunicatingElement;
+import satellite.DirectedCommunicationLink;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- 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 satellite.impl.CommunicatingElementImpl#getCommSubsystem <em>Comm Subsystem</em>}</li>
+ *   <li>{@link 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/satellite/impl/ConstellationMissionImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/ConstellationMissionImpl.java
new file mode 100644
index 00000000..7635d7cd
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/ConstellationMissionImpl.java
@@ -0,0 +1,237 @@
+/**
+ */
+package satellite.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import satellite.ConstellationMission;
+import satellite.GroundStationNetwork;
+import satellite.SatellitePackage;
+import satellite.Spacecraft;
+
+/**
+ * <!-- 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 satellite.impl.ConstellationMissionImpl#getGroundStationNetwork <em>Ground Station Network</em>}</li>
+ *   <li>{@link 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/satellite/impl/CubeSat3UImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat3UImpl.java
new file mode 100644
index 00000000..a7ba37a7
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat3UImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.CubeSat3U;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cube Sat3 U</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CubeSat3UImpl extends SpacecraftImpl 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/satellite/impl/CubeSat6UImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat6UImpl.java
new file mode 100644
index 00000000..d4f42e6c
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat6UImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.CubeSat6U;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cube Sat6 U</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CubeSat6UImpl extends SpacecraftImpl 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/satellite/impl/DirectedCommunicationLinkImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/DirectedCommunicationLinkImpl.java
new file mode 100644
index 00000000..2df1328f
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/DirectedCommunicationLinkImpl.java
@@ -0,0 +1,227 @@
+/**
+ */
+package satellite.impl;
+
+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;
+
+import satellite.CommSubsystem;
+import satellite.DirectedCommunicationLink;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- 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 satellite.impl.DirectedCommunicationLinkImpl#getSource <em>Source</em>}</li>
+ *   <li>{@link 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/satellite/impl/GroundStationNetworkImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/GroundStationNetworkImpl.java
new file mode 100644
index 00000000..244b9568
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/GroundStationNetworkImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.GroundStationNetwork;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- 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/satellite/impl/InterferometryMissionImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/InterferometryMissionImpl.java
new file mode 100644
index 00000000..3401ad51
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/InterferometryMissionImpl.java
@@ -0,0 +1,166 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import satellite.InterferometryMission;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- 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 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/satellite/impl/InterferometryPayloadImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/InterferometryPayloadImpl.java
new file mode 100644
index 00000000..c8f9e816
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/InterferometryPayloadImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.InterferometryPayload;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- 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/satellite/impl/PayloadImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/PayloadImpl.java
new file mode 100644
index 00000000..6ee96353
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/PayloadImpl.java
@@ -0,0 +1,39 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import satellite.Payload;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- 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/satellite/impl/SatelliteFactoryImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatelliteFactoryImpl.java
new file mode 100644
index 00000000..e899dc79
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatelliteFactoryImpl.java
@@ -0,0 +1,294 @@
+/**
+ */
+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;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import satellite.*;
+
+/**
+ * <!-- 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/satellite/impl/SatellitePackageImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatellitePackageImpl.java
new file mode 100644
index 00000000..2347fe07
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatellitePackageImpl.java
@@ -0,0 +1,690 @@
+/**
+ */
+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.CubeSat3U;
+import satellite.CubeSat6U;
+import satellite.DirectedCommunicationLink;
+import satellite.GroundStationNetwork;
+import satellite.InterferometryMission;
+import satellite.InterferometryPayload;
+import satellite.Payload;
+import satellite.SatelliteFactory;
+import satellite.SatellitePackage;
+import satellite.SmallSat;
+import satellite.Spacecraft;
+import satellite.SpacecraftKind;
+import satellite.TransceiverBand;
+
+/**
+ * <!-- 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 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 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 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);
+
+		// 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.getSpacecraft());
+		cubeSat6UEClass.getESuperTypes().add(this.getSpacecraft());
+		smallSatEClass.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);
+
+		// 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);
+
+		// 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/SmallSatImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SmallSatImpl.java
new file mode 100644
index 00000000..1785dbf3
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SmallSatImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.SatellitePackage;
+import satellite.SmallSat;
+
+/**
+ * <!-- 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/satellite/impl/SpacecraftImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SpacecraftImpl.java
new file mode 100644
index 00000000..73609fbd
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SpacecraftImpl.java
@@ -0,0 +1,212 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import satellite.Payload;
+import satellite.SatellitePackage;
+import satellite.Spacecraft;
+import satellite.SpacecraftKind;
+
+/**
+ * <!-- 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 satellite.impl.SpacecraftImpl#getPayload <em>Payload</em>}</li>
+ *   <li>{@link 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 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
+	 */
+	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() {
+		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:
+			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 KIND__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //SpacecraftImpl
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
new file mode 100644
index 00000000..1ecf7b19
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/util/SatelliteAdapterFactory.java
@@ -0,0 +1,328 @@
+/**
+ */
+package satellite.util;
+
+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;
+
+import satellite.*;
+
+/**
+ * <!-- 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 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 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 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 satellite.ConstellationMission
+	 * @generated
+	 */
+	public Adapter createConstellationMissionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link 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 satellite.InterferometryMission
+	 * @generated
+	 */
+	public Adapter createInterferometryMissionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link 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 satellite.CommunicatingElement
+	 * @generated
+	 */
+	public Adapter createCommunicatingElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link 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 satellite.GroundStationNetwork
+	 * @generated
+	 */
+	public Adapter createGroundStationNetworkAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link 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 satellite.Spacecraft
+	 * @generated
+	 */
+	public Adapter createSpacecraftAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link 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 satellite.CommSubsystem
+	 * @generated
+	 */
+	public Adapter createCommSubsystemAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link 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 satellite.DirectedCommunicationLink
+	 * @generated
+	 */
+	public Adapter createDirectedCommunicationLinkAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link 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 satellite.Payload
+	 * @generated
+	 */
+	public Adapter createPayloadAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link 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 satellite.InterferometryPayload
+	 * @generated
+	 */
+	public Adapter createInterferometryPayloadAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link 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 satellite.CubeSat3U
+	 * @generated
+	 */
+	public Adapter createCubeSat3UAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link 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 satellite.CubeSat6U
+	 * @generated
+	 */
+	public Adapter createCubeSat6UAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link 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 satellite.SmallSat
+	 * @generated
+	 */
+	public Adapter createSmallSatAdapter() {
+		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/satellite/util/SatelliteSwitch.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/util/SatelliteSwitch.java
new file mode 100644
index 00000000..3eb78d75
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/util/SatelliteSwitch.java
@@ -0,0 +1,374 @@
+/**
+ */
+package satellite.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+import satellite.*;
+
+/**
+ * <!-- 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 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 = 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 = 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;
+		}
+		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>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/model/satellite.aird b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.aird
index 569089d8..31575c3c 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.aird
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.aird
@@ -1306,6 +1306,7 @@
     <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.aggregators.min</semanticResources>
     <semanticResources>../src/hu/bme/mit/inf/dslreasoner/domains/satellite/metrics/SatelliteMetrics.vql</semanticResources>
     <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.aggregators.max</semanticResources>
+    <semanticResources>java:/Objects/hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind</semanticResources>
     <ownedViews xmi:type="viewpoint:DView" uid="_reOHEF0qEemRYLyXht2IrQ">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
       <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_re1yIF0qEemRYLyXht2IrQ" name="satellite" repPath="#_rel6gF0qEemRYLyXht2IrQ">
@@ -1352,6 +1353,12 @@
             <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
           </endLabelStyleDescription>
         </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_o3yl4HA6Eem9acJE7_CmTw" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
+          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelFormat>bold</labelFormat>
+          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+        </computedStyleDescriptions>
       </data>
     </ownedAnnotationEntries>
     <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_rfAxQF0qEemRYLyXht2IrQ" source="GMF_DIAGRAMS">
@@ -1502,9 +1509,9 @@
               <styles xmi:type="notation:FontStyle" xmi:id="_5QV24W60Eem3gIPdAp40Tw" fontName="Noto Sans" fontHeight="8"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_5QV24m60Eem3gIPdAp40Tw"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_6f0hwG60Eem3gIPdAp40Tw" type="3010" element="_6fjcAG60Eem3gIPdAp40Tw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_6f0hwW60Eem3gIPdAp40Tw" fontName="Noto Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_6f0hwm60Eem3gIPdAp40Tw"/>
+            <children xmi:type="notation:Node" xmi:id="_UKi6wHA6Eem9acJE7_CmTw" type="3010" element="_UKKgQHA6Eem9acJE7_CmTw">
+              <styles xmi:type="notation:FontStyle" xmi:id="_UKi6wXA6Eem9acJE7_CmTw" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_UKi6wnA6Eem9acJE7_CmTw"/>
             </children>
             <children xmi:type="notation:Node" xmi:id="_7SZ1QG60Eem3gIPdAp40Tw" type="3010" element="_7R9JUG60Eem3gIPdAp40Tw">
               <styles xmi:type="notation:FontStyle" xmi:id="_7SZ1QW60Eem3gIPdAp40Tw" fontName="Noto Sans" fontHeight="8"/>
@@ -1516,6 +1523,33 @@
           <styles xmi:type="notation:ShapeStyle" xmi:id="_2omYkW60Eem3gIPdAp40Tw" fontName="Noto Sans" fontHeight="8"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2omYkm60Eem3gIPdAp40Tw" x="990" y="325" width="120" height="100"/>
         </children>
+        <children xmi:type="notation:Node" xmi:id="_fnQ1sHA6Eem9acJE7_CmTw" type="2003" element="_fm1X4HA6Eem9acJE7_CmTw">
+          <children xmi:type="notation:Node" xmi:id="_fnT5AHA6Eem9acJE7_CmTw" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_fnUgEHA6Eem9acJE7_CmTw" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_fnUgEXA6Eem9acJE7_CmTw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_fnUgEnA6Eem9acJE7_CmTw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_fnQ1sXA6Eem9acJE7_CmTw" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fnQ1snA6Eem9acJE7_CmTw" x="209" y="484" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_haz28HA6Eem9acJE7_CmTw" type="2003" element="_hanCoHA6Eem9acJE7_CmTw">
+          <children xmi:type="notation:Node" xmi:id="_ha0eAHA6Eem9acJE7_CmTw" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_ha0eAXA6Eem9acJE7_CmTw" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_ha0eAnA6Eem9acJE7_CmTw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_ha0eA3A6Eem9acJE7_CmTw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_haz28XA6Eem9acJE7_CmTw" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_haz28nA6Eem9acJE7_CmTw" x="352" y="484" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_irD94HA6Eem9acJE7_CmTw" type="2003" element="_iqnR8HA6Eem9acJE7_CmTw">
+          <children xmi:type="notation:Node" xmi:id="_irEk8HA6Eem9acJE7_CmTw" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_irEk8XA6Eem9acJE7_CmTw" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_irEk8nA6Eem9acJE7_CmTw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_irEk83A6Eem9acJE7_CmTw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_irD94XA6Eem9acJE7_CmTw" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_irD94nA6Eem9acJE7_CmTw" x="495" y="484" width="120" height="100"/>
+        </children>
         <styles xmi:type="notation:DiagramStyle" xmi:id="_rfAxQl0qEemRYLyXht2IrQ"/>
         <edges xmi:type="notation:Edge" xmi:id="_0jV4gF0qEemRYLyXht2IrQ" type="4001" element="_0jIdIF0qEemRYLyXht2IrQ" source="_vlcbIF0qEemRYLyXht2IrQ" target="_tNH44F0qEemRYLyXht2IrQ">
           <children xmi:type="notation:Node" xmi:id="_0jXGoF0qEemRYLyXht2IrQ" type="6001">
@@ -1693,6 +1727,54 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PdVVkl0yEemRYLyXht2IrQ" id="(0.7222222222222222,1.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PdVVk10yEemRYLyXht2IrQ" id="(0.3305084745762712,0.0)"/>
         </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_n98MwHA6Eem9acJE7_CmTw" type="4001" element="_n9tjRnA6Eem9acJE7_CmTw" source="_irD94HA6Eem9acJE7_CmTw" target="_Aq3OgF0sEemRYLyXht2IrQ">
+          <children xmi:type="notation:Node" xmi:id="_n98z0HA6Eem9acJE7_CmTw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n98z0XA6Eem9acJE7_CmTw" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_n98z0nA6Eem9acJE7_CmTw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n98z03A6Eem9acJE7_CmTw" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_n98z1HA6Eem9acJE7_CmTw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n98z1XA6Eem9acJE7_CmTw" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_n98MwXA6Eem9acJE7_CmTw" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_n98MwnA6Eem9acJE7_CmTw" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_n98Mw3A6Eem9acJE7_CmTw" points="[0, 0, 94, 151]$[-94, -151, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n98z1nA6Eem9acJE7_CmTw" id="(0.2796610169491525,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n98z13A6Eem9acJE7_CmTw" id="(0.3305084745762712,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_3d2LIHBMEempc7JjePmuNw" type="4001" element="_3dgz_3BMEempc7JjePmuNw" source="_haz28HA6Eem9acJE7_CmTw" target="_Aq3OgF0sEemRYLyXht2IrQ">
+          <children xmi:type="notation:Node" xmi:id="_3d_VEHBMEempc7JjePmuNw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3d_VEXBMEempc7JjePmuNw" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_3eAjMHBMEempc7JjePmuNw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3eAjMXBMEempc7JjePmuNw" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_3eBKQHBMEempc7JjePmuNw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3eBKQXBMEempc7JjePmuNw" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_3d2LIXBMEempc7JjePmuNw" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_3d2LInBMEempc7JjePmuNw" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3d2LI3BMEempc7JjePmuNw" points="[0, 0, -14, 61]$[14, -61, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3eENkHBMEempc7JjePmuNw" id="(0.6583333333333333,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3eENkXBMEempc7JjePmuNw" id="(0.3305084745762712,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_37fJYHBMEempc7JjePmuNw" type="4001" element="_37Qf-HBMEempc7JjePmuNw" source="_fnQ1sHA6Eem9acJE7_CmTw" target="_Aq3OgF0sEemRYLyXht2IrQ">
+          <children xmi:type="notation:Node" xmi:id="_37fwcHBMEempc7JjePmuNw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_37fwcXBMEempc7JjePmuNw" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_37fwcnBMEempc7JjePmuNw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_37fwc3BMEempc7JjePmuNw" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_37fwdHBMEempc7JjePmuNw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_37fwdXBMEempc7JjePmuNw" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_37fJYXBMEempc7JjePmuNw" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_37fJYnBMEempc7JjePmuNw" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_37fJY3BMEempc7JjePmuNw" points="[0, 0, -63, 154]$[63, -154, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_37gXgHBMEempc7JjePmuNw" id="(0.559322033898305,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_37gXgXBMEempc7JjePmuNw" id="(0.3305084745762712,0.0)"/>
+        </edges>
       </data>
     </ownedAnnotationEntries>
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_tM4oUF0qEemRYLyXht2IrQ" name="ConstellationMission" tooltipText="" outgoingEdges="_KzljXl0yEemRYLyXht2IrQ _PdH6PF0yEemRYLyXht2IrQ" incomingEdges="_0jIdIF0qEemRYLyXht2IrQ" width="12" height="10">
@@ -1761,21 +1843,21 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_AqsPYF0sEemRYLyXht2IrQ" name="Spacecraft" tooltipText="" outgoingEdges="_PEp-k10sEemRYLyXht2IrQ _3GzPll0xEemRYLyXht2IrQ" incomingEdges="_PdH6PF0yEemRYLyXht2IrQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_AqsPYF0sEemRYLyXht2IrQ" name="Spacecraft" tooltipText="" outgoingEdges="_PEp-k10sEemRYLyXht2IrQ _3GzPll0xEemRYLyXht2IrQ" incomingEdges="_PdH6PF0yEemRYLyXht2IrQ _n9tjRnA6Eem9acJE7_CmTw _3dgz_3BMEempc7JjePmuNw _37Qf-HBMEempc7JjePmuNw" width="12" height="10">
       <target xmi:type="ecore:EClass" href="satellite.ecore#//Spacecraft"/>
       <semanticElements xmi:type="ecore:EClass" href="satellite.ecore#//Spacecraft"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_ApvGVG61Eem3gIPdAp40Tw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l4otI3A6Eem9acJE7_CmTw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_-9TZsG60Eem3gIPdAp40Tw" name="kind : SpacecraftKind = CubeSat3U" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_-9TZsG60Eem3gIPdAp40Tw" name="/kind : SpacecraftKind = CubeSat3U" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="satellite.ecore#//Spacecraft/kind"/>
         <semanticElements xmi:type="ecore:EAttribute" href="satellite.ecore#//Spacecraft/kind"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_BUQqAW61Eem3gIPdAp40Tw" labelAlignment="LEFT" description="_028-wF0vEemRYLyXht2IrQ">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_o3yl4nA6Eem9acJE7_CmTw" labelColor="39,76,114" labelAlignment="LEFT" description="_o3yl4HA6Eem9acJE7_CmTw">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
@@ -2047,10 +2129,10 @@
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
       </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_6fjcAG60Eem3gIPdAp40Tw" name="SubeSat6U" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="satellite.ecore#//SpacecraftKind/SubeSat6U"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="satellite.ecore#//SpacecraftKind/SubeSat6U"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_6fjcAW60Eem3gIPdAp40Tw" labelAlignment="LEFT">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_UKKgQHA6Eem9acJE7_CmTw" name="CubeSat6U" tooltipText="">
+        <target xmi:type="ecore:EEnumLiteral" href="satellite.ecore#//SpacecraftKind/CubeSat6U"/>
+        <semanticElements xmi:type="ecore:EEnumLiteral" href="satellite.ecore#//SpacecraftKind/CubeSat6U"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_UKLHUHA6Eem9acJE7_CmTw" labelAlignment="LEFT">
           <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
@@ -2064,6 +2146,75 @@
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
       </ownedElements>
     </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_fm1X4HA6Eem9acJE7_CmTw" name="CubeSat3U" tooltipText="" outgoingEdges="_37Qf-HBMEempc7JjePmuNw" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="satellite.ecore#//CubeSat3U"/>
+      <semanticElements xmi:type="ecore:EClass" href="satellite.ecore#//CubeSat3U"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_fm1-8HA6Eem9acJE7_CmTw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_hanCoHA6Eem9acJE7_CmTw" name="CubeSat6U" tooltipText="" outgoingEdges="_3dgz_3BMEempc7JjePmuNw" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="satellite.ecore#//CubeSat6U"/>
+      <semanticElements xmi:type="ecore:EClass" href="satellite.ecore#//CubeSat6U"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_hanCoXA6Eem9acJE7_CmTw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_iqnR8HA6Eem9acJE7_CmTw" name="SmallSat" tooltipText="" outgoingEdges="_n9tjRnA6Eem9acJE7_CmTw" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="satellite.ecore#//SmallSat"/>
+      <semanticElements xmi:type="ecore:EClass" href="satellite.ecore#//SmallSat"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_iqn5AHA6Eem9acJE7_CmTw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_n9tjRnA6Eem9acJE7_CmTw" sourceNode="_iqnR8HA6Eem9acJE7_CmTw" targetNode="_AqsPYF0sEemRYLyXht2IrQ">
+      <target xmi:type="ecore:EClass" href="satellite.ecore#//SmallSat"/>
+      <semanticElements xmi:type="ecore:EClass" href="satellite.ecore#//SmallSat"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_n9uKUHA6Eem9acJE7_CmTw" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_n9uKUXA6Eem9acJE7_CmTw" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_n9uKUnA6Eem9acJE7_CmTw" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_3dgz_3BMEempc7JjePmuNw" sourceNode="_hanCoHA6Eem9acJE7_CmTw" targetNode="_AqsPYF0sEemRYLyXht2IrQ">
+      <target xmi:type="ecore:EClass" href="satellite.ecore#//CubeSat6U"/>
+      <semanticElements xmi:type="ecore:EClass" href="satellite.ecore#//CubeSat6U"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ItnCw3BNEempc7JjePmuNw" lineStyle="dot" targetArrow="InputClosedArrow" routingStyle="tree" strokeColor="125,125,125">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.1/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_ItnCxHBNEempc7JjePmuNw" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ItnCxXBNEempc7JjePmuNw" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_37Qf-HBMEempc7JjePmuNw" sourceNode="_fm1X4HA6Eem9acJE7_CmTw" targetNode="_AqsPYF0sEemRYLyXht2IrQ">
+      <target xmi:type="ecore:EClass" href="satellite.ecore#//CubeSat3U"/>
+      <semanticElements xmi:type="ecore:EClass" href="satellite.ecore#//CubeSat3U"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ItmbuXBNEempc7JjePmuNw" lineStyle="dot" targetArrow="InputClosedArrow" routingStyle="tree" strokeColor="125,125,125">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.1/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_ItmbunBNEempc7JjePmuNw" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Itmbu3BNEempc7JjePmuNw" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
     <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_reoWwF0qEemRYLyXht2IrQ"/>
     <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore
index 99766ab7..ae9197da 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="satellite" nsURI="http://www.example.org/satellite" nsPrefix="satellite">
+  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
+    <details key="settingDelegates" value="org.eclipse.viatra.query.querybasedfeature"/>
+  </eAnnotations>
   <eClassifiers xsi:type="ecore:EClass" name="ConstellationMission" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EReference" name="groundStationNetwork" lowerBound="1"
         eType="#//GroundStationNetwork" containment="true"/>
@@ -21,7 +24,12 @@
   <eClassifiers xsi:type="ecore:EClass" name="Spacecraft" abstract="true" eSuperTypes="#//CommunicatingElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="payload" eType="#//Payload"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" lowerBound="1" eType="#//SpacecraftKind"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" lowerBound="1" eType="#//SpacecraftKind"
+        changeable="false" volatile="true" transient="true" derived="true">
+      <eAnnotations source="org.eclipse.viatra.query.querybasedfeature">
+        <details key="patternFQN" value="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CommSubsystem">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="band" lowerBound="1" eType="#//TransceiverBand"/>
@@ -50,4 +58,8 @@
     <eLiterals name="CubeSat6U" value="1"/>
     <eLiterals name="SmallSat" value="2"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CubeSat3U" eSuperTypes="#//CubeSat"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CubeSat6U" eSuperTypes="#//CubeSat"/>
+  <eClassifiers xsi:type="ecore:EClass" name="SmallSat" eSuperTypes="#//Spacecraft"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CubeSat" abstract="true" eSuperTypes="#//Spacecraft"/>
 </ecore:EPackage>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel
index 61a4104a..f8b6d75b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel
@@ -10,8 +10,7 @@
     operationReflection="true" importOrganizing="true">
   <foreignModel>satellite.ecore</foreignModel>
   <testsDirectory xsi:nil="true"/>
-  <genPackages prefix="Satellite" basePackage="hu.bme.mit.inf.dslreasoner.domains"
-      disposableProviderFactory="true" ecorePackage="satellite.ecore#/">
+  <genPackages prefix="Satellite" disposableProviderFactory="true" ecorePackage="satellite.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="satellite.ecore#//TransceiverBand">
       <genEnumLiterals ecoreEnumLiteral="satellite.ecore#//TransceiverBand/UHF"/>
       <genEnumLiterals ecoreEnumLiteral="satellite.ecore#//TransceiverBand/X"/>
@@ -27,21 +26,21 @@
       <genEnumLiterals ecoreEnumLiteral="satellite.ecore#//SpacecraftKind/CubeSat6U"/>
       <genEnumLiterals ecoreEnumLiteral="satellite.ecore#//SpacecraftKind/SmallSat"/>
     </genEnums>
-    <genClasses ecoreClass="satellite.ecore#//ConstellationMission">
+    <genClasses image="false" ecoreClass="satellite.ecore#//ConstellationMission">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//ConstellationMission/groundStationNetwork"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//ConstellationMission/spacecraft"/>
     </genClasses>
     <genClasses ecoreClass="satellite.ecore#//InterferometryMission">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute satellite.ecore#//InterferometryMission/observationTime"/>
     </genClasses>
-    <genClasses ecoreClass="satellite.ecore#//CommunicatingElement">
+    <genClasses image="false" ecoreClass="satellite.ecore#//CommunicatingElement">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//CommunicatingElement/commSubsystem"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//CommunicatingElement/communicationLink"/>
     </genClasses>
     <genClasses ecoreClass="satellite.ecore#//GroundStationNetwork"/>
-    <genClasses ecoreClass="satellite.ecore#//Spacecraft">
+    <genClasses image="false" ecoreClass="satellite.ecore#//Spacecraft">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//Spacecraft/payload"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute satellite.ecore#//Spacecraft/kind"/>
+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute satellite.ecore#//Spacecraft/kind"/>
     </genClasses>
     <genClasses ecoreClass="satellite.ecore#//CommSubsystem">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute satellite.ecore#//CommSubsystem/band"/>
@@ -51,7 +50,10 @@
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference satellite.ecore#//DirectedCommunicationLink/source"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference satellite.ecore#//DirectedCommunicationLink/target"/>
     </genClasses>
-    <genClasses ecoreClass="satellite.ecore#//Payload"/>
+    <genClasses image="false" ecoreClass="satellite.ecore#//Payload"/>
     <genClasses ecoreClass="satellite.ecore#//InterferometryPayload"/>
+    <genClasses ecoreClass="satellite.ecore#//CubeSat3U"/>
+    <genClasses ecoreClass="satellite.ecore#//CubeSat6U"/>
+    <genClasses ecoreClass="satellite.ecore#//SmallSat"/>
   </genPackages>
 </genmodel:GenModel>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generated3valued.vql_deactivated b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generated3valued.vql_deactivated
index b7530140..853b7b54 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generated3valued.vql_deactivated
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generated3valued.vql_deactivated
@@ -45,6 +45,11 @@ pattern mayEquivalent(problem:LogicProblem, interpretation:PartialInterpretation
 	find mayExist(problem,interpretation,b);
 	a == b;
 }
+pattern mustEquivalent(problem:LogicProblem, interpretation:PartialInterpretation, a: DefinedElement, b: DefinedElement) {
+	find mustExist(problem,interpretation,a);
+	find mustExist(problem,interpretation,b);
+	a == b;
+}
 
 ////////////////////////
 // 0.3 Required Patterns by TypeIndexer
@@ -104,23 +109,23 @@ private pattern mayInstanceOfConstellationMission_class(problem:LogicProblem, in
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
+	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
 	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
-	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfConstellationMission_class_UndefinedPart(problem,interpretation,element);
 	neg find mustInstanceOfInterferometryMission_class(problem,interpretation,element);
+	neg find mustInstanceOfConstellationMission_class_UndefinedPart(problem,interpretation,element);
 	neg find scopeDisallowsNewConstellationMission_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
+	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
 	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
-	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfConstellationMission_class_UndefinedPart(problem,interpretation,element);
 	neg find mustInstanceOfInterferometryMission_class(problem,interpretation,element);
+	neg find mustInstanceOfConstellationMission_class_UndefinedPart(problem,interpretation,element);
 	neg find scopeDisallowsNewConstellationMission_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or
@@ -148,21 +153,21 @@ private pattern mayInstanceOfInterferometryMission_class(problem:LogicProblem, i
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
+	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
 	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class_UndefinedPart(problem,interpretation,element);
-	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
 	neg find scopeDisallowsNewInterferometryMission_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
+	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
 	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class_UndefinedPart(problem,interpretation,element);
-	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
 	neg find scopeDisallowsNewInterferometryMission_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or
@@ -190,23 +195,23 @@ private pattern mayInstanceOfCommunicatingElement_class(problem:LogicProblem, in
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class_UndefinedPart(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class_UndefinedPart(problem,interpretation,element);
 	neg find scopeDisallowsNewCommunicatingElement_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class_UndefinedPart(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class_UndefinedPart(problem,interpretation,element);
 	neg find scopeDisallowsNewCommunicatingElement_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or
@@ -234,21 +239,21 @@ private pattern mayInstanceOfGroundStationNetwork_class(problem:LogicProblem, in
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class_UndefinedPart(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class_UndefinedPart(problem,interpretation,element);
 	neg find scopeDisallowsNewGroundStationNetwork_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class_UndefinedPart(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class_UndefinedPart(problem,interpretation,element);
 	neg find scopeDisallowsNewGroundStationNetwork_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or
@@ -276,333 +281,377 @@ private pattern mayInstanceOfSpacecraft_class(problem:LogicProblem, interpretati
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
-	neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat_class(problem,interpretation,element);
 	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
 	neg find scopeDisallowsNewSpacecraft_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
-	neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
-	neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat_class(problem,interpretation,element);
 	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
 	neg find scopeDisallowsNewSpacecraft_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or
 { find mustInstanceOfSpacecraft_class(problem,interpretation,element); }
 /**
- * An element must be an instance of type "CubeSat3U class".
+ * An element must be an instance of type "CommSubsystem class".
  */
-private pattern mustInstanceOfCubeSat3U_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
-	Type.name(type,"CubeSat3U class");
+private pattern mustInstanceOfCommSubsystem_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
+	Type.name(type,"CommSubsystem class");
 	find directInstanceOf(problem,interpretation,element,type);
 }
-private pattern scopeDisallowsNewCubeSat3U_class(problem:LogicProblem, interpretation:PartialInterpretation) {
+private pattern scopeDisallowsNewCommSubsystem_class(problem:LogicProblem, interpretation:PartialInterpretation) {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.scopes(interpretation,scope);
 	Scope.targetTypeInterpretation(scope,typeInterpretation);
 	Scope.maxNewElements(scope,0);
 	PartialComplexTypeInterpretation.interpretationOf(typeInterpretation,type);
-	Type.name(type,"CubeSat3U class");
+	Type.name(type,"CommSubsystem class");
 }
 
 /**
- * An element may be an instance of type "CubeSat3U class".
+ * An element may be an instance of type "CommSubsystem class".
  */
-private pattern mayInstanceOfCubeSat3U_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
+private pattern mayInstanceOfCommSubsystem_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-	neg find scopeDisallowsNewCubeSat3U_class(problem, interpretation);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,element);
+	neg find scopeDisallowsNewCommSubsystem_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
-	neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-	neg find scopeDisallowsNewCubeSat3U_class(problem, interpretation);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,element);
+	neg find scopeDisallowsNewCommSubsystem_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or
-{ find mustInstanceOfCubeSat3U_class(problem,interpretation,element); }
+{ find mustInstanceOfCommSubsystem_class(problem,interpretation,element); }
 /**
- * An element must be an instance of type "CubeSat6U class".
+ * An element must be an instance of type "DirectedCommunicationLink class".
  */
-private pattern mustInstanceOfCubeSat6U_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
-	Type.name(type,"CubeSat6U class");
+private pattern mustInstanceOfDirectedCommunicationLink_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
+	Type.name(type,"DirectedCommunicationLink class");
 	find directInstanceOf(problem,interpretation,element,type);
 }
-private pattern scopeDisallowsNewCubeSat6U_class(problem:LogicProblem, interpretation:PartialInterpretation) {
+private pattern scopeDisallowsNewDirectedCommunicationLink_class(problem:LogicProblem, interpretation:PartialInterpretation) {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.scopes(interpretation,scope);
 	Scope.targetTypeInterpretation(scope,typeInterpretation);
 	Scope.maxNewElements(scope,0);
 	PartialComplexTypeInterpretation.interpretationOf(typeInterpretation,type);
-	Type.name(type,"CubeSat6U class");
+	Type.name(type,"DirectedCommunicationLink class");
 }
 
 /**
- * An element may be an instance of type "CubeSat6U class".
+ * An element may be an instance of type "DirectedCommunicationLink class".
  */
-private pattern mayInstanceOfCubeSat6U_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
+private pattern mayInstanceOfDirectedCommunicationLink_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
 	neg find mustInstanceOfPayload_class(problem,interpretation,element);
-	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
-	neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
-	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-	neg find scopeDisallowsNewCubeSat6U_class(problem, interpretation);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+	neg find scopeDisallowsNewDirectedCommunicationLink_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
 	neg find mustInstanceOfPayload_class(problem,interpretation,element);
-	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
-	neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
-	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-	neg find scopeDisallowsNewCubeSat6U_class(problem, interpretation);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+	neg find scopeDisallowsNewDirectedCommunicationLink_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or
-{ find mustInstanceOfCubeSat6U_class(problem,interpretation,element); }
+{ find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element); }
 /**
- * An element must be an instance of type "SmallSat class".
+ * An element must be an instance of type "Payload class".
  */
-private pattern mustInstanceOfSmallSat_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
-	Type.name(type,"SmallSat class");
+private pattern mustInstanceOfPayload_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
+	Type.name(type,"Payload class");
 	find directInstanceOf(problem,interpretation,element,type);
 }
-private pattern scopeDisallowsNewSmallSat_class(problem:LogicProblem, interpretation:PartialInterpretation) {
+private pattern scopeDisallowsNewPayload_class(problem:LogicProblem, interpretation:PartialInterpretation) {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.scopes(interpretation,scope);
 	Scope.targetTypeInterpretation(scope,typeInterpretation);
 	Scope.maxNewElements(scope,0);
 	PartialComplexTypeInterpretation.interpretationOf(typeInterpretation,type);
-	Type.name(type,"SmallSat class");
+	Type.name(type,"Payload class");
 }
 
 /**
- * An element may be an instance of type "SmallSat class".
+ * An element may be an instance of type "Payload class".
  */
-private pattern mayInstanceOfSmallSat_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
+private pattern mayInstanceOfPayload_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
-	neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-	neg find scopeDisallowsNewSmallSat_class(problem, interpretation);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfInterferometryPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+	neg find scopeDisallowsNewPayload_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
-	neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
-	neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
-	neg find scopeDisallowsNewSmallSat_class(problem, interpretation);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfInterferometryPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+	neg find scopeDisallowsNewPayload_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or
-{ find mustInstanceOfSmallSat_class(problem,interpretation,element); }
+{ find mustInstanceOfPayload_class(problem,interpretation,element); }
 /**
- * An element must be an instance of type "CommSubsystem class".
+ * An element must be an instance of type "InterferometryPayload class".
  */
-private pattern mustInstanceOfCommSubsystem_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
-	Type.name(type,"CommSubsystem class");
+private pattern mustInstanceOfInterferometryPayload_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
+	Type.name(type,"InterferometryPayload class");
 	find directInstanceOf(problem,interpretation,element,type);
 }
-private pattern scopeDisallowsNewCommSubsystem_class(problem:LogicProblem, interpretation:PartialInterpretation) {
+private pattern scopeDisallowsNewInterferometryPayload_class(problem:LogicProblem, interpretation:PartialInterpretation) {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.scopes(interpretation,scope);
 	Scope.targetTypeInterpretation(scope,typeInterpretation);
 	Scope.maxNewElements(scope,0);
 	PartialComplexTypeInterpretation.interpretationOf(typeInterpretation,type);
-	Type.name(type,"CommSubsystem class");
+	Type.name(type,"InterferometryPayload class");
 }
 
 /**
- * An element may be an instance of type "CommSubsystem class".
+ * An element may be an instance of type "InterferometryPayload class".
  */
-private pattern mayInstanceOfCommSubsystem_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
+private pattern mayInstanceOfInterferometryPayload_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find scopeDisallowsNewCommSubsystem_class(problem, interpretation);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find scopeDisallowsNewInterferometryPayload_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
+	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
 	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find scopeDisallowsNewInterferometryPayload_class(problem, interpretation);
+	neg find isPrimitive(element);
+} or
+{ find mustInstanceOfInterferometryPayload_class(problem,interpretation,element); }
+/**
+ * An element must be an instance of type "CubeSat3U class".
+ */
+private pattern mustInstanceOfCubeSat3U_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
+	Type.name(type,"CubeSat3U class");
+	find directInstanceOf(problem,interpretation,element,type);
+}
+private pattern scopeDisallowsNewCubeSat3U_class(problem:LogicProblem, interpretation:PartialInterpretation) {
+	find interpretation(problem,interpretation);
+	PartialInterpretation.scopes(interpretation,scope);
+	Scope.targetTypeInterpretation(scope,typeInterpretation);
+	Scope.maxNewElements(scope,0);
+	PartialComplexTypeInterpretation.interpretationOf(typeInterpretation,type);
+	Type.name(type,"CubeSat3U class");
+}
+
+/**
+ * An element may be an instance of type "CubeSat3U class".
+ */
+private pattern mayInstanceOfCubeSat3U_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
+{
+	find interpretation(problem,interpretation);
+	PartialInterpretation.newElements(interpretation,element);
+	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
 	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
+	neg find scopeDisallowsNewCubeSat3U_class(problem, interpretation);
+	neg find isPrimitive(element);
+} or {
+	find interpretation(problem,interpretation);
+	PartialInterpretation.openWorldElements(interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find scopeDisallowsNewCommSubsystem_class(problem, interpretation);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
+	neg find scopeDisallowsNewCubeSat3U_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or
-{ find mustInstanceOfCommSubsystem_class(problem,interpretation,element); }
+{ find mustInstanceOfCubeSat3U_class(problem,interpretation,element); }
 /**
- * An element must be an instance of type "DirectedCommunicationLink class".
+ * An element must be an instance of type "CubeSat6U class".
  */
-private pattern mustInstanceOfDirectedCommunicationLink_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
-	Type.name(type,"DirectedCommunicationLink class");
+private pattern mustInstanceOfCubeSat6U_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
+	Type.name(type,"CubeSat6U class");
 	find directInstanceOf(problem,interpretation,element,type);
 }
-private pattern scopeDisallowsNewDirectedCommunicationLink_class(problem:LogicProblem, interpretation:PartialInterpretation) {
+private pattern scopeDisallowsNewCubeSat6U_class(problem:LogicProblem, interpretation:PartialInterpretation) {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.scopes(interpretation,scope);
 	Scope.targetTypeInterpretation(scope,typeInterpretation);
 	Scope.maxNewElements(scope,0);
 	PartialComplexTypeInterpretation.interpretationOf(typeInterpretation,type);
-	Type.name(type,"DirectedCommunicationLink class");
+	Type.name(type,"CubeSat6U class");
 }
 
 /**
- * An element may be an instance of type "DirectedCommunicationLink class".
+ * An element may be an instance of type "CubeSat6U class".
  */
-private pattern mayInstanceOfDirectedCommunicationLink_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
+private pattern mayInstanceOfCubeSat6U_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
 	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find scopeDisallowsNewDirectedCommunicationLink_class(problem, interpretation);
+	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
+	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
+	neg find scopeDisallowsNewCubeSat6U_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
 	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find scopeDisallowsNewDirectedCommunicationLink_class(problem, interpretation);
+	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
+	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
+	neg find scopeDisallowsNewCubeSat6U_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or
-{ find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element); }
+{ find mustInstanceOfCubeSat6U_class(problem,interpretation,element); }
 /**
- * An element must be an instance of type "Payload class".
+ * An element must be an instance of type "SmallSat class".
  */
-private pattern mustInstanceOfPayload_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
-	Type.name(type,"Payload class");
+private pattern mustInstanceOfSmallSat_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
+	Type.name(type,"SmallSat class");
 	find directInstanceOf(problem,interpretation,element,type);
 }
-private pattern scopeDisallowsNewPayload_class(problem:LogicProblem, interpretation:PartialInterpretation) {
+private pattern scopeDisallowsNewSmallSat_class(problem:LogicProblem, interpretation:PartialInterpretation) {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.scopes(interpretation,scope);
 	Scope.targetTypeInterpretation(scope,typeInterpretation);
 	Scope.maxNewElements(scope,0);
 	PartialComplexTypeInterpretation.interpretationOf(typeInterpretation,type);
-	Type.name(type,"Payload class");
+	Type.name(type,"SmallSat class");
 }
 
 /**
- * An element may be an instance of type "Payload class".
+ * An element may be an instance of type "SmallSat class".
  */
-private pattern mayInstanceOfPayload_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
+private pattern mayInstanceOfSmallSat_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfInterferometryPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat_class(problem,interpretation,element);
+	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find scopeDisallowsNewPayload_class(problem, interpretation);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find scopeDisallowsNewSmallSat_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfInterferometryPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat_class(problem,interpretation,element);
+	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find scopeDisallowsNewPayload_class(problem, interpretation);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find scopeDisallowsNewSmallSat_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or
-{ find mustInstanceOfPayload_class(problem,interpretation,element); }
+{ find mustInstanceOfSmallSat_class(problem,interpretation,element); }
 /**
- * An element must be an instance of type "InterferometryPayload class".
+ * An element must be an instance of type "CubeSat class".
  */
-private pattern mustInstanceOfInterferometryPayload_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
-	Type.name(type,"InterferometryPayload class");
+private pattern mustInstanceOfCubeSat_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
+	Type.name(type,"CubeSat class");
 	find directInstanceOf(problem,interpretation,element,type);
 }
-private pattern scopeDisallowsNewInterferometryPayload_class(problem:LogicProblem, interpretation:PartialInterpretation) {
+private pattern scopeDisallowsNewCubeSat_class(problem:LogicProblem, interpretation:PartialInterpretation) {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.scopes(interpretation,scope);
 	Scope.targetTypeInterpretation(scope,typeInterpretation);
 	Scope.maxNewElements(scope,0);
 	PartialComplexTypeInterpretation.interpretationOf(typeInterpretation,type);
-	Type.name(type,"InterferometryPayload class");
+	Type.name(type,"CubeSat class");
 }
 
 /**
- * An element may be an instance of type "InterferometryPayload class".
+ * An element may be an instance of type "CubeSat class".
  */
-private pattern mayInstanceOfInterferometryPayload_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
+private pattern mayInstanceOfCubeSat_class(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find scopeDisallowsNewInterferometryPayload_class(problem, interpretation);
+	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
+	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
+	neg find scopeDisallowsNewCubeSat_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find scopeDisallowsNewInterferometryPayload_class(problem, interpretation);
+	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
+	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
+	neg find scopeDisallowsNewCubeSat_class(problem, interpretation);
 	neg find isPrimitive(element);
 } or
-{ find mustInstanceOfInterferometryPayload_class(problem,interpretation,element); }
+{ find mustInstanceOfCubeSat_class(problem,interpretation,element); }
 /**
  * An element must be an instance of type "TransceiverBand enum".
  */
@@ -637,14 +686,35 @@ private pattern scopeDisallowsNewAntennaGain_enum(problem:LogicProblem, interpre
 	Scope.targetTypeInterpretation(scope,typeInterpretation);
 	Scope.maxNewElements(scope,0);
 	PartialComplexTypeInterpretation.interpretationOf(typeInterpretation,type);
-	Type.name(type,"AntennaGain enum");
+	Type.name(type,"AntennaGain enum");
+}
+
+/**
+ * An element may be an instance of type "AntennaGain enum".
+ */
+private pattern mayInstanceOfAntennaGain_enum(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
+{ find mustInstanceOfAntennaGain_enum(problem,interpretation,element); }
+/**
+ * An element must be an instance of type "SpacecraftKind enum".
+ */
+private pattern mustInstanceOfSpacecraftKind_enum(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement) {
+	Type.name(type,"SpacecraftKind enum");
+	find directInstanceOf(problem,interpretation,element,type);
+}
+private pattern scopeDisallowsNewSpacecraftKind_enum(problem:LogicProblem, interpretation:PartialInterpretation) {
+	find interpretation(problem,interpretation);
+	PartialInterpretation.scopes(interpretation,scope);
+	Scope.targetTypeInterpretation(scope,typeInterpretation);
+	Scope.maxNewElements(scope,0);
+	PartialComplexTypeInterpretation.interpretationOf(typeInterpretation,type);
+	Type.name(type,"SpacecraftKind enum");
 }
 
 /**
- * An element may be an instance of type "AntennaGain enum".
+ * An element may be an instance of type "SpacecraftKind enum".
  */
-private pattern mayInstanceOfAntennaGain_enum(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
-{ find mustInstanceOfAntennaGain_enum(problem,interpretation,element); }
+private pattern mayInstanceOfSpacecraftKind_enum(problem:LogicProblem, interpretation:PartialInterpretation, element:DefinedElement)
+{ find mustInstanceOfSpacecraftKind_enum(problem,interpretation,element); }
 /**
  * An element must be an instance of type "ConstellationMission class DefinedPart".
  */
@@ -689,20 +759,20 @@ private pattern mayInstanceOfConstellationMission_class_UndefinedPart(problem:Lo
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
 	neg find mustInstanceOfInterferometryMission_class(problem,interpretation,element);
 	neg find scopeDisallowsNewConstellationMission_class_UndefinedPart(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
 	neg find mustInstanceOfInterferometryMission_class(problem,interpretation,element);
 	neg find scopeDisallowsNewConstellationMission_class_UndefinedPart(problem, interpretation);
 	neg find isPrimitive(element);
@@ -752,19 +822,19 @@ private pattern mayInstanceOfInterferometryMission_class_UndefinedPart(problem:L
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
 	neg find scopeDisallowsNewInterferometryMission_class_UndefinedPart(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
 	neg find scopeDisallowsNewInterferometryMission_class_UndefinedPart(problem, interpretation);
 	neg find isPrimitive(element);
 } or
@@ -813,23 +883,23 @@ private pattern mayInstanceOfCommunicatingElement_class_UndefinedPart(problem:Lo
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
 	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
 	neg find scopeDisallowsNewCommunicatingElement_class_UndefinedPart(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
 	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
 	neg find scopeDisallowsNewCommunicatingElement_class_UndefinedPart(problem, interpretation);
 	neg find isPrimitive(element);
 } or
@@ -878,21 +948,21 @@ private pattern mayInstanceOfGroundStationNetwork_class_UndefinedPart(problem:Lo
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
 	neg find scopeDisallowsNewGroundStationNetwork_class_UndefinedPart(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
 	neg find scopeDisallowsNewGroundStationNetwork_class_UndefinedPart(problem, interpretation);
 	neg find isPrimitive(element);
 } or
@@ -941,19 +1011,19 @@ private pattern mayInstanceOfCommSubsystem_class_UndefinedPart(problem:LogicProb
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
 	neg find scopeDisallowsNewCommSubsystem_class_UndefinedPart(problem, interpretation);
 	neg find isPrimitive(element);
 } or {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.openWorldElements(interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
 	neg find scopeDisallowsNewCommSubsystem_class_UndefinedPart(problem, interpretation);
 	neg find isPrimitive(element);
 } or
@@ -1232,6 +1302,24 @@ private pattern mayInRelationtarget_reference_DirectedCommunicationLink(
 } or {
 	find mustInRelationtarget_reference_DirectedCommunicationLink(problem,interpretation,source,target);
 }
+/**
+ * Matcher for detecting tuples t where []kind attribute Spacecraft(source,target)
+ */
+ private pattern mustInRelationkind_attribute_Spacecraft(
+ 	problem:LogicProblem, interpretation:PartialInterpretation,
+ 	source: DefinedElement, target:DefinedElement)
+ {
+ 	find mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_spacecraftOfKind(problem,interpretation,source,target);
+ }
+/**
+ * Matcher for detecting tuples t where []kind attribute Spacecraft(source,target)
+ */
+ private pattern mayInRelationkind_attribute_Spacecraft(
+ 	problem:LogicProblem, interpretation:PartialInterpretation,
+ 	source: DefinedElement, target:DefinedElement)
+ {
+ 	find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_spacecraftOfKind(problem,interpretation,source,target);
+ }
 /**
  * Matcher for detecting tuples t where []band attribute CommSubsystem(source,target)
  */
@@ -1317,15 +1405,15 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
 	find mustInRelationcommunicationLink_reference_CommunicatingElement(problem,interpretation,var_Element,var_virtual0);
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_virtual0);
-	var_virtual0 == var_Link;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_Link);
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationsource_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual1);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual1);
-	var_virtual1 == var_SourceComm;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_SourceComm);
 	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_SourceElement);
 	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_SourceElement,var_virtual2);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
-	var_virtual2 == var_SourceComm;
+	find mustEquivalent(problem, interpretation, var_virtual2, var_SourceComm);
 	neg find mayEquivalent(problem, interpretation, var_Element, var_SourceElement);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkDoesNotStartAtContainingElement(
@@ -1347,7 +1435,7 @@ private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satelli
 	find mayInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_SourceElement,var_virtual2);
 	find mayInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
 	find mayEquivalent(problem, interpretation, var_virtual2, var_SourceComm);
-	var_Element != var_SourceElement;
+	neg find mustEquivalent(problem, interpretation, var_Element, var_SourceElement);
 }
 private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkDoesNotStartAtContainingElement(
 	problem:LogicProblem, interpretation:PartialInterpretation,
@@ -1359,16 +1447,16 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Element);
 	find mustInRelationcommunicationLink_reference_CommunicatingElement(problem,interpretation,var_Element,var_virtual0);
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_virtual0);
-	var_virtual0 == var_Link;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_Link);
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationsource_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual1);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual1);
-	var_virtual1 == var_SourceComm;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_SourceComm);
 	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_SourceElement);
 	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_SourceElement,var_virtual2);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
-	var_virtual2 == var_SourceComm;
-	var_Element != var_SourceElement;
+	find mustEquivalent(problem, interpretation, var_virtual2, var_SourceComm);
+	neg find mustEquivalent(problem, interpretation, var_Element, var_SourceElement);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries notEnoughInterferometryPayloads
 private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_notEnoughInterferometryPayloads(
@@ -1422,7 +1510,7 @@ private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satelli
 	// Mission is exported
 	find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_spacecraftWithInterferometryPayload(problem,interpretation,var_Mission,var_Spacecraft1);
 	find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_spacecraftWithInterferometryPayload(problem,interpretation,var_Mission,var_Spacecraft2);
-	var_Spacecraft1 != var_Spacecraft2;
+	neg find mustEquivalent(problem, interpretation, var_Spacecraft1, var_Spacecraft2);
 }
 private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_atLeastTwoInterferometryPayloads(
 	problem:LogicProblem, interpretation:PartialInterpretation,
@@ -1433,7 +1521,7 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	// Mission is exported
 	find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_spacecraftWithInterferometryPayload(problem,interpretation,var_Mission,var_Spacecraft1);
 	find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_spacecraftWithInterferometryPayload(problem,interpretation,var_Mission,var_Spacecraft2);
-	var_Spacecraft1 != var_Spacecraft2;
+	neg find mustEquivalent(problem, interpretation, var_Spacecraft1, var_Spacecraft2);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries spacecraftWithInterferometryPayload
 private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_spacecraftWithInterferometryPayload(
@@ -1448,11 +1536,11 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfConstellationMission_class(problem,interpretation,var_Mission);
 	find mustInRelationspacecraft_reference_ConstellationMission(problem,interpretation,var_Mission,var_virtual0);
 	find mustInstanceOfSpacecraft_class(problem,interpretation,var_virtual0);
-	var_virtual0 == var_Spacecraft;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_Spacecraft);
 	find mustInstanceOfSpacecraft_class(problem,interpretation,var_Spacecraft);
 	find mustInRelationpayload_reference_Spacecraft(problem,interpretation,var_Spacecraft,var_virtual1);
 	find mustInstanceOfPayload_class(problem,interpretation,var_virtual1);
-	var_virtual1 == var_Payload;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_Payload);
 	find mustInstanceOfInterferometryPayload_class(problem,interpretation,var_Payload);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_spacecraftWithInterferometryPayload(
@@ -1486,11 +1574,11 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfConstellationMission_class(problem,interpretation,var_Mission);
 	find mustInRelationspacecraft_reference_ConstellationMission(problem,interpretation,var_Mission,var_virtual0);
 	find mustInstanceOfSpacecraft_class(problem,interpretation,var_virtual0);
-	var_virtual0 == var_Spacecraft;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_Spacecraft);
 	find mustInstanceOfSpacecraft_class(problem,interpretation,var_Spacecraft);
 	find mustInRelationpayload_reference_Spacecraft(problem,interpretation,var_Spacecraft,var_virtual1);
 	find mustInstanceOfPayload_class(problem,interpretation,var_virtual1);
-	var_virtual1 == var_Payload;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_Payload);
 	find mustInstanceOfInterferometryPayload_class(problem,interpretation,var_Payload);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries noLinkToGroundStation
@@ -1504,11 +1592,11 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfConstellationMission_class(problem,interpretation,var_Mission);
 	find mustInRelationgroundStationNetwork_reference_ConstellationMission(problem,interpretation,var_Mission,var_virtual0);
 	find mustInstanceOfGroundStationNetwork_class(problem,interpretation,var_virtual0);
-	var_virtual0 == var_GroundStation;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_GroundStation);
 	find mustInstanceOfConstellationMission_class(problem,interpretation,var_Mission);
 	find mustInRelationspacecraft_reference_ConstellationMission(problem,interpretation,var_Mission,var_virtual1);
 	find mustInstanceOfSpacecraft_class(problem,interpretation,var_virtual1);
-	var_virtual1 == var_Spacecraft;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_Spacecraft);
 	neg find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_indirectCommunicationLink(problem,interpretation,var_Spacecraft,var_GroundStation);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_noLinkToGroundStation(
@@ -1538,13 +1626,336 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfConstellationMission_class(problem,interpretation,var_Mission);
 	find mustInRelationgroundStationNetwork_reference_ConstellationMission(problem,interpretation,var_Mission,var_virtual0);
 	find mustInstanceOfGroundStationNetwork_class(problem,interpretation,var_virtual0);
-	var_virtual0 == var_GroundStation;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_GroundStation);
 	find mustInstanceOfConstellationMission_class(problem,interpretation,var_Mission);
 	find mustInRelationspacecraft_reference_ConstellationMission(problem,interpretation,var_Mission,var_virtual1);
 	find mustInstanceOfSpacecraft_class(problem,interpretation,var_virtual1);
-	var_virtual1 == var_Spacecraft;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_Spacecraft);
 	neg find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_indirectCommunicationLink(problem,interpretation,var_Spacecraft,var_GroundStation);
 }
+// Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries noPotentialLinkToGroundStation
+private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_noPotentialLinkToGroundStation(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_Spacecraft)
+{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_Spacecraft);
+	// Spacecraft is exported
+	find mustInstanceOfConstellationMission_class(problem,interpretation,var_Mission);
+	find mustInRelationgroundStationNetwork_reference_ConstellationMission(problem,interpretation,var_Mission,var_virtual0);
+	find mustInstanceOfGroundStationNetwork_class(problem,interpretation,var_virtual0);
+	find mustEquivalent(problem, interpretation, var_virtual0, var_GroundStation);
+	find mustInstanceOfConstellationMission_class(problem,interpretation,var_Mission);
+	find mustInRelationspacecraft_reference_ConstellationMission(problem,interpretation,var_Mission,var_virtual1);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_virtual1);
+	find mustEquivalent(problem, interpretation, var_virtual1, var_Spacecraft);
+	neg find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_indirectLinkAllowed(problem,interpretation,var_Spacecraft,var_GroundStation);
+}
+private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_noPotentialLinkToGroundStation(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_Spacecraft)
+{
+	find interpretation(problem,interpretation);
+	find mayInstanceOfSpacecraft_class(problem,interpretation,var_Spacecraft);
+	// Spacecraft is exported
+	find mayInstanceOfConstellationMission_class(problem,interpretation,var_Mission);
+	find mayInRelationgroundStationNetwork_reference_ConstellationMission(problem,interpretation,var_Mission,var_virtual0);
+	find mayInstanceOfGroundStationNetwork_class(problem,interpretation,var_virtual0);
+	find mayEquivalent(problem, interpretation, var_virtual0, var_GroundStation);
+	find mayInstanceOfConstellationMission_class(problem,interpretation,var_Mission);
+	find mayInRelationspacecraft_reference_ConstellationMission(problem,interpretation,var_Mission,var_virtual1);
+	find mayInstanceOfSpacecraft_class(problem,interpretation,var_virtual1);
+	find mayEquivalent(problem, interpretation, var_virtual1, var_Spacecraft);
+	neg find mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_indirectLinkAllowed(problem,interpretation,var_Spacecraft,var_GroundStation);
+}
+private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_noPotentialLinkToGroundStation(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_Spacecraft)
+{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_Spacecraft);
+	// Spacecraft is exported
+	find mustInstanceOfConstellationMission_class(problem,interpretation,var_Mission);
+	find mustInRelationgroundStationNetwork_reference_ConstellationMission(problem,interpretation,var_Mission,var_virtual0);
+	find mustInstanceOfGroundStationNetwork_class(problem,interpretation,var_virtual0);
+	find mustEquivalent(problem, interpretation, var_virtual0, var_GroundStation);
+	find mustInstanceOfConstellationMission_class(problem,interpretation,var_Mission);
+	find mustInRelationspacecraft_reference_ConstellationMission(problem,interpretation,var_Mission,var_virtual1);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_virtual1);
+	find mustEquivalent(problem, interpretation, var_virtual1, var_Spacecraft);
+	neg find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_indirectLinkAllowed(problem,interpretation,var_Spacecraft,var_GroundStation);
+}
+// Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries indirectLinkAllowed
+private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_indirectLinkAllowed(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_From, var_To)
+{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_From);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	// From is exported
+	// To is exported
+	find twoParam_mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_linkAllowed+(var_From,var_To);
+}
+private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_indirectLinkAllowed(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_From, var_To)
+{
+	find interpretation(problem,interpretation);
+	find mayInstanceOfSpacecraft_class(problem,interpretation,var_From);
+	find mayInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	// From is exported
+	// To is exported
+	find twoParam_mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_linkAllowed+(var_From,var_To);
+}
+private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_indirectLinkAllowed(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_From, var_To)
+{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_From);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	// From is exported
+	// To is exported
+	find twoParam_currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_linkAllowed+(var_From,var_To);
+}
+// Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries linkAllowed
+private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_linkAllowed(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_From, var_To)
+{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_From);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	// From is exported
+	// To is exported
+	find mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_matchingAntenna(problem,interpretation,var_From,var_To,_var__0);
+	neg find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_cubeSat3U(problem,interpretation,var_From);
+}or{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_From);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	// From is exported
+	// To is exported
+	var_virtual0 == const_UHF_TransceiverBand;DefinedElement.name(const_UHF_TransceiverBand,"UHF TransceiverBand");  //LogicProblem.elements(problem,const_UHF_TransceiverBand);
+	find mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_matchingAntenna(problem,interpretation,var_From,var_To,var_virtual0);
+	find mustInstanceOfCubeSat3U_class(problem,interpretation,var_From);
+}or{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_From);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	// From is exported
+	// To is exported
+	find mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_matchingAntenna(problem,interpretation,var_From,var_To,_var__0);
+	find mustInstanceOfCubeSat3U_class(problem,interpretation,var_From);
+	find mustInstanceOfGroundStationNetwork_class(problem,interpretation,var_To);
+}
+private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_linkAllowed(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_From, var_To)
+{
+	find interpretation(problem,interpretation);
+	find mayInstanceOfSpacecraft_class(problem,interpretation,var_From);
+	find mayInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	// From is exported
+	// To is exported
+	find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_matchingAntenna(problem,interpretation,var_From,var_To,_var__0);
+	neg find mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_cubeSat3U(problem,interpretation,var_From);
+}or{
+	find interpretation(problem,interpretation);
+	find mayInstanceOfSpacecraft_class(problem,interpretation,var_From);
+	find mayInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	// From is exported
+	// To is exported
+	var_virtual0 == const_UHF_TransceiverBand;DefinedElement.name(const_UHF_TransceiverBand,"UHF TransceiverBand");  //LogicProblem.elements(problem,const_UHF_TransceiverBand);
+	find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_matchingAntenna(problem,interpretation,var_From,var_To,var_virtual0);
+	find mayInstanceOfCubeSat3U_class(problem,interpretation,var_From);
+}or{
+	find interpretation(problem,interpretation);
+	find mayInstanceOfSpacecraft_class(problem,interpretation,var_From);
+	find mayInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	// From is exported
+	// To is exported
+	find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_matchingAntenna(problem,interpretation,var_From,var_To,_var__0);
+	find mayInstanceOfCubeSat3U_class(problem,interpretation,var_From);
+	find mayInstanceOfGroundStationNetwork_class(problem,interpretation,var_To);
+}
+private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_linkAllowed(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_From, var_To)
+{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_From);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	// From is exported
+	// To is exported
+	find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_matchingAntenna(problem,interpretation,var_From,var_To,_var__0);
+	neg find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_cubeSat3U(problem,interpretation,var_From);
+}or{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_From);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	// From is exported
+	// To is exported
+	var_virtual0 == const_UHF_TransceiverBand;DefinedElement.name(const_UHF_TransceiverBand,"UHF TransceiverBand");  //LogicProblem.elements(problem,const_UHF_TransceiverBand);
+	find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_matchingAntenna(problem,interpretation,var_From,var_To,var_virtual0);
+	find mustInstanceOfCubeSat3U_class(problem,interpretation,var_From);
+}or{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_From);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	// From is exported
+	// To is exported
+	find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_matchingAntenna(problem,interpretation,var_From,var_To,_var__0);
+	find mustInstanceOfCubeSat3U_class(problem,interpretation,var_From);
+	find mustInstanceOfGroundStationNetwork_class(problem,interpretation,var_To);
+}
+private pattern twoParam_mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_linkAllowed(var_From, var_To) {
+	find mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_linkAllowed(_,_,var_From, var_To);
+}
+private pattern twoParam_mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_linkAllowed(var_From, var_To) {
+	find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_linkAllowed(_,_,var_From, var_To);
+}
+private pattern twoParam_currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_linkAllowed(var_From, var_To) {
+	find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_linkAllowed(_,_,var_From, var_To);
+}
+// Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries matchingAntenna
+private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_matchingAntenna(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_From, var_To, var_Band)
+{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_From);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	// type constraint is enforced by construction
+	// From is exported
+	// To is exported
+	// Band is exported
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_From);
+	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_From,var_virtual0);
+	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
+	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_virtual0,var_virtual1);
+	// type constraint is enforced by construction
+	find mustEquivalent(problem, interpretation, var_virtual1, var_Band);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_To,var_virtual2);
+	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
+	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_virtual2,var_virtual3);
+	// type constraint is enforced by construction
+	find mustEquivalent(problem, interpretation, var_virtual3, var_Band);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_From);
+	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_From,var_virtual4);
+	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual4);
+	find mustInRelationgain_attribute_CommSubsystem(problem,interpretation,var_virtual4,var_virtual5);
+	// type constraint is enforced by construction
+	find mustEquivalent(problem, interpretation, var_virtual5, var_Gain);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_To,var_virtual6);
+	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual6);
+	find mustInRelationgain_attribute_CommSubsystem(problem,interpretation,var_virtual6,var_virtual7);
+	// type constraint is enforced by construction
+	find mustEquivalent(problem, interpretation, var_virtual7, var_Gain);
+}
+private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_matchingAntenna(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_From, var_To, var_Band)
+{
+	find interpretation(problem,interpretation);
+	find mayInstanceOfSpacecraft_class(problem,interpretation,var_From);
+	find mayInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	// type constraint is enforced by construction
+	// From is exported
+	// To is exported
+	// Band is exported
+	find mayInstanceOfCommunicatingElement_class(problem,interpretation,var_From);
+	find mayInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_From,var_virtual0);
+	find mayInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
+	find mayInRelationband_attribute_CommSubsystem(problem,interpretation,var_virtual0,var_virtual1);
+	// type constraint is enforced by construction
+	find mayEquivalent(problem, interpretation, var_virtual1, var_Band);
+	find mayInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	find mayInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_To,var_virtual2);
+	find mayInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
+	find mayInRelationband_attribute_CommSubsystem(problem,interpretation,var_virtual2,var_virtual3);
+	// type constraint is enforced by construction
+	find mayEquivalent(problem, interpretation, var_virtual3, var_Band);
+	find mayInstanceOfCommunicatingElement_class(problem,interpretation,var_From);
+	find mayInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_From,var_virtual4);
+	find mayInstanceOfCommSubsystem_class(problem,interpretation,var_virtual4);
+	find mayInRelationgain_attribute_CommSubsystem(problem,interpretation,var_virtual4,var_virtual5);
+	// type constraint is enforced by construction
+	find mayEquivalent(problem, interpretation, var_virtual5, var_Gain);
+	find mayInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	find mayInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_To,var_virtual6);
+	find mayInstanceOfCommSubsystem_class(problem,interpretation,var_virtual6);
+	find mayInRelationgain_attribute_CommSubsystem(problem,interpretation,var_virtual6,var_virtual7);
+	// type constraint is enforced by construction
+	find mayEquivalent(problem, interpretation, var_virtual7, var_Gain);
+}
+private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_matchingAntenna(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_From, var_To, var_Band)
+{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_From);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	// type constraint is enforced by construction
+	// From is exported
+	// To is exported
+	// Band is exported
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_From);
+	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_From,var_virtual0);
+	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
+	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_virtual0,var_virtual1);
+	// type constraint is enforced by construction
+	find mustEquivalent(problem, interpretation, var_virtual1, var_Band);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_To,var_virtual2);
+	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
+	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_virtual2,var_virtual3);
+	// type constraint is enforced by construction
+	find mustEquivalent(problem, interpretation, var_virtual3, var_Band);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_From);
+	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_From,var_virtual4);
+	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual4);
+	find mustInRelationgain_attribute_CommSubsystem(problem,interpretation,var_virtual4,var_virtual5);
+	// type constraint is enforced by construction
+	find mustEquivalent(problem, interpretation, var_virtual5, var_Gain);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_To);
+	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_To,var_virtual6);
+	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual6);
+	find mustInRelationgain_attribute_CommSubsystem(problem,interpretation,var_virtual6,var_virtual7);
+	// type constraint is enforced by construction
+	find mustEquivalent(problem, interpretation, var_virtual7, var_Gain);
+}
+// Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries cubeSat3U
+private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_cubeSat3U(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_Sat)
+{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfCubeSat3U_class(problem,interpretation,var_Sat);
+	// Sat is exported
+	find mustInstanceOfCubeSat3U_class(problem,interpretation,var_Sat);
+}
+private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_cubeSat3U(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_Sat)
+{
+	find interpretation(problem,interpretation);
+	find mayInstanceOfCubeSat3U_class(problem,interpretation,var_Sat);
+	// Sat is exported
+	find mayInstanceOfCubeSat3U_class(problem,interpretation,var_Sat);
+}
+private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_cubeSat3U(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_Sat)
+{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfCubeSat3U_class(problem,interpretation,var_Sat);
+	// Sat is exported
+	find mustInstanceOfCubeSat3U_class(problem,interpretation,var_Sat);
+}
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries communicationLoop
 private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLoop(
 	problem:LogicProblem, interpretation:PartialInterpretation,
@@ -1620,19 +2031,19 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationsource_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual0);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
-	var_virtual0 == var_SourceSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_SourceSubsystem);
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationtarget_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual1);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual1);
-	var_virtual1 == var_TargetSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_TargetSubsystem);
 	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Source);
 	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Source,var_virtual2);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
-	var_virtual2 == var_SourceSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual2, var_SourceSubsystem);
 	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Target);
 	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Target,var_virtual3);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual3);
-	var_virtual3 == var_TargetSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual3, var_TargetSubsystem);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_directCommunicationLink(
 	problem:LogicProblem, interpretation:PartialInterpretation,
@@ -1672,19 +2083,19 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationsource_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual0);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
-	var_virtual0 == var_SourceSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_SourceSubsystem);
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationtarget_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual1);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual1);
-	var_virtual1 == var_TargetSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_TargetSubsystem);
 	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Source);
 	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Source,var_virtual2);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
-	var_virtual2 == var_SourceSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual2, var_SourceSubsystem);
 	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Target);
 	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Target,var_virtual3);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual3);
-	var_virtual3 == var_TargetSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual3, var_TargetSubsystem);
 }
 private pattern twoParam_mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_directCommunicationLink(var_Source, var_Target) {
 	find mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_directCommunicationLink(_,_,var_Source, var_Target);
@@ -1706,15 +2117,15 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationsource_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual0);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
-	var_virtual0 == var_SourceSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_SourceSubsystem);
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationtarget_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual1);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual1);
-	var_virtual1 == var_TargetSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_TargetSubsystem);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_SourceSubsystem);
 	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_SourceSubsystem,var_virtual2);
 	// type constraint is enforced by construction
-	var_virtual2 == var_Band;
+	find mustEquivalent(problem, interpretation, var_virtual2, var_Band);
 	neg find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_commSubsystemBand(problem,interpretation,var_TargetSubsystem,var_Band);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_incompatibleSourceAndTargetBand(
@@ -1748,15 +2159,15 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationsource_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual0);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
-	var_virtual0 == var_SourceSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_SourceSubsystem);
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationtarget_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual1);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual1);
-	var_virtual1 == var_TargetSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_TargetSubsystem);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_SourceSubsystem);
 	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_SourceSubsystem,var_virtual2);
 	// type constraint is enforced by construction
-	var_virtual2 == var_Band;
+	find mustEquivalent(problem, interpretation, var_virtual2, var_Band);
 	neg find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_commSubsystemBand(problem,interpretation,var_TargetSubsystem,var_Band);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemBand
@@ -1772,7 +2183,7 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual0);
 	// type constraint is enforced by construction
-	var_virtual0 == var_Band;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_Band);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_commSubsystemBand(
 	problem:LogicProblem, interpretation:PartialInterpretation,
@@ -1800,7 +2211,7 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual0);
 	// type constraint is enforced by construction
-	var_virtual0 == var_Band;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_Band);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetGain
 private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_incompatibleSourceAndTargetGain(
@@ -1813,15 +2224,15 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationsource_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual0);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
-	var_virtual0 == var_SourceSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_SourceSubsystem);
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationtarget_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual1);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual1);
-	var_virtual1 == var_TargetSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_TargetSubsystem);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_SourceSubsystem);
 	find mustInRelationgain_attribute_CommSubsystem(problem,interpretation,var_SourceSubsystem,var_virtual2);
 	// type constraint is enforced by construction
-	var_virtual2 == var_Gain;
+	find mustEquivalent(problem, interpretation, var_virtual2, var_Gain);
 	neg find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_commSubsystemGain(problem,interpretation,var_TargetSubsystem,var_Gain);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_incompatibleSourceAndTargetGain(
@@ -1855,15 +2266,15 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationsource_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual0);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
-	var_virtual0 == var_SourceSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_SourceSubsystem);
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationtarget_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual1);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual1);
-	var_virtual1 == var_TargetSubsystem;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_TargetSubsystem);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_SourceSubsystem);
 	find mustInRelationgain_attribute_CommSubsystem(problem,interpretation,var_SourceSubsystem,var_virtual2);
 	// type constraint is enforced by construction
-	var_virtual2 == var_Gain;
+	find mustEquivalent(problem, interpretation, var_virtual2, var_Gain);
 	neg find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_commSubsystemGain(problem,interpretation,var_TargetSubsystem,var_Gain);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemGain
@@ -1879,7 +2290,7 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationgain_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual0);
 	// type constraint is enforced by construction
-	var_virtual0 == var_Gain;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_Gain);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_commSubsystemGain(
 	problem:LogicProblem, interpretation:PartialInterpretation,
@@ -1907,7 +2318,7 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationgain_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual0);
 	// type constraint is enforced by construction
-	var_virtual0 == var_Gain;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_Gain);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries uhfAntennaGainNotLow
 private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_uhfAntennaGainNotLow(
@@ -1921,7 +2332,7 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual1);
 	// type constraint is enforced by construction
-	var_virtual1 == var_virtual0;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_virtual0);
 	neg find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_commSubsystemGainLow(problem,interpretation,var_Comm);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_uhfAntennaGainNotLow(
@@ -1949,7 +2360,7 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual1);
 	// type constraint is enforced by construction
-	var_virtual1 == var_virtual0;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_virtual0);
 	neg find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_commSubsystemGainLow(problem,interpretation,var_Comm);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemGainLow
@@ -1964,7 +2375,7 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationgain_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual1);
 	// type constraint is enforced by construction
-	var_virtual1 == var_virtual0;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_virtual0);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_commSubsystemGainLow(
 	problem:LogicProblem, interpretation:PartialInterpretation,
@@ -1990,7 +2401,7 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationgain_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual1);
 	// type constraint is enforced by construction
-	var_virtual1 == var_virtual0;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_virtual0);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries xAntennaGainNotMedium
 private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_xAntennaGainNotMedium(
@@ -2004,7 +2415,7 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual1);
 	// type constraint is enforced by construction
-	var_virtual1 == var_virtual0;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_virtual0);
 	neg find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_commSubsystemGainMedium(problem,interpretation,var_Comm);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_xAntennaGainNotMedium(
@@ -2032,7 +2443,7 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual1);
 	// type constraint is enforced by construction
-	var_virtual1 == var_virtual0;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_virtual0);
 	neg find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_commSubsystemGainMedium(problem,interpretation,var_Comm);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemGainMedium
@@ -2047,7 +2458,7 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationgain_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual1);
 	// type constraint is enforced by construction
-	var_virtual1 == var_virtual0;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_virtual0);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_commSubsystemGainMedium(
 	problem:LogicProblem, interpretation:PartialInterpretation,
@@ -2073,7 +2484,7 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationgain_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual1);
 	// type constraint is enforced by construction
-	var_virtual1 == var_virtual0;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_virtual0);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries kaAntennaGainLow
 private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_kaAntennaGainLow(
@@ -2087,12 +2498,12 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual1);
 	// type constraint is enforced by construction
-	var_virtual1 == var_virtual0;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_virtual0);
 	var_virtual2 == const_LOW_AntennaGain;DefinedElement.name(const_LOW_AntennaGain,"LOW AntennaGain");  //LogicProblem.elements(problem,const_LOW_AntennaGain);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationgain_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual3);
 	// type constraint is enforced by construction
-	var_virtual3 == var_virtual2;
+	find mustEquivalent(problem, interpretation, var_virtual3, var_virtual2);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_kaAntennaGainLow(
 	problem:LogicProblem, interpretation:PartialInterpretation,
@@ -2123,12 +2534,12 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual1);
 	// type constraint is enforced by construction
-	var_virtual1 == var_virtual0;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_virtual0);
 	var_virtual2 == const_LOW_AntennaGain;DefinedElement.name(const_LOW_AntennaGain,"LOW AntennaGain");  //LogicProblem.elements(problem,const_LOW_AntennaGain);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationgain_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual3);
 	// type constraint is enforced by construction
-	var_virtual3 == var_virtual2;
+	find mustEquivalent(problem, interpretation, var_virtual3, var_virtual2);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries threeUCubeSatWithNonUhfCrossLink
 private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_threeUCubeSatWithNonUhfCrossLink(
@@ -2141,20 +2552,20 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Sat);
 	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Sat,var_virtual0);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
-	var_virtual0 == var_SourceComm;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_SourceComm);
 	neg find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_commSubsystemBandUhf(problem,interpretation,var_SourceComm);
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationsource_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual1);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual1);
-	var_virtual1 == var_SourceComm;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_SourceComm);
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationtarget_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual2);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
-	var_virtual2 == var_TargetComm;
+	find mustEquivalent(problem, interpretation, var_virtual2, var_TargetComm);
 	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Target);
 	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Target,var_virtual3);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual3);
-	var_virtual3 == var_TargetComm;
+	find mustEquivalent(problem, interpretation, var_virtual3, var_TargetComm);
 	neg find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_groundStationNetwork(problem,interpretation,var_Target);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_threeUCubeSatWithNonUhfCrossLink(
@@ -2193,20 +2604,20 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Sat);
 	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Sat,var_virtual0);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual0);
-	var_virtual0 == var_SourceComm;
+	find mustEquivalent(problem, interpretation, var_virtual0, var_SourceComm);
 	neg find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_commSubsystemBandUhf(problem,interpretation,var_SourceComm);
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationsource_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual1);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual1);
-	var_virtual1 == var_SourceComm;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_SourceComm);
 	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,var_Link);
 	find mustInRelationtarget_reference_DirectedCommunicationLink(problem,interpretation,var_Link,var_virtual2);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual2);
-	var_virtual2 == var_TargetComm;
+	find mustEquivalent(problem, interpretation, var_virtual2, var_TargetComm);
 	find mustInstanceOfCommunicatingElement_class(problem,interpretation,var_Target);
 	find mustInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,var_Target,var_virtual3);
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual3);
-	var_virtual3 == var_TargetComm;
+	find mustEquivalent(problem, interpretation, var_virtual3, var_TargetComm);
 	neg find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_groundStationNetwork(problem,interpretation,var_Target);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemBandUhf
@@ -2221,7 +2632,7 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual1);
 	// type constraint is enforced by construction
-	var_virtual1 == var_virtual0;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_virtual0);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_commSubsystemBandUhf(
 	problem:LogicProblem, interpretation:PartialInterpretation,
@@ -2247,7 +2658,7 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_Comm);
 	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_Comm,var_virtual1);
 	// type constraint is enforced by construction
-	var_virtual1 == var_virtual0;
+	find mustEquivalent(problem, interpretation, var_virtual1, var_virtual0);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries groundStationNetwork
 private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_groundStationNetwork(
@@ -2291,7 +2702,7 @@ private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satell
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual1);
 	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_virtual1,var_virtual2);
 	// type constraint is enforced by construction
-	var_virtual2 == var_virtual0;
+	find mustEquivalent(problem, interpretation, var_virtual2, var_virtual0);
 	neg find mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_smallSat(problem,interpretation,var_Spacecraft);
 }
 private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_cubeSatWithKaAntenna(
@@ -2323,7 +2734,7 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	find mustInstanceOfCommSubsystem_class(problem,interpretation,var_virtual1);
 	find mustInRelationband_attribute_CommSubsystem(problem,interpretation,var_virtual1,var_virtual2);
 	// type constraint is enforced by construction
-	var_virtual2 == var_virtual0;
+	find mustEquivalent(problem, interpretation, var_virtual2, var_virtual0);
 	neg find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_smallSat(problem,interpretation,var_Spacecraft);
 }
 // Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries smallSat
@@ -2350,9 +2761,103 @@ private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_sat
 	var_Sat)
 {
 	find interpretation(problem,interpretation);
-	find mustInstanceOfSmallSat_class(problem,interpretation,var_Sat);
-	// Sat is exported
-	find mustInstanceOfSmallSat_class(problem,interpretation,var_Sat);
+	find mustInstanceOfSmallSat_class(problem,interpretation,var_Sat);
+	// Sat is exported
+	find mustInstanceOfSmallSat_class(problem,interpretation,var_Sat);
+}
+// Must, May and Current queries for pattern hu bme mit inf dslreasoner domains satellite queries spacecraftOfKind
+private pattern mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_spacecraftOfKind(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_Spacecraft, var_Kind)
+{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_Spacecraft);
+	// type constraint is enforced by construction
+	// Spacecraft is exported
+	// Kind is exported
+	find mustInstanceOfCubeSat3U_class(problem,interpretation,var_Spacecraft);
+	var_virtual0 == const_CubeSat3U_SpacecraftKind;DefinedElement.name(const_CubeSat3U_SpacecraftKind,"CubeSat3U SpacecraftKind");  //LogicProblem.elements(problem,const_CubeSat3U_SpacecraftKind);
+	find mustEquivalent(problem, interpretation, var_Kind, var_virtual0);
+}or{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_Spacecraft);
+	// type constraint is enforced by construction
+	// Spacecraft is exported
+	// Kind is exported
+	find mustInstanceOfCubeSat6U_class(problem,interpretation,var_Spacecraft);
+	var_virtual0 == const_CubeSat6U_SpacecraftKind;DefinedElement.name(const_CubeSat6U_SpacecraftKind,"CubeSat6U SpacecraftKind");  //LogicProblem.elements(problem,const_CubeSat6U_SpacecraftKind);
+	find mustEquivalent(problem, interpretation, var_Kind, var_virtual0);
+}or{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_Spacecraft);
+	// type constraint is enforced by construction
+	// Spacecraft is exported
+	// Kind is exported
+	find mustInstanceOfSmallSat_class(problem,interpretation,var_Spacecraft);
+	var_virtual0 == const_SmallSat_SpacecraftKind;DefinedElement.name(const_SmallSat_SpacecraftKind,"SmallSat SpacecraftKind");  //LogicProblem.elements(problem,const_SmallSat_SpacecraftKind);
+	find mustEquivalent(problem, interpretation, var_Kind, var_virtual0);
+}
+private pattern mayInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_spacecraftOfKind(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_Spacecraft, var_Kind)
+{
+	find interpretation(problem,interpretation);
+	find mayInstanceOfSpacecraft_class(problem,interpretation,var_Spacecraft);
+	// type constraint is enforced by construction
+	// Spacecraft is exported
+	// Kind is exported
+	find mayInstanceOfCubeSat3U_class(problem,interpretation,var_Spacecraft);
+	var_virtual0 == const_CubeSat3U_SpacecraftKind;DefinedElement.name(const_CubeSat3U_SpacecraftKind,"CubeSat3U SpacecraftKind");  //LogicProblem.elements(problem,const_CubeSat3U_SpacecraftKind);
+	find mayEquivalent(problem, interpretation, var_Kind, var_virtual0);
+}or{
+	find interpretation(problem,interpretation);
+	find mayInstanceOfSpacecraft_class(problem,interpretation,var_Spacecraft);
+	// type constraint is enforced by construction
+	// Spacecraft is exported
+	// Kind is exported
+	find mayInstanceOfCubeSat6U_class(problem,interpretation,var_Spacecraft);
+	var_virtual0 == const_CubeSat6U_SpacecraftKind;DefinedElement.name(const_CubeSat6U_SpacecraftKind,"CubeSat6U SpacecraftKind");  //LogicProblem.elements(problem,const_CubeSat6U_SpacecraftKind);
+	find mayEquivalent(problem, interpretation, var_Kind, var_virtual0);
+}or{
+	find interpretation(problem,interpretation);
+	find mayInstanceOfSpacecraft_class(problem,interpretation,var_Spacecraft);
+	// type constraint is enforced by construction
+	// Spacecraft is exported
+	// Kind is exported
+	find mayInstanceOfSmallSat_class(problem,interpretation,var_Spacecraft);
+	var_virtual0 == const_SmallSat_SpacecraftKind;DefinedElement.name(const_SmallSat_SpacecraftKind,"SmallSat SpacecraftKind");  //LogicProblem.elements(problem,const_SmallSat_SpacecraftKind);
+	find mayEquivalent(problem, interpretation, var_Kind, var_virtual0);
+}
+private pattern currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_spacecraftOfKind(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	var_Spacecraft, var_Kind)
+{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_Spacecraft);
+	// type constraint is enforced by construction
+	// Spacecraft is exported
+	// Kind is exported
+	find mustInstanceOfCubeSat3U_class(problem,interpretation,var_Spacecraft);
+	var_virtual0 == const_CubeSat3U_SpacecraftKind;DefinedElement.name(const_CubeSat3U_SpacecraftKind,"CubeSat3U SpacecraftKind");  //LogicProblem.elements(problem,const_CubeSat3U_SpacecraftKind);
+	find mustEquivalent(problem, interpretation, var_Kind, var_virtual0);
+}or{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_Spacecraft);
+	// type constraint is enforced by construction
+	// Spacecraft is exported
+	// Kind is exported
+	find mustInstanceOfCubeSat6U_class(problem,interpretation,var_Spacecraft);
+	var_virtual0 == const_CubeSat6U_SpacecraftKind;DefinedElement.name(const_CubeSat6U_SpacecraftKind,"CubeSat6U SpacecraftKind");  //LogicProblem.elements(problem,const_CubeSat6U_SpacecraftKind);
+	find mustEquivalent(problem, interpretation, var_Kind, var_virtual0);
+}or{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,var_Spacecraft);
+	// type constraint is enforced by construction
+	// Spacecraft is exported
+	// Kind is exported
+	find mustInstanceOfSmallSat_class(problem,interpretation,var_Spacecraft);
+	var_virtual0 == const_SmallSat_SpacecraftKind;DefinedElement.name(const_SmallSat_SpacecraftKind,"SmallSat SpacecraftKind");  //LogicProblem.elements(problem,const_SmallSat_SpacecraftKind);
+	find mustEquivalent(problem, interpretation, var_Kind, var_virtual0);
 }
 
 //////////
@@ -2388,11 +2893,21 @@ pattern invalidatedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queri
 {
 	find mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkDoesNotStartAtContainingElement(problem,interpretation,var_Link);
 }
+pattern invalidatedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_notEnoughInterferometryPayloads(problem:LogicProblem, interpretation:PartialInterpretation,
+	var_Mission)
+{
+	find mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_notEnoughInterferometryPayloads(problem,interpretation,var_Mission);
+}
 pattern invalidatedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_noLinkToGroundStation(problem:LogicProblem, interpretation:PartialInterpretation,
 	var_Spacecraft)
 {
 	find mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_noLinkToGroundStation(problem,interpretation,var_Spacecraft);
 }
+pattern invalidatedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_noPotentialLinkToGroundStation(problem:LogicProblem, interpretation:PartialInterpretation,
+	var_Spacecraft)
+{
+	find mustInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_noPotentialLinkToGroundStation(problem,interpretation,var_Spacecraft);
+}
 pattern invalidatedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLoop(problem:LogicProblem, interpretation:PartialInterpretation,
 	var_Element)
 {
@@ -2511,11 +3026,21 @@ pattern unfinishedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_querie
 {
 	find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLinkDoesNotStartAtContainingElement(problem,interpretation,var_Link);
 }
+pattern unfinishedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_notEnoughInterferometryPayloads(problem:LogicProblem, interpretation:PartialInterpretation,
+	var_Mission)
+{
+	find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_notEnoughInterferometryPayloads(problem,interpretation,var_Mission);
+}
 pattern unfinishedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_noLinkToGroundStation(problem:LogicProblem, interpretation:PartialInterpretation,
 	var_Spacecraft)
 {
 	find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_noLinkToGroundStation(problem,interpretation,var_Spacecraft);
 }
+pattern unfinishedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_noPotentialLinkToGroundStation(problem:LogicProblem, interpretation:PartialInterpretation,
+	var_Spacecraft)
+{
+	find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_noPotentialLinkToGroundStation(problem,interpretation,var_Spacecraft);
+}
 pattern unfinishedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_communicationLoop(problem:LogicProblem, interpretation:PartialInterpretation,
 	var_Element)
 {
@@ -2565,31 +3090,35 @@ pattern unfinishedBy_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_querie
 private pattern hasElementInContainment(problem:LogicProblem, interpretation:PartialInterpretation)
 {
 	find interpretation(problem,interpretation);
-	find mustInstanceOfCommunicatingElement_class(problem,interpretation,root);
+	find mustInstanceOfInterferometryPayload_class(problem,interpretation,root);
 	find mustExist(problem, interpretation, root);
 }or{
 	find interpretation(problem,interpretation);
-	find mustInstanceOfConstellationMission_class(problem,interpretation,root);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,root);
 	find mustExist(problem, interpretation, root);
 }or{
 	find interpretation(problem,interpretation);
-	find mustInstanceOfInterferometryMission_class(problem,interpretation,root);
+	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,root);
 	find mustExist(problem, interpretation, root);
 }or{
 	find interpretation(problem,interpretation);
-	find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,root);
+	find mustInstanceOfCubeSat_class(problem,interpretation,root);
 	find mustExist(problem, interpretation, root);
 }or{
 	find interpretation(problem,interpretation);
-	find mustInstanceOfSmallSat_class(problem,interpretation,root);
+	find mustInstanceOfConstellationMission_class(problem,interpretation,root);
 	find mustExist(problem, interpretation, root);
 }or{
 	find interpretation(problem,interpretation);
-	find mustInstanceOfPayload_class(problem,interpretation,root);
+	find mustInstanceOfInterferometryMission_class(problem,interpretation,root);
 	find mustExist(problem, interpretation, root);
 }or{
 	find interpretation(problem,interpretation);
-	find mustInstanceOfGroundStationNetwork_class(problem,interpretation,root);
+	find mustInstanceOfCubeSat3U_class(problem,interpretation,root);
+	find mustExist(problem, interpretation, root);
+}or{
+	find interpretation(problem,interpretation);
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,root);
 	find mustExist(problem, interpretation, root);
 }or{
 	find interpretation(problem,interpretation);
@@ -2597,19 +3126,19 @@ private pattern hasElementInContainment(problem:LogicProblem, interpretation:Par
 	find mustExist(problem, interpretation, root);
 }or{
 	find interpretation(problem,interpretation);
-	find mustInstanceOfCommSubsystem_class(problem,interpretation,root);
+	find mustInstanceOfSmallSat_class(problem,interpretation,root);
 	find mustExist(problem, interpretation, root);
 }or{
 	find interpretation(problem,interpretation);
-	find mustInstanceOfInterferometryPayload_class(problem,interpretation,root);
+	find mustInstanceOfCommSubsystem_class(problem,interpretation,root);
 	find mustExist(problem, interpretation, root);
 }or{
 	find interpretation(problem,interpretation);
-	find mustInstanceOfCubeSat3U_class(problem,interpretation,root);
+	find mustInstanceOfGroundStationNetwork_class(problem,interpretation,root);
 	find mustExist(problem, interpretation, root);
 }or{
 	find interpretation(problem,interpretation);
-	find mustInstanceOfSpacecraft_class(problem,interpretation,root);
+	find mustInstanceOfPayload_class(problem,interpretation,root);
 	find mustExist(problem, interpretation, root);
 }or{
 	find interpretation(problem,interpretation);
@@ -2652,59 +3181,43 @@ private pattern hasElementInContainment(problem:LogicProblem, interpretation:Par
 	find mustInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,root);
 	find mustExist(problem, interpretation, root);
 }
-pattern createObject_CubeSat6U_class_by_spacecraft_reference_ConstellationMission(
+pattern createObject_DirectedCommunicationLink_class_by_communicationLink_reference_CommunicatingElement(
 	problem:LogicProblem, interpretation:PartialInterpretation,
 	relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialComplexTypeInterpretation,
 	container:DefinedElement)
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"CubeSat6U class");
+	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"DirectedCommunicationLink class");
 	PartialInterpretation.partialrelationinterpretation(interpretation,relationInterpretation);
-	PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"spacecraft reference ConstellationMission");
-	find mustInstanceOfConstellationMission_class(problem,interpretation,container);
-	find mayInstanceOfCubeSat6U_class(problem,interpretation,newObject);
-	find mayInRelationspacecraft_reference_ConstellationMission(problem,interpretation,container,newObject);
+	PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"communicationLink reference CommunicatingElement");
+	find mustInstanceOfCommunicatingElement_class(problem,interpretation,container);
+	find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,newObject);
+	find mayInRelationcommunicationLink_reference_CommunicatingElement(problem,interpretation,container,newObject);
 	find mustExist(problem, interpretation, container);
 	neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_CubeSat6U_class(
+pattern createObject_DirectedCommunicationLink_class(
 	problem:LogicProblem, interpretation:PartialInterpretation,
 	typeInterpretation:PartialComplexTypeInterpretation)
 {
 	find interpretation(problem,interpretation);
 	neg find hasElementInContainment(problem,interpretation);
 	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"CubeSat6U class");
-	find mayInstanceOfCubeSat6U_class(problem,interpretation,newObject);
+	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"DirectedCommunicationLink class");
+	find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,newObject);
 	find mayExist(problem, interpretation, newObject);
 	neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_CommSubsystem_class_UndefinedPart_by_commSubsystem_reference_CommunicatingElement(
-	problem:LogicProblem, interpretation:PartialInterpretation,
-	relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialComplexTypeInterpretation,
-	container:DefinedElement)
-{
-	find interpretation(problem,interpretation);
-	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"CommSubsystem class UndefinedPart");
-	PartialInterpretation.partialrelationinterpretation(interpretation,relationInterpretation);
-	PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"commSubsystem reference CommunicatingElement");
-	find mustInstanceOfCommunicatingElement_class(problem,interpretation,container);
-	find mayInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,newObject);
-	find mayInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,container,newObject);
-	find mustExist(problem, interpretation, container);
-	neg find mustExist(problem, interpretation, newObject);
-}
-pattern createObject_CommSubsystem_class_UndefinedPart(
+pattern createObject_InterferometryMission_class_UndefinedPart(
 	problem:LogicProblem, interpretation:PartialInterpretation,
 	typeInterpretation:PartialComplexTypeInterpretation)
 {
 	find interpretation(problem,interpretation);
 	neg find hasElementInContainment(problem,interpretation);
 	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"CommSubsystem class UndefinedPart");
-	find mayInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,newObject);
+	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"InterferometryMission class UndefinedPart");
+	find mayInstanceOfInterferometryMission_class_UndefinedPart(problem,interpretation,newObject);
 	find mayExist(problem, interpretation, newObject);
 	neg find mustExist(problem, interpretation, newObject);
 }
@@ -2736,31 +3249,31 @@ pattern createObject_InterferometryPayload_class(
 	find mayExist(problem, interpretation, newObject);
 	neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_SmallSat_class_by_spacecraft_reference_ConstellationMission(
+pattern createObject_GroundStationNetwork_class_UndefinedPart_by_groundStationNetwork_reference_ConstellationMission(
 	problem:LogicProblem, interpretation:PartialInterpretation,
 	relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialComplexTypeInterpretation,
 	container:DefinedElement)
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"SmallSat class");
+	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"GroundStationNetwork class UndefinedPart");
 	PartialInterpretation.partialrelationinterpretation(interpretation,relationInterpretation);
-	PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"spacecraft reference ConstellationMission");
+	PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"groundStationNetwork reference ConstellationMission");
 	find mustInstanceOfConstellationMission_class(problem,interpretation,container);
-	find mayInstanceOfSmallSat_class(problem,interpretation,newObject);
-	find mayInRelationspacecraft_reference_ConstellationMission(problem,interpretation,container,newObject);
+	find mayInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,newObject);
+	find mayInRelationgroundStationNetwork_reference_ConstellationMission(problem,interpretation,container,newObject);
 	find mustExist(problem, interpretation, container);
 	neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_SmallSat_class(
+pattern createObject_GroundStationNetwork_class_UndefinedPart(
 	problem:LogicProblem, interpretation:PartialInterpretation,
 	typeInterpretation:PartialComplexTypeInterpretation)
 {
 	find interpretation(problem,interpretation);
 	neg find hasElementInContainment(problem,interpretation);
 	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"SmallSat class");
-	find mayInstanceOfSmallSat_class(problem,interpretation,newObject);
+	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"GroundStationNetwork class UndefinedPart");
+	find mayInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,newObject);
 	find mayExist(problem, interpretation, newObject);
 	neg find mustExist(problem, interpretation, newObject);
 }
@@ -2792,71 +3305,87 @@ pattern createObject_CubeSat3U_class(
 	find mayExist(problem, interpretation, newObject);
 	neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_GroundStationNetwork_class_UndefinedPart_by_groundStationNetwork_reference_ConstellationMission(
+pattern createObject_SmallSat_class_by_spacecraft_reference_ConstellationMission(
 	problem:LogicProblem, interpretation:PartialInterpretation,
 	relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialComplexTypeInterpretation,
 	container:DefinedElement)
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"GroundStationNetwork class UndefinedPart");
+	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"SmallSat class");
 	PartialInterpretation.partialrelationinterpretation(interpretation,relationInterpretation);
-	PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"groundStationNetwork reference ConstellationMission");
+	PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"spacecraft reference ConstellationMission");
 	find mustInstanceOfConstellationMission_class(problem,interpretation,container);
-	find mayInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,newObject);
-	find mayInRelationgroundStationNetwork_reference_ConstellationMission(problem,interpretation,container,newObject);
+	find mayInstanceOfSmallSat_class(problem,interpretation,newObject);
+	find mayInRelationspacecraft_reference_ConstellationMission(problem,interpretation,container,newObject);
 	find mustExist(problem, interpretation, container);
 	neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_GroundStationNetwork_class_UndefinedPart(
+pattern createObject_SmallSat_class(
 	problem:LogicProblem, interpretation:PartialInterpretation,
 	typeInterpretation:PartialComplexTypeInterpretation)
 {
 	find interpretation(problem,interpretation);
 	neg find hasElementInContainment(problem,interpretation);
 	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"GroundStationNetwork class UndefinedPart");
-	find mayInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,newObject);
+	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"SmallSat class");
+	find mayInstanceOfSmallSat_class(problem,interpretation,newObject);
 	find mayExist(problem, interpretation, newObject);
 	neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_DirectedCommunicationLink_class_by_communicationLink_reference_CommunicatingElement(
+pattern createObject_CommSubsystem_class_UndefinedPart_by_commSubsystem_reference_CommunicatingElement(
 	problem:LogicProblem, interpretation:PartialInterpretation,
 	relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialComplexTypeInterpretation,
 	container:DefinedElement)
 {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"DirectedCommunicationLink class");
+	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"CommSubsystem class UndefinedPart");
 	PartialInterpretation.partialrelationinterpretation(interpretation,relationInterpretation);
-	PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"communicationLink reference CommunicatingElement");
+	PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"commSubsystem reference CommunicatingElement");
 	find mustInstanceOfCommunicatingElement_class(problem,interpretation,container);
-	find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,newObject);
-	find mayInRelationcommunicationLink_reference_CommunicatingElement(problem,interpretation,container,newObject);
+	find mayInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,newObject);
+	find mayInRelationcommSubsystem_reference_CommunicatingElement(problem,interpretation,container,newObject);
 	find mustExist(problem, interpretation, container);
 	neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_DirectedCommunicationLink_class(
+pattern createObject_CommSubsystem_class_UndefinedPart(
 	problem:LogicProblem, interpretation:PartialInterpretation,
 	typeInterpretation:PartialComplexTypeInterpretation)
 {
 	find interpretation(problem,interpretation);
 	neg find hasElementInContainment(problem,interpretation);
 	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"DirectedCommunicationLink class");
-	find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,newObject);
+	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"CommSubsystem class UndefinedPart");
+	find mayInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,newObject);
 	find mayExist(problem, interpretation, newObject);
 	neg find mustExist(problem, interpretation, newObject);
 }
-pattern createObject_InterferometryMission_class_UndefinedPart(
+pattern createObject_CubeSat6U_class_by_spacecraft_reference_ConstellationMission(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	relationInterpretation:PartialRelationInterpretation, typeInterpretation:PartialComplexTypeInterpretation,
+	container:DefinedElement)
+{
+	find interpretation(problem,interpretation);
+	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
+	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"CubeSat6U class");
+	PartialInterpretation.partialrelationinterpretation(interpretation,relationInterpretation);
+	PartialRelationInterpretation.interpretationOf.name(relationInterpretation,"spacecraft reference ConstellationMission");
+	find mustInstanceOfConstellationMission_class(problem,interpretation,container);
+	find mayInstanceOfCubeSat6U_class(problem,interpretation,newObject);
+	find mayInRelationspacecraft_reference_ConstellationMission(problem,interpretation,container,newObject);
+	find mustExist(problem, interpretation, container);
+	neg find mustExist(problem, interpretation, newObject);
+}
+pattern createObject_CubeSat6U_class(
 	problem:LogicProblem, interpretation:PartialInterpretation,
 	typeInterpretation:PartialComplexTypeInterpretation)
 {
 	find interpretation(problem,interpretation);
 	neg find hasElementInContainment(problem,interpretation);
 	PartialInterpretation.partialtypeinterpratation(interpretation,typeInterpretation);
-	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"InterferometryMission class UndefinedPart");
-	find mayInstanceOfInterferometryMission_class_UndefinedPart(problem,interpretation,newObject);
+	PartialComplexTypeInterpretation.interpretationOf.name(typeInterpretation,"CubeSat6U class");
+	find mayInstanceOfCubeSat6U_class(problem,interpretation,newObject);
 	find mayExist(problem, interpretation, newObject);
 	neg find mustExist(problem, interpretation, newObject);
 }
@@ -2864,95 +3393,94 @@ pattern createObject_InterferometryMission_class_UndefinedPart(
 //////////
 // 4.2 Type refinement
 //////////
-pattern refineTypeTo_CubeSat6U_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
+pattern refineTypeTo_DirectedCommunicationLink_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	find mayInstanceOfCubeSat6U_class(problem,interpretation,element);
-	neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
-	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
-	neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
+	find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
 }
-pattern refineTypeTo_CommSubsystem_class_UndefinedPart(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
+pattern refineTypeTo_InterferometryMission_class_UndefinedPart(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	find mayInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	find mayInstanceOfInterferometryMission_class_UndefinedPart(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfInterferometryMission_class_UndefinedPart(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
 }
 pattern refineTypeTo_InterferometryPayload_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
 	find mayInstanceOfInterferometryPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
 	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
 	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
 	neg find mustInstanceOfInterferometryPayload_class(problem,interpretation,element);
-	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
 }
-pattern refineTypeTo_SmallSat_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
+pattern refineTypeTo_GroundStationNetwork_class_UndefinedPart(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	find mayInstanceOfSmallSat_class(problem,interpretation,element);
-	neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
-	neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
+	find mayInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
-	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,element);
+	neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
 }
 pattern refineTypeTo_CubeSat3U_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
 	find mayInstanceOfCubeSat3U_class(problem,interpretation,element);
-	neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
-	neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
+	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
 }
-pattern refineTypeTo_GroundStationNetwork_class_UndefinedPart(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
+pattern refineTypeTo_SmallSat_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	find mayInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	find mayInstanceOfSmallSat_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfGroundStationNetwork_class_UndefinedPart(problem,interpretation,element);
-	neg find mustInstanceOfSpacecraft_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat_class(problem,interpretation,element);
+	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
 }
-pattern refineTypeTo_DirectedCommunicationLink_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
+pattern refineTypeTo_CommSubsystem_class_UndefinedPart(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	find mayInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	find mayInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
 	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class_UndefinedPart(problem,interpretation,element);
 }
-pattern refineTypeTo_InterferometryMission_class_UndefinedPart(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
+pattern refineTypeTo_CubeSat6U_class(problem:LogicProblem, interpretation:PartialInterpretation, element: DefinedElement) {
 	find interpretation(problem,interpretation);
 	PartialInterpretation.newElements(interpretation,element);
-	find mayInstanceOfInterferometryMission_class_UndefinedPart(problem,interpretation,element);
-	neg find mustInstanceOfCommunicatingElement_class(problem,interpretation,element);
-	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
-	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	find mayInstanceOfCubeSat6U_class(problem,interpretation,element);
 	neg find mustInstanceOfDirectedCommunicationLink_class(problem,interpretation,element);
-	neg find mustInstanceOfInterferometryMission_class_UndefinedPart(problem,interpretation,element);
+	neg find mustInstanceOfPayload_class(problem,interpretation,element);
+	neg find mustInstanceOfConstellationMission_class(problem,interpretation,element);
+	neg find mustInstanceOfGroundStationNetwork_class(problem,interpretation,element);
+	neg find mustInstanceOfCommSubsystem_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat3U_class(problem,interpretation,element);
+	neg find mustInstanceOfSmallSat_class(problem,interpretation,element);
+	neg find mustInstanceOfCubeSat6U_class(problem,interpretation,element);
 }
 
 //////////
@@ -2988,6 +3516,21 @@ pattern refineRelation_target_reference_DirectedCommunicationLink(
 	find mayInRelationtarget_reference_DirectedCommunicationLink(problem,interpretation,from,to);
 	neg find mustInRelationtarget_reference_DirectedCommunicationLink(problem,interpretation,from,to);
 }
+pattern refineRelation_kind_attribute_Spacecraft(
+	problem:LogicProblem, interpretation:PartialInterpretation,
+	relationIterpretation:PartialRelationInterpretation,
+	from: DefinedElement, to: DefinedElement)
+{
+	find interpretation(problem,interpretation);
+	PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);
+	PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"kind attribute Spacecraft");
+	find mustExist(problem, interpretation, from);
+	find mustExist(problem, interpretation, to);
+	find mustInstanceOfSpacecraft_class(problem,interpretation,from);
+	find mustInstanceOfSpacecraftKind_enum(problem,interpretation,to);
+	find mayInRelationkind_attribute_Spacecraft(problem,interpretation,from,to);
+	neg find mustInRelationkind_attribute_Spacecraft(problem,interpretation,from,to);
+}
 pattern refineRelation_band_attribute_CommSubsystem(
 	problem:LogicProblem, interpretation:PartialInterpretation,
 	relationIterpretation:PartialRelationInterpretation,
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generation.logicproblem b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generation.logicproblem
index 7b46b451..2a54174a 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generation.logicproblem
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/generation.logicproblem
@@ -1,29 +1,31 @@
 <?xml version="1.0" encoding="ASCII"?>
 <language:LogicProblem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore2logicannotations="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language/ecore2logicannotation" xmlns:language="http://www.bme.hu/mit/inf/dslreasoner/logic/model/problem" xmlns:language_1="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language" xmlns:partial2logicannotations="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language/partial2logicannotation" xmlns:viatra2logicannotations="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language/viatra2logicannotation">
-  <types xsi:type="language_1:TypeDeclaration" name="ConstellationMission class" subtypes="//@types.1 //@types.14 //@types.15" isAbstract="true"/>
-  <types xsi:type="language_1:TypeDeclaration" name="InterferometryMission class" subtypes="//@types.16 //@types.17" supertypes="//@types.0" isAbstract="true"/>
-  <types xsi:type="language_1:TypeDeclaration" name="CommunicatingElement class" subtypes="//@types.3 //@types.4 //@types.18 //@types.19" isAbstract="true"/>
-  <types xsi:type="language_1:TypeDeclaration" name="GroundStationNetwork class" subtypes="//@types.20 //@types.21" supertypes="//@types.2" isAbstract="true"/>
-  <types xsi:type="language_1:TypeDeclaration" name="Spacecraft class" subtypes="//@types.5 //@types.6 //@types.7" supertypes="//@types.2 //@types.19" isAbstract="true"/>
-  <types xsi:type="language_1:TypeDeclaration" name="CubeSat3U class" supertypes="//@types.4"/>
-  <types xsi:type="language_1:TypeDeclaration" name="CubeSat6U class" supertypes="//@types.4"/>
-  <types xsi:type="language_1:TypeDeclaration" name="SmallSat class" supertypes="//@types.4"/>
-  <types xsi:type="language_1:TypeDeclaration" name="CommSubsystem class" subtypes="//@types.22 //@types.23" isAbstract="true"/>
+  <types xsi:type="language_1:TypeDeclaration" name="ConstellationMission class" subtypes="//@types.1 //@types.16 //@types.17" isAbstract="true"/>
+  <types xsi:type="language_1:TypeDeclaration" name="InterferometryMission class" subtypes="//@types.18 //@types.19" supertypes="//@types.0" isAbstract="true"/>
+  <types xsi:type="language_1:TypeDeclaration" name="CommunicatingElement class" subtypes="//@types.3 //@types.4 //@types.20 //@types.21" isAbstract="true"/>
+  <types xsi:type="language_1:TypeDeclaration" name="GroundStationNetwork class" subtypes="//@types.22 //@types.23" supertypes="//@types.2" isAbstract="true"/>
+  <types xsi:type="language_1:TypeDeclaration" name="Spacecraft class" subtypes="//@types.11 //@types.12" supertypes="//@types.2 //@types.21" isAbstract="true"/>
+  <types xsi:type="language_1:TypeDeclaration" name="CommSubsystem class" subtypes="//@types.24 //@types.25" isAbstract="true"/>
   <types xsi:type="language_1:TypeDeclaration" name="DirectedCommunicationLink class"/>
-  <types xsi:type="language_1:TypeDeclaration" name="Payload class" subtypes="//@types.11" isAbstract="true"/>
-  <types xsi:type="language_1:TypeDeclaration" name="InterferometryPayload class" supertypes="//@types.10"/>
+  <types xsi:type="language_1:TypeDeclaration" name="Payload class" subtypes="//@types.8" isAbstract="true"/>
+  <types xsi:type="language_1:TypeDeclaration" name="InterferometryPayload class" supertypes="//@types.7"/>
+  <types xsi:type="language_1:TypeDeclaration" name="CubeSat3U class" supertypes="//@types.12"/>
+  <types xsi:type="language_1:TypeDeclaration" name="CubeSat6U class" supertypes="//@types.12"/>
+  <types xsi:type="language_1:TypeDeclaration" name="SmallSat class" supertypes="//@types.4"/>
+  <types xsi:type="language_1:TypeDeclaration" name="CubeSat class" subtypes="//@types.9 //@types.10" supertypes="//@types.4" isAbstract="true"/>
   <types xsi:type="language_1:TypeDefinition" name="TransceiverBand enum" elements="//@elements.0 //@elements.1 //@elements.2"/>
   <types xsi:type="language_1:TypeDefinition" name="AntennaGain enum" elements="//@elements.3 //@elements.4 //@elements.5"/>
-  <types xsi:type="language_1:TypeDefinition" name="ConstellationMission class DefinedPart" subtypes="//@types.16" supertypes="//@types.0" isAbstract="true" elements="//@elements.6"/>
-  <types xsi:type="language_1:TypeDeclaration" name="ConstellationMission class UndefinedPart" subtypes="//@types.17" supertypes="//@types.0" isAbstract="true"/>
-  <types xsi:type="language_1:TypeDefinition" name="InterferometryMission class DefinedPart" supertypes="//@types.1 //@types.14" elements="//@elements.6"/>
-  <types xsi:type="language_1:TypeDeclaration" name="InterferometryMission class UndefinedPart" supertypes="//@types.1 //@types.15"/>
-  <types xsi:type="language_1:TypeDefinition" name="CommunicatingElement class DefinedPart" subtypes="//@types.20" supertypes="//@types.2" isAbstract="true" elements="//@elements.7"/>
-  <types xsi:type="language_1:TypeDeclaration" name="CommunicatingElement class UndefinedPart" subtypes="//@types.21 //@types.4" supertypes="//@types.2" isAbstract="true"/>
-  <types xsi:type="language_1:TypeDefinition" name="GroundStationNetwork class DefinedPart" supertypes="//@types.3 //@types.18" elements="//@elements.7"/>
-  <types xsi:type="language_1:TypeDeclaration" name="GroundStationNetwork class UndefinedPart" supertypes="//@types.3 //@types.19"/>
-  <types xsi:type="language_1:TypeDefinition" name="CommSubsystem class DefinedPart" supertypes="//@types.8" elements="//@elements.8 //@elements.9"/>
-  <types xsi:type="language_1:TypeDeclaration" name="CommSubsystem class UndefinedPart" supertypes="//@types.8"/>
+  <types xsi:type="language_1:TypeDefinition" name="SpacecraftKind enum" elements="//@elements.6 //@elements.7 //@elements.8"/>
+  <types xsi:type="language_1:TypeDefinition" name="ConstellationMission class DefinedPart" subtypes="//@types.18" supertypes="//@types.0" isAbstract="true" elements="//@elements.9"/>
+  <types xsi:type="language_1:TypeDeclaration" name="ConstellationMission class UndefinedPart" subtypes="//@types.19" supertypes="//@types.0" isAbstract="true"/>
+  <types xsi:type="language_1:TypeDefinition" name="InterferometryMission class DefinedPart" supertypes="//@types.1 //@types.16" elements="//@elements.9"/>
+  <types xsi:type="language_1:TypeDeclaration" name="InterferometryMission class UndefinedPart" supertypes="//@types.1 //@types.17"/>
+  <types xsi:type="language_1:TypeDefinition" name="CommunicatingElement class DefinedPart" subtypes="//@types.22" supertypes="//@types.2" isAbstract="true" elements="//@elements.10"/>
+  <types xsi:type="language_1:TypeDeclaration" name="CommunicatingElement class UndefinedPart" subtypes="//@types.23 //@types.4" supertypes="//@types.2" isAbstract="true"/>
+  <types xsi:type="language_1:TypeDefinition" name="GroundStationNetwork class DefinedPart" supertypes="//@types.3 //@types.20" elements="//@elements.10"/>
+  <types xsi:type="language_1:TypeDeclaration" name="GroundStationNetwork class UndefinedPart" supertypes="//@types.3 //@types.21"/>
+  <types xsi:type="language_1:TypeDefinition" name="CommSubsystem class DefinedPart" supertypes="//@types.5" elements="//@elements.11 //@elements.12"/>
+  <types xsi:type="language_1:TypeDeclaration" name="CommSubsystem class UndefinedPart" supertypes="//@types.5"/>
   <assertions name="lowerMultiplicity groundStationNetwork ConstellationMission" annotations="//@annotations.0">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
@@ -534,7 +536,7 @@
       </quantifiedVariables>
       <expression xsi:type="language_1:Exists">
         <quantifiedVariables name="trg 1">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
@@ -551,13 +553,13 @@
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
       </quantifiedVariables>
       <quantifiedVariables name="trg 1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
       </quantifiedVariables>
       <quantifiedVariables name="trg 2">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
       </quantifiedVariables>
       <quantifiedVariables name="trg 3">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Impl">
         <leftOperand xsi:type="language_1:And">
@@ -590,10 +592,10 @@
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
       </quantifiedVariables>
       <quantifiedVariables name="trg 1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
       </quantifiedVariables>
       <quantifiedVariables name="trg 2">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Impl">
         <leftOperand xsi:type="language_1:And">
@@ -621,10 +623,10 @@
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
       </quantifiedVariables>
       <quantifiedVariables name="trg 1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.10"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.7"/>
       </quantifiedVariables>
       <quantifiedVariables name="trg 2">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.10"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.7"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Impl">
         <leftOperand xsi:type="language_1:And">
@@ -649,11 +651,11 @@
   <assertions name="lowerMultiplicity source DirectedCommunicationLink" annotations="//@annotations.8">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Exists">
         <quantifiedVariables name="trg 1">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
@@ -667,13 +669,13 @@
   <assertions name="upperMultiplicity source DirectedCommunicationLink" annotations="//@annotations.9">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
       </quantifiedVariables>
       <quantifiedVariables name="trg 1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
       </quantifiedVariables>
       <quantifiedVariables name="trg 2">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Impl">
         <leftOperand xsi:type="language_1:And">
@@ -698,11 +700,11 @@
   <assertions name="lowerMultiplicity target DirectedCommunicationLink" annotations="//@annotations.10">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Exists">
         <quantifiedVariables name="trg 1">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
@@ -716,13 +718,13 @@
   <assertions name="upperMultiplicity target DirectedCommunicationLink" annotations="//@annotations.11">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
       </quantifiedVariables>
       <quantifiedVariables name="trg 1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
       </quantifiedVariables>
       <quantifiedVariables name="trg 2">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Impl">
         <leftOperand xsi:type="language_1:And">
@@ -744,14 +746,14 @@
       </expression>
     </value>
   </assertions>
-  <assertions name="lowerMultiplicity band CommSubsystem" annotations="//@annotations.12">
+  <assertions name="lowerMultiplicity kind Spacecraft" annotations="//@annotations.12">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Exists">
         <quantifiedVariables name="trg 1">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.12"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.15"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
@@ -762,16 +764,16 @@
       </expression>
     </value>
   </assertions>
-  <assertions name="upperMultiplicity band CommSubsystem" annotations="//@annotations.13">
+  <assertions name="upperMultiplicity kind Spacecraft" annotations="//@annotations.13">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
       </quantifiedVariables>
       <quantifiedVariables name="trg 1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.12"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.15"/>
       </quantifiedVariables>
       <quantifiedVariables name="trg 2">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.12"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.15"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Impl">
         <leftOperand xsi:type="language_1:And">
@@ -793,10 +795,10 @@
       </expression>
     </value>
   </assertions>
-  <assertions name="lowerMultiplicity gain CommSubsystem" annotations="//@annotations.14">
+  <assertions name="lowerMultiplicity band CommSubsystem" annotations="//@annotations.14">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Exists">
         <quantifiedVariables name="trg 1">
@@ -811,10 +813,10 @@
       </expression>
     </value>
   </assertions>
-  <assertions name="upperMultiplicity gain CommSubsystem" annotations="//@annotations.15">
+  <assertions name="upperMultiplicity band CommSubsystem" annotations="//@annotations.15">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
       </quantifiedVariables>
       <quantifiedVariables name="trg 1">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
@@ -842,164 +844,237 @@
       </expression>
     </value>
   </assertions>
-  <assertions name="PartialInterpretation groundStationNetwork reference ConstellationMission" annotations="//@annotations.16">
+  <assertions name="lowerMultiplicity gain CommSubsystem" annotations="//@annotations.16">
+    <value xsi:type="language_1:Forall">
+      <quantifiedVariables name="src">
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+      </quantifiedVariables>
+      <expression xsi:type="language_1:Exists">
+        <quantifiedVariables name="trg 1">
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.14"/>
+        </quantifiedVariables>
+        <expression xsi:type="language_1:And">
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.16/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.16/@value/@expression/@quantifiedVariables.0"/>
+          </operands>
+        </expression>
+      </expression>
+    </value>
+  </assertions>
+  <assertions name="upperMultiplicity gain CommSubsystem" annotations="//@annotations.17">
+    <value xsi:type="language_1:Forall">
+      <quantifiedVariables name="src">
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+      </quantifiedVariables>
+      <quantifiedVariables name="trg 1">
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.14"/>
+      </quantifiedVariables>
+      <quantifiedVariables name="trg 2">
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.14"/>
+      </quantifiedVariables>
+      <expression xsi:type="language_1:Impl">
+        <leftOperand xsi:type="language_1:And">
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.17/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.17/@value/@quantifiedVariables.1"/>
+          </operands>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.17/@value/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.17/@value/@quantifiedVariables.2"/>
+          </operands>
+        </leftOperand>
+        <rightOperand xsi:type="language_1:Not">
+          <operand xsi:type="language_1:Distinct">
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.17/@value/@quantifiedVariables.1"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.17/@value/@quantifiedVariables.2"/>
+          </operand>
+        </rightOperand>
+      </expression>
+    </value>
+  </assertions>
+  <assertions name="PartialInterpretation groundStationNetwork reference ConstellationMission" annotations="//@annotations.18">
     <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-      <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.6"/>
-      <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.7"/>
+      <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.9"/>
+      <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.10"/>
     </value>
   </assertions>
-  <assertions name="PartialInterpretation commSubsystem reference CommunicatingElement" annotations="//@annotations.17">
+  <assertions name="PartialInterpretation commSubsystem reference CommunicatingElement" annotations="//@annotations.19">
     <value xsi:type="language_1:And">
       <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.7"/>
-        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.8"/>
+        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.10"/>
+        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.11"/>
       </operands>
       <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.7"/>
-        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.9"/>
+        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.10"/>
+        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.12"/>
       </operands>
     </value>
   </assertions>
-  <assertions name="PartialInterpretation band attribute CommSubsystem" annotations="//@annotations.18">
+  <assertions name="PartialInterpretation band attribute CommSubsystem" annotations="//@annotations.20">
     <value xsi:type="language_1:And">
-      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.8"/>
+      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.11"/>
         <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.1"/>
       </operands>
-      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.9"/>
+      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.12"/>
         <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.2"/>
       </operands>
     </value>
   </assertions>
-  <assertions name="PartialInterpretation gain attribute CommSubsystem" annotations="//@annotations.19">
+  <assertions name="PartialInterpretation gain attribute CommSubsystem" annotations="//@annotations.21">
     <value xsi:type="language_1:And">
-      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
-        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.8"/>
+      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.11"/>
         <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.4"/>
       </operands>
-      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
-        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.9"/>
+      <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+        <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.12"/>
         <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.5"/>
       </operands>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries communicationLinkDoesNotStartAtContainingElement" annotations="//@annotations.42">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries communicationLinkDoesNotStartAtContainingElement" annotations="//@annotations.50">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.20/@value/@quantifiedVariables.0"/>
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.22/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries noLinkToGroundStation" annotations="//@annotations.43">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries notEnoughInterferometryPayloads" annotations="//@annotations.51">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.21/@value/@quantifiedVariables.0"/>
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.23/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries communicationLoop" annotations="//@annotations.44">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries noLinkToGroundStation" annotations="//@annotations.52">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
         <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.22/@value/@quantifiedVariables.0"/>
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.24/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetBand" annotations="//@annotations.45">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries noPotentialLinkToGroundStation" annotations="//@annotations.53">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.23/@value/@quantifiedVariables.0"/>
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.25/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetGain" annotations="//@annotations.46">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries communicationLoop" annotations="//@annotations.54">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.24/@value/@quantifiedVariables.0"/>
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.26/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries uhfAntennaGainNotLow" annotations="//@annotations.47">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetBand" annotations="//@annotations.55">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.21">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.25/@value/@quantifiedVariables.0"/>
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.27/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries xAntennaGainNotMedium" annotations="//@annotations.48">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetGain" annotations="//@annotations.56">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.26/@value/@quantifiedVariables.0"/>
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.28/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries kaAntennaGainLow" annotations="//@annotations.49">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries uhfAntennaGainNotLow" annotations="//@annotations.57">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.27/@value/@quantifiedVariables.0"/>
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.29/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries threeUCubeSatWithNonUhfCrossLink" annotations="//@annotations.50">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries xAntennaGainNotMedium" annotations="//@annotations.58">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.28/@value/@quantifiedVariables.0"/>
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.30/@value/@quantifiedVariables.0"/>
+        </operand>
+      </expression>
+    </value>
+  </assertions>
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries kaAntennaGainLow" annotations="//@annotations.59">
+    <value xsi:type="language_1:Forall">
+      <quantifiedVariables name="p0">
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+      </quantifiedVariables>
+      <expression xsi:type="language_1:Not">
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.31/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
   </assertions>
-  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries cubeSatWithKaAntenna" annotations="//@annotations.51">
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries threeUCubeSatWithNonUhfCrossLink" annotations="//@annotations.60">
+    <value xsi:type="language_1:Forall">
+      <quantifiedVariables name="p0">
+        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+      </quantifiedVariables>
+      <expression xsi:type="language_1:Not">
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.32/@value/@quantifiedVariables.0"/>
+        </operand>
+      </expression>
+    </value>
+  </assertions>
+  <assertions name="errorpattern hu bme mit inf dslreasoner domains satellite queries cubeSatWithKaAntenna" annotations="//@annotations.61">
     <value xsi:type="language_1:Forall">
       <quantifiedVariables name="p0">
         <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
       </quantifiedVariables>
       <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.29/@value/@quantifiedVariables.0"/>
+        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.33/@value/@quantifiedVariables.0"/>
         </operand>
       </expression>
     </value>
@@ -1014,36 +1089,40 @@
   </relations>
   <relations xsi:type="language_1:RelationDeclaration" name="commSubsystem reference CommunicatingElement">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
   </relations>
   <relations xsi:type="language_1:RelationDeclaration" name="communicationLink reference CommunicatingElement">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
   </relations>
   <relations xsi:type="language_1:RelationDeclaration" name="payload reference Spacecraft">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.10"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.7"/>
   </relations>
   <relations xsi:type="language_1:RelationDeclaration" name="source reference DirectedCommunicationLink">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
   </relations>
   <relations xsi:type="language_1:RelationDeclaration" name="target reference DirectedCommunicationLink">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+  </relations>
+  <relations xsi:type="language_1:RelationDeclaration" name="kind attribute Spacecraft" annotations="//@annotations.62">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.15"/>
   </relations>
   <relations xsi:type="language_1:RelationDeclaration" name="band attribute CommSubsystem">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.12"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
   </relations>
   <relations xsi:type="language_1:RelationDeclaration" name="gain attribute CommSubsystem">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.14"/>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries communicationLinkDoesNotStartAtContainingElement" annotations="//@annotations.20">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries communicationLinkDoesNotStartAtContainingElement" annotations="//@annotations.22">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
     <variables name="parameter Link">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:Exists">
@@ -1051,37 +1130,37 @@
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
         </quantifiedVariables>
         <quantifiedVariables name="variable SourceComm">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <quantifiedVariables name="variable SourceElement">
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.3">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@variables.0"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9/@value/@operands.0/@quantifiedVariables.2"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@value/@operands.0/@quantifiedVariables.2"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9/@value/@operands.0/@quantifiedVariables.1"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@value/@operands.0/@quantifiedVariables.1"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
           </operands>
           <operands xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9/@value/@operands.0/@quantifiedVariables.0"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9/@value/@operands.0/@quantifiedVariables.2"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@value/@operands.0/@quantifiedVariables.0"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@value/@operands.0/@quantifiedVariables.2"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries notEnoughInterferometryPayloads" annotations="//@annotations.21">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries notEnoughInterferometryPayloads" annotations="//@annotations.23">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
     <variables name="parameter Mission">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
@@ -1089,18 +1168,18 @@
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
         <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@variables.0"/>
+          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@variables.0"/>
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
         </operands>
         <operands xsi:type="language_1:Not">
-          <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@variables.0"/>
+          <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@variables.0"/>
           </operand>
         </operands>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries atLeastTwoInterferometryPayloads" annotations="//@annotations.22">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries atLeastTwoInterferometryPayloads" annotations="//@annotations.24">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
     <variables name="parameter Mission">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
@@ -1115,26 +1194,26 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@variables.0"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.0"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.1"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.0"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.1"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
+            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries spacecraftWithInterferometryPayload" annotations="//@annotations.23">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries spacecraftWithInterferometryPayload" annotations="//@annotations.25">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
     <variables name="parameter Mission">
@@ -1146,26 +1225,26 @@
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:Exists">
         <quantifiedVariables name="variable Payload">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.11"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.1">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@variables.1"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.4">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.11"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@value/@operands.0/@quantifiedVariables.0"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries noLinkToGroundStation" annotations="//@annotations.24">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries noLinkToGroundStation" annotations="//@annotations.26">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
     <variables name="parameter Spacecraft">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
@@ -1180,46 +1259,255 @@
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@value/@operands.0/@quantifiedVariables.1"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.1"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.1">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@variables.0"/>
+          </operands>
+          <operands xsi:type="language_1:InstanceOf">
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@variables.0"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
+          </operands>
+          <operands xsi:type="language_1:Not">
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.21">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@variables.0"/>
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.1"/>
+            </operand>
+          </operands>
+        </expression>
+      </operands>
+    </value>
+  </relations>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries noPotentialLinkToGroundStation" annotations="//@annotations.27">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
+    <variables name="parameter Spacecraft">
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
+    </variables>
+    <value xsi:type="language_1:Or">
+      <operands xsi:type="language_1:Exists">
+        <quantifiedVariables name="variable Mission">
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
+        </quantifiedVariables>
+        <quantifiedVariables name="variable GroundStation">
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
+        </quantifiedVariables>
+        <expression xsi:type="language_1:And">
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@value/@operands.0/@quantifiedVariables.1"/>
+          </operands>
+          <operands xsi:type="language_1:InstanceOf">
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@value/@operands.0/@quantifiedVariables.1"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
+          </operands>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.1">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@variables.0"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@variables.0"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@variables.0"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@variables.0"/>
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@value/@operands.0/@quantifiedVariables.1"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@variables.0"/>
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@value/@operands.0/@quantifiedVariables.1"/>
             </operand>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries communicationLoop" annotations="//@annotations.25">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries indirectLinkAllowed" annotations="//@annotations.28">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
+    <variables name="parameter From">
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
+    </variables>
+    <variables name="parameter To">
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
+    </variables>
+    <value xsi:type="language_1:Or">
+      <operands xsi:type="language_1:And">
+        <operands xsi:type="language_1:TransitiveClosure" relation="//@relations.17"/>
+      </operands>
+    </value>
+  </relations>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries linkAllowed" annotations="//@annotations.29">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
+    <variables name="parameter From">
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
+    </variables>
+    <variables name="parameter To">
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
+    </variables>
+    <value xsi:type="language_1:Or">
+      <operands xsi:type="language_1:Exists">
+        <quantifiedVariables name="variable 0">
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
+        </quantifiedVariables>
+        <expression xsi:type="language_1:And">
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.0/@quantifiedVariables.0"/>
+          </operands>
+          <operands xsi:type="language_1:Not">
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
+            </operand>
+          </operands>
+        </expression>
+      </operands>
+      <operands xsi:type="language_1:Exists">
+        <quantifiedVariables name="variable virtual0">
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
+        </quantifiedVariables>
+        <expression xsi:type="language_1:And">
+          <operands xsi:type="language_1:Equals">
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.1/@quantifiedVariables.0"/>
+            <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.0"/>
+          </operands>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.1/@quantifiedVariables.0"/>
+          </operands>
+          <operands xsi:type="language_1:InstanceOf">
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+          </operands>
+        </expression>
+      </operands>
+      <operands xsi:type="language_1:Exists">
+        <quantifiedVariables name="variable 0">
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
+        </quantifiedVariables>
+        <expression xsi:type="language_1:And">
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.2/@quantifiedVariables.0"/>
+          </operands>
+          <operands xsi:type="language_1:InstanceOf">
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+          </operands>
+          <operands xsi:type="language_1:InstanceOf">
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.1"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
+          </operands>
+        </expression>
+      </operands>
+    </value>
+  </relations>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries matchingAntenna" annotations="//@annotations.30">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
+    <variables name="parameter From">
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
+    </variables>
+    <variables name="parameter To">
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
+    </variables>
+    <variables name="parameter Band">
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
+    </variables>
+    <value xsi:type="language_1:Or">
+      <operands xsi:type="language_1:Exists">
+        <quantifiedVariables name="variable Gain">
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.14"/>
+        </quantifiedVariables>
+        <quantifiedVariables name="variable virtual0">
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+        </quantifiedVariables>
+        <quantifiedVariables name="variable virtual2">
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+        </quantifiedVariables>
+        <quantifiedVariables name="variable virtual4">
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+        </quantifiedVariables>
+        <quantifiedVariables name="variable virtual6">
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+        </quantifiedVariables>
+        <expression xsi:type="language_1:And">
+          <operands xsi:type="language_1:InstanceOf">
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.0"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
+          </operands>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.1"/>
+          </operands>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.2"/>
+          </operands>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.2"/>
+          </operands>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.2"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.2"/>
+          </operands>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.3"/>
+          </operands>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.3"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.0"/>
+          </operands>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.4"/>
+          </operands>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.4"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@value/@operands.0/@quantifiedVariables.0"/>
+          </operands>
+        </expression>
+      </operands>
+    </value>
+  </relations>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries cubeSat3U" annotations="//@annotations.31">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+    <variables name="parameter Sat">
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+    </variables>
+    <value xsi:type="language_1:Or">
+      <operands xsi:type="language_1:And">
+        <operands xsi:type="language_1:InstanceOf">
+          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.0"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+        </operands>
+      </operands>
+    </value>
+  </relations>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries communicationLoop" annotations="//@annotations.32">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     <variables name="parameter Element">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@variables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@variables.0"/>
+        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.21">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@variables.0"/>
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@variables.0"/>
         </operands>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries indirectCommunicationLink" annotations="//@annotations.26">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries indirectCommunicationLink" annotations="//@annotations.33">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     <variables name="parameter Source">
@@ -1230,11 +1518,11 @@
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:TransitiveClosure" relation="//@relations.16"/>
+        <operands xsi:type="language_1:TransitiveClosure" relation="//@relations.22"/>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries directCommunicationLink" annotations="//@annotations.27">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries directCommunicationLink" annotations="//@annotations.34">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
     <variables name="parameter Source">
@@ -1246,387 +1534,387 @@
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:Exists">
         <quantifiedVariables name="variable Link">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
         </quantifiedVariables>
         <quantifiedVariables name="variable SourceSubsystem">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <quantifiedVariables name="variable TargetSubsystem">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@value/@operands.0/@quantifiedVariables.2"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.2"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@value/@operands.0/@quantifiedVariables.1"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.1"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@variables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@value/@operands.0/@quantifiedVariables.2"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@variables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.2"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@value/@operands.0/@quantifiedVariables.2"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.2"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetBand" annotations="//@annotations.28">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetBand" annotations="//@annotations.35">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
     <variables name="parameter Link">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:Exists">
         <quantifiedVariables name="variable SourceSubsystem">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <quantifiedVariables name="variable TargetSubsystem">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <quantifiedVariables name="variable Band">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.12"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.0/@quantifiedVariables.1"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.1"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.0/@quantifiedVariables.2"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.2"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.0/@quantifiedVariables.1"/>
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@value/@operands.0/@quantifiedVariables.2"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.1"/>
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.2"/>
             </operand>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemBand" annotations="//@annotations.29">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.12"/>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemBand" annotations="//@annotations.36">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
     <variables name="parameter Comm">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     </variables>
     <variables name="parameter Band">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.12"/>
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.1"/>
+        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@variables.0"/>
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@variables.1"/>
         </operands>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetGain" annotations="//@annotations.30">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries incompatibleSourceAndTargetGain" annotations="//@annotations.37">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
     <variables name="parameter Link">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:Exists">
         <quantifiedVariables name="variable SourceSubsystem">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <quantifiedVariables name="variable TargetSubsystem">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <quantifiedVariables name="variable Gain">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.14"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.1"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.1"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.2"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.2"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.1"/>
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.2"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.1"/>
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.2"/>
             </operand>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemGain" annotations="//@annotations.31">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemGain" annotations="//@annotations.38">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.14"/>
     <variables name="parameter Comm">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     </variables>
     <variables name="parameter Gain">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.14"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@variables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@variables.1"/>
+        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@variables.0"/>
+          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@variables.1"/>
         </operands>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries uhfAntennaGainNotLow" annotations="//@annotations.32">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries uhfAntennaGainNotLow" annotations="//@annotations.39">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     <variables name="parameter Comm">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:Exists">
         <quantifiedVariables name="variable virtual0">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.12"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.21/@value/@operands.0/@quantifiedVariables.0"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@value/@operands.0/@quantifiedVariables.0"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.0"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.21/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.21/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.21/@variables.0"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.28">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@variables.0"/>
             </operand>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemGainLow" annotations="//@annotations.33">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemGainLow" annotations="//@annotations.40">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     <variables name="parameter Comm">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:Exists">
         <quantifiedVariables name="variable virtual0">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.14"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.0"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.28/@value/@operands.0/@quantifiedVariables.0"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.3"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.28/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.28/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries xAntennaGainNotMedium" annotations="//@annotations.34">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries xAntennaGainNotMedium" annotations="//@annotations.41">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     <variables name="parameter Comm">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:Exists">
         <quantifiedVariables name="variable virtual0">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.12"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.0"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@value/@operands.0/@quantifiedVariables.0"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.1"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@variables.0"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.30">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@variables.0"/>
             </operand>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemGainMedium" annotations="//@annotations.35">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemGainMedium" annotations="//@annotations.42">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     <variables name="parameter Comm">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:Exists">
         <quantifiedVariables name="variable virtual0">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.14"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@value/@operands.0/@quantifiedVariables.0"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.30/@value/@operands.0/@quantifiedVariables.0"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.4"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.30/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.30/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries kaAntennaGainLow" annotations="//@annotations.36">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries kaAntennaGainLow" annotations="//@annotations.43">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     <variables name="parameter Comm">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:Exists">
         <quantifiedVariables name="variable virtual0">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.12"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
         </quantifiedVariables>
         <quantifiedVariables name="variable virtual2">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.14"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.0"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@value/@operands.0/@quantifiedVariables.0"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.2"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.1"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@value/@operands.0/@quantifiedVariables.1"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.3"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@value/@operands.0/@quantifiedVariables.1"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.31/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries threeUCubeSatWithNonUhfCrossLink" annotations="//@annotations.37">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries threeUCubeSatWithNonUhfCrossLink" annotations="//@annotations.44">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
     <variables name="parameter Sat">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:Exists">
         <quantifiedVariables name="variable SourceComm">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <quantifiedVariables name="variable Link">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.6"/>
         </quantifiedVariables>
         <quantifiedVariables name="variable TargetComm">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <quantifiedVariables name="variable Target">
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@variables.0"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@variables.0"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@value/@operands.0/@quantifiedVariables.0"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.33">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.0"/>
             </operand>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@value/@operands.0/@quantifiedVariables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@value/@operands.0/@quantifiedVariables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@value/@operands.0/@quantifiedVariables.0"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.0"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@value/@operands.0/@quantifiedVariables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@value/@operands.0/@quantifiedVariables.2"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.2"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@value/@operands.0/@quantifiedVariables.3"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@value/@operands.0/@quantifiedVariables.2"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.3"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.2"/>
           </operands>
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@value/@operands.0/@quantifiedVariables.2"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.2"/>
+            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.28">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@value/@operands.0/@quantifiedVariables.3"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.32/@value/@operands.0/@quantifiedVariables.3"/>
             </operand>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemBandUhf" annotations="//@annotations.38">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries commSubsystemBandUhf" annotations="//@annotations.45">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     <variables name="parameter Comm">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:Exists">
         <quantifiedVariables name="variable virtual0">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.12"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@value/@operands.0/@quantifiedVariables.0"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.33/@value/@operands.0/@quantifiedVariables.0"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.0"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.27/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.33/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.33/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries groundStationNetwork" annotations="//@annotations.39">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries groundStationNetwork" annotations="//@annotations.46">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
     <variables name="parameter Network">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
@@ -1634,13 +1922,13 @@
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
         <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.28/@variables.0"/>
+          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.34/@variables.0"/>
           <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
         </operands>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries cubeSatWithKaAntenna" annotations="//@annotations.40">
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries cubeSatWithKaAntenna" annotations="//@annotations.47">
     <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
     <variables name="parameter Spacecraft">
       <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
@@ -1648,62 +1936,107 @@
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:Exists">
         <quantifiedVariables name="variable virtual0">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.12"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.13"/>
         </quantifiedVariables>
         <quantifiedVariables name="variable virtual1">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.8"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.5"/>
         </quantifiedVariables>
         <expression xsi:type="language_1:And">
           <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@variables.0"/>
+            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@variables.0"/>
             <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
           </operands>
           <operands xsi:type="language_1:Equals">
-            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@value/@operands.0/@quantifiedVariables.0"/>
+            <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@value/@operands.0/@quantifiedVariables.0"/>
             <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.2"/>
           </operands>
           <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@variables.0"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@value/@operands.0/@quantifiedVariables.1"/>
           </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@value/@operands.0/@quantifiedVariables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@value/@operands.0/@quantifiedVariables.0"/>
+          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@value/@operands.0/@quantifiedVariables.1"/>
+            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@value/@operands.0/@quantifiedVariables.0"/>
           </operands>
           <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.30">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.29/@variables.0"/>
+            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.36">
+              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.35/@variables.0"/>
             </operand>
           </operands>
         </expression>
       </operands>
     </value>
   </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries smallSat" annotations="//@annotations.41">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.7"/>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries smallSat" annotations="//@annotations.48">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.11"/>
     <variables name="parameter Sat">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.7"/>
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.11"/>
+    </variables>
+    <value xsi:type="language_1:Or">
+      <operands xsi:type="language_1:And">
+        <operands xsi:type="language_1:InstanceOf">
+          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.36/@variables.0"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.11"/>
+        </operands>
+      </operands>
+    </value>
+  </relations>
+  <relations xsi:type="language_1:RelationDefinition" name="pattern hu bme mit inf dslreasoner domains satellite queries spacecraftOfKind" annotations="//@annotations.49" defines="//@relations.7">
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
+    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.15"/>
+    <variables name="parameter Spacecraft">
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.4"/>
+    </variables>
+    <variables name="parameter Kind">
+      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.15"/>
     </variables>
     <value xsi:type="language_1:Or">
       <operands xsi:type="language_1:And">
         <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.30/@variables.0"/>
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.7"/>
+          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@variables.0"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.9"/>
+        </operands>
+        <operands xsi:type="language_1:Equals">
+          <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@variables.1"/>
+          <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.6"/>
+        </operands>
+      </operands>
+      <operands xsi:type="language_1:And">
+        <operands xsi:type="language_1:InstanceOf">
+          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@variables.0"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.10"/>
+        </operands>
+        <operands xsi:type="language_1:Equals">
+          <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@variables.1"/>
+          <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.7"/>
+        </operands>
+      </operands>
+      <operands xsi:type="language_1:And">
+        <operands xsi:type="language_1:InstanceOf">
+          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@variables.0"/>
+          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.11"/>
+        </operands>
+        <operands xsi:type="language_1:Equals">
+          <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.37/@variables.1"/>
+          <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@elements.8"/>
         </operands>
       </operands>
     </value>
   </relations>
-  <elements name="UHF literal TransceiverBand" definedInType="//@types.12"/>
-  <elements name="X literal TransceiverBand" definedInType="//@types.12"/>
-  <elements name="Ka literal TransceiverBand" definedInType="//@types.12"/>
-  <elements name="LOW literal AntennaGain" definedInType="//@types.13"/>
-  <elements name="MEDIUM literal AntennaGain" definedInType="//@types.13"/>
-  <elements name="HIGH literal AntennaGain" definedInType="//@types.13"/>
-  <elements name="o 1" definedInType="//@types.14 //@types.16"/>
-  <elements name="o 2" definedInType="//@types.18 //@types.20"/>
-  <elements name="o 3" definedInType="//@types.22"/>
-  <elements name="o 4" definedInType="//@types.22"/>
-  <containmentHierarchies typesOrderedInHierarchy="//@types.2 //@types.0 //@types.1 //@types.9 //@types.7 //@types.10 //@types.3 //@types.6 //@types.8 //@types.11 //@types.5 //@types.4 //@types.14 //@types.15 //@types.16 //@types.17 //@types.18 //@types.19 //@types.20 //@types.21 //@types.22 //@types.23" containmentRelations="//@relations.0 //@relations.1 //@relations.2 //@relations.3 //@relations.4"/>
+  <elements name="UHF literal TransceiverBand" definedInType="//@types.13"/>
+  <elements name="X literal TransceiverBand" definedInType="//@types.13"/>
+  <elements name="Ka literal TransceiverBand" definedInType="//@types.13"/>
+  <elements name="LOW literal AntennaGain" definedInType="//@types.14"/>
+  <elements name="MEDIUM literal AntennaGain" definedInType="//@types.14"/>
+  <elements name="HIGH literal AntennaGain" definedInType="//@types.14"/>
+  <elements name="CubeSat3U literal SpacecraftKind" definedInType="//@types.15"/>
+  <elements name="CubeSat6U literal SpacecraftKind" definedInType="//@types.15"/>
+  <elements name="SmallSat literal SpacecraftKind" definedInType="//@types.15"/>
+  <elements name="o 1" definedInType="//@types.16 //@types.18"/>
+  <elements name="o 2" definedInType="//@types.20 //@types.22"/>
+  <elements name="o 3" definedInType="//@types.24"/>
+  <elements name="o 4" definedInType="//@types.24"/>
+  <containmentHierarchies typesOrderedInHierarchy="//@types.8 //@types.4 //@types.6 //@types.12 //@types.0 //@types.1 //@types.9 //@types.2 //@types.10 //@types.11 //@types.5 //@types.3 //@types.7 //@types.16 //@types.17 //@types.18 //@types.19 //@types.20 //@types.21 //@types.22 //@types.23 //@types.24 //@types.25" containmentRelations="//@relations.0 //@relations.1 //@relations.2 //@relations.3 //@relations.4"/>
   <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.0" relation="//@relations.0" lower="1"/>
   <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.1" relation="//@relations.0" upper="1"/>
   <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.2" relation="//@relations.1" lower="2"/>
@@ -1720,40 +2053,51 @@
   <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.13" relation="//@relations.7" upper="1"/>
   <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.14" relation="//@relations.8" lower="1"/>
   <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.15" relation="//@relations.8" upper="1"/>
-  <annotations xsi:type="partial2logicannotations:PartialModelRelation2Assertion" target="//@assertions.16" targetRelation="//@relations.0"/>
-  <annotations xsi:type="partial2logicannotations:PartialModelRelation2Assertion" target="//@assertions.17" targetRelation="//@relations.2"/>
-  <annotations xsi:type="partial2logicannotations:PartialModelRelation2Assertion" target="//@assertions.18" targetRelation="//@relations.7"/>
-  <annotations xsi:type="partial2logicannotations:PartialModelRelation2Assertion" target="//@assertions.19" targetRelation="//@relations.8"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.9" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkDoesNotStartAtContainingElement"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.10" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.notEnoughInterferometryPayloads"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.11" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.atLeastTwoInterferometryPayloads"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.12" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftWithInterferometryPayload"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.13" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noLinkToGroundStation"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.14" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLoop"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.15" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.indirectCommunicationLink"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.16" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.directCommunicationLink"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.17" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.incompatibleSourceAndTargetBand"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.18" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemBand"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.19" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.incompatibleSourceAndTargetGain"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.20" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemGain"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.21" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.uhfAntennaGainNotLow"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.22" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemGainLow"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.23" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.xAntennaGainNotMedium"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.24" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemGainMedium"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.25" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.kaAntennaGainLow"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.26" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.threeUCubeSatWithNonUhfCrossLink"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.27" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemBandUhf"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.28" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.groundStationNetwork"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.29" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.cubeSatWithKaAntenna"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.30" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.smallSat"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.20" query="//@annotations.20"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.21" query="//@annotations.24"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.22" query="//@annotations.25"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.23" query="//@annotations.28"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.24" query="//@annotations.30"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.25" query="//@annotations.32"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.26" query="//@annotations.34"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.27" query="//@annotations.36"/>
+  <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.16" relation="//@relations.9" lower="1"/>
+  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.17" relation="//@relations.9" upper="1"/>
+  <annotations xsi:type="partial2logicannotations:PartialModelRelation2Assertion" target="//@assertions.18" targetRelation="//@relations.0"/>
+  <annotations xsi:type="partial2logicannotations:PartialModelRelation2Assertion" target="//@assertions.19" targetRelation="//@relations.2"/>
+  <annotations xsi:type="partial2logicannotations:PartialModelRelation2Assertion" target="//@assertions.20" targetRelation="//@relations.8"/>
+  <annotations xsi:type="partial2logicannotations:PartialModelRelation2Assertion" target="//@assertions.21" targetRelation="//@relations.9"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.10" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkDoesNotStartAtContainingElement"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.11" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.notEnoughInterferometryPayloads"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.12" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.atLeastTwoInterferometryPayloads"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.13" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftWithInterferometryPayload"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.14" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noLinkToGroundStation"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.15" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noPotentialLinkToGroundStation"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.16" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.indirectLinkAllowed"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.17" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.linkAllowed"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.18" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.matchingAntenna"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.19" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.cubeSat3U"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.20" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLoop"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.21" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.indirectCommunicationLink"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.22" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.directCommunicationLink"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.23" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.incompatibleSourceAndTargetBand"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.24" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemBand"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.25" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.incompatibleSourceAndTargetGain"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.26" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemGain"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.27" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.uhfAntennaGainNotLow"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.28" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemGainLow"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.29" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.xAntennaGainNotMedium"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.30" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemGainMedium"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.31" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.kaAntennaGainLow"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.32" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.threeUCubeSatWithNonUhfCrossLink"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.33" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.commSubsystemBandUhf"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.34" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.groundStationNetwork"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.35" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.cubeSatWithKaAntenna"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.36" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.smallSat"/>
+  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.37" patternFullyQualifiedName="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.22" query="//@annotations.22"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.23" query="//@annotations.23"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.24" query="//@annotations.26"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.25" query="//@annotations.27"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.26" query="//@annotations.32"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.27" query="//@annotations.35"/>
   <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.28" query="//@annotations.37"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.29" query="//@annotations.40"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.29" query="//@annotations.39"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.30" query="//@annotations.41"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.31" query="//@annotations.43"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.32" query="//@annotations.44"/>
+  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.33" query="//@annotations.47"/>
+  <annotations xsi:type="viatra2logicannotations:DefinedByDerivedFeature" target="//@relations.7" query="//@annotations.49"/>
 </language:LogicProblem>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/init.partialmodel b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/init.partialmodel
index e458c179..6589a3ca 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/init.partialmodel
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/debug/init.partialmodel
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="ASCII"?>
-<partialinterpretation:PartialInterpretation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:language="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language" xmlns:partialinterpretation="http://www.bme.hu/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage" minNewElements="5" maxNewElements="10">
+<partialinterpretation:PartialInterpretation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:language="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language" xmlns:partialinterpretation="http://www.bme.hu/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage" minNewElements="16" maxNewElements="32">
   <problem href="outputs/debug/generation.logicproblem#/"/>
   <partialrelationinterpretation>
     <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.0"/>
     <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink">
-      <param1 href="outputs/debug/generation.logicproblem#//@elements.6"/>
-      <param2 href="outputs/debug/generation.logicproblem#//@elements.7"/>
+      <param1 href="outputs/debug/generation.logicproblem#//@elements.9"/>
+      <param2 href="outputs/debug/generation.logicproblem#//@elements.10"/>
     </relationlinks>
     <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.0/@parameters.0"/>
     <param2 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.0/@parameters.1"/>
@@ -18,12 +18,12 @@
   <partialrelationinterpretation>
     <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.2"/>
     <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink">
-      <param1 href="outputs/debug/generation.logicproblem#//@elements.7"/>
-      <param2 href="outputs/debug/generation.logicproblem#//@elements.8"/>
+      <param1 href="outputs/debug/generation.logicproblem#//@elements.10"/>
+      <param2 href="outputs/debug/generation.logicproblem#//@elements.11"/>
     </relationlinks>
     <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink">
-      <param1 href="outputs/debug/generation.logicproblem#//@elements.7"/>
-      <param2 href="outputs/debug/generation.logicproblem#//@elements.9"/>
+      <param1 href="outputs/debug/generation.logicproblem#//@elements.10"/>
+      <param2 href="outputs/debug/generation.logicproblem#//@elements.12"/>
     </relationlinks>
     <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.2/@parameters.0"/>
     <param2 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.2/@parameters.1"/>
@@ -50,29 +50,34 @@
   </partialrelationinterpretation>
   <partialrelationinterpretation>
     <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.7"/>
+    <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.7/@parameters.0"/>
+    <param2 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.7/@parameters.1"/>
+  </partialrelationinterpretation>
+  <partialrelationinterpretation>
+    <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.8"/>
     <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink">
-      <param1 href="outputs/debug/generation.logicproblem#//@elements.8"/>
+      <param1 href="outputs/debug/generation.logicproblem#//@elements.11"/>
       <param2 href="outputs/debug/generation.logicproblem#//@elements.1"/>
     </relationlinks>
     <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink">
-      <param1 href="outputs/debug/generation.logicproblem#//@elements.9"/>
+      <param1 href="outputs/debug/generation.logicproblem#//@elements.12"/>
       <param2 href="outputs/debug/generation.logicproblem#//@elements.2"/>
     </relationlinks>
-    <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.7/@parameters.0"/>
-    <param2 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.7/@parameters.1"/>
+    <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.8/@parameters.0"/>
+    <param2 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.8/@parameters.1"/>
   </partialrelationinterpretation>
   <partialrelationinterpretation>
-    <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.8"/>
+    <interpretationOf href="outputs/debug/generation.logicproblem#//@relations.9"/>
     <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink">
-      <param1 href="outputs/debug/generation.logicproblem#//@elements.8"/>
+      <param1 href="outputs/debug/generation.logicproblem#//@elements.11"/>
       <param2 href="outputs/debug/generation.logicproblem#//@elements.4"/>
     </relationlinks>
     <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink">
-      <param1 href="outputs/debug/generation.logicproblem#//@elements.9"/>
+      <param1 href="outputs/debug/generation.logicproblem#//@elements.12"/>
       <param2 href="outputs/debug/generation.logicproblem#//@elements.5"/>
     </relationlinks>
-    <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.8/@parameters.0"/>
-    <param2 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.8/@parameters.1"/>
+    <param1 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.9/@parameters.0"/>
+    <param2 xsi:type="language:ComplexTypeReference" href="outputs/debug/generation.logicproblem#//@relations.9/@parameters.1"/>
   </partialrelationinterpretation>
   <newElements xsi:type="partialinterpretation:BooleanElement" name="true" valueSet="true" value="true"/>
   <newElements xsi:type="partialinterpretation:BooleanElement" name="false" valueSet="true"/>
@@ -81,62 +86,65 @@
   <partialtypeinterpratation xsi:type="partialinterpretation:PartialRealInterpretation" elements="//@openWorldElements.1"/>
   <partialtypeinterpratation xsi:type="partialinterpretation:PartialStringInterpretation" elements="//@openWorldElements.2"/>
   <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.0">
-    <elements href="outputs/debug/generation.logicproblem#//@elements.6"/>
+    <elements href="outputs/debug/generation.logicproblem#//@elements.9"/>
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.0"/>
   </partialtypeinterpratation>
   <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.1" supertypeInterpretation="//@partialtypeinterpratation.4">
-    <elements href="outputs/debug/generation.logicproblem#//@elements.6"/>
+    <elements href="outputs/debug/generation.logicproblem#//@elements.9"/>
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.1"/>
   </partialtypeinterpratation>
   <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.2">
-    <elements href="outputs/debug/generation.logicproblem#//@elements.7"/>
+    <elements href="outputs/debug/generation.logicproblem#//@elements.10"/>
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.2"/>
   </partialtypeinterpratation>
   <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.3" supertypeInterpretation="//@partialtypeinterpratation.6">
-    <elements href="outputs/debug/generation.logicproblem#//@elements.7"/>
+    <elements href="outputs/debug/generation.logicproblem#//@elements.10"/>
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.3"/>
   </partialtypeinterpratation>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.4" supertypeInterpretation="//@partialtypeinterpratation.6 //@partialtypeinterpratation.18">
+  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.4" supertypeInterpretation="//@partialtypeinterpratation.6 //@partialtypeinterpratation.19">
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.4"/>
   </partialtypeinterpratation>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.5" supertypeInterpretation="//@partialtypeinterpratation.8 //@partialtypeinterpratation.6 //@partialtypeinterpratation.18">
+  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.5">
+    <elements href="outputs/debug/generation.logicproblem#//@elements.11"/>
+    <elements href="outputs/debug/generation.logicproblem#//@elements.12"/>
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.5"/>
   </partialtypeinterpratation>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.6" supertypeInterpretation="//@partialtypeinterpratation.8 //@partialtypeinterpratation.6 //@partialtypeinterpratation.18">
+  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.6">
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.6"/>
   </partialtypeinterpratation>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.7" supertypeInterpretation="//@partialtypeinterpratation.8 //@partialtypeinterpratation.6 //@partialtypeinterpratation.18">
+  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.7">
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.7"/>
   </partialtypeinterpratation>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.8">
-    <elements href="outputs/debug/generation.logicproblem#//@elements.8"/>
-    <elements href="outputs/debug/generation.logicproblem#//@elements.9"/>
+  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.8" supertypeInterpretation="//@partialtypeinterpratation.11">
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.8"/>
   </partialtypeinterpratation>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.9">
+  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.9" supertypeInterpretation="//@partialtypeinterpratation.16 //@partialtypeinterpratation.8 //@partialtypeinterpratation.6 //@partialtypeinterpratation.19">
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.9"/>
   </partialtypeinterpratation>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.10">
+  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.10" supertypeInterpretation="//@partialtypeinterpratation.16 //@partialtypeinterpratation.8 //@partialtypeinterpratation.6 //@partialtypeinterpratation.19">
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.10"/>
   </partialtypeinterpratation>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.11" supertypeInterpretation="//@partialtypeinterpratation.14">
+  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.11" supertypeInterpretation="//@partialtypeinterpratation.8 //@partialtypeinterpratation.6 //@partialtypeinterpratation.19">
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.11"/>
   </partialtypeinterpratation>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.12" supertypeInterpretation="//@partialtypeinterpratation.4">
-    <interpretationOf href="outputs/debug/generation.logicproblem#//@types.15"/>
+  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.12" supertypeInterpretation="//@partialtypeinterpratation.8 //@partialtypeinterpratation.6 //@partialtypeinterpratation.19">
+    <interpretationOf href="outputs/debug/generation.logicproblem#//@types.12"/>
   </partialtypeinterpratation>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.13" supertypeInterpretation="//@partialtypeinterpratation.5 //@partialtypeinterpratation.4 //@partialtypeinterpratation.16">
+  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.13" supertypeInterpretation="//@partialtypeinterpratation.4">
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.17"/>
   </partialtypeinterpratation>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.14" supertypeInterpretation="//@partialtypeinterpratation.6">
+  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.14" supertypeInterpretation="//@partialtypeinterpratation.5 //@partialtypeinterpratation.4 //@partialtypeinterpratation.17">
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.19"/>
   </partialtypeinterpratation>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.15" supertypeInterpretation="//@partialtypeinterpratation.7 //@partialtypeinterpratation.6 //@partialtypeinterpratation.18">
+  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.15" supertypeInterpretation="//@partialtypeinterpratation.6">
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.21"/>
   </partialtypeinterpratation>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.16" supertypeInterpretation="//@partialtypeinterpratation.12">
+  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.16" supertypeInterpretation="//@partialtypeinterpratation.7 //@partialtypeinterpratation.6 //@partialtypeinterpratation.19">
     <interpretationOf href="outputs/debug/generation.logicproblem#//@types.23"/>
   </partialtypeinterpratation>
+  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.17" supertypeInterpretation="//@partialtypeinterpratation.9">
+    <interpretationOf href="outputs/debug/generation.logicproblem#//@types.25"/>
+  </partialtypeinterpratation>
   <openWorldElements xsi:type="partialinterpretation:IntegerElement" name="New Integers"/>
   <openWorldElements xsi:type="partialinterpretation:RealElement" name="New Reals"/>
   <openWorldElements xsi:type="partialinterpretation:StringElement" name="New Strings"/>
@@ -158,4 +166,5 @@
   <scopes targetTypeInterpretation="//@partialtypeinterpratation.18"/>
   <scopes targetTypeInterpretation="//@partialtypeinterpratation.19"/>
   <scopes targetTypeInterpretation="//@partialtypeinterpratation.20"/>
+  <scopes targetTypeInterpretation="//@partialtypeinterpratation.21"/>
 </partialinterpretation:PartialInterpretation>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/log.txt b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/log.txt
index 67589bd9..1d3c9f62 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/log.txt
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/log.txt
@@ -1 +1 @@
-Model generation finished
+Model generation started
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/1.gml b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/1.gml
index b8da662f..59498c9f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/1.gml
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/1.gml
@@ -220,6 +220,114 @@ graph
 		[
 			id	6
 			graphics
+			[
+				w	288.20000000000005
+				h	40
+				type	"rectangle"
+				fill	"#FFFFFF"
+				fill2	"#FFFFFF"
+				outline	"#000000"
+			]
+			LabelGraphics
+			[
+				text	"CubeSat3U literal SpacecraftKind"
+				outline	"#000000"
+				fill	"#FFFFFF"
+				fontSize	16
+				fontName	"Monospace"
+				autoSizePolicy	"node_width"
+				anchor	"t"
+				borderDistance	0.0
+			]
+			LabelGraphics
+			[
+				text	"
+	SpacecraftKind enum
+	"
+				fontSize	14
+				fontName	"Consolas"
+				alignment	"left"
+				anchor	"tl"
+				borderDistance	6
+			]
+		]
+	
+	node
+		[
+			id	7
+			graphics
+			[
+				w	288.20000000000005
+				h	40
+				type	"rectangle"
+				fill	"#FFFFFF"
+				fill2	"#FFFFFF"
+				outline	"#000000"
+			]
+			LabelGraphics
+			[
+				text	"CubeSat6U literal SpacecraftKind"
+				outline	"#000000"
+				fill	"#FFFFFF"
+				fontSize	16
+				fontName	"Monospace"
+				autoSizePolicy	"node_width"
+				anchor	"t"
+				borderDistance	0.0
+			]
+			LabelGraphics
+			[
+				text	"
+	SpacecraftKind enum
+	"
+				fontSize	14
+				fontName	"Consolas"
+				alignment	"left"
+				anchor	"tl"
+				borderDistance	6
+			]
+		]
+	
+	node
+		[
+			id	8
+			graphics
+			[
+				w	279.40000000000003
+				h	40
+				type	"rectangle"
+				fill	"#FFFFFF"
+				fill2	"#FFFFFF"
+				outline	"#000000"
+			]
+			LabelGraphics
+			[
+				text	"SmallSat literal SpacecraftKind"
+				outline	"#000000"
+				fill	"#FFFFFF"
+				fontSize	16
+				fontName	"Monospace"
+				autoSizePolicy	"node_width"
+				anchor	"t"
+				borderDistance	0.0
+			]
+			LabelGraphics
+			[
+				text	"
+	SpacecraftKind enum
+	"
+				fontSize	14
+				fontName	"Consolas"
+				alignment	"left"
+				anchor	"tl"
+				borderDistance	6
+			]
+		]
+	
+	node
+		[
+			id	9
+			graphics
 			[
 				w	315.70000000000005
 				h	82
@@ -257,7 +365,7 @@ graph
 	
 	node
 		[
-			id	7
+			id	10
 			graphics
 			[
 				w	308.0
@@ -296,7 +404,7 @@ graph
 	
 	node
 		[
-			id	8
+			id	11
 			graphics
 			[
 				w	254.10000000000002
@@ -333,7 +441,7 @@ graph
 	
 	node
 		[
-			id	9
+			id	12
 			graphics
 			[
 				w	254.10000000000002
@@ -370,7 +478,7 @@ graph
 	
 	node
 		[
-			id	10
+			id	13
 			graphics
 			[
 				w	41.800000000000004
@@ -405,7 +513,7 @@ graph
 	
 	node
 		[
-			id	11
+			id	14
 			graphics
 			[
 				w	50.6
@@ -440,11 +548,11 @@ graph
 	
 	node
 		[
-			id	12
+			id	15
 			graphics
 			[
 				w	323.40000000000003
-				h	82
+				h	96
 				type	"rectangle"
 				fill	"#FFFFFF"
 				fill2	"#FFFFFF"
@@ -467,6 +575,7 @@ graph
 	CommunicatingElement class
 	Spacecraft class
 	CubeSat6U class
+	CubeSat class
 	CommunicatingElement class UndefinedPart
 	"
 				fontSize	14
@@ -479,11 +588,11 @@ graph
 	
 	node
 		[
-			id	13
+			id	16
 			graphics
 			[
-				w	223.3
-				h	54
+				w	323.40000000000003
+				h	96
 				type	"rectangle"
 				fill	"#FFFFFF"
 				fill2	"#FFFFFF"
@@ -503,8 +612,11 @@ graph
 			LabelGraphics
 			[
 				text	"
-	Payload class
-	InterferometryPayload class
+	CommunicatingElement class
+	Spacecraft class
+	CubeSat3U class
+	CubeSat class
+	CommunicatingElement class UndefinedPart
 	"
 				fontSize	14
 				fontName	"Consolas"
@@ -516,10 +628,10 @@ graph
 	
 	node
 		[
-			id	14
+			id	17
 			graphics
 			[
-				w	269.5
+				w	223.3
 				h	54
 				type	"rectangle"
 				fill	"#FFFFFF"
@@ -540,8 +652,8 @@ graph
 			LabelGraphics
 			[
 				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
+	Payload class
+	InterferometryPayload class
 	"
 				fontSize	14
 				fontName	"Consolas"
@@ -553,11 +665,11 @@ graph
 	
 	node
 		[
-			id	15
+			id	18
 			graphics
 			[
-				w	323.40000000000003
-				h	82
+				w	269.5
+				h	54
 				type	"rectangle"
 				fill	"#FFFFFF"
 				fill2	"#FFFFFF"
@@ -577,10 +689,8 @@ graph
 			LabelGraphics
 			[
 				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
+	CommSubsystem class
+	CommSubsystem class UndefinedPart
 	"
 				fontSize	14
 				fontName	"Consolas"
@@ -592,7 +702,7 @@ graph
 	
 	node
 		[
-			id	16
+			id	19
 			graphics
 			[
 				w	223.3
@@ -629,7 +739,7 @@ graph
 	
 	node
 		[
-			id	17
+			id	20
 			graphics
 			[
 				w	269.5
@@ -666,11 +776,11 @@ graph
 	
 	node
 		[
-			id	18
+			id	21
 			graphics
 			[
-				w	269.5
-				h	54
+				w	254.10000000000002
+				h	40
 				type	"rectangle"
 				fill	"#FFFFFF"
 				fill2	"#FFFFFF"
@@ -690,8 +800,7 @@ graph
 			LabelGraphics
 			[
 				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
+	DirectedCommunicationLink class
 	"
 				fontSize	14
 				fontName	"Consolas"
@@ -703,11 +812,11 @@ graph
 	
 	node
 		[
-			id	19
+			id	22
 			graphics
 			[
-				w	254.10000000000002
-				h	40
+				w	269.5
+				h	54
 				type	"rectangle"
 				fill	"#FFFFFF"
 				fill2	"#FFFFFF"
@@ -727,7 +836,8 @@ graph
 			LabelGraphics
 			[
 				text	"
-	DirectedCommunicationLink class
+	CommSubsystem class
+	CommSubsystem class UndefinedPart
 	"
 				fontSize	14
 				fontName	"Consolas"
@@ -739,7 +849,7 @@ graph
 	
 	node
 		[
-			id	20
+			id	23
 			graphics
 			[
 				w	269.5
@@ -776,7 +886,7 @@ graph
 	
 	node
 		[
-			id	21
+			id	24
 			graphics
 			[
 				w	254.10000000000002
@@ -812,7 +922,7 @@ graph
 	
 	node
 		[
-			id	22
+			id	25
 			graphics
 			[
 				w	112.2
@@ -847,7 +957,7 @@ graph
 	
 	node
 		[
-			id	23
+			id	26
 			graphics
 			[
 				w	85.80000000000001
@@ -882,7 +992,7 @@ graph
 	
 	node
 		[
-			id	24
+			id	27
 			graphics
 			[
 				w	103.4
@@ -917,7 +1027,7 @@ graph
 	
 	node
 		[
-			id	25
+			id	28
 			graphics
 			[
 				w	103.4
@@ -951,8 +1061,8 @@ graph
 		]
 	edge
 	[
-		source	6
-		target	7
+		source	9
+		target	10
 		graphics
 		[
 			fill	"#000000"
@@ -971,8 +1081,8 @@ graph
 	]
 	edge
 	[
-		source	6
-		target	12
+		source	9
+		target	15
 		graphics
 		[
 			fill	"#000000"
@@ -991,8 +1101,8 @@ graph
 	]
 	edge
 	[
-		source	6
-		target	15
+		source	9
+		target	16
 		graphics
 		[
 			fill	"#000000"
@@ -1011,8 +1121,8 @@ graph
 	]
 	edge
 	[
-		source	7
-		target	8
+		source	10
+		target	11
 		graphics
 		[
 			fill	"#000000"
@@ -1031,8 +1141,8 @@ graph
 	]
 	edge
 	[
-		source	7
-		target	9
+		source	10
+		target	12
 		graphics
 		[
 			fill	"#000000"
@@ -1051,8 +1161,8 @@ graph
 	]
 	edge
 	[
-		source	12
-		target	14
+		source	15
+		target	18
 		graphics
 		[
 			fill	"#000000"
@@ -1071,8 +1181,8 @@ graph
 	]
 	edge
 	[
-		source	15
-		target	17
+		source	16
+		target	20
 		graphics
 		[
 			fill	"#000000"
@@ -1092,7 +1202,7 @@ graph
 	edge
 	[
 		source	15
-		target	18
+		target	22
 		graphics
 		[
 			fill	"#000000"
@@ -1111,8 +1221,8 @@ graph
 	]
 	edge
 	[
-		source	12
-		target	20
+		source	16
+		target	23
 		graphics
 		[
 			fill	"#000000"
@@ -1132,7 +1242,7 @@ graph
 	edge
 	[
 		source	15
-		target	19
+		target	21
 		graphics
 		[
 			fill	"#000000"
@@ -1151,8 +1261,8 @@ graph
 	]
 	edge
 	[
-		source	12
-		target	21
+		source	16
+		target	24
 		graphics
 		[
 			fill	"#000000"
@@ -1171,8 +1281,8 @@ graph
 	]
 	edge
 	[
-		source	12
-		target	13
+		source	16
+		target	17
 		graphics
 		[
 			fill	"#000000"
@@ -1192,7 +1302,7 @@ graph
 	edge
 	[
 		source	15
-		target	16
+		target	19
 		graphics
 		[
 			fill	"#000000"
@@ -1211,7 +1321,7 @@ graph
 	]
 	edge
 	[
-		source	19
+		source	21
 		target	18
 		graphics
 		[
@@ -1230,8 +1340,8 @@ graph
 	]
 	edge
 	[
-		source	21
-		target	20
+		source	24
+		target	23
 		graphics
 		[
 			fill	"#000000"
@@ -1249,8 +1359,8 @@ graph
 	]
 	edge
 	[
-		source	19
-		target	8
+		source	21
+		target	12
 		graphics
 		[
 			fill	"#000000"
@@ -1268,8 +1378,8 @@ graph
 	]
 	edge
 	[
-		source	21
-		target	8
+		source	24
+		target	11
 		graphics
 		[
 			fill	"#000000"
@@ -1287,7 +1397,7 @@ graph
 	]
 	edge
 	[
-		source	8
+		source	11
 		target	1
 		graphics
 		[
@@ -1306,7 +1416,7 @@ graph
 	]
 	edge
 	[
-		source	9
+		source	12
 		target	2
 		graphics
 		[
@@ -1325,8 +1435,8 @@ graph
 	]
 	edge
 	[
-		source	14
-		target	0
+		source	18
+		target	2
 		graphics
 		[
 			fill	"#000000"
@@ -1344,7 +1454,7 @@ graph
 	]
 	edge
 	[
-		source	17
+		source	20
 		target	1
 		graphics
 		[
@@ -1363,7 +1473,7 @@ graph
 	]
 	edge
 	[
-		source	18
+		source	22
 		target	1
 		graphics
 		[
@@ -1382,7 +1492,7 @@ graph
 	]
 	edge
 	[
-		source	20
+		source	23
 		target	1
 		graphics
 		[
@@ -1401,7 +1511,7 @@ graph
 	]
 	edge
 	[
-		source	8
+		source	11
 		target	4
 		graphics
 		[
@@ -1420,7 +1530,7 @@ graph
 	]
 	edge
 	[
-		source	9
+		source	12
 		target	5
 		graphics
 		[
@@ -1439,8 +1549,8 @@ graph
 	]
 	edge
 	[
-		source	14
-		target	3
+		source	18
+		target	5
 		graphics
 		[
 			fill	"#000000"
@@ -1458,8 +1568,8 @@ graph
 	]
 	edge
 	[
-		source	17
-		target	3
+		source	20
+		target	5
 		graphics
 		[
 			fill	"#000000"
@@ -1477,8 +1587,8 @@ graph
 	]
 	edge
 	[
-		source	18
-		target	4
+		source	22
+		target	5
 		graphics
 		[
 			fill	"#000000"
@@ -1496,7 +1606,7 @@ graph
 	]
 	edge
 	[
-		source	20
+		source	23
 		target	4
 		graphics
 		[
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/1.png b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/1.png
index 46fb5138..832f8b42 100644
Binary files a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/1.png and b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/1.png differ
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/1.xmi b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/1.xmi
index 5d49f882..44ca2b3e 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/1.xmi
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/1.xmi
@@ -4,16 +4,16 @@
     <commSubsystem band="X" gain="MEDIUM"/>
     <commSubsystem band="Ka" gain="HIGH"/>
   </groundStationNetwork>
-  <spacecraft xsi:type="satellite:SmallSat">
+  <spacecraft xsi:type="satellite:CubeSat3U">
+    <commSubsystem band="X" gain="HIGH"/>
     <commSubsystem band="X" gain="MEDIUM"/>
-    <commSubsystem band="X"/>
-    <communicationLink source="//@spacecraft.0/@commSubsystem.0" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <communicationLink source="//@spacecraft.0/@commSubsystem.1" target="//@groundStationNetwork/@commSubsystem.0"/>
     <payload xsi:type="satellite:InterferometryPayload"/>
   </spacecraft>
   <spacecraft xsi:type="satellite:CubeSat6U">
-    <commSubsystem/>
-    <commSubsystem band="X" gain="MEDIUM"/>
-    <communicationLink source="//@spacecraft.1/@commSubsystem.1" target="//@groundStationNetwork/@commSubsystem.0"/>
+    <commSubsystem band="X" gain="HIGH"/>
+    <commSubsystem band="Ka" gain="HIGH"/>
+    <communicationLink source="//@spacecraft.1/@commSubsystem.1" target="//@groundStationNetwork/@commSubsystem.1"/>
     <payload xsi:type="satellite:InterferometryPayload"/>
   </spacecraft>
 </satellite:InterferometryMission>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/2.gml b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/2.gml
deleted file mode 100644
index c5fd2a74..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/2.gml
+++ /dev/null
@@ -1,1983 +0,0 @@
-graph
-[
-	node
-		[
-			id	0
-			graphics
-			[
-				w	244.20000000000002
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"UHF literal TransceiverBand"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	TransceiverBand enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	1
-			graphics
-			[
-				w	226.60000000000002
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"X literal TransceiverBand"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	TransceiverBand enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	2
-			graphics
-			[
-				w	235.4
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"Ka literal TransceiverBand"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	TransceiverBand enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	3
-			graphics
-			[
-				w	209.00000000000003
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"LOW literal AntennaGain"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	AntennaGain enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	4
-			graphics
-			[
-				w	235.4
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"MEDIUM literal AntennaGain"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	AntennaGain enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	5
-			graphics
-			[
-				w	217.8
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"HIGH literal AntennaGain"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	AntennaGain enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	6
-			graphics
-			[
-				w	315.70000000000005
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 1"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	ConstellationMission class DefinedPart
-	InterferometryMission class DefinedPart
-	ConstellationMission class
-	InterferometryMission class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	7
-			graphics
-			[
-				w	308.0
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 2"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class DefinedPart
-	GroundStationNetwork class DefinedPart
-	CommunicatingElement class
-	GroundStationNetwork class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	8
-			graphics
-			[
-				w	254.10000000000002
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 3"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class DefinedPart
-	CommSubsystem class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	9
-			graphics
-			[
-				w	254.10000000000002
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 4"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class DefinedPart
-	CommSubsystem class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	10
-			graphics
-			[
-				w	41.800000000000004
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"true"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	11
-			graphics
-			[
-				w	50.6
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"false"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	12
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	13
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	CubeSat6U class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	14
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	15
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	16
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	17
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	18
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	19
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	20
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	21
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	CubeSat6U class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	22
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	23
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	24
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	25
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	26
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	27
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	28
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	29
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	30
-			graphics
-			[
-				w	112.2
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Integers"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	31
-			graphics
-			[
-				w	85.80000000000001
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Reals"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	32
-			graphics
-			[
-				w	103.4
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Strings"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	33
-			graphics
-			[
-				w	103.4
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Objects"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	edge
-	[
-		source	6
-		target	7
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"groundStationNetwork reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	12
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	13
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	17
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	19
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	21
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	22
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	7
-		target	8
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	7
-		target	9
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	13
-		target	14
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	12
-		target	16
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	21
-		target	23
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	19
-		target	24
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	17
-		target	27
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	22
-		target	28
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	13
-		target	15
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	12
-		target	18
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	17
-		target	20
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	19
-		target	25
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	22
-		target	26
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	21
-		target	29
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	8
-		target	1
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	9
-		target	2
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	14
-		target	0
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	16
-		target	2
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	23
-		target	1
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	24
-		target	2
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	27
-		target	1
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	28
-		target	2
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	8
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	9
-		target	5
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	14
-		target	5
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	16
-		target	3
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	24
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	23
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	27
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	28
-		target	3
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-]
-
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/2.png b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/2.png
deleted file mode 100644
index 791ec34e..00000000
Binary files a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/2.png and /dev/null differ
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/2.xmi b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/2.xmi
deleted file mode 100644
index 14a9208d..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/2.xmi
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite model/satellite.ecore">
-  <groundStationNetwork>
-    <commSubsystem band="X" gain="MEDIUM"/>
-    <commSubsystem band="Ka" gain="HIGH"/>
-  </groundStationNetwork>
-  <spacecraft xsi:type="satellite:CubeSat6U">
-    <commSubsystem band="X" gain="MEDIUM"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:CubeSat6U">
-    <commSubsystem gain="HIGH"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem band="X" gain="MEDIUM"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem band="Ka" gain="MEDIUM"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem band="Ka"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem band="Ka"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-</satellite:InterferometryMission>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/3.gml b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/3.gml
deleted file mode 100644
index caae7300..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/3.gml
+++ /dev/null
@@ -1,1926 +0,0 @@
-graph
-[
-	node
-		[
-			id	0
-			graphics
-			[
-				w	244.20000000000002
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"UHF literal TransceiverBand"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	TransceiverBand enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	1
-			graphics
-			[
-				w	226.60000000000002
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"X literal TransceiverBand"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	TransceiverBand enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	2
-			graphics
-			[
-				w	235.4
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"Ka literal TransceiverBand"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	TransceiverBand enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	3
-			graphics
-			[
-				w	209.00000000000003
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"LOW literal AntennaGain"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	AntennaGain enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	4
-			graphics
-			[
-				w	235.4
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"MEDIUM literal AntennaGain"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	AntennaGain enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	5
-			graphics
-			[
-				w	217.8
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"HIGH literal AntennaGain"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	AntennaGain enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	6
-			graphics
-			[
-				w	315.70000000000005
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 1"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	ConstellationMission class DefinedPart
-	InterferometryMission class DefinedPart
-	ConstellationMission class
-	InterferometryMission class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	7
-			graphics
-			[
-				w	308.0
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 2"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class DefinedPart
-	GroundStationNetwork class DefinedPart
-	CommunicatingElement class
-	GroundStationNetwork class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	8
-			graphics
-			[
-				w	254.10000000000002
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 3"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class DefinedPart
-	CommSubsystem class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	9
-			graphics
-			[
-				w	254.10000000000002
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 4"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class DefinedPart
-	CommSubsystem class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	10
-			graphics
-			[
-				w	41.800000000000004
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"true"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	11
-			graphics
-			[
-				w	50.6
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"false"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	12
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	13
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	CubeSat6U class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	14
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	15
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	16
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	17
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	18
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	19
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	20
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	21
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	CubeSat6U class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	22
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	23
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	24
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	25
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	26
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	27
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	28
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	29
-			graphics
-			[
-				w	112.2
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Integers"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	30
-			graphics
-			[
-				w	85.80000000000001
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Reals"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	31
-			graphics
-			[
-				w	103.4
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Strings"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	32
-			graphics
-			[
-				w	103.4
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Objects"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	edge
-	[
-		source	6
-		target	7
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"groundStationNetwork reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	12
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	13
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	17
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	19
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	21
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	22
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	7
-		target	8
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	7
-		target	9
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	13
-		target	14
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	12
-		target	16
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	21
-		target	23
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	19
-		target	24
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	17
-		target	27
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	22
-		target	28
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	13
-		target	15
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	12
-		target	18
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	17
-		target	20
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	19
-		target	25
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	22
-		target	26
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	8
-		target	1
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	9
-		target	2
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	14
-		target	0
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	16
-		target	2
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	23
-		target	1
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	24
-		target	2
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	27
-		target	1
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	28
-		target	0
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	8
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	9
-		target	5
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	14
-		target	5
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	16
-		target	3
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	24
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	23
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	27
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	28
-		target	3
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-]
-
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/3.png b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/3.png
deleted file mode 100644
index 38901d43..00000000
Binary files a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/3.png and /dev/null differ
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/3.xmi b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/3.xmi
deleted file mode 100644
index d0a119b9..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/3.xmi
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite model/satellite.ecore">
-  <groundStationNetwork>
-    <commSubsystem band="X" gain="MEDIUM"/>
-    <commSubsystem band="Ka" gain="HIGH"/>
-  </groundStationNetwork>
-  <spacecraft xsi:type="satellite:CubeSat6U">
-    <commSubsystem band="X" gain="MEDIUM"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:CubeSat6U">
-    <commSubsystem gain="HIGH"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem band="X" gain="MEDIUM"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem band="Ka" gain="MEDIUM"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem band="Ka"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-</satellite:InterferometryMission>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/4.gml b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/4.gml
deleted file mode 100644
index eef67577..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/4.gml
+++ /dev/null
@@ -1,1983 +0,0 @@
-graph
-[
-	node
-		[
-			id	0
-			graphics
-			[
-				w	244.20000000000002
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"UHF literal TransceiverBand"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	TransceiverBand enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	1
-			graphics
-			[
-				w	226.60000000000002
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"X literal TransceiverBand"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	TransceiverBand enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	2
-			graphics
-			[
-				w	235.4
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"Ka literal TransceiverBand"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	TransceiverBand enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	3
-			graphics
-			[
-				w	209.00000000000003
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"LOW literal AntennaGain"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	AntennaGain enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	4
-			graphics
-			[
-				w	235.4
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"MEDIUM literal AntennaGain"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	AntennaGain enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	5
-			graphics
-			[
-				w	217.8
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"HIGH literal AntennaGain"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	AntennaGain enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	6
-			graphics
-			[
-				w	315.70000000000005
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 1"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	ConstellationMission class DefinedPart
-	InterferometryMission class DefinedPart
-	ConstellationMission class
-	InterferometryMission class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	7
-			graphics
-			[
-				w	308.0
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 2"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class DefinedPart
-	GroundStationNetwork class DefinedPart
-	CommunicatingElement class
-	GroundStationNetwork class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	8
-			graphics
-			[
-				w	254.10000000000002
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 3"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class DefinedPart
-	CommSubsystem class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	9
-			graphics
-			[
-				w	254.10000000000002
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 4"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class DefinedPart
-	CommSubsystem class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	10
-			graphics
-			[
-				w	41.800000000000004
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"true"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	11
-			graphics
-			[
-				w	50.6
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"false"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	12
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	13
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	CubeSat6U class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	14
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	15
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	16
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	17
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	18
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	19
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	20
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	21
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	CubeSat6U class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	22
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	23
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	24
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	25
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	26
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	27
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	28
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	29
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	30
-			graphics
-			[
-				w	112.2
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Integers"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	31
-			graphics
-			[
-				w	85.80000000000001
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Reals"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	32
-			graphics
-			[
-				w	103.4
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Strings"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	33
-			graphics
-			[
-				w	103.4
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Objects"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	edge
-	[
-		source	6
-		target	7
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"groundStationNetwork reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	12
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	13
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	17
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	19
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	21
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	22
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	7
-		target	8
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	7
-		target	9
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	13
-		target	14
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	12
-		target	16
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	21
-		target	23
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	19
-		target	24
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	17
-		target	27
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	22
-		target	28
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	13
-		target	15
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	12
-		target	18
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	17
-		target	20
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	19
-		target	25
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	22
-		target	26
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	21
-		target	29
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	8
-		target	1
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	9
-		target	2
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	14
-		target	0
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	16
-		target	2
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	23
-		target	1
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	24
-		target	2
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	27
-		target	1
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	28
-		target	0
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	8
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	9
-		target	5
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	14
-		target	5
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	16
-		target	3
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	24
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	23
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	27
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	28
-		target	3
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-]
-
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/4.png b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/4.png
deleted file mode 100644
index e378a9fb..00000000
Binary files a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/4.png and /dev/null differ
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/4.xmi b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/4.xmi
deleted file mode 100644
index 4dcf0982..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/4.xmi
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite model/satellite.ecore">
-  <groundStationNetwork>
-    <commSubsystem band="X" gain="MEDIUM"/>
-    <commSubsystem band="Ka" gain="HIGH"/>
-  </groundStationNetwork>
-  <spacecraft xsi:type="satellite:CubeSat6U">
-    <commSubsystem band="X" gain="MEDIUM"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:CubeSat6U">
-    <commSubsystem gain="HIGH"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem band="X" gain="MEDIUM"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem band="Ka" gain="MEDIUM"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem band="Ka"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-</satellite:InterferometryMission>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/5.gml b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/5.gml
deleted file mode 100644
index 3f21efdc..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/5.gml
+++ /dev/null
@@ -1,1926 +0,0 @@
-graph
-[
-	node
-		[
-			id	0
-			graphics
-			[
-				w	244.20000000000002
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"UHF literal TransceiverBand"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	TransceiverBand enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	1
-			graphics
-			[
-				w	226.60000000000002
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"X literal TransceiverBand"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	TransceiverBand enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	2
-			graphics
-			[
-				w	235.4
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"Ka literal TransceiverBand"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	TransceiverBand enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	3
-			graphics
-			[
-				w	209.00000000000003
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"LOW literal AntennaGain"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	AntennaGain enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	4
-			graphics
-			[
-				w	235.4
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"MEDIUM literal AntennaGain"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	AntennaGain enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	5
-			graphics
-			[
-				w	217.8
-				h	40
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"HIGH literal AntennaGain"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	AntennaGain enum
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	6
-			graphics
-			[
-				w	315.70000000000005
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 1"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	ConstellationMission class DefinedPart
-	InterferometryMission class DefinedPart
-	ConstellationMission class
-	InterferometryMission class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	7
-			graphics
-			[
-				w	308.0
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 2"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class DefinedPart
-	GroundStationNetwork class DefinedPart
-	CommunicatingElement class
-	GroundStationNetwork class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	8
-			graphics
-			[
-				w	254.10000000000002
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 3"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class DefinedPart
-	CommSubsystem class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	9
-			graphics
-			[
-				w	254.10000000000002
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"o 4"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class DefinedPart
-	CommSubsystem class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	10
-			graphics
-			[
-				w	41.800000000000004
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"true"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	11
-			graphics
-			[
-				w	50.6
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"false"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	12
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	13
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	CubeSat6U class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	14
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	15
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	16
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	17
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	18
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	19
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	20
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	21
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	CubeSat6U class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	22
-			graphics
-			[
-				w	323.40000000000003
-				h	82
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommunicatingElement class
-	Spacecraft class
-	SmallSat class
-	CommunicatingElement class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	23
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	24
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	25
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	26
-			graphics
-			[
-				w	223.3
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	Payload class
-	InterferometryPayload class
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	27
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	28
-			graphics
-			[
-				w	269.5
-				h	54
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"null"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	CommSubsystem class
-	CommSubsystem class UndefinedPart
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	29
-			graphics
-			[
-				w	112.2
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Integers"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	30
-			graphics
-			[
-				w	85.80000000000001
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Reals"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	31
-			graphics
-			[
-				w	103.4
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Strings"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	
-	node
-		[
-			id	32
-			graphics
-			[
-				w	103.4
-				h	26
-				type	"rectangle"
-				fill	"#FFFFFF"
-				fill2	"#FFFFFF"
-				outline	"#000000"
-			]
-			LabelGraphics
-			[
-				text	"New Objects"
-				outline	"#000000"
-				fill	"#FFFFFF"
-				fontSize	16
-				fontName	"Monospace"
-				autoSizePolicy	"node_width"
-				anchor	"t"
-				borderDistance	0.0
-			]
-			LabelGraphics
-			[
-				text	"
-	"
-				fontSize	14
-				fontName	"Consolas"
-				alignment	"left"
-				anchor	"tl"
-				borderDistance	6
-			]
-		]
-	edge
-	[
-		source	6
-		target	7
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"groundStationNetwork reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	12
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	13
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	17
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	19
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	21
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	6
-		target	22
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"spacecraft reference ConstellationMission"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	7
-		target	8
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	7
-		target	9
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	13
-		target	14
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	12
-		target	16
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	21
-		target	23
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	19
-		target	24
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	17
-		target	27
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	22
-		target	28
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"commSubsystem reference CommunicatingElement"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	13
-		target	15
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	12
-		target	18
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	17
-		target	20
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	19
-		target	25
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	22
-		target	26
-		graphics
-		[
-			fill	"#000000"
-			width	3
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"payload reference Spacecraft"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	8
-		target	1
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	9
-		target	2
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	14
-		target	0
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	16
-		target	2
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	23
-		target	1
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	24
-		target	2
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	27
-		target	1
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	28
-		target	1
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"band attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	8
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	9
-		target	5
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	14
-		target	5
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	16
-		target	3
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	24
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	23
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	27
-		target	4
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-	edge
-	[
-		source	28
-		target	3
-		graphics
-		[
-			fill	"#000000"
-			targetArrow	"standard"
-		]
-		LabelGraphics
-		[
-			text	"gain attribute CommSubsystem"
-			fontSize	14
-			fontName	"Consolas"
-			configuration	"AutoFlippingLabel"
-			model	"six_pos"
-			position	"thead"
-		]
-	]
-]
-
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/5.png b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/5.png
deleted file mode 100644
index 4d65f5ba..00000000
Binary files a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/5.png and /dev/null differ
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/5.xmi b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/5.xmi
deleted file mode 100644
index b0c5bef1..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/models/5.xmi
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<satellite:InterferometryMission xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:satellite="http://www.example.org/satellite" xsi:schemaLocation="http://www.example.org/satellite model/satellite.ecore">
-  <groundStationNetwork>
-    <commSubsystem band="X" gain="MEDIUM"/>
-    <commSubsystem band="Ka" gain="HIGH"/>
-  </groundStationNetwork>
-  <spacecraft xsi:type="satellite:CubeSat6U">
-    <commSubsystem band="X" gain="MEDIUM"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:CubeSat6U">
-    <commSubsystem gain="HIGH"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem band="X" gain="MEDIUM"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem band="Ka" gain="MEDIUM"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem band="Ka"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-  <spacecraft xsi:type="satellite:SmallSat">
-    <commSubsystem band="X"/>
-    <payload xsi:type="satellite:InterferometryPayload"/>
-  </spacecraft>
-</satellite:InterferometryMission>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/statistics.csv b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/statistics.csv
index c6c34dfc..35c220e0 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/statistics.csv
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/outputs/statistics.csv
@@ -1,3 +1,3 @@
 Task;Run;Result;Domain to logic transformation time;Logic to solver transformation time;Solver time;Postprocessing time;_Solution0FoundAt;TransformationExecutionTime;TypeAnalysisTime;StateCoderTime;StateCoderFailCount;SolutionCopyTime
-1;1;ModelResultImpl;715;4234;39649;4468544142;39591;20421;147;938;0;10
+1;1;ModelResultImpl;580;4611;34341;4979693485;34306;19566;148;1006;0;5
 
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml
index 0cdd345c..5d75b948 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?><?eclipse version="3.0"?><!--
 --><plugin>
+  <extension id="extension.derived.hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">
+    <wellbehaving-derived-feature classifier-name="Spacecraft" feature-name="kind" package-nsUri="http://www.example.org/satellite"/>
+  </extension>
   <extension point="org.eclipse.emf.ecore.generated_package">
     <!-- @generated satellite -->
-    <package class="hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage" genModel="model/satellite.genmodel" uri="http://www.example.org/satellite"/>
+    <package class="satellite.SatellitePackage" genModel="model/satellite.genmodel" uri="http://www.example.org/satellite"/>
   </extension>
   <extension id="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SatelliteQueries" point="org.eclipse.viatra.query.runtime.queryspecification">
     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SatelliteQueries" id="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SatelliteQueries">
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkDoesNotStartAtContainingElement"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.notEnoughInterferometryPayloads"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noLinkToGroundStation"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noPotentialLinkToGroundStation"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLoop"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.incompatibleSourceAndTargetBand"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.incompatibleSourceAndTargetGain"/>
@@ -17,9 +21,8 @@
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.kaAntennaGainLow"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.threeUCubeSatWithNonUhfCrossLink"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.cubeSatWithKaAntenna"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.coverageMetric"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.timeMetric"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.costMetric"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.smallSat"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind"/>
     </group>
   </extension>
 </plugin>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/metrics/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/metrics/.gitignore
deleted file mode 100644
index 3e7cd5e2..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/metrics/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/.CoverageMetric.java._trace
-/.SatelliteMetrics.java._trace
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/metrics/internal/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/metrics/internal/.gitignore
deleted file mode 100644
index d3195cfc..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/metrics/internal/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/.MissionCoverage.java._trace
-/.SatelliteMetricsAll.java._trace
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/.gitignore
index 5f0d5b4b..6f361334 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/.gitignore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/.gitignore
@@ -20,3 +20,6 @@
 /.TimeMetric.java._trace
 /.CostMetric.java._trace
 /.SpacecraftCost.java._trace
+/.SpacecraftOfKind.java._trace
+/.NoPotentialLinkToGroundStation.java._trace
+/.SmallSat.java._trace
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CostMetric.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CostMetric.java
deleted file mode 100644
index 474719b2..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CostMetric.java
+++ /dev/null
@@ -1,544 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionCost;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.log4j.Logger;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.matchers.aggregators.sum;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-
-/**
- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         // Cost
- *         
- *         pattern costMetric(Cost : java Double) {
- *         	Cost == sum find missionCost(_, #_);
- *         }
- * </pre></code>
- * 
- * @see Matcher
- * @see Match
- * 
- */
-@SuppressWarnings("all")
-public final class CostMetric extends BaseGeneratedEMFQuerySpecification<CostMetric.Matcher> {
-  /**
-   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.costMetric pattern,
-   * to be used in conjunction with {@link Matcher}.
-   * 
-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
-   * Each instance is a (possibly partial) substitution of pattern parameters,
-   * usable to represent a match of the pattern in the result of a query,
-   * or to specify the bound (fixed) input parameters when issuing a query.
-   * 
-   * @see Matcher
-   * 
-   */
-  public static abstract class Match extends BasePatternMatch {
-    private Double fCost;
-    
-    private static List<String> parameterNames = makeImmutableList("Cost");
-    
-    private Match(final Double pCost) {
-      this.fCost = pCost;
-    }
-    
-    @Override
-    public Object get(final String parameterName) {
-      if ("Cost".equals(parameterName)) return this.fCost;
-      return null;
-    }
-    
-    public Double getCost() {
-      return this.fCost;
-    }
-    
-    @Override
-    public boolean set(final String parameterName, final Object newValue) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      if ("Cost".equals(parameterName) ) {
-          this.fCost = (Double) newValue;
-          return true;
-      }
-      return false;
-    }
-    
-    public void setCost(final Double pCost) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fCost = pCost;
-    }
-    
-    @Override
-    public String patternName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.costMetric";
-    }
-    
-    @Override
-    public List<String> parameterNames() {
-      return CostMetric.Match.parameterNames;
-    }
-    
-    @Override
-    public Object[] toArray() {
-      return new Object[]{fCost};
-    }
-    
-    @Override
-    public CostMetric.Match toImmutable() {
-      return isMutable() ? newMatch(fCost) : this;
-    }
-    
-    @Override
-    public String prettyPrint() {
-      StringBuilder result = new StringBuilder();
-      result.append("\"Cost\"=" + prettyPrintValue(fCost));
-      return result.toString();
-    }
-    
-    @Override
-    public int hashCode() {
-      return Objects.hash(fCost);
-    }
-    
-    @Override
-    public boolean equals(final Object obj) {
-      if (this == obj)
-          return true;
-      if (obj == null) {
-          return false;
-      }
-      if ((obj instanceof CostMetric.Match)) {
-          CostMetric.Match other = (CostMetric.Match) obj;
-          return Objects.equals(fCost, other.fCost);
-      } else {
-          // this should be infrequent
-          if (!(obj instanceof IPatternMatch)) {
-              return false;
-          }
-          IPatternMatch otherSig  = (IPatternMatch) obj;
-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-      }
-    }
-    
-    @Override
-    public CostMetric specification() {
-      return CostMetric.instance();
-    }
-    
-    /**
-     * Returns an empty, mutable match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @return the empty match.
-     * 
-     */
-    public static CostMetric.Match newEmptyMatch() {
-      return new Mutable(null);
-    }
-    
-    /**
-     * Returns a mutable (partial) match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
-     * @return the new, mutable (partial) match object.
-     * 
-     */
-    public static CostMetric.Match newMutableMatch(final Double pCost) {
-      return new Mutable(pCost);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public static CostMetric.Match newMatch(final Double pCost) {
-      return new Immutable(pCost);
-    }
-    
-    private static final class Mutable extends CostMetric.Match {
-      Mutable(final Double pCost) {
-        super(pCost);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return true;
-      }
-    }
-    
-    private static final class Immutable extends CostMetric.Match {
-      Immutable(final Double pCost) {
-        super(pCost);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return false;
-      }
-    }
-  }
-  
-  /**
-   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.costMetric pattern,
-   * providing pattern-specific query methods.
-   * 
-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
-   * 
-   * <p>Matches of the pattern will be represented as {@link Match}.
-   * 
-   * <p>Original source:
-   * <code><pre>
-   * // Cost
-   * 
-   * pattern costMetric(Cost : java Double) {
-   * 	Cost == sum find missionCost(_, #_);
-   * }
-   * </pre></code>
-   * 
-   * @see Match
-   * @see CostMetric
-   * 
-   */
-  public static class Matcher extends BaseMatcher<CostMetric.Match> {
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    public static CostMetric.Matcher on(final ViatraQueryEngine engine) {
-      // check if matcher already exists
-      Matcher matcher = engine.getExistingMatcher(querySpecification());
-      if (matcher == null) {
-          matcher = (Matcher)engine.getMatcher(querySpecification());
-      }
-      return matcher;
-    }
-    
-    /**
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * @return an initialized matcher
-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-     * 
-     */
-    public static CostMetric.Matcher create() {
-      return new Matcher();
-    }
-    
-    private static final int POSITION_COST = 0;
-    
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(CostMetric.Matcher.class);
-    
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    private Matcher() {
-      super(querySpecification());
-    }
-    
-    /**
-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
-     * @return matches represented as a Match object.
-     * 
-     */
-    public Collection<CostMetric.Match> getAllMatches(final Double pCost) {
-      return rawStreamAllMatches(new Object[]{pCost}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
-     * @return a stream of matches represented as a Match object.
-     * 
-     */
-    public Stream<CostMetric.Match> streamAllMatches(final Double pCost) {
-      return rawStreamAllMatches(new Object[]{pCost});
-    }
-    
-    /**
-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
-     * @return a match represented as a Match object, or null if no match is found.
-     * 
-     */
-    public Optional<CostMetric.Match> getOneArbitraryMatch(final Double pCost) {
-      return rawGetOneArbitraryMatch(new Object[]{pCost});
-    }
-    
-    /**
-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-     * under any possible substitution of the unspecified parameters (if any).
-     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
-     * @return true if the input is a valid (partial) match of the pattern.
-     * 
-     */
-    public boolean hasMatch(final Double pCost) {
-      return rawHasMatch(new Object[]{pCost});
-    }
-    
-    /**
-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
-     * @return the number of pattern matches found.
-     * 
-     */
-    public int countMatches(final Double pCost) {
-      return rawCountMatches(new Object[]{pCost});
-    }
-    
-    /**
-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
-     * @param processor the action that will process the selected match.
-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-     * 
-     */
-    public boolean forOneArbitraryMatch(final Double pCost, final Consumer<? super CostMetric.Match> processor) {
-      return rawForOneArbitraryMatch(new Object[]{pCost}, processor);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public CostMetric.Match newMatch(final Double pCost) {
-      return CostMetric.Match.newMatch(pCost);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Cost.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<Double> rawStreamAllValuesOfCost(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_COST, parameters).map(Double.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Cost.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Double> getAllValuesOfCost() {
-      return rawStreamAllValuesOfCost(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Cost.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Double> streamAllValuesOfCost() {
-      return rawStreamAllValuesOfCost(emptyArray());
-    }
-    
-    @Override
-    protected CostMetric.Match tupleToMatch(final Tuple t) {
-      try {
-          return CostMetric.Match.newMatch((Double) t.get(POSITION_COST));
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in tuple not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected CostMetric.Match arrayToMatch(final Object[] match) {
-      try {
-          return CostMetric.Match.newMatch((Double) match[POSITION_COST]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected CostMetric.Match arrayToMatchMutable(final Object[] match) {
-      try {
-          return CostMetric.Match.newMutableMatch((Double) match[POSITION_COST]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    /**
-     * @return the singleton instance of the query specification of this pattern
-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-     * 
-     */
-    public static IQuerySpecification<CostMetric.Matcher> querySpecification() {
-      return CostMetric.instance();
-    }
-  }
-  
-  private CostMetric() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static CostMetric instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected CostMetric.Matcher instantiate(final ViatraQueryEngine engine) {
-    return CostMetric.Matcher.on(engine);
-  }
-  
-  @Override
-  public CostMetric.Matcher instantiate() {
-    return CostMetric.Matcher.create();
-  }
-  
-  @Override
-  public CostMetric.Match newEmptyMatch() {
-    return CostMetric.Match.newEmptyMatch();
-  }
-  
-  @Override
-  public CostMetric.Match newMatch(final Object... parameters) {
-    return CostMetric.Match.newMatch((java.lang.Double) parameters[0]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CostMetric (visibility: PUBLIC, simpleName: CostMetric, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CostMetric, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CostMetric (visibility: PUBLIC, simpleName: CostMetric, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CostMetric, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final CostMetric INSTANCE = new CostMetric();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final CostMetric.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Cost = new PParameter("Cost", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Cost);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PUBLIC);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.costMetric";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Cost");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Cost = body.getOrCreateVariableByName("Cost");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Cost), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Cost, parameter_Cost)
-          ));
-          // 	Cost == sum find missionCost(_, #_)
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new AggregatorConstraint(new sum().getAggregatorLogic(Double.class), body, Tuples.flatTupleOf(var___0_, var___1_), MissionCost.instance().getInternalQueryRepresentation(), var__virtual_0_, 1);
-          new Equality(body, var_Cost, var__virtual_0_);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CoverageMetric.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CoverageMetric.java
deleted file mode 100644
index 23b02ce4..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CoverageMetric.java
+++ /dev/null
@@ -1,552 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionCoverage;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.log4j.Logger;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.matchers.aggregators.sum;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-
-/**
- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         //
- *         // Metrics
- *         //
- *         
- *         // Coverage
- *         
- *         pattern coverageMetric(Coverage : java Double) {
- *         	Coverage == sum find missionCoverage(_, #_);
- *         }
- * </pre></code>
- * 
- * @see Matcher
- * @see Match
- * 
- */
-@SuppressWarnings("all")
-public final class CoverageMetric extends BaseGeneratedEMFQuerySpecification<CoverageMetric.Matcher> {
-  /**
-   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.coverageMetric pattern,
-   * to be used in conjunction with {@link Matcher}.
-   * 
-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
-   * Each instance is a (possibly partial) substitution of pattern parameters,
-   * usable to represent a match of the pattern in the result of a query,
-   * or to specify the bound (fixed) input parameters when issuing a query.
-   * 
-   * @see Matcher
-   * 
-   */
-  public static abstract class Match extends BasePatternMatch {
-    private Double fCoverage;
-    
-    private static List<String> parameterNames = makeImmutableList("Coverage");
-    
-    private Match(final Double pCoverage) {
-      this.fCoverage = pCoverage;
-    }
-    
-    @Override
-    public Object get(final String parameterName) {
-      if ("Coverage".equals(parameterName)) return this.fCoverage;
-      return null;
-    }
-    
-    public Double getCoverage() {
-      return this.fCoverage;
-    }
-    
-    @Override
-    public boolean set(final String parameterName, final Object newValue) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      if ("Coverage".equals(parameterName) ) {
-          this.fCoverage = (Double) newValue;
-          return true;
-      }
-      return false;
-    }
-    
-    public void setCoverage(final Double pCoverage) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fCoverage = pCoverage;
-    }
-    
-    @Override
-    public String patternName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.coverageMetric";
-    }
-    
-    @Override
-    public List<String> parameterNames() {
-      return CoverageMetric.Match.parameterNames;
-    }
-    
-    @Override
-    public Object[] toArray() {
-      return new Object[]{fCoverage};
-    }
-    
-    @Override
-    public CoverageMetric.Match toImmutable() {
-      return isMutable() ? newMatch(fCoverage) : this;
-    }
-    
-    @Override
-    public String prettyPrint() {
-      StringBuilder result = new StringBuilder();
-      result.append("\"Coverage\"=" + prettyPrintValue(fCoverage));
-      return result.toString();
-    }
-    
-    @Override
-    public int hashCode() {
-      return Objects.hash(fCoverage);
-    }
-    
-    @Override
-    public boolean equals(final Object obj) {
-      if (this == obj)
-          return true;
-      if (obj == null) {
-          return false;
-      }
-      if ((obj instanceof CoverageMetric.Match)) {
-          CoverageMetric.Match other = (CoverageMetric.Match) obj;
-          return Objects.equals(fCoverage, other.fCoverage);
-      } else {
-          // this should be infrequent
-          if (!(obj instanceof IPatternMatch)) {
-              return false;
-          }
-          IPatternMatch otherSig  = (IPatternMatch) obj;
-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-      }
-    }
-    
-    @Override
-    public CoverageMetric specification() {
-      return CoverageMetric.instance();
-    }
-    
-    /**
-     * Returns an empty, mutable match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @return the empty match.
-     * 
-     */
-    public static CoverageMetric.Match newEmptyMatch() {
-      return new Mutable(null);
-    }
-    
-    /**
-     * Returns a mutable (partial) match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @param pCoverage the fixed value of pattern parameter Coverage, or null if not bound.
-     * @return the new, mutable (partial) match object.
-     * 
-     */
-    public static CoverageMetric.Match newMutableMatch(final Double pCoverage) {
-      return new Mutable(pCoverage);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pCoverage the fixed value of pattern parameter Coverage, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public static CoverageMetric.Match newMatch(final Double pCoverage) {
-      return new Immutable(pCoverage);
-    }
-    
-    private static final class Mutable extends CoverageMetric.Match {
-      Mutable(final Double pCoverage) {
-        super(pCoverage);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return true;
-      }
-    }
-    
-    private static final class Immutable extends CoverageMetric.Match {
-      Immutable(final Double pCoverage) {
-        super(pCoverage);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return false;
-      }
-    }
-  }
-  
-  /**
-   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.coverageMetric pattern,
-   * providing pattern-specific query methods.
-   * 
-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
-   * 
-   * <p>Matches of the pattern will be represented as {@link Match}.
-   * 
-   * <p>Original source:
-   * <code><pre>
-   * //
-   * // Metrics
-   * //
-   * 
-   * // Coverage
-   * 
-   * pattern coverageMetric(Coverage : java Double) {
-   * 	Coverage == sum find missionCoverage(_, #_);
-   * }
-   * </pre></code>
-   * 
-   * @see Match
-   * @see CoverageMetric
-   * 
-   */
-  public static class Matcher extends BaseMatcher<CoverageMetric.Match> {
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    public static CoverageMetric.Matcher on(final ViatraQueryEngine engine) {
-      // check if matcher already exists
-      Matcher matcher = engine.getExistingMatcher(querySpecification());
-      if (matcher == null) {
-          matcher = (Matcher)engine.getMatcher(querySpecification());
-      }
-      return matcher;
-    }
-    
-    /**
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * @return an initialized matcher
-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-     * 
-     */
-    public static CoverageMetric.Matcher create() {
-      return new Matcher();
-    }
-    
-    private static final int POSITION_COVERAGE = 0;
-    
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(CoverageMetric.Matcher.class);
-    
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    private Matcher() {
-      super(querySpecification());
-    }
-    
-    /**
-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pCoverage the fixed value of pattern parameter Coverage, or null if not bound.
-     * @return matches represented as a Match object.
-     * 
-     */
-    public Collection<CoverageMetric.Match> getAllMatches(final Double pCoverage) {
-      return rawStreamAllMatches(new Object[]{pCoverage}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     * @param pCoverage the fixed value of pattern parameter Coverage, or null if not bound.
-     * @return a stream of matches represented as a Match object.
-     * 
-     */
-    public Stream<CoverageMetric.Match> streamAllMatches(final Double pCoverage) {
-      return rawStreamAllMatches(new Object[]{pCoverage});
-    }
-    
-    /**
-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pCoverage the fixed value of pattern parameter Coverage, or null if not bound.
-     * @return a match represented as a Match object, or null if no match is found.
-     * 
-     */
-    public Optional<CoverageMetric.Match> getOneArbitraryMatch(final Double pCoverage) {
-      return rawGetOneArbitraryMatch(new Object[]{pCoverage});
-    }
-    
-    /**
-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-     * under any possible substitution of the unspecified parameters (if any).
-     * @param pCoverage the fixed value of pattern parameter Coverage, or null if not bound.
-     * @return true if the input is a valid (partial) match of the pattern.
-     * 
-     */
-    public boolean hasMatch(final Double pCoverage) {
-      return rawHasMatch(new Object[]{pCoverage});
-    }
-    
-    /**
-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pCoverage the fixed value of pattern parameter Coverage, or null if not bound.
-     * @return the number of pattern matches found.
-     * 
-     */
-    public int countMatches(final Double pCoverage) {
-      return rawCountMatches(new Object[]{pCoverage});
-    }
-    
-    /**
-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pCoverage the fixed value of pattern parameter Coverage, or null if not bound.
-     * @param processor the action that will process the selected match.
-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-     * 
-     */
-    public boolean forOneArbitraryMatch(final Double pCoverage, final Consumer<? super CoverageMetric.Match> processor) {
-      return rawForOneArbitraryMatch(new Object[]{pCoverage}, processor);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pCoverage the fixed value of pattern parameter Coverage, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public CoverageMetric.Match newMatch(final Double pCoverage) {
-      return CoverageMetric.Match.newMatch(pCoverage);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Coverage.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<Double> rawStreamAllValuesOfCoverage(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_COVERAGE, parameters).map(Double.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Coverage.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Double> getAllValuesOfCoverage() {
-      return rawStreamAllValuesOfCoverage(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Coverage.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Double> streamAllValuesOfCoverage() {
-      return rawStreamAllValuesOfCoverage(emptyArray());
-    }
-    
-    @Override
-    protected CoverageMetric.Match tupleToMatch(final Tuple t) {
-      try {
-          return CoverageMetric.Match.newMatch((Double) t.get(POSITION_COVERAGE));
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in tuple not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected CoverageMetric.Match arrayToMatch(final Object[] match) {
-      try {
-          return CoverageMetric.Match.newMatch((Double) match[POSITION_COVERAGE]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected CoverageMetric.Match arrayToMatchMutable(final Object[] match) {
-      try {
-          return CoverageMetric.Match.newMutableMatch((Double) match[POSITION_COVERAGE]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    /**
-     * @return the singleton instance of the query specification of this pattern
-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-     * 
-     */
-    public static IQuerySpecification<CoverageMetric.Matcher> querySpecification() {
-      return CoverageMetric.instance();
-    }
-  }
-  
-  private CoverageMetric() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static CoverageMetric instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected CoverageMetric.Matcher instantiate(final ViatraQueryEngine engine) {
-    return CoverageMetric.Matcher.on(engine);
-  }
-  
-  @Override
-  public CoverageMetric.Matcher instantiate() {
-    return CoverageMetric.Matcher.create();
-  }
-  
-  @Override
-  public CoverageMetric.Match newEmptyMatch() {
-    return CoverageMetric.Match.newEmptyMatch();
-  }
-  
-  @Override
-  public CoverageMetric.Match newMatch(final Object... parameters) {
-    return CoverageMetric.Match.newMatch((java.lang.Double) parameters[0]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CoverageMetric (visibility: PUBLIC, simpleName: CoverageMetric, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CoverageMetric, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CoverageMetric (visibility: PUBLIC, simpleName: CoverageMetric, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CoverageMetric, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final CoverageMetric INSTANCE = new CoverageMetric();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final CoverageMetric.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Coverage = new PParameter("Coverage", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Coverage);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PUBLIC);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.coverageMetric";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Coverage");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Coverage = body.getOrCreateVariableByName("Coverage");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Coverage), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Coverage, parameter_Coverage)
-          ));
-          // 	Coverage == sum find missionCoverage(_, #_)
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new AggregatorConstraint(new sum().getAggregatorLogic(Double.class), body, Tuples.flatTupleOf(var___0_, var___1_), MissionCoverage.instance().getInternalQueryRepresentation(), var__virtual_0_, 1);
-          new Equality(body, var_Coverage, var__virtual_0_);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CubeSatWithKaAntenna.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CubeSatWithKaAntenna.java
index c15563ff..ba69943a 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CubeSatWithKaAntenna.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/CubeSatWithKaAntenna.java
@@ -4,7 +4,7 @@
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
 import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SmallSat;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SmallSat;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashSet;
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoPotentialLinkToGroundStation.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoPotentialLinkToGroundStation.java
new file mode 100644
index 00000000..1e8f8502
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NoPotentialLinkToGroundStation.java
@@ -0,0 +1,571 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectLinkAllowed;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(severity = "error", key = {Spacecraft},
+ *         	message = "Spacecraft has no potential communication path to the ground station.")
+ *         pattern noPotentialLinkToGroundStation(Spacecraft : Spacecraft) {
+ *         	ConstellationMission.groundStationNetwork(Mission, GroundStation);
+ *         	ConstellationMission.spacecraft(Mission, Spacecraft);
+ *         	neg find indirectLinkAllowed(Spacecraft, GroundStation);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class NoPotentialLinkToGroundStation extends BaseGeneratedEMFQuerySpecification<NoPotentialLinkToGroundStation.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noPotentialLinkToGroundStation pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Spacecraft fSpacecraft;
+    
+    private static List<String> parameterNames = makeImmutableList("Spacecraft");
+    
+    private Match(final Spacecraft pSpacecraft) {
+      this.fSpacecraft = pSpacecraft;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      if ("Spacecraft".equals(parameterName)) return this.fSpacecraft;
+      return null;
+    }
+    
+    public Spacecraft getSpacecraft() {
+      return this.fSpacecraft;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Spacecraft".equals(parameterName) ) {
+          this.fSpacecraft = (Spacecraft) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setSpacecraft(final Spacecraft pSpacecraft) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fSpacecraft = pSpacecraft;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noPotentialLinkToGroundStation";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return NoPotentialLinkToGroundStation.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fSpacecraft};
+    }
+    
+    @Override
+    public NoPotentialLinkToGroundStation.Match toImmutable() {
+      return isMutable() ? newMatch(fSpacecraft) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Spacecraft\"=" + prettyPrintValue(fSpacecraft));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fSpacecraft);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof NoPotentialLinkToGroundStation.Match)) {
+          NoPotentialLinkToGroundStation.Match other = (NoPotentialLinkToGroundStation.Match) obj;
+          return Objects.equals(fSpacecraft, other.fSpacecraft);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public NoPotentialLinkToGroundStation specification() {
+      return NoPotentialLinkToGroundStation.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static NoPotentialLinkToGroundStation.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static NoPotentialLinkToGroundStation.Match newMutableMatch(final Spacecraft pSpacecraft) {
+      return new Mutable(pSpacecraft);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static NoPotentialLinkToGroundStation.Match newMatch(final Spacecraft pSpacecraft) {
+      return new Immutable(pSpacecraft);
+    }
+    
+    private static final class Mutable extends NoPotentialLinkToGroundStation.Match {
+      Mutable(final Spacecraft pSpacecraft) {
+        super(pSpacecraft);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends NoPotentialLinkToGroundStation.Match {
+      Immutable(final Spacecraft pSpacecraft) {
+        super(pSpacecraft);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noPotentialLinkToGroundStation pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(severity = "error", key = {Spacecraft},
+   * 	message = "Spacecraft has no potential communication path to the ground station.")
+   * pattern noPotentialLinkToGroundStation(Spacecraft : Spacecraft) {
+   * 	ConstellationMission.groundStationNetwork(Mission, GroundStation);
+   * 	ConstellationMission.spacecraft(Mission, Spacecraft);
+   * 	neg find indirectLinkAllowed(Spacecraft, GroundStation);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see NoPotentialLinkToGroundStation
+   * 
+   */
+  public static class Matcher extends BaseMatcher<NoPotentialLinkToGroundStation.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static NoPotentialLinkToGroundStation.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static NoPotentialLinkToGroundStation.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_SPACECRAFT = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(NoPotentialLinkToGroundStation.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<NoPotentialLinkToGroundStation.Match> getAllMatches(final Spacecraft pSpacecraft) {
+      return rawStreamAllMatches(new Object[]{pSpacecraft}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<NoPotentialLinkToGroundStation.Match> streamAllMatches(final Spacecraft pSpacecraft) {
+      return rawStreamAllMatches(new Object[]{pSpacecraft});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<NoPotentialLinkToGroundStation.Match> getOneArbitraryMatch(final Spacecraft pSpacecraft) {
+      return rawGetOneArbitraryMatch(new Object[]{pSpacecraft});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Spacecraft pSpacecraft) {
+      return rawHasMatch(new Object[]{pSpacecraft});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Spacecraft pSpacecraft) {
+      return rawCountMatches(new Object[]{pSpacecraft});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Spacecraft pSpacecraft, final Consumer<? super NoPotentialLinkToGroundStation.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pSpacecraft}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public NoPotentialLinkToGroundStation.Match newMatch(final Spacecraft pSpacecraft) {
+      return NoPotentialLinkToGroundStation.Match.newMatch(pSpacecraft);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Spacecraft.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Spacecraft> rawStreamAllValuesOfSpacecraft(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_SPACECRAFT, parameters).map(Spacecraft.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Spacecraft.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Spacecraft> getAllValuesOfSpacecraft() {
+      return rawStreamAllValuesOfSpacecraft(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Spacecraft.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Spacecraft> streamAllValuesOfSpacecraft() {
+      return rawStreamAllValuesOfSpacecraft(emptyArray());
+    }
+    
+    @Override
+    protected NoPotentialLinkToGroundStation.Match tupleToMatch(final Tuple t) {
+      try {
+          return NoPotentialLinkToGroundStation.Match.newMatch((Spacecraft) t.get(POSITION_SPACECRAFT));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected NoPotentialLinkToGroundStation.Match arrayToMatch(final Object[] match) {
+      try {
+          return NoPotentialLinkToGroundStation.Match.newMatch((Spacecraft) match[POSITION_SPACECRAFT]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected NoPotentialLinkToGroundStation.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return NoPotentialLinkToGroundStation.Match.newMutableMatch((Spacecraft) match[POSITION_SPACECRAFT]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<NoPotentialLinkToGroundStation.Matcher> querySpecification() {
+      return NoPotentialLinkToGroundStation.instance();
+    }
+  }
+  
+  private NoPotentialLinkToGroundStation() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static NoPotentialLinkToGroundStation instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected NoPotentialLinkToGroundStation.Matcher instantiate(final ViatraQueryEngine engine) {
+    return NoPotentialLinkToGroundStation.Matcher.on(engine);
+  }
+  
+  @Override
+  public NoPotentialLinkToGroundStation.Matcher instantiate() {
+    return NoPotentialLinkToGroundStation.Matcher.create();
+  }
+  
+  @Override
+  public NoPotentialLinkToGroundStation.Match newEmptyMatch() {
+    return NoPotentialLinkToGroundStation.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public NoPotentialLinkToGroundStation.Match newMatch(final Object... parameters) {
+    return NoPotentialLinkToGroundStation.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoPotentialLinkToGroundStation (visibility: PUBLIC, simpleName: NoPotentialLinkToGroundStation, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoPotentialLinkToGroundStation, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoPotentialLinkToGroundStation (visibility: PUBLIC, simpleName: NoPotentialLinkToGroundStation, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoPotentialLinkToGroundStation, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final NoPotentialLinkToGroundStation INSTANCE = new NoPotentialLinkToGroundStation();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final NoPotentialLinkToGroundStation.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noPotentialLinkToGroundStation";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Spacecraft");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
+          PVariable var_Mission = body.getOrCreateVariableByName("Mission");
+          PVariable var_GroundStation = body.getOrCreateVariableByName("GroundStation");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft)
+          ));
+          // 	ConstellationMission.groundStationNetwork(Mission, GroundStation)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "ConstellationMission")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "ConstellationMission", "groundStationNetwork")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "GroundStationNetwork")));
+          new Equality(body, var__virtual_0_, var_GroundStation);
+          // 	ConstellationMission.spacecraft(Mission, Spacecraft)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "ConstellationMission")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "ConstellationMission", "spacecraft")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
+          new Equality(body, var__virtual_1_, var_Spacecraft);
+          // 	neg find indirectLinkAllowed(Spacecraft, GroundStation)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_Spacecraft, var_GroundStation), IndirectLinkAllowed.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("Spacecraft")
+                              }));
+          annotation.addAttribute("message", "Spacecraft has no potential communication path to the ground station.");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NotEnoughInterferometryPayloads.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NotEnoughInterferometryPayloads.java
index 39af9d5b..d75dea5f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NotEnoughInterferometryPayloads.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/NotEnoughInterferometryPayloads.java
@@ -28,6 +28,8 @@ import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
 import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
 import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
 import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
 import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
 import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
 import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
@@ -45,8 +47,8 @@ import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
  *         <code><pre>
  *         // At least two spacecraft must have the interferometry payload configured
  *         
- *         //{@literal @}Constraint(severity = "error", key = {Mission},
- *         //	message = "Interferometry mission needs at least two spacecraft configured with the interferometry payload.")
+ *         {@literal @}Constraint(severity = "error", key = {Mission},
+ *         	message = "Interferometry mission needs at least two spacecraft configured with the interferometry payload.")
  *         pattern notEnoughInterferometryPayloads(Mission : InterferometryMission) {
  *         	InterferometryMission(Mission);
  *         	neg find atLeastTwoInterferometryPayloads(Mission);
@@ -233,8 +235,8 @@ public final class NotEnoughInterferometryPayloads extends BaseGeneratedEMFQuery
    * <code><pre>
    * // At least two spacecraft must have the interferometry payload configured
    * 
-   * //{@literal @}Constraint(severity = "error", key = {Mission},
-   * //	message = "Interferometry mission needs at least two spacecraft configured with the interferometry payload.")
+   * {@literal @}Constraint(severity = "error", key = {Mission},
+   * 	message = "Interferometry mission needs at least two spacecraft configured with the interferometry payload.")
    * pattern notEnoughInterferometryPayloads(Mission : InterferometryMission) {
    * 	InterferometryMission(Mission);
    * 	neg find atLeastTwoInterferometryPayloads(Mission);
@@ -542,6 +544,15 @@ public final class NotEnoughInterferometryPayloads extends BaseGeneratedEMFQuery
           new NegativePatternCall(body, Tuples.flatTupleOf(var_Mission), AtLeastTwoInterferometryPayloads.instance().getInternalQueryRepresentation());
           bodies.add(body);
       }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("Mission")
+                              }));
+          annotation.addAttribute("message", "Interferometry mission needs at least two spacecraft configured with the interferometry payload.");
+          addAnnotation(annotation);
+      }
       return bodies;
     }
   }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java
index b6601c28..c86761ce 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.java
@@ -5,16 +5,16 @@ package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLoop;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CostMetric;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CoverageMetric;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CubeSatWithKaAntenna;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.IncompatibleSourceAndTargetBand;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.IncompatibleSourceAndTargetGain;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.KaAntennaGainLow;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoLinkToGroundStation;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoPotentialLinkToGroundStation;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NotEnoughInterferometryPayloads;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SmallSat;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SpacecraftOfKind;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.ThreeUCubeSatWithNonUhfCrossLink;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.TimeMetric;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.UhfAntennaGainNotLow;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.XAntennaGainNotMedium;
 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
@@ -31,6 +31,7 @@ import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
  * <li>communicationLinkDoesNotStartAtContainingElement</li>
  * <li>notEnoughInterferometryPayloads</li>
  * <li>noLinkToGroundStation</li>
+ * <li>noPotentialLinkToGroundStation</li>
  * <li>communicationLoop</li>
  * <li>incompatibleSourceAndTargetBand</li>
  * <li>incompatibleSourceAndTargetGain</li>
@@ -39,9 +40,8 @@ import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
  * <li>kaAntennaGainLow</li>
  * <li>threeUCubeSatWithNonUhfCrossLink</li>
  * <li>cubeSatWithKaAntenna</li>
- * <li>coverageMetric</li>
- * <li>timeMetric</li>
- * <li>costMetric</li>
+ * <li>smallSat</li>
+ * <li>spacecraftOfKind</li>
  * </ul>
  * 
  * @see IQueryGroup
@@ -69,6 +69,7 @@ public final class SatelliteQueries extends BaseGeneratedPatternGroup {
     querySpecifications.add(CommunicationLinkDoesNotStartAtContainingElement.instance());
     querySpecifications.add(NotEnoughInterferometryPayloads.instance());
     querySpecifications.add(NoLinkToGroundStation.instance());
+    querySpecifications.add(NoPotentialLinkToGroundStation.instance());
     querySpecifications.add(CommunicationLoop.instance());
     querySpecifications.add(IncompatibleSourceAndTargetBand.instance());
     querySpecifications.add(IncompatibleSourceAndTargetGain.instance());
@@ -77,9 +78,8 @@ public final class SatelliteQueries extends BaseGeneratedPatternGroup {
     querySpecifications.add(KaAntennaGainLow.instance());
     querySpecifications.add(ThreeUCubeSatWithNonUhfCrossLink.instance());
     querySpecifications.add(CubeSatWithKaAntenna.instance());
-    querySpecifications.add(CoverageMetric.instance());
-    querySpecifications.add(TimeMetric.instance());
-    querySpecifications.add(CostMetric.instance());
+    querySpecifications.add(SmallSat.instance());
+    querySpecifications.add(SpacecraftOfKind.instance());
   }
   
   public CommunicationLinkDoesNotStartAtContainingElement getCommunicationLinkDoesNotStartAtContainingElement() {
@@ -106,6 +106,14 @@ public final class SatelliteQueries extends BaseGeneratedPatternGroup {
     return NoLinkToGroundStation.Matcher.on(engine);
   }
   
+  public NoPotentialLinkToGroundStation getNoPotentialLinkToGroundStation() {
+    return NoPotentialLinkToGroundStation.instance();
+  }
+  
+  public NoPotentialLinkToGroundStation.Matcher getNoPotentialLinkToGroundStation(final ViatraQueryEngine engine) {
+    return NoPotentialLinkToGroundStation.Matcher.on(engine);
+  }
+  
   public CommunicationLoop getCommunicationLoop() {
     return CommunicationLoop.instance();
   }
@@ -170,27 +178,19 @@ public final class SatelliteQueries extends BaseGeneratedPatternGroup {
     return CubeSatWithKaAntenna.Matcher.on(engine);
   }
   
-  public CoverageMetric getCoverageMetric() {
-    return CoverageMetric.instance();
-  }
-  
-  public CoverageMetric.Matcher getCoverageMetric(final ViatraQueryEngine engine) {
-    return CoverageMetric.Matcher.on(engine);
-  }
-  
-  public TimeMetric getTimeMetric() {
-    return TimeMetric.instance();
+  public SmallSat getSmallSat() {
+    return SmallSat.instance();
   }
   
-  public TimeMetric.Matcher getTimeMetric(final ViatraQueryEngine engine) {
-    return TimeMetric.Matcher.on(engine);
+  public SmallSat.Matcher getSmallSat(final ViatraQueryEngine engine) {
+    return SmallSat.Matcher.on(engine);
   }
   
-  public CostMetric getCostMetric() {
-    return CostMetric.instance();
+  public SpacecraftOfKind getSpacecraftOfKind() {
+    return SpacecraftOfKind.instance();
   }
   
-  public CostMetric.Matcher getCostMetric(final ViatraQueryEngine engine) {
-    return CostMetric.Matcher.on(engine);
+  public SpacecraftOfKind.Matcher getSpacecraftOfKind(final ViatraQueryEngine engine) {
+    return SpacecraftOfKind.Matcher.on(engine);
   }
 }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SmallSat.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SmallSat.java
new file mode 100644
index 00000000..7bc497ab
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SmallSat.java
@@ -0,0 +1,533 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern smallSat(Sat : SmallSat) {
+ *         	SmallSat(Sat);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class SmallSat extends BaseGeneratedEMFQuerySpecification<SmallSat.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.smallSat pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat fSat;
+    
+    private static List<String> parameterNames = makeImmutableList("Sat");
+    
+    private Match(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
+      this.fSat = pSat;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      if ("Sat".equals(parameterName)) return this.fSat;
+      return null;
+    }
+    
+    public hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat getSat() {
+      return this.fSat;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Sat".equals(parameterName) ) {
+          this.fSat = (hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setSat(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fSat = pSat;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.smallSat";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return SmallSat.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fSat};
+    }
+    
+    @Override
+    public SmallSat.Match toImmutable() {
+      return isMutable() ? newMatch(fSat) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Sat\"=" + prettyPrintValue(fSat));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fSat);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof SmallSat.Match)) {
+          SmallSat.Match other = (SmallSat.Match) obj;
+          return Objects.equals(fSat, other.fSat);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public SmallSat specification() {
+      return SmallSat.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static SmallSat.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pSat the fixed value of pattern parameter Sat, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static SmallSat.Match newMutableMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
+      return new Mutable(pSat);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pSat the fixed value of pattern parameter Sat, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static SmallSat.Match newMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
+      return new Immutable(pSat);
+    }
+    
+    private static final class Mutable extends SmallSat.Match {
+      Mutable(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
+        super(pSat);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends SmallSat.Match {
+      Immutable(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
+        super(pSat);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.smallSat pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern smallSat(Sat : SmallSat) {
+   * 	SmallSat(Sat);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see SmallSat
+   * 
+   */
+  public static class Matcher extends BaseMatcher<SmallSat.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static SmallSat.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static SmallSat.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_SAT = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(SmallSat.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pSat the fixed value of pattern parameter Sat, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<SmallSat.Match> getAllMatches(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
+      return rawStreamAllMatches(new Object[]{pSat}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pSat the fixed value of pattern parameter Sat, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<SmallSat.Match> streamAllMatches(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
+      return rawStreamAllMatches(new Object[]{pSat});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pSat the fixed value of pattern parameter Sat, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<SmallSat.Match> getOneArbitraryMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
+      return rawGetOneArbitraryMatch(new Object[]{pSat});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pSat the fixed value of pattern parameter Sat, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
+      return rawHasMatch(new Object[]{pSat});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pSat the fixed value of pattern parameter Sat, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
+      return rawCountMatches(new Object[]{pSat});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pSat the fixed value of pattern parameter Sat, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat, final Consumer<? super SmallSat.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pSat}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pSat the fixed value of pattern parameter Sat, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public SmallSat.Match newMatch(final hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat pSat) {
+      return SmallSat.Match.newMatch(pSat);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Sat.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat> rawStreamAllValuesOfSat(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_SAT, parameters).map(hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Sat.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat> getAllValuesOfSat() {
+      return rawStreamAllValuesOfSat(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Sat.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat> streamAllValuesOfSat() {
+      return rawStreamAllValuesOfSat(emptyArray());
+    }
+    
+    @Override
+    protected SmallSat.Match tupleToMatch(final Tuple t) {
+      try {
+          return SmallSat.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat) t.get(POSITION_SAT));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected SmallSat.Match arrayToMatch(final Object[] match) {
+      try {
+          return SmallSat.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat) match[POSITION_SAT]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected SmallSat.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return SmallSat.Match.newMutableMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat) match[POSITION_SAT]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<SmallSat.Matcher> querySpecification() {
+      return SmallSat.instance();
+    }
+  }
+  
+  private SmallSat() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static SmallSat instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected SmallSat.Matcher instantiate(final ViatraQueryEngine engine) {
+    return SmallSat.Matcher.on(engine);
+  }
+  
+  @Override
+  public SmallSat.Matcher instantiate() {
+    return SmallSat.Matcher.create();
+  }
+  
+  @Override
+  public SmallSat.Match newEmptyMatch() {
+    return SmallSat.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public SmallSat.Match newMatch(final Object... parameters) {
+    return SmallSat.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SmallSat (visibility: PUBLIC, simpleName: SmallSat, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SmallSat, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SmallSat (visibility: PUBLIC, simpleName: SmallSat, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SmallSat, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final SmallSat INSTANCE = new SmallSat();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final SmallSat.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Sat = new PParameter("Sat", "hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "SmallSat")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Sat);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.smallSat";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Sat");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Sat = body.getOrCreateVariableByName("Sat");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "SmallSat")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Sat, parameter_Sat)
+          ));
+          // 	SmallSat(Sat)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "SmallSat")));
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SpacecraftOfKind.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SpacecraftOfKind.java
new file mode 100644
index 00000000..52602bb5
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SpacecraftOfKind.java
@@ -0,0 +1,754 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.ConstantValue;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}QueryBasedFeature(feature = "kind")
+ *         pattern spacecraftOfKind(Spacecraft : Spacecraft, Kind : SpacecraftKind) {
+ *         	CubeSat3U(Spacecraft);
+ *         	Kind == SpacecraftKind::CubeSat3U;
+ *         } or {
+ *         	CubeSat6U(Spacecraft);
+ *         	Kind == SpacecraftKind::CubeSat6U;
+ *         } or {
+ *         	SmallSat(Spacecraft);
+ *         	Kind == SpacecraftKind::SmallSat;
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class SpacecraftOfKind extends BaseGeneratedEMFQuerySpecification<SpacecraftOfKind.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Spacecraft fSpacecraft;
+    
+    private SpacecraftKind fKind;
+    
+    private static List<String> parameterNames = makeImmutableList("Spacecraft", "Kind");
+    
+    private Match(final Spacecraft pSpacecraft, final SpacecraftKind pKind) {
+      this.fSpacecraft = pSpacecraft;
+      this.fKind = pKind;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      if ("Spacecraft".equals(parameterName)) return this.fSpacecraft;
+      if ("Kind".equals(parameterName)) return this.fKind;
+      return null;
+    }
+    
+    public Spacecraft getSpacecraft() {
+      return this.fSpacecraft;
+    }
+    
+    public SpacecraftKind getKind() {
+      return this.fKind;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Spacecraft".equals(parameterName) ) {
+          this.fSpacecraft = (Spacecraft) newValue;
+          return true;
+      }
+      if ("Kind".equals(parameterName) ) {
+          this.fKind = (SpacecraftKind) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setSpacecraft(final Spacecraft pSpacecraft) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fSpacecraft = pSpacecraft;
+    }
+    
+    public void setKind(final SpacecraftKind pKind) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fKind = pKind;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return SpacecraftOfKind.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fSpacecraft, fKind};
+    }
+    
+    @Override
+    public SpacecraftOfKind.Match toImmutable() {
+      return isMutable() ? newMatch(fSpacecraft, fKind) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Spacecraft\"=" + prettyPrintValue(fSpacecraft) + ", ");
+      result.append("\"Kind\"=" + prettyPrintValue(fKind));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fSpacecraft, fKind);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof SpacecraftOfKind.Match)) {
+          SpacecraftOfKind.Match other = (SpacecraftOfKind.Match) obj;
+          return Objects.equals(fSpacecraft, other.fSpacecraft) && Objects.equals(fKind, other.fKind);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public SpacecraftOfKind specification() {
+      return SpacecraftOfKind.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static SpacecraftOfKind.Match newEmptyMatch() {
+      return new Mutable(null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @param pKind the fixed value of pattern parameter Kind, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static SpacecraftOfKind.Match newMutableMatch(final Spacecraft pSpacecraft, final SpacecraftKind pKind) {
+      return new Mutable(pSpacecraft, pKind);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @param pKind the fixed value of pattern parameter Kind, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static SpacecraftOfKind.Match newMatch(final Spacecraft pSpacecraft, final SpacecraftKind pKind) {
+      return new Immutable(pSpacecraft, pKind);
+    }
+    
+    private static final class Mutable extends SpacecraftOfKind.Match {
+      Mutable(final Spacecraft pSpacecraft, final SpacecraftKind pKind) {
+        super(pSpacecraft, pKind);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends SpacecraftOfKind.Match {
+      Immutable(final Spacecraft pSpacecraft, final SpacecraftKind pKind) {
+        super(pSpacecraft, pKind);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}QueryBasedFeature(feature = "kind")
+   * pattern spacecraftOfKind(Spacecraft : Spacecraft, Kind : SpacecraftKind) {
+   * 	CubeSat3U(Spacecraft);
+   * 	Kind == SpacecraftKind::CubeSat3U;
+   * } or {
+   * 	CubeSat6U(Spacecraft);
+   * 	Kind == SpacecraftKind::CubeSat6U;
+   * } or {
+   * 	SmallSat(Spacecraft);
+   * 	Kind == SpacecraftKind::SmallSat;
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see SpacecraftOfKind
+   * 
+   */
+  public static class Matcher extends BaseMatcher<SpacecraftOfKind.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static SpacecraftOfKind.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static SpacecraftOfKind.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_SPACECRAFT = 0;
+    
+    private static final int POSITION_KIND = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(SpacecraftOfKind.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @param pKind the fixed value of pattern parameter Kind, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<SpacecraftOfKind.Match> getAllMatches(final Spacecraft pSpacecraft, final SpacecraftKind pKind) {
+      return rawStreamAllMatches(new Object[]{pSpacecraft, pKind}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @param pKind the fixed value of pattern parameter Kind, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<SpacecraftOfKind.Match> streamAllMatches(final Spacecraft pSpacecraft, final SpacecraftKind pKind) {
+      return rawStreamAllMatches(new Object[]{pSpacecraft, pKind});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @param pKind the fixed value of pattern parameter Kind, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<SpacecraftOfKind.Match> getOneArbitraryMatch(final Spacecraft pSpacecraft, final SpacecraftKind pKind) {
+      return rawGetOneArbitraryMatch(new Object[]{pSpacecraft, pKind});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @param pKind the fixed value of pattern parameter Kind, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Spacecraft pSpacecraft, final SpacecraftKind pKind) {
+      return rawHasMatch(new Object[]{pSpacecraft, pKind});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @param pKind the fixed value of pattern parameter Kind, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Spacecraft pSpacecraft, final SpacecraftKind pKind) {
+      return rawCountMatches(new Object[]{pSpacecraft, pKind});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @param pKind the fixed value of pattern parameter Kind, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Spacecraft pSpacecraft, final SpacecraftKind pKind, final Consumer<? super SpacecraftOfKind.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pSpacecraft, pKind}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pSpacecraft the fixed value of pattern parameter Spacecraft, or null if not bound.
+     * @param pKind the fixed value of pattern parameter Kind, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public SpacecraftOfKind.Match newMatch(final Spacecraft pSpacecraft, final SpacecraftKind pKind) {
+      return SpacecraftOfKind.Match.newMatch(pSpacecraft, pKind);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Spacecraft.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Spacecraft> rawStreamAllValuesOfSpacecraft(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_SPACECRAFT, parameters).map(Spacecraft.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Spacecraft.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Spacecraft> getAllValuesOfSpacecraft() {
+      return rawStreamAllValuesOfSpacecraft(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Spacecraft.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Spacecraft> streamAllValuesOfSpacecraft() {
+      return rawStreamAllValuesOfSpacecraft(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Spacecraft.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Spacecraft> streamAllValuesOfSpacecraft(final SpacecraftOfKind.Match partialMatch) {
+      return rawStreamAllValuesOfSpacecraft(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Spacecraft.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Spacecraft> streamAllValuesOfSpacecraft(final SpacecraftKind pKind) {
+      return rawStreamAllValuesOfSpacecraft(new Object[]{null, pKind});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Spacecraft.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Spacecraft> getAllValuesOfSpacecraft(final SpacecraftOfKind.Match partialMatch) {
+      return rawStreamAllValuesOfSpacecraft(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Spacecraft.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Spacecraft> getAllValuesOfSpacecraft(final SpacecraftKind pKind) {
+      return rawStreamAllValuesOfSpacecraft(new Object[]{null, pKind}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Kind.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<SpacecraftKind> rawStreamAllValuesOfKind(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_KIND, parameters).map(SpacecraftKind.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Kind.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<SpacecraftKind> getAllValuesOfKind() {
+      return rawStreamAllValuesOfKind(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Kind.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<SpacecraftKind> streamAllValuesOfKind() {
+      return rawStreamAllValuesOfKind(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Kind.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<SpacecraftKind> streamAllValuesOfKind(final SpacecraftOfKind.Match partialMatch) {
+      return rawStreamAllValuesOfKind(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Kind.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<SpacecraftKind> streamAllValuesOfKind(final Spacecraft pSpacecraft) {
+      return rawStreamAllValuesOfKind(new Object[]{pSpacecraft, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Kind.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<SpacecraftKind> getAllValuesOfKind(final SpacecraftOfKind.Match partialMatch) {
+      return rawStreamAllValuesOfKind(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Kind.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<SpacecraftKind> getAllValuesOfKind(final Spacecraft pSpacecraft) {
+      return rawStreamAllValuesOfKind(new Object[]{pSpacecraft, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected SpacecraftOfKind.Match tupleToMatch(final Tuple t) {
+      try {
+          return SpacecraftOfKind.Match.newMatch((Spacecraft) t.get(POSITION_SPACECRAFT), (SpacecraftKind) t.get(POSITION_KIND));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected SpacecraftOfKind.Match arrayToMatch(final Object[] match) {
+      try {
+          return SpacecraftOfKind.Match.newMatch((Spacecraft) match[POSITION_SPACECRAFT], (SpacecraftKind) match[POSITION_KIND]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected SpacecraftOfKind.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return SpacecraftOfKind.Match.newMutableMatch((Spacecraft) match[POSITION_SPACECRAFT], (SpacecraftKind) match[POSITION_KIND]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<SpacecraftOfKind.Matcher> querySpecification() {
+      return SpacecraftOfKind.instance();
+    }
+  }
+  
+  private SpacecraftOfKind() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static SpacecraftOfKind instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected SpacecraftOfKind.Matcher instantiate(final ViatraQueryEngine engine) {
+    return SpacecraftOfKind.Matcher.on(engine);
+  }
+  
+  @Override
+  public SpacecraftOfKind.Matcher instantiate() {
+    return SpacecraftOfKind.Matcher.create();
+  }
+  
+  @Override
+  public SpacecraftOfKind.Match newEmptyMatch() {
+    return SpacecraftOfKind.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public SpacecraftOfKind.Match newMatch(final Object... parameters) {
+    return SpacecraftOfKind.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft) parameters[0], (hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SpacecraftOfKind (visibility: PUBLIC, simpleName: SpacecraftOfKind, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SpacecraftOfKind, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SpacecraftOfKind (visibility: PUBLIC, simpleName: SpacecraftOfKind, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SpacecraftOfKind, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final SpacecraftOfKind INSTANCE = new SpacecraftOfKind();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final SpacecraftOfKind.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Kind = new PParameter("Kind", "hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "SpacecraftKind")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft, parameter_Kind);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Spacecraft","Kind");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
+          PVariable var_Kind = body.getOrCreateVariableByName("Kind");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Kind), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "SpacecraftKind")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
+             new ExportedParameter(body, var_Kind, parameter_Kind)
+          ));
+          // 	CubeSat3U(Spacecraft)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CubeSat3U")));
+          // 	Kind == SpacecraftKind::CubeSat3U
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new ConstantValue(body, var__virtual_0_, getEnumLiteral("http://www.example.org/satellite", "SpacecraftKind", "CubeSat3U").getInstance());
+          new Equality(body, var_Kind, var__virtual_0_);
+          bodies.add(body);
+      }
+      {
+          PBody body = new PBody(this);
+          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
+          PVariable var_Kind = body.getOrCreateVariableByName("Kind");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Kind), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "SpacecraftKind")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
+             new ExportedParameter(body, var_Kind, parameter_Kind)
+          ));
+          // 	CubeSat6U(Spacecraft)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CubeSat6U")));
+          // 	Kind == SpacecraftKind::CubeSat6U
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new ConstantValue(body, var__virtual_0_, getEnumLiteral("http://www.example.org/satellite", "SpacecraftKind", "CubeSat6U").getInstance());
+          new Equality(body, var_Kind, var__virtual_0_);
+          bodies.add(body);
+      }
+      {
+          PBody body = new PBody(this);
+          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
+          PVariable var_Kind = body.getOrCreateVariableByName("Kind");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Kind), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "SpacecraftKind")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
+             new ExportedParameter(body, var_Kind, parameter_Kind)
+          ));
+          // 	SmallSat(Spacecraft)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "SmallSat")));
+          // 	Kind == SpacecraftKind::SmallSat
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new ConstantValue(body, var__virtual_0_, getEnumLiteral("http://www.example.org/satellite", "SpacecraftKind", "SmallSat").getInstance());
+          new Equality(body, var_Kind, var__virtual_0_);
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("QueryBasedFeature");
+          annotation.addAttribute("feature", "kind");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/ThreeUCubeSatWithNonUhfCrossLink.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/ThreeUCubeSatWithNonUhfCrossLink.java
index 6500c9d3..6408033b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/ThreeUCubeSatWithNonUhfCrossLink.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/ThreeUCubeSatWithNonUhfCrossLink.java
@@ -3,7 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
 
-import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemBandUhf;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.GroundStationNetwork;
 import java.util.Arrays;
@@ -18,7 +18,6 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.viatra.query.runtime.api.IPatternMatch;
 import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
@@ -27,7 +26,6 @@ import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificat
 import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
 import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
 import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
 import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
 import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
 import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
@@ -37,7 +35,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterRe
 import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
 import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
 import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.ConstantValue;
 import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
@@ -56,8 +53,7 @@ import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
  *         
  *         {@literal @}Constraint(severity = "error", key = {Sat},
  *         	message = "3U CubeSats can only cross-link using UHF.")
- *         pattern threeUCubeSatWithNonUhfCrossLink(Sat : Spacecraft) {
- *         	Spacecraft.kind(Sat, SpacecraftKind::CubeSat3U);
+ *         pattern threeUCubeSatWithNonUhfCrossLink(Sat : CubeSat3U) {
  *         	CommunicatingElement.commSubsystem(Sat, SourceComm);
  *         	neg find commSubsystemBandUhf(SourceComm);
  *         	DirectedCommunicationLink.source(Link, SourceComm);
@@ -86,11 +82,11 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
    * 
    */
   public static abstract class Match extends BasePatternMatch {
-    private Spacecraft fSat;
+    private CubeSat3U fSat;
     
     private static List<String> parameterNames = makeImmutableList("Sat");
     
-    private Match(final Spacecraft pSat) {
+    private Match(final CubeSat3U pSat) {
       this.fSat = pSat;
     }
     
@@ -100,7 +96,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
       return null;
     }
     
-    public Spacecraft getSat() {
+    public CubeSat3U getSat() {
       return this.fSat;
     }
     
@@ -108,13 +104,13 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
     public boolean set(final String parameterName, final Object newValue) {
       if (!isMutable()) throw new java.lang.UnsupportedOperationException();
       if ("Sat".equals(parameterName) ) {
-          this.fSat = (Spacecraft) newValue;
+          this.fSat = (CubeSat3U) newValue;
           return true;
       }
       return false;
     }
     
-    public void setSat(final Spacecraft pSat) {
+    public void setSat(final CubeSat3U pSat) {
       if (!isMutable()) throw new java.lang.UnsupportedOperationException();
       this.fSat = pSat;
     }
@@ -195,7 +191,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
      * @return the new, mutable (partial) match object.
      * 
      */
-    public static ThreeUCubeSatWithNonUhfCrossLink.Match newMutableMatch(final Spacecraft pSat) {
+    public static ThreeUCubeSatWithNonUhfCrossLink.Match newMutableMatch(final CubeSat3U pSat) {
       return new Mutable(pSat);
     }
     
@@ -207,12 +203,12 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
      * @return the (partial) match object.
      * 
      */
-    public static ThreeUCubeSatWithNonUhfCrossLink.Match newMatch(final Spacecraft pSat) {
+    public static ThreeUCubeSatWithNonUhfCrossLink.Match newMatch(final CubeSat3U pSat) {
       return new Immutable(pSat);
     }
     
     private static final class Mutable extends ThreeUCubeSatWithNonUhfCrossLink.Match {
-      Mutable(final Spacecraft pSat) {
+      Mutable(final CubeSat3U pSat) {
         super(pSat);
       }
       
@@ -223,7 +219,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
     }
     
     private static final class Immutable extends ThreeUCubeSatWithNonUhfCrossLink.Match {
-      Immutable(final Spacecraft pSat) {
+      Immutable(final CubeSat3U pSat) {
         super(pSat);
       }
       
@@ -250,8 +246,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
    * 
    * {@literal @}Constraint(severity = "error", key = {Sat},
    * 	message = "3U CubeSats can only cross-link using UHF.")
-   * pattern threeUCubeSatWithNonUhfCrossLink(Sat : Spacecraft) {
-   * 	Spacecraft.kind(Sat, SpacecraftKind::CubeSat3U);
+   * pattern threeUCubeSatWithNonUhfCrossLink(Sat : CubeSat3U) {
    * 	CommunicatingElement.commSubsystem(Sat, SourceComm);
    * 	neg find commSubsystemBandUhf(SourceComm);
    * 	DirectedCommunicationLink.source(Link, SourceComm);
@@ -315,7 +310,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
      * @return matches represented as a Match object.
      * 
      */
-    public Collection<ThreeUCubeSatWithNonUhfCrossLink.Match> getAllMatches(final Spacecraft pSat) {
+    public Collection<ThreeUCubeSatWithNonUhfCrossLink.Match> getAllMatches(final CubeSat3U pSat) {
       return rawStreamAllMatches(new Object[]{pSat}).collect(Collectors.toSet());
     }
     
@@ -329,7 +324,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
      * @return a stream of matches represented as a Match object.
      * 
      */
-    public Stream<ThreeUCubeSatWithNonUhfCrossLink.Match> streamAllMatches(final Spacecraft pSat) {
+    public Stream<ThreeUCubeSatWithNonUhfCrossLink.Match> streamAllMatches(final CubeSat3U pSat) {
       return rawStreamAllMatches(new Object[]{pSat});
     }
     
@@ -340,7 +335,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
      * @return a match represented as a Match object, or null if no match is found.
      * 
      */
-    public Optional<ThreeUCubeSatWithNonUhfCrossLink.Match> getOneArbitraryMatch(final Spacecraft pSat) {
+    public Optional<ThreeUCubeSatWithNonUhfCrossLink.Match> getOneArbitraryMatch(final CubeSat3U pSat) {
       return rawGetOneArbitraryMatch(new Object[]{pSat});
     }
     
@@ -351,7 +346,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
      * @return true if the input is a valid (partial) match of the pattern.
      * 
      */
-    public boolean hasMatch(final Spacecraft pSat) {
+    public boolean hasMatch(final CubeSat3U pSat) {
       return rawHasMatch(new Object[]{pSat});
     }
     
@@ -361,7 +356,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
      * @return the number of pattern matches found.
      * 
      */
-    public int countMatches(final Spacecraft pSat) {
+    public int countMatches(final CubeSat3U pSat) {
       return rawCountMatches(new Object[]{pSat});
     }
     
@@ -373,7 +368,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
      * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
      * 
      */
-    public boolean forOneArbitraryMatch(final Spacecraft pSat, final Consumer<? super ThreeUCubeSatWithNonUhfCrossLink.Match> processor) {
+    public boolean forOneArbitraryMatch(final CubeSat3U pSat, final Consumer<? super ThreeUCubeSatWithNonUhfCrossLink.Match> processor) {
       return rawForOneArbitraryMatch(new Object[]{pSat}, processor);
     }
     
@@ -385,7 +380,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
      * @return the (partial) match object.
      * 
      */
-    public ThreeUCubeSatWithNonUhfCrossLink.Match newMatch(final Spacecraft pSat) {
+    public ThreeUCubeSatWithNonUhfCrossLink.Match newMatch(final CubeSat3U pSat) {
       return ThreeUCubeSatWithNonUhfCrossLink.Match.newMatch(pSat);
     }
     
@@ -394,8 +389,8 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    protected Stream<Spacecraft> rawStreamAllValuesOfSat(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_SAT, parameters).map(Spacecraft.class::cast);
+    protected Stream<CubeSat3U> rawStreamAllValuesOfSat(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_SAT, parameters).map(CubeSat3U.class::cast);
     }
     
     /**
@@ -403,7 +398,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<Spacecraft> getAllValuesOfSat() {
+    public Set<CubeSat3U> getAllValuesOfSat() {
       return rawStreamAllValuesOfSat(emptyArray()).collect(Collectors.toSet());
     }
     
@@ -412,14 +407,14 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Stream<Spacecraft> streamAllValuesOfSat() {
+    public Stream<CubeSat3U> streamAllValuesOfSat() {
       return rawStreamAllValuesOfSat(emptyArray());
     }
     
     @Override
     protected ThreeUCubeSatWithNonUhfCrossLink.Match tupleToMatch(final Tuple t) {
       try {
-          return ThreeUCubeSatWithNonUhfCrossLink.Match.newMatch((Spacecraft) t.get(POSITION_SAT));
+          return ThreeUCubeSatWithNonUhfCrossLink.Match.newMatch((CubeSat3U) t.get(POSITION_SAT));
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in tuple not properly typed!",e);
           return null;
@@ -429,7 +424,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
     @Override
     protected ThreeUCubeSatWithNonUhfCrossLink.Match arrayToMatch(final Object[] match) {
       try {
-          return ThreeUCubeSatWithNonUhfCrossLink.Match.newMatch((Spacecraft) match[POSITION_SAT]);
+          return ThreeUCubeSatWithNonUhfCrossLink.Match.newMatch((CubeSat3U) match[POSITION_SAT]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -439,7 +434,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
     @Override
     protected ThreeUCubeSatWithNonUhfCrossLink.Match arrayToMatchMutable(final Object[] match) {
       try {
-          return ThreeUCubeSatWithNonUhfCrossLink.Match.newMutableMatch((Spacecraft) match[POSITION_SAT]);
+          return ThreeUCubeSatWithNonUhfCrossLink.Match.newMutableMatch((CubeSat3U) match[POSITION_SAT]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -490,7 +485,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
   
   @Override
   public ThreeUCubeSatWithNonUhfCrossLink.Match newMatch(final Object... parameters) {
-    return ThreeUCubeSatWithNonUhfCrossLink.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft) parameters[0]);
+    return ThreeUCubeSatWithNonUhfCrossLink.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U) parameters[0]);
   }
   
   /**
@@ -522,7 +517,7 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final ThreeUCubeSatWithNonUhfCrossLink.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_Sat = new PParameter("Sat", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    private final PParameter parameter_Sat = new PParameter("Sat", "hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CubeSat3U")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_Sat);
     
@@ -556,44 +551,36 @@ public final class ThreeUCubeSatWithNonUhfCrossLink extends BaseGeneratedEMFQuer
           PVariable var_Link = body.getOrCreateVariableByName("Link");
           PVariable var_TargetComm = body.getOrCreateVariableByName("TargetComm");
           PVariable var_Target = body.getOrCreateVariableByName("Target");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CubeSat3U")));
           body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
              new ExportedParameter(body, var_Sat, parameter_Sat)
           ));
-          // 	Spacecraft.kind(Sat, SpacecraftKind::CubeSat3U)
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new ConstantValue(body, var__virtual_0_, getEnumLiteral("http://www.example.org/satellite", "SpacecraftKind", "CubeSat3U").getInstance());
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "Spacecraft", "kind")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "SpacecraftKind")));
-          new Equality(body, var__virtual_1_, var__virtual_0_);
           // 	CommunicatingElement.commSubsystem(Sat, SourceComm)
           new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
-          new Equality(body, var__virtual_2_, var_SourceComm);
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
+          new Equality(body, var__virtual_0_, var_SourceComm);
           // 	neg find commSubsystemBandUhf(SourceComm)
           new NegativePatternCall(body, Tuples.flatTupleOf(var_SourceComm), CommSubsystemBandUhf.instance().getInternalQueryRepresentation());
           // 	DirectedCommunicationLink.source(Link, SourceComm)
           new TypeConstraint(body, Tuples.flatTupleOf(var_Link), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
-          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Link, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "DirectedCommunicationLink", "source")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
-          new Equality(body, var__virtual_3_, var_SourceComm);
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Link, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "DirectedCommunicationLink", "source")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
+          new Equality(body, var__virtual_1_, var_SourceComm);
           // 	DirectedCommunicationLink.target(Link, TargetComm)
           new TypeConstraint(body, Tuples.flatTupleOf(var_Link), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
-          PVariable var__virtual_4_ = body.getOrCreateVariableByName(".virtual{4}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Link, var__virtual_4_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "DirectedCommunicationLink", "target")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_4_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
-          new Equality(body, var__virtual_4_, var_TargetComm);
+          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Link, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "DirectedCommunicationLink", "target")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
+          new Equality(body, var__virtual_2_, var_TargetComm);
           // 	CommunicatingElement.commSubsystem(Target, TargetComm)
           new TypeConstraint(body, Tuples.flatTupleOf(var_Target), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
-          PVariable var__virtual_5_ = body.getOrCreateVariableByName(".virtual{5}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Target, var__virtual_5_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_5_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
-          new Equality(body, var__virtual_5_, var_TargetComm);
+          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Target, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
+          new Equality(body, var__virtual_3_, var_TargetComm);
           // 	neg find groundStationNetwork(Target)
           new NegativePatternCall(body, Tuples.flatTupleOf(var_Target), GroundStationNetwork.instance().getInternalQueryRepresentation());
           bodies.add(body);
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/TimeMetric.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/TimeMetric.java
deleted file mode 100644
index 45d4cc35..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/TimeMetric.java
+++ /dev/null
@@ -1,544 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionTime;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.log4j.Logger;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.matchers.aggregators.sum;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-
-/**
- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         // Time
- *         
- *         pattern timeMetric(Time : java Double) {
- *         	Time == sum find missionTime(_, #_);
- *         }
- * </pre></code>
- * 
- * @see Matcher
- * @see Match
- * 
- */
-@SuppressWarnings("all")
-public final class TimeMetric extends BaseGeneratedEMFQuerySpecification<TimeMetric.Matcher> {
-  /**
-   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.timeMetric pattern,
-   * to be used in conjunction with {@link Matcher}.
-   * 
-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
-   * Each instance is a (possibly partial) substitution of pattern parameters,
-   * usable to represent a match of the pattern in the result of a query,
-   * or to specify the bound (fixed) input parameters when issuing a query.
-   * 
-   * @see Matcher
-   * 
-   */
-  public static abstract class Match extends BasePatternMatch {
-    private Double fTime;
-    
-    private static List<String> parameterNames = makeImmutableList("Time");
-    
-    private Match(final Double pTime) {
-      this.fTime = pTime;
-    }
-    
-    @Override
-    public Object get(final String parameterName) {
-      if ("Time".equals(parameterName)) return this.fTime;
-      return null;
-    }
-    
-    public Double getTime() {
-      return this.fTime;
-    }
-    
-    @Override
-    public boolean set(final String parameterName, final Object newValue) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      if ("Time".equals(parameterName) ) {
-          this.fTime = (Double) newValue;
-          return true;
-      }
-      return false;
-    }
-    
-    public void setTime(final Double pTime) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fTime = pTime;
-    }
-    
-    @Override
-    public String patternName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.timeMetric";
-    }
-    
-    @Override
-    public List<String> parameterNames() {
-      return TimeMetric.Match.parameterNames;
-    }
-    
-    @Override
-    public Object[] toArray() {
-      return new Object[]{fTime};
-    }
-    
-    @Override
-    public TimeMetric.Match toImmutable() {
-      return isMutable() ? newMatch(fTime) : this;
-    }
-    
-    @Override
-    public String prettyPrint() {
-      StringBuilder result = new StringBuilder();
-      result.append("\"Time\"=" + prettyPrintValue(fTime));
-      return result.toString();
-    }
-    
-    @Override
-    public int hashCode() {
-      return Objects.hash(fTime);
-    }
-    
-    @Override
-    public boolean equals(final Object obj) {
-      if (this == obj)
-          return true;
-      if (obj == null) {
-          return false;
-      }
-      if ((obj instanceof TimeMetric.Match)) {
-          TimeMetric.Match other = (TimeMetric.Match) obj;
-          return Objects.equals(fTime, other.fTime);
-      } else {
-          // this should be infrequent
-          if (!(obj instanceof IPatternMatch)) {
-              return false;
-          }
-          IPatternMatch otherSig  = (IPatternMatch) obj;
-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-      }
-    }
-    
-    @Override
-    public TimeMetric specification() {
-      return TimeMetric.instance();
-    }
-    
-    /**
-     * Returns an empty, mutable match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @return the empty match.
-     * 
-     */
-    public static TimeMetric.Match newEmptyMatch() {
-      return new Mutable(null);
-    }
-    
-    /**
-     * Returns a mutable (partial) match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @param pTime the fixed value of pattern parameter Time, or null if not bound.
-     * @return the new, mutable (partial) match object.
-     * 
-     */
-    public static TimeMetric.Match newMutableMatch(final Double pTime) {
-      return new Mutable(pTime);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pTime the fixed value of pattern parameter Time, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public static TimeMetric.Match newMatch(final Double pTime) {
-      return new Immutable(pTime);
-    }
-    
-    private static final class Mutable extends TimeMetric.Match {
-      Mutable(final Double pTime) {
-        super(pTime);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return true;
-      }
-    }
-    
-    private static final class Immutable extends TimeMetric.Match {
-      Immutable(final Double pTime) {
-        super(pTime);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return false;
-      }
-    }
-  }
-  
-  /**
-   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.satellite.queries.timeMetric pattern,
-   * providing pattern-specific query methods.
-   * 
-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
-   * 
-   * <p>Matches of the pattern will be represented as {@link Match}.
-   * 
-   * <p>Original source:
-   * <code><pre>
-   * // Time
-   * 
-   * pattern timeMetric(Time : java Double) {
-   * 	Time == sum find missionTime(_, #_);
-   * }
-   * </pre></code>
-   * 
-   * @see Match
-   * @see TimeMetric
-   * 
-   */
-  public static class Matcher extends BaseMatcher<TimeMetric.Match> {
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    public static TimeMetric.Matcher on(final ViatraQueryEngine engine) {
-      // check if matcher already exists
-      Matcher matcher = engine.getExistingMatcher(querySpecification());
-      if (matcher == null) {
-          matcher = (Matcher)engine.getMatcher(querySpecification());
-      }
-      return matcher;
-    }
-    
-    /**
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * @return an initialized matcher
-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-     * 
-     */
-    public static TimeMetric.Matcher create() {
-      return new Matcher();
-    }
-    
-    private static final int POSITION_TIME = 0;
-    
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TimeMetric.Matcher.class);
-    
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    private Matcher() {
-      super(querySpecification());
-    }
-    
-    /**
-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pTime the fixed value of pattern parameter Time, or null if not bound.
-     * @return matches represented as a Match object.
-     * 
-     */
-    public Collection<TimeMetric.Match> getAllMatches(final Double pTime) {
-      return rawStreamAllMatches(new Object[]{pTime}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     * @param pTime the fixed value of pattern parameter Time, or null if not bound.
-     * @return a stream of matches represented as a Match object.
-     * 
-     */
-    public Stream<TimeMetric.Match> streamAllMatches(final Double pTime) {
-      return rawStreamAllMatches(new Object[]{pTime});
-    }
-    
-    /**
-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pTime the fixed value of pattern parameter Time, or null if not bound.
-     * @return a match represented as a Match object, or null if no match is found.
-     * 
-     */
-    public Optional<TimeMetric.Match> getOneArbitraryMatch(final Double pTime) {
-      return rawGetOneArbitraryMatch(new Object[]{pTime});
-    }
-    
-    /**
-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-     * under any possible substitution of the unspecified parameters (if any).
-     * @param pTime the fixed value of pattern parameter Time, or null if not bound.
-     * @return true if the input is a valid (partial) match of the pattern.
-     * 
-     */
-    public boolean hasMatch(final Double pTime) {
-      return rawHasMatch(new Object[]{pTime});
-    }
-    
-    /**
-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pTime the fixed value of pattern parameter Time, or null if not bound.
-     * @return the number of pattern matches found.
-     * 
-     */
-    public int countMatches(final Double pTime) {
-      return rawCountMatches(new Object[]{pTime});
-    }
-    
-    /**
-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pTime the fixed value of pattern parameter Time, or null if not bound.
-     * @param processor the action that will process the selected match.
-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-     * 
-     */
-    public boolean forOneArbitraryMatch(final Double pTime, final Consumer<? super TimeMetric.Match> processor) {
-      return rawForOneArbitraryMatch(new Object[]{pTime}, processor);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pTime the fixed value of pattern parameter Time, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public TimeMetric.Match newMatch(final Double pTime) {
-      return TimeMetric.Match.newMatch(pTime);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Time.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<Double> rawStreamAllValuesOfTime(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_TIME, parameters).map(Double.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Time.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Double> getAllValuesOfTime() {
-      return rawStreamAllValuesOfTime(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for Time.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Double> streamAllValuesOfTime() {
-      return rawStreamAllValuesOfTime(emptyArray());
-    }
-    
-    @Override
-    protected TimeMetric.Match tupleToMatch(final Tuple t) {
-      try {
-          return TimeMetric.Match.newMatch((Double) t.get(POSITION_TIME));
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in tuple not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected TimeMetric.Match arrayToMatch(final Object[] match) {
-      try {
-          return TimeMetric.Match.newMatch((Double) match[POSITION_TIME]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected TimeMetric.Match arrayToMatchMutable(final Object[] match) {
-      try {
-          return TimeMetric.Match.newMutableMatch((Double) match[POSITION_TIME]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    /**
-     * @return the singleton instance of the query specification of this pattern
-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-     * 
-     */
-    public static IQuerySpecification<TimeMetric.Matcher> querySpecification() {
-      return TimeMetric.instance();
-    }
-  }
-  
-  private TimeMetric() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static TimeMetric instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected TimeMetric.Matcher instantiate(final ViatraQueryEngine engine) {
-    return TimeMetric.Matcher.on(engine);
-  }
-  
-  @Override
-  public TimeMetric.Matcher instantiate() {
-    return TimeMetric.Matcher.create();
-  }
-  
-  @Override
-  public TimeMetric.Match newEmptyMatch() {
-    return TimeMetric.Match.newEmptyMatch();
-  }
-  
-  @Override
-  public TimeMetric.Match newMatch(final Object... parameters) {
-    return TimeMetric.Match.newMatch((java.lang.Double) parameters[0]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.TimeMetric (visibility: PUBLIC, simpleName: TimeMetric, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.TimeMetric, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.TimeMetric (visibility: PUBLIC, simpleName: TimeMetric, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.TimeMetric, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final TimeMetric INSTANCE = new TimeMetric();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final TimeMetric.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Time = new PParameter("Time", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Time);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PUBLIC);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.timeMetric";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Time");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Time = body.getOrCreateVariableByName("Time");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Time), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Time, parameter_Time)
-          ));
-          // 	Time == sum find missionTime(_, #_)
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new AggregatorConstraint(new sum().getAggregatorLogic(Double.class), body, Tuples.flatTupleOf(var___0_, var___1_), MissionTime.instance().getInternalQueryRepresentation(), var__virtual_0_, 1);
-          new Equality(body, var_Time, var__virtual_0_);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/.gitignore
index f72ce8f1..4c8bcc9e 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/.gitignore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/.gitignore
@@ -31,3 +31,8 @@
 /.AdditionalCommSubsystemCost.java._trace
 /.SpacecraftWithTwoCommSubsystems.java._trace
 /.SpacecraftCost.java._trace
+/.CrossLinkAllowed.java._trace
+/.MatchingAntenna.java._trace
+/.CubeSat3U.java._trace
+/.LinkAllowed.java._trace
+/.IndirectLinkAllowed.java._trace
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/AdditionalCommSubsystemCost.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/AdditionalCommSubsystemCost.java
deleted file mode 100644
index 61b1da52..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/AdditionalCommSubsystemCost.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftWithTwoCommSubsystems;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.ConstantValue;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         private pattern additionalCommSubsystemCost(Spacecraft : Spacecraft, Cost : java Double) {
- *         	find spacecraftWithTwoCommSubsystems(Spacecraft);
- *         	Cost == 100000.0;
- *         } or {
- *         	neg find spacecraftWithTwoCommSubsystems(Spacecraft);
- *         	Cost == 0.0;
- *         }
- * </pre></code>
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class AdditionalCommSubsystemCost extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private AdditionalCommSubsystemCost() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static AdditionalCommSubsystemCost instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.AdditionalCommSubsystemCost (visibility: PUBLIC, simpleName: AdditionalCommSubsystemCost, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.AdditionalCommSubsystemCost, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.AdditionalCommSubsystemCost (visibility: PUBLIC, simpleName: AdditionalCommSubsystemCost, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.AdditionalCommSubsystemCost, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final AdditionalCommSubsystemCost INSTANCE = new AdditionalCommSubsystemCost();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final AdditionalCommSubsystemCost.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Cost = new PParameter("Cost", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft, parameter_Cost);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PRIVATE);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.additionalCommSubsystemCost";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Spacecraft","Cost");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_Cost = body.getOrCreateVariableByName("Cost");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Cost), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_Cost, parameter_Cost)
-          ));
-          // 	find spacecraftWithTwoCommSubsystems(Spacecraft)
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_Spacecraft), SpacecraftWithTwoCommSubsystems.instance().getInternalQueryRepresentation());
-          // 	Cost == 100000.0
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new ConstantValue(body, var__virtual_0_, 100000.0);
-          new Equality(body, var_Cost, var__virtual_0_);
-          bodies.add(body);
-      }
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_Cost = body.getOrCreateVariableByName("Cost");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Cost), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_Cost, parameter_Cost)
-          ));
-          // 	neg find spacecraftWithTwoCommSubsystems(Spacecraft)
-          new NegativePatternCall(body, Tuples.flatTupleOf(var_Spacecraft), SpacecraftWithTwoCommSubsystems.instance().getInternalQueryRepresentation());
-          // 	Cost == 0.0
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new ConstantValue(body, var__virtual_0_, 0.0);
-          new Equality(body, var_Cost, var__virtual_0_);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-  
-  private static double evaluateExpression_1_1() {
-    return 100000.0;
-  }
-  
-  private static double evaluateExpression_2_1() {
-    return 0.0;
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/BasePrice.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/BasePrice.java
deleted file mode 100644
index c70f4c8b..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/BasePrice.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
-
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.ConstantValue;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         private pattern basePrice(Spacecraft : Spacecraft, BasePrice : java Double) {
- *         	Spacecraft.kind(Spacecraft, SpacecraftKind::CubeSat3U);
- *         	BasePrice == 250000.0;
- *         } or {
- *         	Spacecraft.kind(Spacecraft, SpacecraftKind::CubeSat6U);
- *         	BasePrice == 750000.0;
- *         } or {
- *         	Spacecraft.kind(Spacecraft, SpacecraftKind::SmallSat);
- *         	BasePrice == 3000000.0;
- *         }
- * </pre></code>
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class BasePrice extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private BasePrice() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static BasePrice instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.BasePrice (visibility: PUBLIC, simpleName: BasePrice, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.BasePrice, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.BasePrice (visibility: PUBLIC, simpleName: BasePrice, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.BasePrice, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final BasePrice INSTANCE = new BasePrice();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final BasePrice.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_BasePrice = new PParameter("BasePrice", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft, parameter_BasePrice);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PRIVATE);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.basePrice";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Spacecraft","BasePrice");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_BasePrice = body.getOrCreateVariableByName("BasePrice");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_BasePrice), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_BasePrice, parameter_BasePrice)
-          ));
-          // 	Spacecraft.kind(Spacecraft, SpacecraftKind::CubeSat3U)
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new ConstantValue(body, var__virtual_0_, getEnumLiteral("http://www.example.org/satellite", "SpacecraftKind", "CubeSat3U").getInstance());
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "Spacecraft", "kind")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "SpacecraftKind")));
-          new Equality(body, var__virtual_1_, var__virtual_0_);
-          // 	BasePrice == 250000.0
-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new ConstantValue(body, var__virtual_2_, 250000.0);
-          new Equality(body, var_BasePrice, var__virtual_2_);
-          bodies.add(body);
-      }
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_BasePrice = body.getOrCreateVariableByName("BasePrice");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_BasePrice), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_BasePrice, parameter_BasePrice)
-          ));
-          // 	Spacecraft.kind(Spacecraft, SpacecraftKind::CubeSat6U)
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new ConstantValue(body, var__virtual_0_, getEnumLiteral("http://www.example.org/satellite", "SpacecraftKind", "CubeSat6U").getInstance());
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "Spacecraft", "kind")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "SpacecraftKind")));
-          new Equality(body, var__virtual_1_, var__virtual_0_);
-          // 	BasePrice == 750000.0
-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new ConstantValue(body, var__virtual_2_, 750000.0);
-          new Equality(body, var_BasePrice, var__virtual_2_);
-          bodies.add(body);
-      }
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_BasePrice = body.getOrCreateVariableByName("BasePrice");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_BasePrice), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_BasePrice, parameter_BasePrice)
-          ));
-          // 	Spacecraft.kind(Spacecraft, SpacecraftKind::SmallSat)
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new ConstantValue(body, var__virtual_0_, getEnumLiteral("http://www.example.org/satellite", "SpacecraftKind", "SmallSat").getInstance());
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "Spacecraft", "kind")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "SpacecraftKind")));
-          new Equality(body, var__virtual_1_, var__virtual_0_);
-          // 	BasePrice == 3000000.0
-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new ConstantValue(body, var__virtual_2_, 3000000.0);
-          new Equality(body, var_BasePrice, var__virtual_2_);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-  
-  private static double evaluateExpression_1_1() {
-    return 250000.0;
-  }
-  
-  private static double evaluateExpression_2_1() {
-    return 750000.0;
-  }
-  
-  private static double evaluateExpression_3_1() {
-    return 3000000.0;
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CubeSat3U.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CubeSat3U.java
new file mode 100644
index 00000000..fe789893
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/CubeSat3U.java
@@ -0,0 +1,127 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern cubeSat3U(Sat : CubeSat3U) {
+ *         	CubeSat3U(Sat);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class CubeSat3U extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private CubeSat3U() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static CubeSat3U instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CubeSat3U (visibility: PUBLIC, simpleName: CubeSat3U, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CubeSat3U, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CubeSat3U (visibility: PUBLIC, simpleName: CubeSat3U, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CubeSat3U, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final CubeSat3U INSTANCE = new CubeSat3U();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final CubeSat3U.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Sat = new PParameter("Sat", "hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CubeSat3U")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Sat);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.cubeSat3U";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Sat");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Sat = body.getOrCreateVariableByName("Sat");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CubeSat3U")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Sat, parameter_Sat)
+          ));
+          // 	CubeSat3U(Sat)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CubeSat3U")));
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IncomingData.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IncomingData.java
deleted file mode 100644
index 114bbf33..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IncomingData.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectCommunicationLink;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.ScienceData;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         private pattern incomingData(Spacecraft : Spacecraft, Source : Spacecraft, Data : java Double) {
- *         	find indirectCommunicationLink(Source, Spacecraft);
- *         	find scienceData(Source, Data);
- *         }
- * </pre></code>
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class IncomingData extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private IncomingData() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static IncomingData instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IncomingData (visibility: PUBLIC, simpleName: IncomingData, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IncomingData, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IncomingData (visibility: PUBLIC, simpleName: IncomingData, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IncomingData, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final IncomingData INSTANCE = new IncomingData();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final IncomingData.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Source = new PParameter("Source", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Data = new PParameter("Data", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft, parameter_Source, parameter_Data);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PRIVATE);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.incomingData";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Spacecraft","Source","Data");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_Source = body.getOrCreateVariableByName("Source");
-          PVariable var_Data = body.getOrCreateVariableByName("Data");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Source), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Data), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_Source, parameter_Source),
-             new ExportedParameter(body, var_Data, parameter_Data)
-          ));
-          // 	find indirectCommunicationLink(Source, Spacecraft)
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_Source, var_Spacecraft), IndirectCommunicationLink.instance().getInternalQueryRepresentation());
-          // 	find scienceData(Source, Data)
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_Source, var_Data), ScienceData.instance().getInternalQueryRepresentation());
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectLinkAllowed.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectLinkAllowed.java
new file mode 100644
index 00000000..27648bf3
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/IndirectLinkAllowed.java
@@ -0,0 +1,134 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
+
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.LinkAllowed;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern indirectLinkAllowed(From : Spacecraft, To : CommunicatingElement) {
+ *         	find linkAllowed+(From, To);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class IndirectLinkAllowed extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private IndirectLinkAllowed() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static IndirectLinkAllowed instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectLinkAllowed (visibility: PUBLIC, simpleName: IndirectLinkAllowed, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectLinkAllowed, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectLinkAllowed (visibility: PUBLIC, simpleName: IndirectLinkAllowed, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectLinkAllowed, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final IndirectLinkAllowed INSTANCE = new IndirectLinkAllowed();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final IndirectLinkAllowed.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_From = new PParameter("From", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_To = new PParameter("To", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_From, parameter_To);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.indirectLinkAllowed";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("From","To");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_From = body.getOrCreateVariableByName("From");
+          PVariable var_To = body.getOrCreateVariableByName("To");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_From), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_To), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_From, parameter_From),
+             new ExportedParameter(body, var_To, parameter_To)
+          ));
+          // 	find linkAllowed+(From, To)
+          new BinaryTransitiveClosure(body, Tuples.flatTupleOf(var_From, var_To), LinkAllowed.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/InterferometryPayloadCost.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/InterferometryPayloadCost.java
deleted file mode 100644
index 205d896a..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/InterferometryPayloadCost.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftWithInterferometryPayload;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.ConstantValue;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         private pattern interferometryPayloadCost(Spacecraft : Spacecraft, Cost : java Double) {
- *         	find spacecraftWithInterferometryPayload(_, Spacecraft);
- *         	Cost == 50000.0;
- *         } or {
- *         	neg find spacecraftWithInterferometryPayload(_, Spacecraft);
- *         	Cost == 0.0;
- *         }
- * </pre></code>
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class InterferometryPayloadCost extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private InterferometryPayloadCost() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static InterferometryPayloadCost instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.InterferometryPayloadCost (visibility: PUBLIC, simpleName: InterferometryPayloadCost, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.InterferometryPayloadCost, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.InterferometryPayloadCost (visibility: PUBLIC, simpleName: InterferometryPayloadCost, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.InterferometryPayloadCost, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final InterferometryPayloadCost INSTANCE = new InterferometryPayloadCost();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final InterferometryPayloadCost.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Cost = new PParameter("Cost", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft, parameter_Cost);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PRIVATE);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.interferometryPayloadCost";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Spacecraft","Cost");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_Cost = body.getOrCreateVariableByName("Cost");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Cost), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_Cost, parameter_Cost)
-          ));
-          // 	find spacecraftWithInterferometryPayload(_, Spacecraft)
-          new PositivePatternCall(body, Tuples.flatTupleOf(var___0_, var_Spacecraft), SpacecraftWithInterferometryPayload.instance().getInternalQueryRepresentation());
-          // 	Cost == 50000.0
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new ConstantValue(body, var__virtual_0_, 50000.0);
-          new Equality(body, var_Cost, var__virtual_0_);
-          bodies.add(body);
-      }
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_Cost = body.getOrCreateVariableByName("Cost");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Cost), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_Cost, parameter_Cost)
-          ));
-          // 	neg find spacecraftWithInterferometryPayload(_, Spacecraft)
-          new NegativePatternCall(body, Tuples.flatTupleOf(var___0_, var_Spacecraft), SpacecraftWithInterferometryPayload.instance().getInternalQueryRepresentation());
-          // 	Cost == 0.0
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new ConstantValue(body, var__virtual_0_, 0.0);
-          new Equality(body, var_Cost, var__virtual_0_);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-  
-  private static double evaluateExpression_1_1() {
-    return 50000.0;
-  }
-  
-  private static double evaluateExpression_2_1() {
-    return 0.0;
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/LinkAllowed.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/LinkAllowed.java
new file mode 100644
index 00000000..e7529aa2
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/LinkAllowed.java
@@ -0,0 +1,185 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
+
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CubeSat3U;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MatchingAntenna;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.ConstantValue;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern linkAllowed(From : Spacecraft, To : CommunicatingElement) {
+ *         	find matchingAntenna(From, To, _);
+ *         	neg find cubeSat3U(From);
+ *         } or {
+ *         	find matchingAntenna(From, To, TransceiverBand::UHF);
+ *         	CubeSat3U(From);
+ *         } or {
+ *         	find matchingAntenna(From, To, _);
+ *         	CubeSat3U(From);
+ *         	GroundStationNetwork(To);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class LinkAllowed extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private LinkAllowed() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static LinkAllowed instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.LinkAllowed (visibility: PUBLIC, simpleName: LinkAllowed, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.LinkAllowed, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.LinkAllowed (visibility: PUBLIC, simpleName: LinkAllowed, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.LinkAllowed, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final LinkAllowed INSTANCE = new LinkAllowed();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final LinkAllowed.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_From = new PParameter("From", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_To = new PParameter("To", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_From, parameter_To);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.linkAllowed";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("From","To");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_From = body.getOrCreateVariableByName("From");
+          PVariable var_To = body.getOrCreateVariableByName("To");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_From), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_To), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_From, parameter_From),
+             new ExportedParameter(body, var_To, parameter_To)
+          ));
+          // 	find matchingAntenna(From, To, _)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_From, var_To, var___0_), MatchingAntenna.instance().getInternalQueryRepresentation());
+          // 	neg find cubeSat3U(From)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_From), CubeSat3U.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PBody body = new PBody(this);
+          PVariable var_From = body.getOrCreateVariableByName("From");
+          PVariable var_To = body.getOrCreateVariableByName("To");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_From), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_To), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_From, parameter_From),
+             new ExportedParameter(body, var_To, parameter_To)
+          ));
+          // 	find matchingAntenna(From, To, TransceiverBand::UHF)
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new ConstantValue(body, var__virtual_0_, getEnumLiteral("http://www.example.org/satellite", "TransceiverBand", "UHF").getInstance());
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_From, var_To, var__virtual_0_), MatchingAntenna.instance().getInternalQueryRepresentation());
+          // 	CubeSat3U(From)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_From), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CubeSat3U")));
+          bodies.add(body);
+      }
+      {
+          PBody body = new PBody(this);
+          PVariable var_From = body.getOrCreateVariableByName("From");
+          PVariable var_To = body.getOrCreateVariableByName("To");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_From), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_To), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_From, parameter_From),
+             new ExportedParameter(body, var_To, parameter_To)
+          ));
+          // 	find matchingAntenna(From, To, _)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_From, var_To, var___0_), MatchingAntenna.instance().getInternalQueryRepresentation());
+          // 	CubeSat3U(From)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_From), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CubeSat3U")));
+          // 	GroundStationNetwork(To)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_To), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "GroundStationNetwork")));
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MatchingAntenna.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MatchingAntenna.java
new file mode 100644
index 00000000..b4f0d9e9
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MatchingAntenna.java
@@ -0,0 +1,179 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern matchingAntenna(From : Spacecraft, To : CommunicatingElement, Band : TransceiverBand) {
+ *         	CommunicatingElement.commSubsystem.band(From, Band);
+ *         	CommunicatingElement.commSubsystem.band(To, Band);
+ *         	CommunicatingElement.commSubsystem.gain(From, Gain);
+ *         	CommunicatingElement.commSubsystem.gain(To, Gain);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class MatchingAntenna extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private MatchingAntenna() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static MatchingAntenna instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MatchingAntenna (visibility: PUBLIC, simpleName: MatchingAntenna, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MatchingAntenna, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MatchingAntenna (visibility: PUBLIC, simpleName: MatchingAntenna, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MatchingAntenna, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final MatchingAntenna INSTANCE = new MatchingAntenna();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final MatchingAntenna.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_From = new PParameter("From", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_To = new PParameter("To", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Band = new PParameter("Band", "hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "TransceiverBand")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_From, parameter_To, parameter_Band);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.matchingAntenna";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("From","To","Band");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_From = body.getOrCreateVariableByName("From");
+          PVariable var_To = body.getOrCreateVariableByName("To");
+          PVariable var_Band = body.getOrCreateVariableByName("Band");
+          PVariable var_Gain = body.getOrCreateVariableByName("Gain");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_From), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_To), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Band), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "TransceiverBand")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_From, parameter_From),
+             new ExportedParameter(body, var_To, parameter_To),
+             new ExportedParameter(body, var_Band, parameter_Band)
+          ));
+          // 	CommunicatingElement.commSubsystem.band(From, Band)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_From), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_From, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommSubsystem", "band")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "TransceiverBand")));
+          new Equality(body, var__virtual_1_, var_Band);
+          // 	CommunicatingElement.commSubsystem.band(To, Band)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_To), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
+          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_To, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
+          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommSubsystem", "band")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "TransceiverBand")));
+          new Equality(body, var__virtual_3_, var_Band);
+          // 	CommunicatingElement.commSubsystem.gain(From, Gain)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_From), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
+          PVariable var__virtual_4_ = body.getOrCreateVariableByName(".virtual{4}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_From, var__virtual_4_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_4_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
+          PVariable var__virtual_5_ = body.getOrCreateVariableByName(".virtual{5}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_4_, var__virtual_5_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommSubsystem", "gain")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_5_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "AntennaGain")));
+          new Equality(body, var__virtual_5_, var_Gain);
+          // 	CommunicatingElement.commSubsystem.gain(To, Gain)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_To), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
+          PVariable var__virtual_6_ = body.getOrCreateVariableByName(".virtual{6}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_To, var__virtual_6_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_6_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
+          PVariable var__virtual_7_ = body.getOrCreateVariableByName(".virtual{7}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_6_, var__virtual_7_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommSubsystem", "gain")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_7_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "AntennaGain")));
+          new Equality(body, var__virtual_7_, var_Gain);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MissionCost.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MissionCost.java
deleted file mode 100644
index 0374195f..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MissionCost.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftCost;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.aggregators.sum;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         private pattern missionCost(Mission : InterferometryMission, Cost : java Double) {
- *         	InterferometryMission.observationTime(Mission, ObservationTime);
- *         	SpacecraftCost == sum find spacecraftCost(Mission, _, #_);
- *         	Cost == eval(SpacecraftCost + 100000.0  ObservationTime);
- *         }
- * </pre></code>
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class MissionCost extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private MissionCost() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static MissionCost instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionCost (visibility: PUBLIC, simpleName: MissionCost, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionCost, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionCost (visibility: PUBLIC, simpleName: MissionCost, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionCost, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final MissionCost INSTANCE = new MissionCost();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final MissionCost.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Mission = new PParameter("Mission", "hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "InterferometryMission")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Cost = new PParameter("Cost", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Mission, parameter_Cost);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PRIVATE);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.missionCost";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Mission","Cost");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Mission = body.getOrCreateVariableByName("Mission");
-          PVariable var_Cost = body.getOrCreateVariableByName("Cost");
-          PVariable var_ObservationTime = body.getOrCreateVariableByName("ObservationTime");
-          PVariable var_SpacecraftCost = body.getOrCreateVariableByName("SpacecraftCost");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "InterferometryMission")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Cost), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Mission, parameter_Mission),
-             new ExportedParameter(body, var_Cost, parameter_Cost)
-          ));
-          // 	InterferometryMission.observationTime(Mission, ObservationTime)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "InterferometryMission")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "InterferometryMission", "observationTime")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EFloat")));
-          new Equality(body, var__virtual_0_, var_ObservationTime);
-          // 	SpacecraftCost == sum find spacecraftCost(Mission, _, #_)
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new AggregatorConstraint(new sum().getAggregatorLogic(Double.class), body, Tuples.flatTupleOf(var_Mission, var___0_, var___1_), SpacecraftCost.instance().getInternalQueryRepresentation(), var__virtual_1_, 2);
-          new Equality(body, var_SpacecraftCost, var__virtual_1_);
-          // 	Cost == eval(SpacecraftCost + 100000.0 * ObservationTime)
-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new ExpressionEvaluation(body, new IExpressionEvaluator() {
-          
-              @Override
-              public String getShortDescription() {
-                  return "Expression evaluation from pattern missionCost";
-              }
-              
-              @Override
-              public Iterable<String> getInputParameterNames() {
-                  return Arrays.asList("ObservationTime", "SpacecraftCost");}
-          
-              @Override
-              public Object evaluateExpression(IValueProvider provider) throws Exception {
-                  Float ObservationTime = (Float) provider.getValue("ObservationTime");
-                  Double SpacecraftCost = (Double) provider.getValue("SpacecraftCost");
-                  return evaluateExpression_1_1(ObservationTime, SpacecraftCost);
-              }
-          },  var__virtual_2_ ); 
-          new Equality(body, var_Cost, var__virtual_2_);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-  
-  private static double evaluateExpression_1_1(final Float ObservationTime, final Double SpacecraftCost) {
-    return ((SpacecraftCost).doubleValue() + (100000.0 * (ObservationTime).floatValue()));
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MissionCoverage.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MissionCoverage.java
deleted file mode 100644
index 583c2175..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MissionCoverage.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftWithInterferometryPayload;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.PatternMatchCounter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         private pattern missionCoverage(Mission : InterferometryMission, Coverage : java Double) {
- *         	InterferometryMission.observationTime(Mission, ObservationTime);
- *         	ObserverCount == count find spacecraftWithInterferometryPayload(Mission, _);
- *         	Coverage == eval(Math.pow(1 - 2.0 / ObserverCount, 1 + 9  (1.0 / ObservationTime)) + 0.05  ObservationTime / 3);
- *         }
- * </pre></code>
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class MissionCoverage extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private MissionCoverage() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static MissionCoverage instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionCoverage (visibility: PUBLIC, simpleName: MissionCoverage, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionCoverage, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionCoverage (visibility: PUBLIC, simpleName: MissionCoverage, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionCoverage, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final MissionCoverage INSTANCE = new MissionCoverage();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final MissionCoverage.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Mission = new PParameter("Mission", "hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "InterferometryMission")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Coverage = new PParameter("Coverage", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Mission, parameter_Coverage);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PRIVATE);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.missionCoverage";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Mission","Coverage");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Mission = body.getOrCreateVariableByName("Mission");
-          PVariable var_Coverage = body.getOrCreateVariableByName("Coverage");
-          PVariable var_ObservationTime = body.getOrCreateVariableByName("ObservationTime");
-          PVariable var_ObserverCount = body.getOrCreateVariableByName("ObserverCount");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "InterferometryMission")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Coverage), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Mission, parameter_Mission),
-             new ExportedParameter(body, var_Coverage, parameter_Coverage)
-          ));
-          // 	InterferometryMission.observationTime(Mission, ObservationTime)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "InterferometryMission")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "InterferometryMission", "observationTime")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EFloat")));
-          new Equality(body, var__virtual_0_, var_ObservationTime);
-          // 	ObserverCount == count find spacecraftWithInterferometryPayload(Mission, _)
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new PatternMatchCounter(body, Tuples.flatTupleOf(var_Mission, var___0_), SpacecraftWithInterferometryPayload.instance().getInternalQueryRepresentation(), var__virtual_1_);
-          new Equality(body, var_ObserverCount, var__virtual_1_);
-          // 	Coverage == eval(Math.pow(1 - 2.0 / ObserverCount, 1 + 9 * (1.0 / ObservationTime)) + 0.05 * ObservationTime / 3)
-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new ExpressionEvaluation(body, new IExpressionEvaluator() {
-          
-              @Override
-              public String getShortDescription() {
-                  return "Expression evaluation from pattern missionCoverage";
-              }
-              
-              @Override
-              public Iterable<String> getInputParameterNames() {
-                  return Arrays.asList("ObservationTime", "ObserverCount");}
-          
-              @Override
-              public Object evaluateExpression(IValueProvider provider) throws Exception {
-                  Float ObservationTime = (Float) provider.getValue("ObservationTime");
-                  Integer ObserverCount = (Integer) provider.getValue("ObserverCount");
-                  return evaluateExpression_1_1(ObservationTime, ObserverCount);
-              }
-          },  var__virtual_2_ ); 
-          new Equality(body, var_Coverage, var__virtual_2_);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-  
-  private static double evaluateExpression_1_1(final Float ObservationTime, final Integer ObserverCount) {
-    double _pow = Math.pow((1 - (2.0 / (ObserverCount).intValue())), (1 + (9 * (1.0 / (ObservationTime).floatValue()))));
-    double _plus = (_pow + ((0.05 * (ObservationTime).floatValue()) / 3));
-    return _plus;
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MissionTime.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MissionTime.java
deleted file mode 100644
index 3ad42bf5..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/MissionTime.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.TransmitTime;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.aggregators.sum;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         private pattern missionTime(Mission : InterferometryMission, Time : java Double) {
- *         	InterferometryMission.observationTime(Mission, ObservationTime);
- *         	TrasmitTime == sum find transmitTime(Mission, _, #_);
- *         	Time == eval(TrasmitTime + 60.0  ObservationTime);
- *         }
- * </pre></code>
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class MissionTime extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private MissionTime() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static MissionTime instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionTime (visibility: PUBLIC, simpleName: MissionTime, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionTime, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionTime (visibility: PUBLIC, simpleName: MissionTime, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionTime, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final MissionTime INSTANCE = new MissionTime();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final MissionTime.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Mission = new PParameter("Mission", "hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "InterferometryMission")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Time = new PParameter("Time", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Mission, parameter_Time);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PRIVATE);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.missionTime";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Mission","Time");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Mission = body.getOrCreateVariableByName("Mission");
-          PVariable var_Time = body.getOrCreateVariableByName("Time");
-          PVariable var_ObservationTime = body.getOrCreateVariableByName("ObservationTime");
-          PVariable var_TrasmitTime = body.getOrCreateVariableByName("TrasmitTime");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "InterferometryMission")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Time), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Mission, parameter_Mission),
-             new ExportedParameter(body, var_Time, parameter_Time)
-          ));
-          // 	InterferometryMission.observationTime(Mission, ObservationTime)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "InterferometryMission")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "InterferometryMission", "observationTime")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EFloat")));
-          new Equality(body, var__virtual_0_, var_ObservationTime);
-          // 	TrasmitTime == sum find transmitTime(Mission, _, #_)
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new AggregatorConstraint(new sum().getAggregatorLogic(Double.class), body, Tuples.flatTupleOf(var_Mission, var___0_, var___1_), TransmitTime.instance().getInternalQueryRepresentation(), var__virtual_1_, 2);
-          new Equality(body, var_TrasmitTime, var__virtual_1_);
-          // 	Time == eval(TrasmitTime + 60.0 * ObservationTime)
-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new ExpressionEvaluation(body, new IExpressionEvaluator() {
-          
-              @Override
-              public String getShortDescription() {
-                  return "Expression evaluation from pattern missionTime";
-              }
-              
-              @Override
-              public Iterable<String> getInputParameterNames() {
-                  return Arrays.asList("ObservationTime", "TrasmitTime");}
-          
-              @Override
-              public Object evaluateExpression(IValueProvider provider) throws Exception {
-                  Float ObservationTime = (Float) provider.getValue("ObservationTime");
-                  Double TrasmitTime = (Double) provider.getValue("TrasmitTime");
-                  return evaluateExpression_1_1(ObservationTime, TrasmitTime);
-              }
-          },  var__virtual_2_ ); 
-          new Equality(body, var_Time, var__virtual_2_);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-  
-  private static double evaluateExpression_1_1(final Float ObservationTime, final Double TrasmitTime) {
-    return ((TrasmitTime).doubleValue() + (60.0 * (ObservationTime).floatValue()));
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java
index 2f310711..36fa4557 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SatelliteQueriesAll.java
@@ -5,43 +5,32 @@ package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
 
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLinkDoesNotStartAtContainingElement;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CommunicationLoop;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CostMetric;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CoverageMetric;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CubeSatWithKaAntenna;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.IncompatibleSourceAndTargetBand;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.IncompatibleSourceAndTargetGain;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.KaAntennaGainLow;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoLinkToGroundStation;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NoPotentialLinkToGroundStation;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.NotEnoughInterferometryPayloads;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SmallSat;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SpacecraftOfKind;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.ThreeUCubeSatWithNonUhfCrossLink;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.TimeMetric;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.UhfAntennaGainNotLow;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.XAntennaGainNotMedium;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.AdditionalCommSubsystemCost;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.AtLeastTwoInterferometryPayloads;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.BasePrice;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemBand;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemBandUhf;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemGain;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemGainLow;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CommSubsystemGainMedium;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.CubeSat3U;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.DirectCommunicationLink;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.GroundStationNetwork;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IncomingData;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectCommunicationLink;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.InterferometryPayloadCost;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionCost;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionCoverage;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MissionTime;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.ScienceData;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SmallSat;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftCost;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftOfKind;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftUplink;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IndirectLinkAllowed;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.LinkAllowed;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.MatchingAntenna;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftWithInterferometryPayload;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftWithTwoCommSubsystems;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.TransmitRate;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.TransmitTime;
 import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
 
 /**
@@ -55,6 +44,11 @@ import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
  * <li>atLeastTwoInterferometryPayloads</li>
  * <li>spacecraftWithInterferometryPayload</li>
  * <li>noLinkToGroundStation</li>
+ * <li>noPotentialLinkToGroundStation</li>
+ * <li>indirectLinkAllowed</li>
+ * <li>linkAllowed</li>
+ * <li>matchingAntenna</li>
+ * <li>cubeSat3U</li>
  * <li>communicationLoop</li>
  * <li>indirectCommunicationLink</li>
  * <li>directCommunicationLink</li>
@@ -72,23 +66,7 @@ import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
  * <li>groundStationNetwork</li>
  * <li>cubeSatWithKaAntenna</li>
  * <li>smallSat</li>
- * <li>coverageMetric</li>
- * <li>missionCoverage</li>
- * <li>timeMetric</li>
- * <li>missionTime</li>
- * <li>transmitTime</li>
- * <li>incomingData</li>
- * <li>scienceData</li>
- * <li>transmitRate</li>
- * <li>spacecraftUplink</li>
- * <li>costMetric</li>
- * <li>missionCost</li>
- * <li>spacecraftCost</li>
  * <li>spacecraftOfKind</li>
- * <li>basePrice</li>
- * <li>interferometryPayloadCost</li>
- * <li>additionalCommSubsystemCost</li>
- * <li>spacecraftWithTwoCommSubsystems</li>
  * </ul>
  * 
  * @see IQueryGroup
@@ -118,6 +96,11 @@ public final class SatelliteQueriesAll extends BaseGeneratedPatternGroup {
     querySpecifications.add(AtLeastTwoInterferometryPayloads.instance());
     querySpecifications.add(SpacecraftWithInterferometryPayload.instance());
     querySpecifications.add(NoLinkToGroundStation.instance());
+    querySpecifications.add(NoPotentialLinkToGroundStation.instance());
+    querySpecifications.add(IndirectLinkAllowed.instance());
+    querySpecifications.add(LinkAllowed.instance());
+    querySpecifications.add(MatchingAntenna.instance());
+    querySpecifications.add(CubeSat3U.instance());
     querySpecifications.add(CommunicationLoop.instance());
     querySpecifications.add(IndirectCommunicationLink.instance());
     querySpecifications.add(DirectCommunicationLink.instance());
@@ -135,22 +118,6 @@ public final class SatelliteQueriesAll extends BaseGeneratedPatternGroup {
     querySpecifications.add(GroundStationNetwork.instance());
     querySpecifications.add(CubeSatWithKaAntenna.instance());
     querySpecifications.add(SmallSat.instance());
-    querySpecifications.add(CoverageMetric.instance());
-    querySpecifications.add(MissionCoverage.instance());
-    querySpecifications.add(TimeMetric.instance());
-    querySpecifications.add(MissionTime.instance());
-    querySpecifications.add(TransmitTime.instance());
-    querySpecifications.add(IncomingData.instance());
-    querySpecifications.add(ScienceData.instance());
-    querySpecifications.add(TransmitRate.instance());
-    querySpecifications.add(SpacecraftUplink.instance());
-    querySpecifications.add(CostMetric.instance());
-    querySpecifications.add(MissionCost.instance());
-    querySpecifications.add(SpacecraftCost.instance());
     querySpecifications.add(SpacecraftOfKind.instance());
-    querySpecifications.add(BasePrice.instance());
-    querySpecifications.add(InterferometryPayloadCost.instance());
-    querySpecifications.add(AdditionalCommSubsystemCost.instance());
-    querySpecifications.add(SpacecraftWithTwoCommSubsystems.instance());
   }
 }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/ScienceData.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/ScienceData.java
deleted file mode 100644
index b558e51e..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/ScienceData.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
-
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         private pattern scienceData(Spacecraft : Spacecraft, Data : java Double) {
- *         	ConstellationMission.spacecraft(Mission, Spacecraft);
- *         	InterferometryMission.observationTime(Mission, ObservationTime);
- *         	Data == eval(12.0  ObservationTime);
- *         }
- * </pre></code>
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class ScienceData extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private ScienceData() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static ScienceData instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.ScienceData (visibility: PUBLIC, simpleName: ScienceData, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.ScienceData, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.ScienceData (visibility: PUBLIC, simpleName: ScienceData, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.ScienceData, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final ScienceData INSTANCE = new ScienceData();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final ScienceData.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Data = new PParameter("Data", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft, parameter_Data);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PRIVATE);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.scienceData";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Spacecraft","Data");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_Data = body.getOrCreateVariableByName("Data");
-          PVariable var_Mission = body.getOrCreateVariableByName("Mission");
-          PVariable var_ObservationTime = body.getOrCreateVariableByName("ObservationTime");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Data), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_Data, parameter_Data)
-          ));
-          // 	ConstellationMission.spacecraft(Mission, Spacecraft)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "ConstellationMission")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "ConstellationMission", "spacecraft")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new Equality(body, var__virtual_0_, var_Spacecraft);
-          // 	InterferometryMission.observationTime(Mission, ObservationTime)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "InterferometryMission")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "InterferometryMission", "observationTime")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EFloat")));
-          new Equality(body, var__virtual_1_, var_ObservationTime);
-          // 	Data == eval(12.0 * ObservationTime)
-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new ExpressionEvaluation(body, new IExpressionEvaluator() {
-          
-              @Override
-              public String getShortDescription() {
-                  return "Expression evaluation from pattern scienceData";
-              }
-              
-              @Override
-              public Iterable<String> getInputParameterNames() {
-                  return Arrays.asList("ObservationTime");}
-          
-              @Override
-              public Object evaluateExpression(IValueProvider provider) throws Exception {
-                  Float ObservationTime = (Float) provider.getValue("ObservationTime");
-                  return evaluateExpression_1_1(ObservationTime);
-              }
-          },  var__virtual_2_ ); 
-          new Equality(body, var_Data, var__virtual_2_);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-  
-  private static double evaluateExpression_1_1(final Float ObservationTime) {
-    return (12.0 * (ObservationTime).floatValue());
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SmallSat.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SmallSat.java
deleted file mode 100644
index d74ed28a..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SmallSat.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
-
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.ConstantValue;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         private pattern smallSat(Sat : Spacecraft) {
- *         	Spacecraft.kind(Sat, SpacecraftKind::SmallSat);
- *         }
- * </pre></code>
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class SmallSat extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private SmallSat() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static SmallSat instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SmallSat (visibility: PUBLIC, simpleName: SmallSat, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SmallSat, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SmallSat (visibility: PUBLIC, simpleName: SmallSat, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SmallSat, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final SmallSat INSTANCE = new SmallSat();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final SmallSat.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Sat = new PParameter("Sat", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Sat);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PRIVATE);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.smallSat";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Sat");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Sat = body.getOrCreateVariableByName("Sat");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Sat, parameter_Sat)
-          ));
-          // 	Spacecraft.kind(Sat, SpacecraftKind::SmallSat)
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new ConstantValue(body, var__virtual_0_, getEnumLiteral("http://www.example.org/satellite", "SpacecraftKind", "SmallSat").getInstance());
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Sat, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "Spacecraft", "kind")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "SpacecraftKind")));
-          new Equality(body, var__virtual_1_, var__virtual_0_);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftCost.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftCost.java
deleted file mode 100644
index 65fed74a..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftCost.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.AdditionalCommSubsystemCost;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.BasePrice;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.InterferometryPayloadCost;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftOfKind;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.PatternMatchCounter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         private pattern spacecraftCost(Mission : InterferometryMission, Spacecraft : Spacecraft, Cost : java Double) {
- *         	ConstellationMission.spacecraft(Mission, Spacecraft);
- *         	Spacecraft.kind(Spacecraft, Kind);
- *         	KindCount == count find spacecraftOfKind(_, Kind);
- *         	find basePrice(Spacecraft, BasePrice);
- *         	find interferometryPayloadCost(Spacecraft, InterferometryPayloadCost);
- *         	find additionalCommSubsystemCost(Spacecraft, AdditionalCommSubsystemCost);
- *         	Cost == eval(BasePrice  Math.pow(KindCount, -0.25) + InterferometryPayloadCost + AdditionalCommSubsystemCost);
- *         }
- * </pre></code>
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class SpacecraftCost extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private SpacecraftCost() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static SpacecraftCost instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftCost (visibility: PUBLIC, simpleName: SpacecraftCost, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftCost, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftCost (visibility: PUBLIC, simpleName: SpacecraftCost, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftCost, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final SpacecraftCost INSTANCE = new SpacecraftCost();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final SpacecraftCost.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Mission = new PParameter("Mission", "hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "InterferometryMission")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Cost = new PParameter("Cost", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Mission, parameter_Spacecraft, parameter_Cost);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PRIVATE);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftCost";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Mission","Spacecraft","Cost");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Mission = body.getOrCreateVariableByName("Mission");
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_Cost = body.getOrCreateVariableByName("Cost");
-          PVariable var_Kind = body.getOrCreateVariableByName("Kind");
-          PVariable var_KindCount = body.getOrCreateVariableByName("KindCount");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-          PVariable var_BasePrice = body.getOrCreateVariableByName("BasePrice");
-          PVariable var_InterferometryPayloadCost = body.getOrCreateVariableByName("InterferometryPayloadCost");
-          PVariable var_AdditionalCommSubsystemCost = body.getOrCreateVariableByName("AdditionalCommSubsystemCost");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "InterferometryMission")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Cost), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Mission, parameter_Mission),
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_Cost, parameter_Cost)
-          ));
-          // 	ConstellationMission.spacecraft(Mission, Spacecraft)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "ConstellationMission")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "ConstellationMission", "spacecraft")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new Equality(body, var__virtual_0_, var_Spacecraft);
-          // 	Spacecraft.kind(Spacecraft, Kind)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "Spacecraft", "kind")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "SpacecraftKind")));
-          new Equality(body, var__virtual_1_, var_Kind);
-          // 	KindCount == count find spacecraftOfKind(_, Kind)
-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new PatternMatchCounter(body, Tuples.flatTupleOf(var___0_, var_Kind), SpacecraftOfKind.instance().getInternalQueryRepresentation(), var__virtual_2_);
-          new Equality(body, var_KindCount, var__virtual_2_);
-          // 	find basePrice(Spacecraft, BasePrice)
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_Spacecraft, var_BasePrice), BasePrice.instance().getInternalQueryRepresentation());
-          // 	find interferometryPayloadCost(Spacecraft, InterferometryPayloadCost)
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_Spacecraft, var_InterferometryPayloadCost), InterferometryPayloadCost.instance().getInternalQueryRepresentation());
-          // 	find additionalCommSubsystemCost(Spacecraft, AdditionalCommSubsystemCost)
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_Spacecraft, var_AdditionalCommSubsystemCost), AdditionalCommSubsystemCost.instance().getInternalQueryRepresentation());
-          // 	Cost == eval(BasePrice * Math.pow(KindCount, -0.25) + InterferometryPayloadCost + AdditionalCommSubsystemCost)
-          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
-          new ExpressionEvaluation(body, new IExpressionEvaluator() {
-          
-              @Override
-              public String getShortDescription() {
-                  return "Expression evaluation from pattern spacecraftCost";
-              }
-              
-              @Override
-              public Iterable<String> getInputParameterNames() {
-                  return Arrays.asList("AdditionalCommSubsystemCost", "BasePrice", "InterferometryPayloadCost", "KindCount");}
-          
-              @Override
-              public Object evaluateExpression(IValueProvider provider) throws Exception {
-                  Double AdditionalCommSubsystemCost = (Double) provider.getValue("AdditionalCommSubsystemCost");
-                  Double BasePrice = (Double) provider.getValue("BasePrice");
-                  Double InterferometryPayloadCost = (Double) provider.getValue("InterferometryPayloadCost");
-                  Integer KindCount = (Integer) provider.getValue("KindCount");
-                  return evaluateExpression_1_1(AdditionalCommSubsystemCost, BasePrice, InterferometryPayloadCost, KindCount);
-              }
-          },  var__virtual_3_ ); 
-          new Equality(body, var_Cost, var__virtual_3_);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-  
-  private static double evaluateExpression_1_1(final Double AdditionalCommSubsystemCost, final Double BasePrice, final Double InterferometryPayloadCost, final Integer KindCount) {
-    double _pow = Math.pow((KindCount).intValue(), (-0.25));
-    double _multiply = ((BasePrice).doubleValue() * _pow);
-    double _plus = (_multiply + (InterferometryPayloadCost).doubleValue());
-    double _plus_1 = (_plus + (AdditionalCommSubsystemCost).doubleValue());
-    return _plus_1;
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftOfKind.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftOfKind.java
deleted file mode 100644
index 5e49aa58..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftOfKind.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
-
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         private pattern spacecraftOfKind(Spacecraft : Spacecraft, Kind : SpacecraftKind) {
- *         	Spacecraft.kind(Spacecraft, Kind);
- *         }
- * </pre></code>
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class SpacecraftOfKind extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private SpacecraftOfKind() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static SpacecraftOfKind instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftOfKind (visibility: PUBLIC, simpleName: SpacecraftOfKind, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftOfKind, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftOfKind (visibility: PUBLIC, simpleName: SpacecraftOfKind, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftOfKind, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final SpacecraftOfKind INSTANCE = new SpacecraftOfKind();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final SpacecraftOfKind.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Kind = new PParameter("Kind", "hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "SpacecraftKind")), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft, parameter_Kind);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PRIVATE);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Spacecraft","Kind");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_Kind = body.getOrCreateVariableByName("Kind");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Kind), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "SpacecraftKind")));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_Kind, parameter_Kind)
-          ));
-          // 	Spacecraft.kind(Spacecraft, Kind)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "Spacecraft", "kind")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "SpacecraftKind")));
-          new Equality(body, var__virtual_0_, var_Kind);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftUplink.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftUplink.java
deleted file mode 100644
index 966ff6f8..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftUplink.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
-
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         private pattern spacecraftUplink(Spacecraft : Spacecraft, Band : TransceiverBand, Target : CommunicatingElement) {
- *         	CommunicatingElement.communicationLink(Spacecraft, Link);
- *         	DirectedCommunicationLink.source.band(Link, Band);
- *         	DirectedCommunicationLink.target(Link, TargetSubsystem);
- *         	CommunicatingElement.commSubsystem(Target, TargetSubsystem);
- *         }
- * </pre></code>
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class SpacecraftUplink extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private SpacecraftUplink() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static SpacecraftUplink instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftUplink (visibility: PUBLIC, simpleName: SpacecraftUplink, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftUplink, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftUplink (visibility: PUBLIC, simpleName: SpacecraftUplink, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftUplink, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final SpacecraftUplink INSTANCE = new SpacecraftUplink();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final SpacecraftUplink.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Band = new PParameter("Band", "hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.example.org/satellite", "TransceiverBand")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Target = new PParameter("Target", "hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "CommunicatingElement")), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft, parameter_Band, parameter_Target);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PRIVATE);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftUplink";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Spacecraft","Band","Target");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_Band = body.getOrCreateVariableByName("Band");
-          PVariable var_Target = body.getOrCreateVariableByName("Target");
-          PVariable var_Link = body.getOrCreateVariableByName("Link");
-          PVariable var_TargetSubsystem = body.getOrCreateVariableByName("TargetSubsystem");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Band), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "TransceiverBand")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Target), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_Band, parameter_Band),
-             new ExportedParameter(body, var_Target, parameter_Target)
-          ));
-          // 	CommunicatingElement.communicationLink(Spacecraft, Link)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "communicationLink")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
-          new Equality(body, var__virtual_0_, var_Link);
-          // 	DirectedCommunicationLink.source.band(Link, Band)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Link), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Link, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "DirectedCommunicationLink", "source")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommSubsystem", "band")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.example.org/satellite", "TransceiverBand")));
-          new Equality(body, var__virtual_2_, var_Band);
-          // 	DirectedCommunicationLink.target(Link, TargetSubsystem)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Link), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "DirectedCommunicationLink")));
-          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Link, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "DirectedCommunicationLink", "target")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
-          new Equality(body, var__virtual_3_, var_TargetSubsystem);
-          // 	CommunicatingElement.commSubsystem(Target, TargetSubsystem)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Target), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommunicatingElement")));
-          PVariable var__virtual_4_ = body.getOrCreateVariableByName(".virtual{4}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Target, var__virtual_4_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_4_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
-          new Equality(body, var__virtual_4_, var_TargetSubsystem);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftWithTwoCommSubsystems.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftWithTwoCommSubsystems.java
deleted file mode 100644
index 98f1be7b..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/SpacecraftWithTwoCommSubsystems.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
-
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         private pattern spacecraftWithTwoCommSubsystems(Spacecraft : Spacecraft) {
- *         	Spacecraft.commSubsystem(Spacecraft, Subsystem1);
- *         	Spacecraft.commSubsystem(Spacecraft, Subsystem2);
- *         	Subsystem1 != Subsystem2;
- *         }
- * </pre></code>
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class SpacecraftWithTwoCommSubsystems extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private SpacecraftWithTwoCommSubsystems() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static SpacecraftWithTwoCommSubsystems instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftWithTwoCommSubsystems (visibility: PUBLIC, simpleName: SpacecraftWithTwoCommSubsystems, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftWithTwoCommSubsystems, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftWithTwoCommSubsystems (visibility: PUBLIC, simpleName: SpacecraftWithTwoCommSubsystems, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftWithTwoCommSubsystems, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final SpacecraftWithTwoCommSubsystems INSTANCE = new SpacecraftWithTwoCommSubsystems();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final SpacecraftWithTwoCommSubsystems.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PRIVATE);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftWithTwoCommSubsystems";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Spacecraft");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_Subsystem1 = body.getOrCreateVariableByName("Subsystem1");
-          PVariable var_Subsystem2 = body.getOrCreateVariableByName("Subsystem2");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft)
-          ));
-          // 	Spacecraft.commSubsystem(Spacecraft, Subsystem1)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
-          new Equality(body, var__virtual_0_, var_Subsystem1);
-          // 	Spacecraft.commSubsystem(Spacecraft, Subsystem2)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "CommunicatingElement", "commSubsystem")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "CommSubsystem")));
-          new Equality(body, var__virtual_1_, var_Subsystem2);
-          // 	Subsystem1 != Subsystem2
-          new Inequality(body, var_Subsystem1, var_Subsystem2);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/TransmitRate.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/TransmitRate.java
deleted file mode 100644
index 2faa7733..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/TransmitRate.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.SpacecraftUplink;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.ConstantValue;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         private pattern transmitRate(Spacecraft : Spacecraft, TransmitRate : java Double) {
- *         	find spacecraftUplink(Spacecraft, TransceiverBand::UHF, Target);
- *         	Spacecraft(Target);
- *         	TransmitRate == 5.0;
- *         } or {
- *         	find spacecraftUplink(Spacecraft, TransceiverBand::X, Target);
- *         	Spacecraft(Target);
- *         	TransmitRate == 1.6;
- *         } or {
- *         	find spacecraftUplink(Spacecraft, TransceiverBand::X, Target);
- *         	GroundStationNetwork(Target);
- *         	TransmitRate == 0.7;
- *         } or {
- *         	find spacecraftUplink(Spacecraft, TransceiverBand::Ka, Target);
- *         	Spacecraft(Target);
- *         	TransmitRate == 220.0;
- *         } or {
- *         	find spacecraftUplink(Spacecraft, TransceiverBand::Ka, Target);
- *         	GroundStationNetwork(Target);
- *         	TransmitRate == 80.0;
- *         }
- * </pre></code>
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class TransmitRate extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private TransmitRate() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static TransmitRate instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.TransmitRate (visibility: PUBLIC, simpleName: TransmitRate, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.TransmitRate, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.TransmitRate (visibility: PUBLIC, simpleName: TransmitRate, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.TransmitRate, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final TransmitRate INSTANCE = new TransmitRate();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final TransmitRate.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_TransmitRate = new PParameter("TransmitRate", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Spacecraft, parameter_TransmitRate);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PRIVATE);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.transmitRate";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Spacecraft","TransmitRate");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_TransmitRate = body.getOrCreateVariableByName("TransmitRate");
-          PVariable var_Target = body.getOrCreateVariableByName("Target");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_TransmitRate), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_TransmitRate, parameter_TransmitRate)
-          ));
-          // 	find spacecraftUplink(Spacecraft, TransceiverBand::UHF, Target)
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new ConstantValue(body, var__virtual_0_, getEnumLiteral("http://www.example.org/satellite", "TransceiverBand", "UHF").getInstance());
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_Spacecraft, var__virtual_0_, var_Target), SpacecraftUplink.instance().getInternalQueryRepresentation());
-          // 	Spacecraft(Target)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Target), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          // 	TransmitRate == 5.0
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new ConstantValue(body, var__virtual_1_, 5.0);
-          new Equality(body, var_TransmitRate, var__virtual_1_);
-          bodies.add(body);
-      }
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_TransmitRate = body.getOrCreateVariableByName("TransmitRate");
-          PVariable var_Target = body.getOrCreateVariableByName("Target");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_TransmitRate), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_TransmitRate, parameter_TransmitRate)
-          ));
-          // 	find spacecraftUplink(Spacecraft, TransceiverBand::X, Target)
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new ConstantValue(body, var__virtual_0_, getEnumLiteral("http://www.example.org/satellite", "TransceiverBand", "X").getInstance());
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_Spacecraft, var__virtual_0_, var_Target), SpacecraftUplink.instance().getInternalQueryRepresentation());
-          // 	Spacecraft(Target)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Target), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          // 	TransmitRate == 1.6
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new ConstantValue(body, var__virtual_1_, 1.6);
-          new Equality(body, var_TransmitRate, var__virtual_1_);
-          bodies.add(body);
-      }
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_TransmitRate = body.getOrCreateVariableByName("TransmitRate");
-          PVariable var_Target = body.getOrCreateVariableByName("Target");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_TransmitRate), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_TransmitRate, parameter_TransmitRate)
-          ));
-          // 	find spacecraftUplink(Spacecraft, TransceiverBand::X, Target)
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new ConstantValue(body, var__virtual_0_, getEnumLiteral("http://www.example.org/satellite", "TransceiverBand", "X").getInstance());
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_Spacecraft, var__virtual_0_, var_Target), SpacecraftUplink.instance().getInternalQueryRepresentation());
-          // 	GroundStationNetwork(Target)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Target), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "GroundStationNetwork")));
-          // 	TransmitRate == 0.7
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new ConstantValue(body, var__virtual_1_, 0.7);
-          new Equality(body, var_TransmitRate, var__virtual_1_);
-          bodies.add(body);
-      }
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_TransmitRate = body.getOrCreateVariableByName("TransmitRate");
-          PVariable var_Target = body.getOrCreateVariableByName("Target");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_TransmitRate), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_TransmitRate, parameter_TransmitRate)
-          ));
-          // 	find spacecraftUplink(Spacecraft, TransceiverBand::Ka, Target)
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new ConstantValue(body, var__virtual_0_, getEnumLiteral("http://www.example.org/satellite", "TransceiverBand", "Ka").getInstance());
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_Spacecraft, var__virtual_0_, var_Target), SpacecraftUplink.instance().getInternalQueryRepresentation());
-          // 	Spacecraft(Target)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Target), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          // 	TransmitRate == 220.0
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new ConstantValue(body, var__virtual_1_, 220.0);
-          new Equality(body, var_TransmitRate, var__virtual_1_);
-          bodies.add(body);
-      }
-      {
-          PBody body = new PBody(this);
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_TransmitRate = body.getOrCreateVariableByName("TransmitRate");
-          PVariable var_Target = body.getOrCreateVariableByName("Target");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_TransmitRate), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_TransmitRate, parameter_TransmitRate)
-          ));
-          // 	find spacecraftUplink(Spacecraft, TransceiverBand::Ka, Target)
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new ConstantValue(body, var__virtual_0_, getEnumLiteral("http://www.example.org/satellite", "TransceiverBand", "Ka").getInstance());
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_Spacecraft, var__virtual_0_, var_Target), SpacecraftUplink.instance().getInternalQueryRepresentation());
-          // 	GroundStationNetwork(Target)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Target), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "GroundStationNetwork")));
-          // 	TransmitRate == 80.0
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new ConstantValue(body, var__virtual_1_, 80.0);
-          new Equality(body, var_TransmitRate, var__virtual_1_);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-  
-  private static double evaluateExpression_1_1() {
-    return 5.0;
-  }
-  
-  private static double evaluateExpression_2_1() {
-    return 1.6;
-  }
-  
-  private static double evaluateExpression_3_1() {
-    return 0.7;
-  }
-  
-  private static double evaluateExpression_4_1() {
-    return 220.0;
-  }
-  
-  private static double evaluateExpression_5_1() {
-    return 80.0;
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/TransmitTime.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/TransmitTime.java
deleted file mode 100644
index eb338bec..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/internal/TransmitTime.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.IncomingData;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.ScienceData;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.TransmitRate;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.aggregators.sum;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
-import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.xtext.xbase.lib.DoubleExtensions;
-
-/**
- * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         private pattern transmitTime(Mission : InterferometryMission, Spacecraft : Spacecraft, TransmitTime : java Double) {
- *         	ConstellationMission.spacecraft(Mission, Spacecraft);
- *         	find scienceData(Spacecraft, ScienceData);
- *         	IncomingData == sum find incomingData(Spacecraft, _, #_);
- *         	find transmitRate(Spacecraft, TransmitRate);
- *         	TransmitTime == eval((ScienceData + IncomingData) / (7.5  TransmitRate));
- *         }
- * </pre></code>
- * 
- * @see GenericPatternMatcher
- * @see GenericPatternMatch
- * 
- */
-@SuppressWarnings("all")
-public final class TransmitTime extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
-  private TransmitTime() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static TransmitTime instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.TransmitTime (visibility: PUBLIC, simpleName: TransmitTime, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.TransmitTime, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.TransmitTime (visibility: PUBLIC, simpleName: TransmitTime, identifier: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal.TransmitTime, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final TransmitTime INSTANCE = new TransmitTime();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final TransmitTime.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_Mission = new PParameter("Mission", "hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "InterferometryMission")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_Spacecraft = new PParameter("Spacecraft", "hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/satellite", "Spacecraft")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_TransmitTime = new PParameter("TransmitTime", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_Mission, parameter_Spacecraft, parameter_TransmitTime);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PRIVATE);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.transmitTime";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("Mission","Spacecraft","TransmitTime");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_Mission = body.getOrCreateVariableByName("Mission");
-          PVariable var_Spacecraft = body.getOrCreateVariableByName("Spacecraft");
-          PVariable var_TransmitTime = body.getOrCreateVariableByName("TransmitTime");
-          PVariable var_ScienceData = body.getOrCreateVariableByName("ScienceData");
-          PVariable var_IncomingData = body.getOrCreateVariableByName("IncomingData");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
-          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
-          PVariable var_TransmitRate = body.getOrCreateVariableByName("TransmitRate");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "InterferometryMission")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Spacecraft), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_TransmitTime), new JavaTransitiveInstancesKey(java.lang.Double.class));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_Mission, parameter_Mission),
-             new ExportedParameter(body, var_Spacecraft, parameter_Spacecraft),
-             new ExportedParameter(body, var_TransmitTime, parameter_TransmitTime)
-          ));
-          // 	ConstellationMission.spacecraft(Mission, Spacecraft)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "ConstellationMission")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_Mission, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/satellite", "ConstellationMission", "spacecraft")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/satellite", "Spacecraft")));
-          new Equality(body, var__virtual_0_, var_Spacecraft);
-          // 	find scienceData(Spacecraft, ScienceData)
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_Spacecraft, var_ScienceData), ScienceData.instance().getInternalQueryRepresentation());
-          // 	IncomingData == sum find incomingData(Spacecraft, _, #_)
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new AggregatorConstraint(new sum().getAggregatorLogic(Double.class), body, Tuples.flatTupleOf(var_Spacecraft, var___0_, var___1_), IncomingData.instance().getInternalQueryRepresentation(), var__virtual_1_, 2);
-          new Equality(body, var_IncomingData, var__virtual_1_);
-          // 	find transmitRate(Spacecraft, TransmitRate)
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_Spacecraft, var_TransmitRate), TransmitRate.instance().getInternalQueryRepresentation());
-          // 	TransmitTime == eval((ScienceData + IncomingData) / (7.5 * TransmitRate))
-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
-          new ExpressionEvaluation(body, new IExpressionEvaluator() {
-          
-              @Override
-              public String getShortDescription() {
-                  return "Expression evaluation from pattern transmitTime";
-              }
-              
-              @Override
-              public Iterable<String> getInputParameterNames() {
-                  return Arrays.asList("IncomingData", "ScienceData", "TransmitRate");}
-          
-              @Override
-              public Object evaluateExpression(IValueProvider provider) throws Exception {
-                  Double IncomingData = (Double) provider.getValue("IncomingData");
-                  Double ScienceData = (Double) provider.getValue("ScienceData");
-                  Double TransmitRate = (Double) provider.getValue("TransmitRate");
-                  return evaluateExpression_1_1(IncomingData, ScienceData, TransmitRate);
-              }
-          },  var__virtual_2_ ); 
-          new Equality(body, var_TransmitTime, var__virtual_2_);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-  
-  private static double evaluateExpression_1_1(final Double IncomingData, final Double ScienceData, final Double TransmitRate) {
-    double _plus = DoubleExtensions.operator_plus(ScienceData, IncomingData);
-    double _divide = (_plus / (7.5 * (TransmitRate).doubleValue()));
-    return _divide;
-  }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
index 7ca948cc..40553e29 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
@@ -13,8 +13,8 @@ pattern communicationLinkDoesNotStartAtContainingElement(Link : DirectedCommunic
 
 // At least two spacecraft must have the interferometry payload configured
 
-//@Constraint(severity = "error", key = {Mission},
-//	message = "Interferometry mission needs at least two spacecraft configured with the interferometry payload.")
+@Constraint(severity = "error", key = {Mission},
+	message = "Interferometry mission needs at least two spacecraft configured with the interferometry payload.")
 pattern notEnoughInterferometryPayloads(Mission : InterferometryMission) {
 	InterferometryMission(Mission);
 	neg find atLeastTwoInterferometryPayloads(Mission);
@@ -42,6 +42,41 @@ pattern noLinkToGroundStation(Spacecraft : Spacecraft) {
 	neg find indirectCommunicationLink(Spacecraft, GroundStation);
 }
 
+@Constraint(severity = "error", key = {Spacecraft},
+	message = "Spacecraft has no potential communication path to the ground station.")
+pattern noPotentialLinkToGroundStation(Spacecraft : Spacecraft) {
+	ConstellationMission.groundStationNetwork(Mission, GroundStation);
+	ConstellationMission.spacecraft(Mission, Spacecraft);
+	neg find indirectLinkAllowed(Spacecraft, GroundStation);
+}
+
+private pattern indirectLinkAllowed(From : Spacecraft, To : CommunicatingElement) {
+	find linkAllowed+(From, To);
+}
+
+private pattern linkAllowed(From : Spacecraft, To : CommunicatingElement) {
+	find matchingAntenna(From, To, _);
+	neg find cubeSat3U(From);
+} or {
+	find matchingAntenna(From, To, TransceiverBand::UHF);
+	CubeSat3U(From);
+} or {
+	find matchingAntenna(From, To, _);
+	CubeSat3U(From);
+	GroundStationNetwork(To);
+}
+
+private pattern matchingAntenna(From : Spacecraft, To : CommunicatingElement, Band : TransceiverBand) {
+	CommunicatingElement.commSubsystem.band(From, Band);
+	CommunicatingElement.commSubsystem.band(To, Band);
+	CommunicatingElement.commSubsystem.gain(From, Gain);
+	CommunicatingElement.commSubsystem.gain(To, Gain);
+}
+
+private pattern cubeSat3U(Sat : CubeSat3U) {
+	CubeSat3U(Sat);
+}
+
 // No communication loops may exist
 // No spacecraft may directly communicate with itself
 
@@ -133,8 +168,7 @@ pattern kaAntennaGainLow(Comm : CommSubsystem) {
 
 @Constraint(severity = "error", key = {Sat},
 	message = "3U CubeSats can only cross-link using UHF.")
-pattern threeUCubeSatWithNonUhfCrossLink(Sat : Spacecraft) {
-	Spacecraft.kind(Sat, SpacecraftKind::CubeSat3U);
+pattern threeUCubeSatWithNonUhfCrossLink(Sat : CubeSat3U) {
 	CommunicatingElement.commSubsystem(Sat, SourceComm);
 	neg find commSubsystemBandUhf(SourceComm);
 	DirectedCommunicationLink.source(Link, SourceComm);
@@ -160,10 +194,23 @@ pattern cubeSatWithKaAntenna(Spacecraft : Spacecraft) {
 	neg find smallSat(Spacecraft);
 }
 
-private pattern smallSat(Sat : Spacecraft) {
-	Spacecraft.kind(Sat, SpacecraftKind::SmallSat);
+pattern smallSat(Sat : SmallSat) {
+	SmallSat(Sat);
 }
 
+@QueryBasedFeature(feature = "kind")
+pattern spacecraftOfKind(Spacecraft : Spacecraft, Kind : SpacecraftKind) {
+	CubeSat3U(Spacecraft);
+	Kind == SpacecraftKind::CubeSat3U;
+} or {
+	CubeSat6U(Spacecraft);
+	Kind == SpacecraftKind::CubeSat6U;
+} or {
+	SmallSat(Spacecraft);
+	Kind == SpacecraftKind::SmallSat;
+}
+
+/*
 //
 // Metrics
 //
@@ -262,10 +309,6 @@ private pattern spacecraftCost(Mission : InterferometryMission, Spacecraft : Spa
 	Cost == eval(BasePrice * Math.pow(KindCount, -0.25) + InterferometryPayloadCost + AdditionalCommSubsystemCost);
 }
 
-private pattern spacecraftOfKind(Spacecraft : Spacecraft, Kind : SpacecraftKind) {
-	Spacecraft.kind(Spacecraft, Kind);
-}
-
 private pattern basePrice(Spacecraft : Spacecraft, BasePrice : java Double) {
 	Spacecraft.kind(Spacecraft, SpacecraftKind::CubeSat3U);
 	BasePrice == 250000.0;
@@ -298,3 +341,4 @@ private pattern spacecraftWithTwoCommSubsystems(Spacecraft : Spacecraft) {
 	Spacecraft.commSubsystem(Spacecraft, Subsystem2);
 	Subsystem1 != Subsystem2;
 }
+*/
\ No newline at end of file
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/runner/.SatelliteGeneratorMain.xtendbin b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/runner/.SatelliteGeneratorMain.xtendbin
new file mode 100644
index 00000000..2f1887a8
Binary files /dev/null and b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/runner/.SatelliteGeneratorMain.xtendbin differ
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/runner/SatelliteGeneratorMain.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/runner/SatelliteGeneratorMain.java
new file mode 100644
index 00000000..f6890163
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/xtend-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/runner/SatelliteGeneratorMain.java
@@ -0,0 +1,15 @@
+package hu.bme.mit.inf.dslreasoner.domains.satellite.runner;
+
+import hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor;
+import org.eclipse.xtext.xbase.lib.InputOutput;
+
+@SuppressWarnings("all")
+public final class SatelliteGeneratorMain {
+  private SatelliteGeneratorMain() {
+    throw new IllegalStateException("This is a static utility class and should not be instantiated directly.");
+  }
+  
+  public static void main(final String[] args) {
+    InputOutput.<String>println(StandaloneScriptExecutor.executeScript("configs/generation.vsconfig"));
+  }
+}
-- 
cgit v1.2.3-54-g00ecf