From 3997c2408f192e22f809cd96faa5bc552530289d Mon Sep 17 00:00:00 2001
From: ArenBabikian <aren.babikian@mail.mcgill.ca>
Date: Sun, 14 Jun 2020 19:38:40 -0400
Subject: This branch is ready to be merged into master

---
 .../META-INF/MANIFEST.MF                           |   9 +-
 .../model/generated/ApplicationConfiguration.ecore |   1 +
 .../generated/ApplicationConfiguration.genmodel    |   5 +-
 .../plugin.xml_gen                                 |   2 +-
 ...tractApplicationConfigurationRuntimeModule.java |   2 +-
 .../application/ApplicationConfiguration.xtextbin  | Bin 11742 -> 11792 bytes
 ...ationConfigurationStandaloneSetupGenerated.java |   2 +-
 .../applicationConfiguration/AllPackageEntry.java  |   6 +-
 .../applicationConfiguration/AllPatternEntry.java  |   6 +-
 .../ApplicationConfigurationFactory.java           |   2 +-
 .../ApplicationConfigurationPackage.java           |   2 +-
 .../applicationConfiguration/ClassReference.java   |   6 +-
 .../applicationConfiguration/ClassTypeScope.java   |   6 +-
 .../applicationConfiguration/Command.java          |   2 +-
 .../applicationConfiguration/Config.java           |   2 +-
 .../ConfigDeclaration.java                         |   6 +-
 .../applicationConfiguration/ConfigEntry.java      |   2 +-
 .../applicationConfiguration/ConfigReference.java  |   6 +-
 .../ConfigSpecification.java                       |   6 +-
 .../ConfigurationScript.java                       |  10 +-
 .../applicationConfiguration/CustomEntry.java      |  10 +-
 .../applicationConfiguration/Declaration.java      |   6 +-
 .../DocumentLevelSpecification.java                |  17 +-
 .../DocumentationEntry.java                        |   6 +-
 .../applicationConfiguration/EPackageImport.java   |   6 +-
 .../applicationConfiguration/ExactNumber.java      |  10 +-
 .../application/applicationConfiguration/File.java |   2 +-
 .../applicationConfiguration/FileDeclaration.java  |   6 +-
 .../applicationConfiguration/FileReference.java    |   6 +-
 .../FileSpecification.java                         |   6 +-
 .../applicationConfiguration/FolderEntry.java      |   6 +-
 .../applicationConfiguration/GenerationTask.java   |  58 +--
 .../applicationConfiguration/GraphPattern.java     |   2 +-
 .../GraphPatternDeclaration.java                   |   6 +-
 .../GraphPatternReference.java                     |   6 +-
 .../applicationConfiguration/Import.java           |   2 +-
 .../applicationConfiguration/IntEnumberation.java  |   6 +-
 .../applicationConfiguration/IntegerReference.java |   2 +-
 .../applicationConfiguration/IntegerScope.java     |   2 +-
 .../applicationConfiguration/IntegerTypeScope.java |   6 +-
 .../applicationConfiguration/IntervallNumber.java  |  14 +-
 .../applicationConfiguration/MemoryEntry.java      |   6 +-
 .../applicationConfiguration/Metamodel.java        |   2 +-
 .../MetamodelDeclaration.java                      |   6 +-
 .../applicationConfiguration/MetamodelElement.java |  10 +-
 .../applicationConfiguration/MetamodelEntry.java   |   6 +-
 .../MetamodelReference.java                        |   6 +-
 .../MetamodelSpecification.java                    |   6 +-
 .../applicationConfiguration/ModelEntry.java       |   2 +-
 .../NumberSpecification.java                       |   2 +-
 .../applicationConfiguration/ObjectReference.java  |   2 +-
 .../applicationConfiguration/ObjectTypeScope.java  |   6 +-
 .../applicationConfiguration/PartialModel.java     |   2 +-
 .../PartialModelDeclaration.java                   |   6 +-
 .../PartialModelEntry.java                         |   6 +-
 .../PartialModelReference.java                     |   6 +-
 .../PartialModelSpecification.java                 |   6 +-
 .../applicationConfiguration/PatternElement.java   |   6 +-
 .../applicationConfiguration/PatternEntry.java     |   6 +-
 .../PatternSpecification.java                      |   6 +-
 .../applicationConfiguration/RealEnumeration.java  |   6 +-
 .../applicationConfiguration/RealReference.java    |   2 +-
 .../applicationConfiguration/RealScope.java        |   2 +-
 .../applicationConfiguration/RealTypeScope.java    |   6 +-
 .../applicationConfiguration/RuntimeEntry.java     |   6 +-
 .../applicationConfiguration/Scope.java            |   2 +-
 .../applicationConfiguration/ScopeDeclaration.java |   6 +-
 .../applicationConfiguration/ScopeReference.java   |   6 +-
 .../ScopeSpecification.java                        |   6 +-
 .../applicationConfiguration/Solver.java           |  42 ++-
 .../StringEnumeration.java                         |   6 +-
 .../applicationConfiguration/StringReference.java  |   2 +-
 .../applicationConfiguration/StringScope.java      |   2 +-
 .../applicationConfiguration/StringTypeScope.java  |   6 +-
 .../application/applicationConfiguration/Task.java |   2 +-
 .../applicationConfiguration/TypeReference.java    |   2 +-
 .../applicationConfiguration/TypeScope.java        |  14 +-
 .../applicationConfiguration/ViatraImport.java     |   6 +-
 .../impl/AllPackageEntryImpl.java                  |   3 +-
 .../impl/AllPatternEntryImpl.java                  |   3 +-
 .../impl/ApplicationConfigurationFactoryImpl.java  |  70 +++-
 .../impl/ApplicationConfigurationPackageImpl.java  | 147 +++++++-
 .../impl/ClassReferenceImpl.java                   |   4 +-
 .../impl/ClassTypeScopeImpl.java                   |   4 +-
 .../applicationConfiguration/impl/CommandImpl.java |   2 +-
 .../impl/ConfigDeclarationImpl.java                |   4 +-
 .../impl/ConfigEntryImpl.java                      |   2 +-
 .../applicationConfiguration/impl/ConfigImpl.java  |   2 +-
 .../impl/ConfigReferenceImpl.java                  |   4 +-
 .../impl/ConfigSpecificationImpl.java              |   3 +-
 .../impl/ConfigurationScriptImpl.java              |   4 +-
 .../impl/CustomEntryImpl.java                      |   8 +-
 .../impl/DeclarationImpl.java                      |   6 +-
 .../impl/DocumentationEntryImpl.java               |   6 +-
 .../impl/EPackageImportImpl.java                   |   4 +-
 .../impl/ExactNumberImpl.java                      |   8 +-
 .../impl/FileDeclarationImpl.java                  |   4 +-
 .../applicationConfiguration/impl/FileImpl.java    |   2 +-
 .../impl/FileReferenceImpl.java                    |   4 +-
 .../impl/FileSpecificationImpl.java                |   6 +-
 .../impl/FolderEntryImpl.java                      |   3 +-
 .../impl/GenerationTaskImpl.java                   |  32 +-
 .../impl/GraphPatternDeclarationImpl.java          |   4 +-
 .../impl/GraphPatternImpl.java                     |   2 +-
 .../impl/GraphPatternReferenceImpl.java            |   4 +-
 .../applicationConfiguration/impl/ImportImpl.java  |   2 +-
 .../impl/IntEnumberationImpl.java                  |   5 +-
 .../impl/IntegerReferenceImpl.java                 |   2 +-
 .../impl/IntegerScopeImpl.java                     |   2 +-
 .../impl/IntegerTypeScopeImpl.java                 |   4 +-
 .../impl/IntervallNumberImpl.java                  |  10 +-
 .../impl/MemoryEntryImpl.java                      |   6 +-
 .../impl/MetamodelDeclarationImpl.java             |   4 +-
 .../impl/MetamodelElementImpl.java                 |   6 +-
 .../impl/MetamodelEntryImpl.java                   |   4 +-
 .../impl/MetamodelImpl.java                        |   2 +-
 .../impl/MetamodelReferenceImpl.java               |   4 +-
 .../impl/MetamodelSpecificationImpl.java           |   3 +-
 .../impl/ModelEntryImpl.java                       |   2 +-
 .../impl/NumberSpecificationImpl.java              |   2 +-
 .../impl/ObjectReferenceImpl.java                  |   2 +-
 .../impl/ObjectTypeScopeImpl.java                  |   4 +-
 .../impl/PartialModelDeclarationImpl.java          |   4 +-
 .../impl/PartialModelEntryImpl.java                |   4 +-
 .../impl/PartialModelImpl.java                     |   2 +-
 .../impl/PartialModelReferenceImpl.java            |   4 +-
 .../impl/PartialModelSpecificationImpl.java        |   3 +-
 .../impl/PatternElementImpl.java                   |   4 +-
 .../impl/PatternEntryImpl.java                     |   4 +-
 .../impl/PatternSpecificationImpl.java             |   3 +-
 .../impl/RealEnumerationImpl.java                  |   5 +-
 .../impl/RealReferenceImpl.java                    |   2 +-
 .../impl/RealScopeImpl.java                        |   2 +-
 .../impl/RealTypeScopeImpl.java                    |   4 +-
 .../impl/RuntimeEntryImpl.java                     |   6 +-
 .../impl/ScopeDeclarationImpl.java                 |   4 +-
 .../applicationConfiguration/impl/ScopeImpl.java   |   2 +-
 .../impl/ScopeReferenceImpl.java                   |   4 +-
 .../impl/ScopeSpecificationImpl.java               |   3 +-
 .../impl/StringEnumerationImpl.java                |   5 +-
 .../impl/StringReferenceImpl.java                  |   2 +-
 .../impl/StringScopeImpl.java                      |   2 +-
 .../impl/StringTypeScopeImpl.java                  |   4 +-
 .../applicationConfiguration/impl/TaskImpl.java    |   2 +-
 .../impl/TypeReferenceImpl.java                    |   2 +-
 .../impl/TypeScopeImpl.java                        |  10 +-
 .../impl/ViatraImportImpl.java                     |   4 +-
 .../ApplicationConfigurationAdapterFactory.java    |   2 +-
 .../util/ApplicationConfigurationSwitch.java       |   2 +-
 ...icationConfigurationAntlrTokenFileProvider.java |   2 +-
 .../antlr/ApplicationConfigurationParser.java      |   2 +-
 .../internal/InternalApplicationConfiguration.g    |  10 +-
 .../InternalApplicationConfiguration.tokens        |   2 +
 .../InternalApplicationConfigurationLexer.java     | 418 ++++++++++++---------
 .../InternalApplicationConfigurationParser.java    |  38 +-
 ...tractApplicationConfigurationScopeProvider.java |   2 +-
 .../ApplicationConfigurationSemanticSequencer.java |   2 +-
 ...ApplicationConfigurationSyntacticSequencer.java |   2 +-
 .../ApplicationConfigurationGrammarAccess.java     |  42 ++-
 .../AbstractApplicationConfigurationValidator.java |   3 +-
 .../application/ApplicationConfiguration.xtext     |   8 +-
 .../application/execution/SolverLoader.xtend       | 143 ++++---
 .../validation/QueryAndMetamodelValidator.java     |  89 -----
 163 files changed, 920 insertions(+), 837 deletions(-)

(limited to 'Application/hu.bme.mit.inf.dslreasoner.application')

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/META-INF/MANIFEST.MF b/Application/hu.bme.mit.inf.dslreasoner.application/META-INF/MANIFEST.MF
index 44b8c453..eb929f2e 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/META-INF/MANIFEST.MF
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/META-INF/MANIFEST.MF
@@ -9,11 +9,11 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.xbase,
  org.eclipse.equinox.common;bundle-version="3.5.0",
  org.eclipse.emf.ecore,
- org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
  org.eclipse.xtext.util,
- org.eclipse.xtend.lib,
+ org.eclipse.xtend.lib;bundle-version="2.14.0",
  org.eclipse.emf.common,
- org.antlr.runtime,
+ org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
  hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",
  hu.bme.mit.inf.dslreasoner.smt.reasoner;bundle-version="1.0.0",
@@ -38,7 +38,8 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.ui.ide,
  org.eclipse.text,
- org.eclipse.collections;bundle-version="9.2.0"
+ org.eclipse.collections;bundle-version="9.2.0",
+ ca.mcgill.ecse.dslreasoner.vampire.reasoner;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: hu.bme.mit.inf.dslreasoner.application,
  hu.bme.mit.inf.dslreasoner.application.applicationConfiguration,
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore
index 6b321279..f6425407 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.ecore
@@ -130,6 +130,7 @@
     <eLiterals name="SMTSolver" literal="SMTSolver"/>
     <eLiterals name="AlloySolver" value="1" literal="AlloySolver"/>
     <eLiterals name="ViatraSolver" value="2" literal="ViatraSolver"/>
+    <eLiterals name="TPTPSolver" value="3" literal="TPTPSolver"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ScopeSpecification" eSuperTypes="#//Scope">
     <eStructuralFeatures xsi:type="ecore:EReference" name="scopes" upperBound="-1"
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel
index fd7f0686..93500b66 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/model/generated/ApplicationConfiguration.genmodel
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.12.0" modelDirectory="/hu.bme.mit.inf.dslreasoner.application/src-gen"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.21.0" modelDirectory="/hu.bme.mit.inf.dslreasoner.application/src-gen"
     modelPluginID="hu.bme.mit.inf.dslreasoner.application" forceOverwrite="true" modelName="ApplicationConfiguration"
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.13" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.viatra.query.patternlanguage.emf/model/PatternLanguage.genmodel#//vql">
+    complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.viatra.query.patternlanguage.emf/model/PatternLanguage.genmodel#//vql">
   <genPackages prefix="ApplicationConfiguration" basePackage="hu.bme.mit.inf.dslreasoner.application"
       disposableProviderFactory="true" fileExtensions="vsconfig" ecorePackage="ApplicationConfiguration.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="ApplicationConfiguration.ecore#//DocumentLevelSpecification">
@@ -15,6 +15,7 @@
       <genEnumLiterals ecoreEnumLiteral="ApplicationConfiguration.ecore#//Solver/SMTSolver"/>
       <genEnumLiterals ecoreEnumLiteral="ApplicationConfiguration.ecore#//Solver/AlloySolver"/>
       <genEnumLiterals ecoreEnumLiteral="ApplicationConfiguration.ecore#//Solver/ViatraSolver"/>
+      <genEnumLiterals ecoreEnumLiteral="ApplicationConfiguration.ecore#//Solver/TPTPSolver"/>
     </genEnums>
     <genClasses ecoreClass="ApplicationConfiguration.ecore#//ConfigurationScript">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference ApplicationConfiguration.ecore#//ConfigurationScript/imports"/>
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/plugin.xml_gen b/Application/hu.bme.mit.inf.dslreasoner.application/plugin.xml_gen
index 956abc6e..4d80aa1f 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/plugin.xml_gen
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/plugin.xml_gen
@@ -2,7 +2,7 @@
 <?eclipse version="3.0"?>
 <plugin>
 	<extension point="org.eclipse.emf.ecore.generated_package">
-		<package 
+		<package
 			uri = "http://www.bme.hu/mit/inf/dslreasoner/application/ApplicationConfiguration"
 			class = "hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage"
 			genModel = "model/generated/ApplicationConfiguration.genmodel" />
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/AbstractApplicationConfigurationRuntimeModule.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/AbstractApplicationConfigurationRuntimeModule.java
index 0a62d0b2..dfa6c5ca 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/AbstractApplicationConfigurationRuntimeModule.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/AbstractApplicationConfigurationRuntimeModule.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtextbin b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtextbin
index e1f09380..512d938a 100644
Binary files a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtextbin and b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtextbin differ
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/ApplicationConfigurationStandaloneSetupGenerated.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/ApplicationConfigurationStandaloneSetupGenerated.java
index 30f88a59..bfb49405 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/ApplicationConfigurationStandaloneSetupGenerated.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/ApplicationConfigurationStandaloneSetupGenerated.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/AllPackageEntry.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/AllPackageEntry.java
index 722084c8..2a0150d0 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/AllPackageEntry.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/AllPackageEntry.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -27,10 +27,6 @@ public interface AllPackageEntry extends MetamodelEntry
    * Returns the value of the '<em><b>Exclusion</b></em>' containment reference list.
    * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.MetamodelElement}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Exclusion</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>Exclusion</em>' containment reference list.
    * @see hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage#getAllPackageEntry_Exclusion()
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/AllPatternEntry.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/AllPatternEntry.java
index ad3e9885..2a0705c5 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/AllPatternEntry.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/AllPatternEntry.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -27,10 +27,6 @@ public interface AllPatternEntry extends PatternEntry
    * Returns the value of the '<em><b>Exclusuion</b></em>' containment reference list.
    * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.PatternElement}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Exclusuion</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>Exclusuion</em>' containment reference list.
    * @see hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage#getAllPatternEntry_Exclusuion()
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ApplicationConfigurationFactory.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ApplicationConfigurationFactory.java
index 0e44eb6f..db869ca3 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ApplicationConfigurationFactory.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ApplicationConfigurationFactory.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ApplicationConfigurationPackage.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ApplicationConfigurationPackage.java
index 794f56e5..e2499b2d 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ApplicationConfigurationPackage.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ApplicationConfigurationPackage.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ClassReference.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ClassReference.java
index 7cfd12b8..63c175d1 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ClassReference.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ClassReference.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface ClassReference extends TypeReference
   /**
    * Returns the value of the '<em><b>Element</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Element</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>Element</em>' containment reference.
    * @see #setElement(MetamodelElement)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ClassTypeScope.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ClassTypeScope.java
index 41f19765..43c3f992 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ClassTypeScope.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ClassTypeScope.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface ClassTypeScope extends TypeScope
   /**
    * Returns the value of the '<em><b>Type</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type</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>Type</em>' containment reference.
    * @see #setType(ClassReference)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Command.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Command.java
index ada3e7e1..4d6dbba7 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Command.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Command.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Config.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Config.java
index 0572c941..7e7b51c5 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Config.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Config.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigDeclaration.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigDeclaration.java
index 740b98b9..8c0b116c 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigDeclaration.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigDeclaration.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface ConfigDeclaration extends Declaration
   /**
    * Returns the value of the '<em><b>Specification</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Specification</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>Specification</em>' containment reference.
    * @see #setSpecification(ConfigSpecification)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigEntry.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigEntry.java
index cd9cba69..60836e70 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigEntry.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigEntry.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigReference.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigReference.java
index f8cb9d6e..5c451da0 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigReference.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigReference.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface ConfigReference extends Config
   /**
    * Returns the value of the '<em><b>Config</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Config</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Config</em>' reference.
    * @see #setConfig(ConfigDeclaration)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigSpecification.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigSpecification.java
index 93a884bb..2ed3d4d5 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigSpecification.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigSpecification.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -27,10 +27,6 @@ public interface ConfigSpecification extends Config
    * Returns the value of the '<em><b>Entries</b></em>' containment reference list.
    * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ConfigEntry}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Entries</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>Entries</em>' containment reference list.
    * @see hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage#getConfigSpecification_Entries()
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigurationScript.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigurationScript.java
index 2f012f3e..1de83663 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigurationScript.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ConfigurationScript.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -30,10 +30,6 @@ public interface ConfigurationScript extends EObject
    * Returns the value of the '<em><b>Imports</b></em>' containment reference list.
    * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.Import}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Imports</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>Imports</em>' containment reference list.
    * @see hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage#getConfigurationScript_Imports()
@@ -46,10 +42,6 @@ public interface ConfigurationScript extends EObject
    * Returns the value of the '<em><b>Commands</b></em>' containment reference list.
    * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.Command}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Commands</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>Commands</em>' containment reference list.
    * @see hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage#getConfigurationScript_Commands()
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/CustomEntry.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/CustomEntry.java
index 0971e99d..252ad893 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/CustomEntry.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/CustomEntry.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -26,10 +26,6 @@ public interface CustomEntry extends ConfigEntry
   /**
    * Returns the value of the '<em><b>Key</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Key</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Key</em>' attribute.
    * @see #setKey(String)
@@ -52,10 +48,6 @@ public interface CustomEntry extends ConfigEntry
   /**
    * Returns the value of the '<em><b>Value</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Value</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Value</em>' attribute.
    * @see #setValue(String)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Declaration.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Declaration.java
index 5249b5e9..69ba9dca 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Declaration.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Declaration.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface Declaration extends Command
   /**
    * Returns the value of the '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/DocumentLevelSpecification.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/DocumentLevelSpecification.java
index 7629d759..92ac2024 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/DocumentLevelSpecification.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/DocumentLevelSpecification.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -53,10 +53,6 @@ public enum DocumentLevelSpecification implements Enumerator
   /**
    * The '<em><b>None</b></em>' literal value.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>None</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @see #NONE
    * @model name="none"
@@ -68,10 +64,6 @@ public enum DocumentLevelSpecification implements Enumerator
   /**
    * The '<em><b>Normal</b></em>' literal value.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>Normal</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @see #NORMAL
    * @model name="normal"
@@ -83,10 +75,6 @@ public enum DocumentLevelSpecification implements Enumerator
   /**
    * The '<em><b>Full</b></em>' literal value.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>Full</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @see #FULL
    * @model name="full"
@@ -217,6 +205,7 @@ public enum DocumentLevelSpecification implements Enumerator
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public int getValue()
   {
     return value;
@@ -227,6 +216,7 @@ public enum DocumentLevelSpecification implements Enumerator
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -237,6 +227,7 @@ public enum DocumentLevelSpecification implements Enumerator
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getLiteral()
   {
     return literal;
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/DocumentationEntry.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/DocumentationEntry.java
index 64032306..23d5c54d 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/DocumentationEntry.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/DocumentationEntry.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -26,10 +26,6 @@ public interface DocumentationEntry extends ConfigEntry
    * Returns the value of the '<em><b>Level</b></em>' attribute.
    * The literals are from the enumeration {@link hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.DocumentLevelSpecification}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Level</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Level</em>' attribute.
    * @see hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.DocumentLevelSpecification
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/EPackageImport.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/EPackageImport.java
index f73e0bcd..ec1f6549 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/EPackageImport.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/EPackageImport.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -26,10 +26,6 @@ public interface EPackageImport extends Import
   /**
    * Returns the value of the '<em><b>Imported Package</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Imported Package</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Imported Package</em>' reference.
    * @see #setImportedPackage(EPackage)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ExactNumber.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ExactNumber.java
index c72580e5..03189fb7 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ExactNumber.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ExactNumber.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -26,10 +26,6 @@ public interface ExactNumber extends NumberSpecification
   /**
    * Returns the value of the '<em><b>Exact Number</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Exact Number</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Exact Number</em>' attribute.
    * @see #setExactNumber(int)
@@ -52,10 +48,6 @@ public interface ExactNumber extends NumberSpecification
   /**
    * Returns the value of the '<em><b>Exact Unlimited</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Exact Unlimited</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Exact Unlimited</em>' attribute.
    * @see #setExactUnlimited(boolean)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/File.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/File.java
index 4dd48918..61f79cb3 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/File.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/File.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FileDeclaration.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FileDeclaration.java
index de7ee62e..144bb95b 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FileDeclaration.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FileDeclaration.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface FileDeclaration extends Declaration
   /**
    * Returns the value of the '<em><b>Specification</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Specification</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>Specification</em>' containment reference.
    * @see #setSpecification(FileSpecification)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FileReference.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FileReference.java
index fc3f3762..81a1d769 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FileReference.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FileReference.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface FileReference extends File
   /**
    * Returns the value of the '<em><b>Referred</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Referred</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Referred</em>' reference.
    * @see #setReferred(FileDeclaration)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FileSpecification.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FileSpecification.java
index 1b2a09a2..1001cb7d 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FileSpecification.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FileSpecification.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface FileSpecification extends File
   /**
    * Returns the value of the '<em><b>Path</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Path</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Path</em>' attribute.
    * @see #setPath(String)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FolderEntry.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FolderEntry.java
index 05c8ceb9..d4e25f0f 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FolderEntry.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/FolderEntry.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -27,10 +27,6 @@ public interface FolderEntry extends PartialModelEntry
    * Returns the value of the '<em><b>Exclusion</b></em>' containment reference list.
    * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ModelEntry}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Exclusion</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>Exclusion</em>' containment reference list.
    * @see hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage#getFolderEntry_Exclusion()
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GenerationTask.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GenerationTask.java
index 83ee824d..fcfacbf2 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GenerationTask.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GenerationTask.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -38,10 +38,6 @@ public interface GenerationTask extends Task
   /**
    * Returns the value of the '<em><b>Metamodel</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Metamodel</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>Metamodel</em>' containment reference.
    * @see #setMetamodel(Metamodel)
@@ -64,10 +60,6 @@ public interface GenerationTask extends Task
   /**
    * Returns the value of the '<em><b>Partial Model</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Partial Model</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>Partial Model</em>' containment reference.
    * @see #setPartialModel(PartialModel)
@@ -90,10 +82,6 @@ public interface GenerationTask extends Task
   /**
    * Returns the value of the '<em><b>Patterns</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Patterns</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>Patterns</em>' containment reference.
    * @see #setPatterns(GraphPattern)
@@ -116,10 +104,6 @@ public interface GenerationTask extends Task
   /**
    * Returns the value of the '<em><b>Scope</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Scope</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>Scope</em>' containment reference.
    * @see #setScope(Scope)
@@ -142,10 +126,6 @@ public interface GenerationTask extends Task
   /**
    * Returns the value of the '<em><b>Number Specified</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Number Specified</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Number Specified</em>' attribute.
    * @see #setNumberSpecified(boolean)
@@ -168,10 +148,6 @@ public interface GenerationTask extends Task
   /**
    * Returns the value of the '<em><b>Number</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Number</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Number</em>' attribute.
    * @see #setNumber(int)
@@ -194,10 +170,6 @@ public interface GenerationTask extends Task
   /**
    * Returns the value of the '<em><b>Run Specified</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Run Specified</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Run Specified</em>' attribute.
    * @see #setRunSpecified(boolean)
@@ -220,10 +192,6 @@ public interface GenerationTask extends Task
   /**
    * Returns the value of the '<em><b>Runs</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Runs</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Runs</em>' attribute.
    * @see #setRuns(int)
@@ -247,10 +215,6 @@ public interface GenerationTask extends Task
    * Returns the value of the '<em><b>Solver</b></em>' attribute.
    * The literals are from the enumeration {@link hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.Solver}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Solver</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Solver</em>' attribute.
    * @see hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.Solver
@@ -275,10 +239,6 @@ public interface GenerationTask extends Task
   /**
    * Returns the value of the '<em><b>Config</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Config</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>Config</em>' containment reference.
    * @see #setConfig(Config)
@@ -301,10 +261,6 @@ public interface GenerationTask extends Task
   /**
    * Returns the value of the '<em><b>Debug Folder</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Debug Folder</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>Debug Folder</em>' containment reference.
    * @see #setDebugFolder(File)
@@ -327,10 +283,6 @@ public interface GenerationTask extends Task
   /**
    * Returns the value of the '<em><b>Target Log File</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Target Log File</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>Target Log File</em>' containment reference.
    * @see #setTargetLogFile(File)
@@ -353,10 +305,6 @@ public interface GenerationTask extends Task
   /**
    * Returns the value of the '<em><b>Target Statistics File</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Target Statistics File</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>Target Statistics File</em>' containment reference.
    * @see #setTargetStatisticsFile(File)
@@ -379,10 +327,6 @@ public interface GenerationTask extends Task
   /**
    * Returns the value of the '<em><b>Taget Folder</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Taget Folder</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>Taget Folder</em>' containment reference.
    * @see #setTagetFolder(File)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GraphPattern.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GraphPattern.java
index 99d187ea..36b321ca 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GraphPattern.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GraphPattern.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GraphPatternDeclaration.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GraphPatternDeclaration.java
index be0b962d..a218994a 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GraphPatternDeclaration.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GraphPatternDeclaration.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface GraphPatternDeclaration extends Declaration
   /**
    * Returns the value of the '<em><b>Specification</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Specification</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>Specification</em>' containment reference.
    * @see #setSpecification(PatternSpecification)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GraphPatternReference.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GraphPatternReference.java
index 20a32a3a..2fc43c5e 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GraphPatternReference.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/GraphPatternReference.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface GraphPatternReference extends GraphPattern
   /**
    * Returns the value of the '<em><b>Referred</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Referred</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Referred</em>' reference.
    * @see #setReferred(GraphPatternDeclaration)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Import.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Import.java
index 90f27659..ac14c357 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Import.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Import.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntEnumberation.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntEnumberation.java
index 3fffae8e..5ab1c846 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntEnumberation.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntEnumberation.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -27,10 +27,6 @@ public interface IntEnumberation extends NumberSpecification
    * Returns the value of the '<em><b>Entry</b></em>' attribute list.
    * The list contents are of type {@link java.lang.Integer}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Entry</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Entry</em>' attribute list.
    * @see hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage#getIntEnumberation_Entry()
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntegerReference.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntegerReference.java
index 9257cdb9..20cccf50 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntegerReference.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntegerReference.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntegerScope.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntegerScope.java
index 8d5752cb..8277c6c5 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntegerScope.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntegerScope.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntegerTypeScope.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntegerTypeScope.java
index 8b8fc2dd..5ad01666 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntegerTypeScope.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntegerTypeScope.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface IntegerTypeScope extends TypeScope
   /**
    * Returns the value of the '<em><b>Type</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type</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>Type</em>' containment reference.
    * @see #setType(IntegerReference)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntervallNumber.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntervallNumber.java
index 33a1f773..9153b0b8 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntervallNumber.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/IntervallNumber.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -27,10 +27,6 @@ public interface IntervallNumber extends NumberSpecification
   /**
    * Returns the value of the '<em><b>Min</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Min</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Min</em>' attribute.
    * @see #setMin(int)
@@ -53,10 +49,6 @@ public interface IntervallNumber extends NumberSpecification
   /**
    * Returns the value of the '<em><b>Max Number</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Max Number</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Max Number</em>' attribute.
    * @see #setMaxNumber(int)
@@ -79,10 +71,6 @@ public interface IntervallNumber extends NumberSpecification
   /**
    * Returns the value of the '<em><b>Max Unlimited</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Max Unlimited</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Max Unlimited</em>' attribute.
    * @see #setMaxUnlimited(boolean)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MemoryEntry.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MemoryEntry.java
index e370d6b6..ff783a3d 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MemoryEntry.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MemoryEntry.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface MemoryEntry extends ConfigEntry
   /**
    * Returns the value of the '<em><b>Megabyte Limit</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Megabyte Limit</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Megabyte Limit</em>' attribute.
    * @see #setMegabyteLimit(int)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Metamodel.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Metamodel.java
index 76f35449..a48f56af 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Metamodel.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Metamodel.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelDeclaration.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelDeclaration.java
index c6c22075..fb64b72d 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelDeclaration.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelDeclaration.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface MetamodelDeclaration extends Declaration
   /**
    * Returns the value of the '<em><b>Specification</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Specification</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>Specification</em>' containment reference.
    * @see #setSpecification(MetamodelSpecification)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelElement.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelElement.java
index 41cf4f2d..2d70ca30 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelElement.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelElement.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -28,10 +28,6 @@ public interface MetamodelElement extends MetamodelEntry
   /**
    * Returns the value of the '<em><b>Classifier</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Classifier</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Classifier</em>' reference.
    * @see #setClassifier(EClassifier)
@@ -54,10 +50,6 @@ public interface MetamodelElement extends MetamodelEntry
   /**
    * Returns the value of the '<em><b>Feature</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Feature</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Feature</em>' reference.
    * @see #setFeature(ENamedElement)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelEntry.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelEntry.java
index 59e3f4e0..1c402075 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelEntry.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelEntry.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -27,10 +27,6 @@ public interface MetamodelEntry extends EObject
   /**
    * Returns the value of the '<em><b>Package</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Package</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Package</em>' reference.
    * @see #setPackage(EPackage)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelReference.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelReference.java
index c9e7e443..ba32d7f6 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelReference.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelReference.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface MetamodelReference extends Metamodel
   /**
    * Returns the value of the '<em><b>Referred</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Referred</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Referred</em>' reference.
    * @see #setReferred(MetamodelDeclaration)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelSpecification.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelSpecification.java
index 250db1eb..b9e3ea46 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelSpecification.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/MetamodelSpecification.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -27,10 +27,6 @@ public interface MetamodelSpecification extends Metamodel
    * Returns the value of the '<em><b>Entries</b></em>' containment reference list.
    * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.MetamodelEntry}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Entries</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>Entries</em>' containment reference list.
    * @see hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage#getMetamodelSpecification_Entries()
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ModelEntry.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ModelEntry.java
index 1a1fc229..b4999132 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ModelEntry.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ModelEntry.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/NumberSpecification.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/NumberSpecification.java
index bf6ebbb0..7d56fe0f 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/NumberSpecification.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/NumberSpecification.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ObjectReference.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ObjectReference.java
index 0e4f4491..7d79822e 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ObjectReference.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ObjectReference.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ObjectTypeScope.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ObjectTypeScope.java
index d65c42cd..a24d0470 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ObjectTypeScope.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ObjectTypeScope.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface ObjectTypeScope extends TypeScope
   /**
    * Returns the value of the '<em><b>Type</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type</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>Type</em>' containment reference.
    * @see #setType(ObjectReference)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModel.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModel.java
index 786371d4..e96f4d4b 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModel.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModel.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelDeclaration.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelDeclaration.java
index c98183d5..31895987 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelDeclaration.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelDeclaration.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface PartialModelDeclaration extends Declaration
   /**
    * Returns the value of the '<em><b>Specification</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Specification</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>Specification</em>' containment reference.
    * @see #setSpecification(PartialModelSpecification)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelEntry.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelEntry.java
index 09bc0898..afe39a3d 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelEntry.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelEntry.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -26,10 +26,6 @@ public interface PartialModelEntry extends EObject
   /**
    * Returns the value of the '<em><b>Path</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Path</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>Path</em>' containment reference.
    * @see #setPath(File)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelReference.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelReference.java
index b871e0a5..b4a601b2 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelReference.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelReference.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface PartialModelReference extends PartialModel
   /**
    * Returns the value of the '<em><b>Referred</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Referred</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Referred</em>' reference.
    * @see #setReferred(PartialModelDeclaration)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelSpecification.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelSpecification.java
index c9668aab..21894184 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelSpecification.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PartialModelSpecification.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -27,10 +27,6 @@ public interface PartialModelSpecification extends PartialModel
    * Returns the value of the '<em><b>Entry</b></em>' containment reference list.
    * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.PartialModelEntry}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Entry</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>Entry</em>' containment reference list.
    * @see hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage#getPartialModelSpecification_Entry()
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PatternElement.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PatternElement.java
index 11e7de2e..78528902 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PatternElement.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PatternElement.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -26,10 +26,6 @@ public interface PatternElement extends PatternEntry
   /**
    * Returns the value of the '<em><b>Pattern</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Pattern</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Pattern</em>' reference.
    * @see #setPattern(Pattern)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PatternEntry.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PatternEntry.java
index 2d7a21c9..8ebaf4e7 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PatternEntry.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PatternEntry.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -28,10 +28,6 @@ public interface PatternEntry extends EObject
   /**
    * Returns the value of the '<em><b>Package</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Package</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Package</em>' reference.
    * @see #setPackage(PatternModel)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PatternSpecification.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PatternSpecification.java
index 00b9b47a..f05b782d 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PatternSpecification.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/PatternSpecification.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -27,10 +27,6 @@ public interface PatternSpecification extends GraphPattern
    * Returns the value of the '<em><b>Entries</b></em>' containment reference list.
    * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.PatternEntry}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Entries</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>Entries</em>' containment reference list.
    * @see hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage#getPatternSpecification_Entries()
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealEnumeration.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealEnumeration.java
index 1ddc0f67..f2ffe1a0 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealEnumeration.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealEnumeration.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -29,10 +29,6 @@ public interface RealEnumeration extends NumberSpecification
    * Returns the value of the '<em><b>Entry</b></em>' attribute list.
    * The list contents are of type {@link java.math.BigDecimal}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Entry</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Entry</em>' attribute list.
    * @see hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage#getRealEnumeration_Entry()
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealReference.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealReference.java
index 2faf2670..194fa82b 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealReference.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealReference.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealScope.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealScope.java
index 002954b7..a7450638 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealScope.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealScope.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealTypeScope.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealTypeScope.java
index 240f129c..db7d9096 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealTypeScope.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RealTypeScope.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface RealTypeScope extends TypeScope
   /**
    * Returns the value of the '<em><b>Type</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type</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>Type</em>' containment reference.
    * @see #setType(RealReference)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RuntimeEntry.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RuntimeEntry.java
index 8c6a7076..00833c19 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RuntimeEntry.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/RuntimeEntry.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface RuntimeEntry extends ConfigEntry
   /**
    * Returns the value of the '<em><b>Millisec Limit</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Millisec Limit</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Millisec Limit</em>' attribute.
    * @see #setMillisecLimit(int)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Scope.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Scope.java
index 8d21f69b..15c2fa81 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Scope.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Scope.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ScopeDeclaration.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ScopeDeclaration.java
index 6928c79f..e54f73d8 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ScopeDeclaration.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ScopeDeclaration.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface ScopeDeclaration extends Declaration
   /**
    * Returns the value of the '<em><b>Specification</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Specification</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>Specification</em>' containment reference.
    * @see #setSpecification(ScopeSpecification)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ScopeReference.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ScopeReference.java
index a1e14540..329fb726 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ScopeReference.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ScopeReference.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface ScopeReference extends Scope
   /**
    * Returns the value of the '<em><b>Referred</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Referred</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Referred</em>' reference.
    * @see #setReferred(ScopeDeclaration)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ScopeSpecification.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ScopeSpecification.java
index 101a2151..82e3c33d 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ScopeSpecification.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ScopeSpecification.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -27,10 +27,6 @@ public interface ScopeSpecification extends Scope
    * Returns the value of the '<em><b>Scopes</b></em>' containment reference list.
    * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.TypeScope}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Scopes</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>Scopes</em>' containment reference list.
    * @see hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage#getScopeSpecification_Scopes()
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Solver.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Solver.java
index e2750467..3830e0eb 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Solver.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Solver.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -48,15 +48,21 @@ public enum Solver implements Enumerator
    * @generated
    * @ordered
    */
-  VIATRA_SOLVER(2, "ViatraSolver", "ViatraSolver");
+  VIATRA_SOLVER(2, "ViatraSolver", "ViatraSolver"),
+
+  /**
+   * The '<em><b>TPTP Solver</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #TPTP_SOLVER_VALUE
+   * @generated
+   * @ordered
+   */
+  TPTP_SOLVER(3, "TPTPSolver", "TPTPSolver");
 
   /**
    * The '<em><b>SMT Solver</b></em>' literal value.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>SMT Solver</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @see #SMT_SOLVER
    * @model name="SMTSolver"
@@ -68,10 +74,6 @@ public enum Solver implements Enumerator
   /**
    * The '<em><b>Alloy Solver</b></em>' literal value.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>Alloy Solver</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @see #ALLOY_SOLVER
    * @model name="AlloySolver"
@@ -83,10 +85,6 @@ public enum Solver implements Enumerator
   /**
    * The '<em><b>Viatra Solver</b></em>' literal value.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of '<em><b>Viatra Solver</b></em>' literal object isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @see #VIATRA_SOLVER
    * @model name="ViatraSolver"
@@ -95,6 +93,17 @@ public enum Solver implements Enumerator
    */
   public static final int VIATRA_SOLVER_VALUE = 2;
 
+  /**
+   * The '<em><b>TPTP Solver</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #TPTP_SOLVER
+   * @model name="TPTPSolver"
+   * @generated
+   * @ordered
+   */
+  public static final int TPTP_SOLVER_VALUE = 3;
+
   /**
    * An array of all the '<em><b>Solver</b></em>' enumerators.
    * <!-- begin-user-doc -->
@@ -107,6 +116,7 @@ public enum Solver implements Enumerator
       SMT_SOLVER,
       ALLOY_SOLVER,
       VIATRA_SOLVER,
+      TPTP_SOLVER,
     };
 
   /**
@@ -174,6 +184,7 @@ public enum Solver implements Enumerator
       case SMT_SOLVER_VALUE: return SMT_SOLVER;
       case ALLOY_SOLVER_VALUE: return ALLOY_SOLVER;
       case VIATRA_SOLVER_VALUE: return VIATRA_SOLVER;
+      case TPTP_SOLVER_VALUE: return TPTP_SOLVER;
     }
     return null;
   }
@@ -217,6 +228,7 @@ public enum Solver implements Enumerator
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public int getValue()
   {
     return value;
@@ -227,6 +239,7 @@ public enum Solver implements Enumerator
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -237,6 +250,7 @@ public enum Solver implements Enumerator
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getLiteral()
   {
     return literal;
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringEnumeration.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringEnumeration.java
index f075cc55..e9714505 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringEnumeration.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringEnumeration.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -27,10 +27,6 @@ public interface StringEnumeration extends NumberSpecification
    * Returns the value of the '<em><b>Entry</b></em>' attribute list.
    * The list contents are of type {@link java.lang.String}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Entry</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Entry</em>' attribute list.
    * @see hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage#getStringEnumeration_Entry()
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringReference.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringReference.java
index de11d574..06dedb53 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringReference.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringReference.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringScope.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringScope.java
index 4ee46273..3a274bde 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringScope.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringScope.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringTypeScope.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringTypeScope.java
index 4aa21667..9511ce03 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringTypeScope.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/StringTypeScope.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -25,10 +25,6 @@ public interface StringTypeScope extends TypeScope
   /**
    * Returns the value of the '<em><b>Type</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type</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>Type</em>' containment reference.
    * @see #setType(StringReference)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Task.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Task.java
index 633c7dea..bd045a7d 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Task.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/Task.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/TypeReference.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/TypeReference.java
index ca108001..794c255c 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/TypeReference.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/TypeReference.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/TypeScope.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/TypeScope.java
index 914aecae..0100b7cb 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/TypeScope.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/TypeScope.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -28,10 +28,6 @@ public interface TypeScope extends EObject
   /**
    * Returns the value of the '<em><b>Sets New</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Sets New</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Sets New</em>' attribute.
    * @see #setSetsNew(boolean)
@@ -54,10 +50,6 @@ public interface TypeScope extends EObject
   /**
    * Returns the value of the '<em><b>Sets Sum</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Sets Sum</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Sets Sum</em>' attribute.
    * @see #setSetsSum(boolean)
@@ -80,10 +72,6 @@ public interface TypeScope extends EObject
   /**
    * Returns the value of the '<em><b>Number</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Number</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>Number</em>' containment reference.
    * @see #setNumber(NumberSpecification)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ViatraImport.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ViatraImport.java
index c421cb08..3033557e 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ViatraImport.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/ViatraImport.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration;
 
@@ -26,10 +26,6 @@ public interface ViatraImport extends Import
   /**
    * Returns the value of the '<em><b>Imported Viatra</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Imported Viatra</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Imported Viatra</em>' reference.
    * @see #setImportedViatra(PatternModel)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/AllPackageEntryImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/AllPackageEntryImpl.java
index c69a5c6e..f7f8dd05 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/AllPackageEntryImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/AllPackageEntryImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -70,6 +70,7 @@ public class AllPackageEntryImpl extends MetamodelEntryImpl implements AllPackag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<MetamodelElement> getExclusion()
   {
     if (exclusion == null)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/AllPatternEntryImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/AllPatternEntryImpl.java
index 1418bad4..9c26d9c3 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/AllPatternEntryImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/AllPatternEntryImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -70,6 +70,7 @@ public class AllPatternEntryImpl extends PatternEntryImpl implements AllPatternE
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<PatternElement> getExclusuion()
   {
     if (exclusuion == null)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ApplicationConfigurationFactoryImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ApplicationConfigurationFactoryImpl.java
index 7f485ec5..9e1b5e40 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ApplicationConfigurationFactoryImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ApplicationConfigurationFactoryImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -181,6 +181,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ConfigurationScript createConfigurationScript()
   {
     ConfigurationScriptImpl configurationScript = new ConfigurationScriptImpl();
@@ -192,6 +193,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Command createCommand()
   {
     CommandImpl command = new CommandImpl();
@@ -203,6 +205,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Import createImport()
   {
     ImportImpl import_ = new ImportImpl();
@@ -214,6 +217,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EPackageImport createEPackageImport()
   {
     EPackageImportImpl ePackageImport = new EPackageImportImpl();
@@ -225,6 +229,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ViatraImport createViatraImport()
   {
     ViatraImportImpl viatraImport = new ViatraImportImpl();
@@ -236,6 +241,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Declaration createDeclaration()
   {
     DeclarationImpl declaration = new DeclarationImpl();
@@ -247,6 +253,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public FileSpecification createFileSpecification()
   {
     FileSpecificationImpl fileSpecification = new FileSpecificationImpl();
@@ -258,6 +265,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public FileDeclaration createFileDeclaration()
   {
     FileDeclarationImpl fileDeclaration = new FileDeclarationImpl();
@@ -269,6 +277,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public FileReference createFileReference()
   {
     FileReferenceImpl fileReference = new FileReferenceImpl();
@@ -280,6 +289,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public File createFile()
   {
     FileImpl file = new FileImpl();
@@ -291,6 +301,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MetamodelSpecification createMetamodelSpecification()
   {
     MetamodelSpecificationImpl metamodelSpecification = new MetamodelSpecificationImpl();
@@ -302,6 +313,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MetamodelEntry createMetamodelEntry()
   {
     MetamodelEntryImpl metamodelEntry = new MetamodelEntryImpl();
@@ -313,6 +325,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public AllPackageEntry createAllPackageEntry()
   {
     AllPackageEntryImpl allPackageEntry = new AllPackageEntryImpl();
@@ -324,6 +337,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MetamodelElement createMetamodelElement()
   {
     MetamodelElementImpl metamodelElement = new MetamodelElementImpl();
@@ -335,6 +349,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MetamodelDeclaration createMetamodelDeclaration()
   {
     MetamodelDeclarationImpl metamodelDeclaration = new MetamodelDeclarationImpl();
@@ -346,6 +361,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MetamodelReference createMetamodelReference()
   {
     MetamodelReferenceImpl metamodelReference = new MetamodelReferenceImpl();
@@ -357,6 +373,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Metamodel createMetamodel()
   {
     MetamodelImpl metamodel = new MetamodelImpl();
@@ -368,6 +385,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PartialModelSpecification createPartialModelSpecification()
   {
     PartialModelSpecificationImpl partialModelSpecification = new PartialModelSpecificationImpl();
@@ -379,6 +397,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PartialModelEntry createPartialModelEntry()
   {
     PartialModelEntryImpl partialModelEntry = new PartialModelEntryImpl();
@@ -390,6 +409,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ModelEntry createModelEntry()
   {
     ModelEntryImpl modelEntry = new ModelEntryImpl();
@@ -401,6 +421,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public FolderEntry createFolderEntry()
   {
     FolderEntryImpl folderEntry = new FolderEntryImpl();
@@ -412,6 +433,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PartialModelDeclaration createPartialModelDeclaration()
   {
     PartialModelDeclarationImpl partialModelDeclaration = new PartialModelDeclarationImpl();
@@ -423,6 +445,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PartialModelReference createPartialModelReference()
   {
     PartialModelReferenceImpl partialModelReference = new PartialModelReferenceImpl();
@@ -434,6 +457,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PartialModel createPartialModel()
   {
     PartialModelImpl partialModel = new PartialModelImpl();
@@ -445,6 +469,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PatternSpecification createPatternSpecification()
   {
     PatternSpecificationImpl patternSpecification = new PatternSpecificationImpl();
@@ -456,6 +481,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PatternEntry createPatternEntry()
   {
     PatternEntryImpl patternEntry = new PatternEntryImpl();
@@ -467,6 +493,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public AllPatternEntry createAllPatternEntry()
   {
     AllPatternEntryImpl allPatternEntry = new AllPatternEntryImpl();
@@ -478,6 +505,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PatternElement createPatternElement()
   {
     PatternElementImpl patternElement = new PatternElementImpl();
@@ -489,6 +517,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public GraphPatternDeclaration createGraphPatternDeclaration()
   {
     GraphPatternDeclarationImpl graphPatternDeclaration = new GraphPatternDeclarationImpl();
@@ -500,6 +529,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public GraphPatternReference createGraphPatternReference()
   {
     GraphPatternReferenceImpl graphPatternReference = new GraphPatternReferenceImpl();
@@ -511,6 +541,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public GraphPattern createGraphPattern()
   {
     GraphPatternImpl graphPattern = new GraphPatternImpl();
@@ -522,6 +553,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ConfigSpecification createConfigSpecification()
   {
     ConfigSpecificationImpl configSpecification = new ConfigSpecificationImpl();
@@ -533,6 +565,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ConfigDeclaration createConfigDeclaration()
   {
     ConfigDeclarationImpl configDeclaration = new ConfigDeclarationImpl();
@@ -544,6 +577,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ConfigEntry createConfigEntry()
   {
     ConfigEntryImpl configEntry = new ConfigEntryImpl();
@@ -555,6 +589,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public DocumentationEntry createDocumentationEntry()
   {
     DocumentationEntryImpl documentationEntry = new DocumentationEntryImpl();
@@ -566,6 +601,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public RuntimeEntry createRuntimeEntry()
   {
     RuntimeEntryImpl runtimeEntry = new RuntimeEntryImpl();
@@ -577,6 +613,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MemoryEntry createMemoryEntry()
   {
     MemoryEntryImpl memoryEntry = new MemoryEntryImpl();
@@ -588,6 +625,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public CustomEntry createCustomEntry()
   {
     CustomEntryImpl customEntry = new CustomEntryImpl();
@@ -599,6 +637,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ConfigReference createConfigReference()
   {
     ConfigReferenceImpl configReference = new ConfigReferenceImpl();
@@ -610,6 +649,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Config createConfig()
   {
     ConfigImpl config = new ConfigImpl();
@@ -621,6 +661,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ScopeSpecification createScopeSpecification()
   {
     ScopeSpecificationImpl scopeSpecification = new ScopeSpecificationImpl();
@@ -632,6 +673,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public TypeScope createTypeScope()
   {
     TypeScopeImpl typeScope = new TypeScopeImpl();
@@ -643,6 +685,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ClassTypeScope createClassTypeScope()
   {
     ClassTypeScopeImpl classTypeScope = new ClassTypeScopeImpl();
@@ -654,6 +697,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ObjectTypeScope createObjectTypeScope()
   {
     ObjectTypeScopeImpl objectTypeScope = new ObjectTypeScopeImpl();
@@ -665,6 +709,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public IntegerTypeScope createIntegerTypeScope()
   {
     IntegerTypeScopeImpl integerTypeScope = new IntegerTypeScopeImpl();
@@ -676,6 +721,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public RealTypeScope createRealTypeScope()
   {
     RealTypeScopeImpl realTypeScope = new RealTypeScopeImpl();
@@ -687,6 +733,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public StringTypeScope createStringTypeScope()
   {
     StringTypeScopeImpl stringTypeScope = new StringTypeScopeImpl();
@@ -698,6 +745,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public TypeReference createTypeReference()
   {
     TypeReferenceImpl typeReference = new TypeReferenceImpl();
@@ -709,6 +757,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ClassReference createClassReference()
   {
     ClassReferenceImpl classReference = new ClassReferenceImpl();
@@ -720,6 +769,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ObjectReference createObjectReference()
   {
     ObjectReferenceImpl objectReference = new ObjectReferenceImpl();
@@ -731,6 +781,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public IntegerReference createIntegerReference()
   {
     IntegerReferenceImpl integerReference = new IntegerReferenceImpl();
@@ -742,6 +793,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public RealReference createRealReference()
   {
     RealReferenceImpl realReference = new RealReferenceImpl();
@@ -753,6 +805,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public StringReference createStringReference()
   {
     StringReferenceImpl stringReference = new StringReferenceImpl();
@@ -764,6 +817,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public NumberSpecification createNumberSpecification()
   {
     NumberSpecificationImpl numberSpecification = new NumberSpecificationImpl();
@@ -775,6 +829,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ExactNumber createExactNumber()
   {
     ExactNumberImpl exactNumber = new ExactNumberImpl();
@@ -786,6 +841,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public IntervallNumber createIntervallNumber()
   {
     IntervallNumberImpl intervallNumber = new IntervallNumberImpl();
@@ -797,6 +853,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public IntEnumberation createIntEnumberation()
   {
     IntEnumberationImpl intEnumberation = new IntEnumberationImpl();
@@ -808,6 +865,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public RealEnumeration createRealEnumeration()
   {
     RealEnumerationImpl realEnumeration = new RealEnumerationImpl();
@@ -819,6 +877,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public StringEnumeration createStringEnumeration()
   {
     StringEnumerationImpl stringEnumeration = new StringEnumerationImpl();
@@ -830,6 +889,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ScopeDeclaration createScopeDeclaration()
   {
     ScopeDeclarationImpl scopeDeclaration = new ScopeDeclarationImpl();
@@ -841,6 +901,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ScopeReference createScopeReference()
   {
     ScopeReferenceImpl scopeReference = new ScopeReferenceImpl();
@@ -852,6 +913,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Scope createScope()
   {
     ScopeImpl scope = new ScopeImpl();
@@ -863,6 +925,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Task createTask()
   {
     TaskImpl task = new TaskImpl();
@@ -874,6 +937,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public GenerationTask createGenerationTask()
   {
     GenerationTaskImpl generationTask = new GenerationTaskImpl();
@@ -885,6 +949,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public IntegerScope createIntegerScope()
   {
     IntegerScopeImpl integerScope = new IntegerScopeImpl();
@@ -896,6 +961,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public RealScope createRealScope()
   {
     RealScopeImpl realScope = new RealScopeImpl();
@@ -907,6 +973,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public StringScope createStringScope()
   {
     StringScopeImpl stringScope = new StringScopeImpl();
@@ -962,6 +1029,7 @@ public class ApplicationConfigurationFactoryImpl extends EFactoryImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ApplicationConfigurationPackage getApplicationConfigurationPackage()
   {
     return (ApplicationConfigurationPackage)getEPackage();
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ApplicationConfigurationPackageImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ApplicationConfigurationPackageImpl.java
index d549ad84..dd1a5e81 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ApplicationConfigurationPackageImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ApplicationConfigurationPackageImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -612,7 +612,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
 
   /**
    * 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 ApplicationConfigurationPackage#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 -->
@@ -627,7 +627,8 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
     if (isInited) return (ApplicationConfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(ApplicationConfigurationPackage.eNS_URI);
 
     // Obtain or create and register package
-    ApplicationConfigurationPackageImpl theApplicationConfigurationPackage = (ApplicationConfigurationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ApplicationConfigurationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ApplicationConfigurationPackageImpl());
+    Object registeredApplicationConfigurationPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+    ApplicationConfigurationPackageImpl theApplicationConfigurationPackage = registeredApplicationConfigurationPackage instanceof ApplicationConfigurationPackageImpl ? (ApplicationConfigurationPackageImpl)registeredApplicationConfigurationPackage : new ApplicationConfigurationPackageImpl();
 
     isInited = true;
 
@@ -647,7 +648,6 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
     // Mark meta-data to indicate it can't be changed
     theApplicationConfigurationPackage.freeze();
 
-  
     // Update the registry and return the package
     EPackage.Registry.INSTANCE.put(ApplicationConfigurationPackage.eNS_URI, theApplicationConfigurationPackage);
     return theApplicationConfigurationPackage;
@@ -658,6 +658,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getConfigurationScript()
   {
     return configurationScriptEClass;
@@ -668,6 +669,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getConfigurationScript_Imports()
   {
     return (EReference)configurationScriptEClass.getEStructuralFeatures().get(0);
@@ -678,6 +680,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getConfigurationScript_Commands()
   {
     return (EReference)configurationScriptEClass.getEStructuralFeatures().get(1);
@@ -688,6 +691,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getCommand()
   {
     return commandEClass;
@@ -698,6 +702,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getImport()
   {
     return importEClass;
@@ -708,6 +713,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getEPackageImport()
   {
     return ePackageImportEClass;
@@ -718,6 +724,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getEPackageImport_ImportedPackage()
   {
     return (EReference)ePackageImportEClass.getEStructuralFeatures().get(0);
@@ -728,6 +735,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getViatraImport()
   {
     return viatraImportEClass;
@@ -738,6 +746,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getViatraImport_ImportedViatra()
   {
     return (EReference)viatraImportEClass.getEStructuralFeatures().get(0);
@@ -748,6 +757,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getDeclaration()
   {
     return declarationEClass;
@@ -758,6 +768,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getDeclaration_Name()
   {
     return (EAttribute)declarationEClass.getEStructuralFeatures().get(0);
@@ -768,6 +779,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getFileSpecification()
   {
     return fileSpecificationEClass;
@@ -778,6 +790,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getFileSpecification_Path()
   {
     return (EAttribute)fileSpecificationEClass.getEStructuralFeatures().get(0);
@@ -788,6 +801,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getFileDeclaration()
   {
     return fileDeclarationEClass;
@@ -798,6 +812,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getFileDeclaration_Specification()
   {
     return (EReference)fileDeclarationEClass.getEStructuralFeatures().get(0);
@@ -808,6 +823,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getFileReference()
   {
     return fileReferenceEClass;
@@ -818,6 +834,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getFileReference_Referred()
   {
     return (EReference)fileReferenceEClass.getEStructuralFeatures().get(0);
@@ -828,6 +845,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getFile()
   {
     return fileEClass;
@@ -838,6 +856,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getMetamodelSpecification()
   {
     return metamodelSpecificationEClass;
@@ -848,6 +867,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getMetamodelSpecification_Entries()
   {
     return (EReference)metamodelSpecificationEClass.getEStructuralFeatures().get(0);
@@ -858,6 +878,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getMetamodelEntry()
   {
     return metamodelEntryEClass;
@@ -868,6 +889,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getMetamodelEntry_Package()
   {
     return (EReference)metamodelEntryEClass.getEStructuralFeatures().get(0);
@@ -878,6 +900,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getAllPackageEntry()
   {
     return allPackageEntryEClass;
@@ -888,6 +911,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getAllPackageEntry_Exclusion()
   {
     return (EReference)allPackageEntryEClass.getEStructuralFeatures().get(0);
@@ -898,6 +922,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getMetamodelElement()
   {
     return metamodelElementEClass;
@@ -908,6 +933,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getMetamodelElement_Classifier()
   {
     return (EReference)metamodelElementEClass.getEStructuralFeatures().get(0);
@@ -918,6 +944,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getMetamodelElement_Feature()
   {
     return (EReference)metamodelElementEClass.getEStructuralFeatures().get(1);
@@ -928,6 +955,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getMetamodelDeclaration()
   {
     return metamodelDeclarationEClass;
@@ -938,6 +966,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getMetamodelDeclaration_Specification()
   {
     return (EReference)metamodelDeclarationEClass.getEStructuralFeatures().get(0);
@@ -948,6 +977,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getMetamodelReference()
   {
     return metamodelReferenceEClass;
@@ -958,6 +988,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getMetamodelReference_Referred()
   {
     return (EReference)metamodelReferenceEClass.getEStructuralFeatures().get(0);
@@ -968,6 +999,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getMetamodel()
   {
     return metamodelEClass;
@@ -978,6 +1010,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getPartialModelSpecification()
   {
     return partialModelSpecificationEClass;
@@ -988,6 +1021,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getPartialModelSpecification_Entry()
   {
     return (EReference)partialModelSpecificationEClass.getEStructuralFeatures().get(0);
@@ -998,6 +1032,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getPartialModelEntry()
   {
     return partialModelEntryEClass;
@@ -1008,6 +1043,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getPartialModelEntry_Path()
   {
     return (EReference)partialModelEntryEClass.getEStructuralFeatures().get(0);
@@ -1018,6 +1054,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getModelEntry()
   {
     return modelEntryEClass;
@@ -1028,6 +1065,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getFolderEntry()
   {
     return folderEntryEClass;
@@ -1038,6 +1076,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getFolderEntry_Exclusion()
   {
     return (EReference)folderEntryEClass.getEStructuralFeatures().get(0);
@@ -1048,6 +1087,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getPartialModelDeclaration()
   {
     return partialModelDeclarationEClass;
@@ -1058,6 +1098,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getPartialModelDeclaration_Specification()
   {
     return (EReference)partialModelDeclarationEClass.getEStructuralFeatures().get(0);
@@ -1068,6 +1109,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getPartialModelReference()
   {
     return partialModelReferenceEClass;
@@ -1078,6 +1120,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getPartialModelReference_Referred()
   {
     return (EReference)partialModelReferenceEClass.getEStructuralFeatures().get(0);
@@ -1088,6 +1131,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getPartialModel()
   {
     return partialModelEClass;
@@ -1098,6 +1142,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getPatternSpecification()
   {
     return patternSpecificationEClass;
@@ -1108,6 +1153,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getPatternSpecification_Entries()
   {
     return (EReference)patternSpecificationEClass.getEStructuralFeatures().get(0);
@@ -1118,6 +1164,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getPatternEntry()
   {
     return patternEntryEClass;
@@ -1128,6 +1175,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getPatternEntry_Package()
   {
     return (EReference)patternEntryEClass.getEStructuralFeatures().get(0);
@@ -1138,6 +1186,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getAllPatternEntry()
   {
     return allPatternEntryEClass;
@@ -1148,6 +1197,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getAllPatternEntry_Exclusuion()
   {
     return (EReference)allPatternEntryEClass.getEStructuralFeatures().get(0);
@@ -1158,6 +1208,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getPatternElement()
   {
     return patternElementEClass;
@@ -1168,6 +1219,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getPatternElement_Pattern()
   {
     return (EReference)patternElementEClass.getEStructuralFeatures().get(0);
@@ -1178,6 +1230,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getGraphPatternDeclaration()
   {
     return graphPatternDeclarationEClass;
@@ -1188,6 +1241,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getGraphPatternDeclaration_Specification()
   {
     return (EReference)graphPatternDeclarationEClass.getEStructuralFeatures().get(0);
@@ -1198,6 +1252,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getGraphPatternReference()
   {
     return graphPatternReferenceEClass;
@@ -1208,6 +1263,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getGraphPatternReference_Referred()
   {
     return (EReference)graphPatternReferenceEClass.getEStructuralFeatures().get(0);
@@ -1218,6 +1274,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getGraphPattern()
   {
     return graphPatternEClass;
@@ -1228,6 +1285,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getConfigSpecification()
   {
     return configSpecificationEClass;
@@ -1238,6 +1296,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getConfigSpecification_Entries()
   {
     return (EReference)configSpecificationEClass.getEStructuralFeatures().get(0);
@@ -1248,6 +1307,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getConfigDeclaration()
   {
     return configDeclarationEClass;
@@ -1258,6 +1318,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getConfigDeclaration_Specification()
   {
     return (EReference)configDeclarationEClass.getEStructuralFeatures().get(0);
@@ -1268,6 +1329,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getConfigEntry()
   {
     return configEntryEClass;
@@ -1278,6 +1340,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getDocumentationEntry()
   {
     return documentationEntryEClass;
@@ -1288,6 +1351,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getDocumentationEntry_Level()
   {
     return (EAttribute)documentationEntryEClass.getEStructuralFeatures().get(0);
@@ -1298,6 +1362,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getRuntimeEntry()
   {
     return runtimeEntryEClass;
@@ -1308,6 +1373,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getRuntimeEntry_MillisecLimit()
   {
     return (EAttribute)runtimeEntryEClass.getEStructuralFeatures().get(0);
@@ -1318,6 +1384,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getMemoryEntry()
   {
     return memoryEntryEClass;
@@ -1328,6 +1395,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getMemoryEntry_MegabyteLimit()
   {
     return (EAttribute)memoryEntryEClass.getEStructuralFeatures().get(0);
@@ -1338,6 +1406,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getCustomEntry()
   {
     return customEntryEClass;
@@ -1348,6 +1417,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getCustomEntry_Key()
   {
     return (EAttribute)customEntryEClass.getEStructuralFeatures().get(0);
@@ -1358,6 +1428,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getCustomEntry_Value()
   {
     return (EAttribute)customEntryEClass.getEStructuralFeatures().get(1);
@@ -1368,6 +1439,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getConfigReference()
   {
     return configReferenceEClass;
@@ -1378,6 +1450,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getConfigReference_Config()
   {
     return (EReference)configReferenceEClass.getEStructuralFeatures().get(0);
@@ -1388,6 +1461,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getConfig()
   {
     return configEClass;
@@ -1398,6 +1472,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getScopeSpecification()
   {
     return scopeSpecificationEClass;
@@ -1408,6 +1483,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getScopeSpecification_Scopes()
   {
     return (EReference)scopeSpecificationEClass.getEStructuralFeatures().get(0);
@@ -1418,6 +1494,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getTypeScope()
   {
     return typeScopeEClass;
@@ -1428,6 +1505,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getTypeScope_SetsNew()
   {
     return (EAttribute)typeScopeEClass.getEStructuralFeatures().get(0);
@@ -1438,6 +1516,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getTypeScope_SetsSum()
   {
     return (EAttribute)typeScopeEClass.getEStructuralFeatures().get(1);
@@ -1448,6 +1527,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getTypeScope_Number()
   {
     return (EReference)typeScopeEClass.getEStructuralFeatures().get(2);
@@ -1458,6 +1538,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getClassTypeScope()
   {
     return classTypeScopeEClass;
@@ -1468,6 +1549,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getClassTypeScope_Type()
   {
     return (EReference)classTypeScopeEClass.getEStructuralFeatures().get(0);
@@ -1478,6 +1560,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getObjectTypeScope()
   {
     return objectTypeScopeEClass;
@@ -1488,6 +1571,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getObjectTypeScope_Type()
   {
     return (EReference)objectTypeScopeEClass.getEStructuralFeatures().get(0);
@@ -1498,6 +1582,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getIntegerTypeScope()
   {
     return integerTypeScopeEClass;
@@ -1508,6 +1593,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getIntegerTypeScope_Type()
   {
     return (EReference)integerTypeScopeEClass.getEStructuralFeatures().get(0);
@@ -1518,6 +1604,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getRealTypeScope()
   {
     return realTypeScopeEClass;
@@ -1528,6 +1615,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getRealTypeScope_Type()
   {
     return (EReference)realTypeScopeEClass.getEStructuralFeatures().get(0);
@@ -1538,6 +1626,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getStringTypeScope()
   {
     return stringTypeScopeEClass;
@@ -1548,6 +1637,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getStringTypeScope_Type()
   {
     return (EReference)stringTypeScopeEClass.getEStructuralFeatures().get(0);
@@ -1558,6 +1648,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getTypeReference()
   {
     return typeReferenceEClass;
@@ -1568,6 +1659,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getClassReference()
   {
     return classReferenceEClass;
@@ -1578,6 +1670,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getClassReference_Element()
   {
     return (EReference)classReferenceEClass.getEStructuralFeatures().get(0);
@@ -1588,6 +1681,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getObjectReference()
   {
     return objectReferenceEClass;
@@ -1598,6 +1692,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getIntegerReference()
   {
     return integerReferenceEClass;
@@ -1608,6 +1703,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getRealReference()
   {
     return realReferenceEClass;
@@ -1618,6 +1714,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getStringReference()
   {
     return stringReferenceEClass;
@@ -1628,6 +1725,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getNumberSpecification()
   {
     return numberSpecificationEClass;
@@ -1638,6 +1736,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getExactNumber()
   {
     return exactNumberEClass;
@@ -1648,6 +1747,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getExactNumber_ExactNumber()
   {
     return (EAttribute)exactNumberEClass.getEStructuralFeatures().get(0);
@@ -1658,6 +1758,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getExactNumber_ExactUnlimited()
   {
     return (EAttribute)exactNumberEClass.getEStructuralFeatures().get(1);
@@ -1668,6 +1769,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getIntervallNumber()
   {
     return intervallNumberEClass;
@@ -1678,6 +1780,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getIntervallNumber_Min()
   {
     return (EAttribute)intervallNumberEClass.getEStructuralFeatures().get(0);
@@ -1688,6 +1791,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getIntervallNumber_MaxNumber()
   {
     return (EAttribute)intervallNumberEClass.getEStructuralFeatures().get(1);
@@ -1698,6 +1802,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getIntervallNumber_MaxUnlimited()
   {
     return (EAttribute)intervallNumberEClass.getEStructuralFeatures().get(2);
@@ -1708,6 +1813,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getIntEnumberation()
   {
     return intEnumberationEClass;
@@ -1718,6 +1824,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getIntEnumberation_Entry()
   {
     return (EAttribute)intEnumberationEClass.getEStructuralFeatures().get(0);
@@ -1728,6 +1835,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getRealEnumeration()
   {
     return realEnumerationEClass;
@@ -1738,6 +1846,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getRealEnumeration_Entry()
   {
     return (EAttribute)realEnumerationEClass.getEStructuralFeatures().get(0);
@@ -1748,6 +1857,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getStringEnumeration()
   {
     return stringEnumerationEClass;
@@ -1758,6 +1868,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getStringEnumeration_Entry()
   {
     return (EAttribute)stringEnumerationEClass.getEStructuralFeatures().get(0);
@@ -1768,6 +1879,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getScopeDeclaration()
   {
     return scopeDeclarationEClass;
@@ -1778,6 +1890,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getScopeDeclaration_Specification()
   {
     return (EReference)scopeDeclarationEClass.getEStructuralFeatures().get(0);
@@ -1788,6 +1901,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getScopeReference()
   {
     return scopeReferenceEClass;
@@ -1798,6 +1912,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getScopeReference_Referred()
   {
     return (EReference)scopeReferenceEClass.getEStructuralFeatures().get(0);
@@ -1808,6 +1923,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getScope()
   {
     return scopeEClass;
@@ -1818,6 +1934,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getTask()
   {
     return taskEClass;
@@ -1828,6 +1945,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getGenerationTask()
   {
     return generationTaskEClass;
@@ -1838,6 +1956,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getGenerationTask_Metamodel()
   {
     return (EReference)generationTaskEClass.getEStructuralFeatures().get(0);
@@ -1848,6 +1967,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getGenerationTask_PartialModel()
   {
     return (EReference)generationTaskEClass.getEStructuralFeatures().get(1);
@@ -1858,6 +1978,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getGenerationTask_Patterns()
   {
     return (EReference)generationTaskEClass.getEStructuralFeatures().get(2);
@@ -1868,6 +1989,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getGenerationTask_Scope()
   {
     return (EReference)generationTaskEClass.getEStructuralFeatures().get(3);
@@ -1878,6 +2000,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getGenerationTask_NumberSpecified()
   {
     return (EAttribute)generationTaskEClass.getEStructuralFeatures().get(4);
@@ -1888,6 +2011,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getGenerationTask_Number()
   {
     return (EAttribute)generationTaskEClass.getEStructuralFeatures().get(5);
@@ -1898,6 +2022,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getGenerationTask_RunSpecified()
   {
     return (EAttribute)generationTaskEClass.getEStructuralFeatures().get(6);
@@ -1908,6 +2033,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getGenerationTask_Runs()
   {
     return (EAttribute)generationTaskEClass.getEStructuralFeatures().get(7);
@@ -1918,6 +2044,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getGenerationTask_Solver()
   {
     return (EAttribute)generationTaskEClass.getEStructuralFeatures().get(8);
@@ -1928,6 +2055,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getGenerationTask_Config()
   {
     return (EReference)generationTaskEClass.getEStructuralFeatures().get(9);
@@ -1938,6 +2066,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getGenerationTask_DebugFolder()
   {
     return (EReference)generationTaskEClass.getEStructuralFeatures().get(10);
@@ -1948,6 +2077,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getGenerationTask_TargetLogFile()
   {
     return (EReference)generationTaskEClass.getEStructuralFeatures().get(11);
@@ -1958,6 +2088,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getGenerationTask_TargetStatisticsFile()
   {
     return (EReference)generationTaskEClass.getEStructuralFeatures().get(12);
@@ -1968,6 +2099,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getGenerationTask_TagetFolder()
   {
     return (EReference)generationTaskEClass.getEStructuralFeatures().get(13);
@@ -1978,6 +2110,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getIntegerScope()
   {
     return integerScopeEClass;
@@ -1988,6 +2121,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getRealScope()
   {
     return realScopeEClass;
@@ -1998,6 +2132,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getStringScope()
   {
     return stringScopeEClass;
@@ -2008,6 +2143,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EEnum getDocumentLevelSpecification()
   {
     return documentLevelSpecificationEEnum;
@@ -2018,6 +2154,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EEnum getSolver()
   {
     return solverEEnum;
@@ -2028,6 +2165,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ApplicationConfigurationFactory getApplicationConfigurationFactory()
   {
     return (ApplicationConfigurationFactory)getEFactoryInstance();
@@ -2558,6 +2696,7 @@ public class ApplicationConfigurationPackageImpl extends EPackageImpl implements
     addEEnumLiteral(solverEEnum, Solver.SMT_SOLVER);
     addEEnumLiteral(solverEEnum, Solver.ALLOY_SOLVER);
     addEEnumLiteral(solverEEnum, Solver.VIATRA_SOLVER);
+    addEEnumLiteral(solverEEnum, Solver.TPTP_SOLVER);
 
     // Create resource
     createResource(eNS_URI);
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ClassReferenceImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ClassReferenceImpl.java
index d95d291d..3caf25c0 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ClassReferenceImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ClassReferenceImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -66,6 +66,7 @@ public class ClassReferenceImpl extends TypeReferenceImpl implements ClassRefere
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MetamodelElement getElement()
   {
     return element;
@@ -93,6 +94,7 @@ public class ClassReferenceImpl extends TypeReferenceImpl implements ClassRefere
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setElement(MetamodelElement newElement)
   {
     if (newElement != element)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ClassTypeScopeImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ClassTypeScopeImpl.java
index 4eef1c02..cbaa50af 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ClassTypeScopeImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ClassTypeScopeImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -66,6 +66,7 @@ public class ClassTypeScopeImpl extends TypeScopeImpl implements ClassTypeScope
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ClassReference getType()
   {
     return type;
@@ -93,6 +94,7 @@ public class ClassTypeScopeImpl extends TypeScopeImpl implements ClassTypeScope
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setType(ClassReference newType)
   {
     if (newType != type)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/CommandImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/CommandImpl.java
index c7912c0c..669176b5 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/CommandImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/CommandImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigDeclarationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigDeclarationImpl.java
index af0e7c17..a7e9e0ca 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigDeclarationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigDeclarationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -66,6 +66,7 @@ public class ConfigDeclarationImpl extends DeclarationImpl implements ConfigDecl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ConfigSpecification getSpecification()
   {
     return specification;
@@ -93,6 +94,7 @@ public class ConfigDeclarationImpl extends DeclarationImpl implements ConfigDecl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setSpecification(ConfigSpecification newSpecification)
   {
     if (newSpecification != specification)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigEntryImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigEntryImpl.java
index 5c9dee49..4be87b6d 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigEntryImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigEntryImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigImpl.java
index c69dd47b..19ac6a05 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigReferenceImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigReferenceImpl.java
index dbe6aed6..5bae4cf5 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigReferenceImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigReferenceImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -65,6 +65,7 @@ public class ConfigReferenceImpl extends ConfigImpl implements ConfigReference
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ConfigDeclaration getConfig()
   {
     if (config != null && config.eIsProxy())
@@ -95,6 +96,7 @@ public class ConfigReferenceImpl extends ConfigImpl implements ConfigReference
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setConfig(ConfigDeclaration newConfig)
   {
     ConfigDeclaration oldConfig = config;
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigSpecificationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigSpecificationImpl.java
index d4eda037..66251019 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigSpecificationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigSpecificationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -70,6 +70,7 @@ public class ConfigSpecificationImpl extends ConfigImpl implements ConfigSpecifi
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<ConfigEntry> getEntries()
   {
     if (entries == null)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigurationScriptImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigurationScriptImpl.java
index 9a4bb3a0..a45f68c2 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigurationScriptImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ConfigurationScriptImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -84,6 +84,7 @@ public class ConfigurationScriptImpl extends MinimalEObjectImpl.Container implem
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<Import> getImports()
   {
     if (imports == null)
@@ -98,6 +99,7 @@ public class ConfigurationScriptImpl extends MinimalEObjectImpl.Container implem
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<Command> getCommands()
   {
     if (commands == null)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/CustomEntryImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/CustomEntryImpl.java
index b6a38700..b8fdeb0a 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/CustomEntryImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/CustomEntryImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -94,6 +94,7 @@ public class CustomEntryImpl extends ConfigEntryImpl implements CustomEntry
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getKey()
   {
     return key;
@@ -104,6 +105,7 @@ public class CustomEntryImpl extends ConfigEntryImpl implements CustomEntry
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setKey(String newKey)
   {
     String oldKey = key;
@@ -117,6 +119,7 @@ public class CustomEntryImpl extends ConfigEntryImpl implements CustomEntry
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getValue()
   {
     return value;
@@ -127,6 +130,7 @@ public class CustomEntryImpl extends ConfigEntryImpl implements CustomEntry
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setValue(String newValue)
   {
     String oldValue = value;
@@ -221,7 +225,7 @@ public class CustomEntryImpl extends ConfigEntryImpl implements CustomEntry
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (key: ");
     result.append(key);
     result.append(", value: ");
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/DeclarationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/DeclarationImpl.java
index 15de42f0..5eae552b 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/DeclarationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/DeclarationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -73,6 +73,7 @@ public class DeclarationImpl extends CommandImpl implements Declaration
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -83,6 +84,7 @@ public class DeclarationImpl extends CommandImpl implements Declaration
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setName(String newName)
   {
     String oldName = name;
@@ -167,7 +169,7 @@ public class DeclarationImpl extends CommandImpl implements Declaration
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (name: ");
     result.append(name);
     result.append(')');
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/DocumentationEntryImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/DocumentationEntryImpl.java
index 3ea64130..79b25430 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/DocumentationEntryImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/DocumentationEntryImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -74,6 +74,7 @@ public class DocumentationEntryImpl extends ConfigEntryImpl implements Documenta
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public DocumentLevelSpecification getLevel()
   {
     return level;
@@ -84,6 +85,7 @@ public class DocumentationEntryImpl extends ConfigEntryImpl implements Documenta
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setLevel(DocumentLevelSpecification newLevel)
   {
     DocumentLevelSpecification oldLevel = level;
@@ -168,7 +170,7 @@ public class DocumentationEntryImpl extends ConfigEntryImpl implements Documenta
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (level: ");
     result.append(level);
     result.append(')');
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/EPackageImportImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/EPackageImportImpl.java
index 1496e005..5192a52c 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/EPackageImportImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/EPackageImportImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -65,6 +65,7 @@ public class EPackageImportImpl extends ImportImpl implements EPackageImport
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EPackage getImportedPackage()
   {
     if (importedPackage != null && importedPackage.eIsProxy())
@@ -95,6 +96,7 @@ public class EPackageImportImpl extends ImportImpl implements EPackageImport
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setImportedPackage(EPackage newImportedPackage)
   {
     EPackage oldImportedPackage = importedPackage;
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ExactNumberImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ExactNumberImpl.java
index dcd48fa2..bf33c471 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ExactNumberImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ExactNumberImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -94,6 +94,7 @@ public class ExactNumberImpl extends NumberSpecificationImpl implements ExactNum
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public int getExactNumber()
   {
     return exactNumber;
@@ -104,6 +105,7 @@ public class ExactNumberImpl extends NumberSpecificationImpl implements ExactNum
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setExactNumber(int newExactNumber)
   {
     int oldExactNumber = exactNumber;
@@ -117,6 +119,7 @@ public class ExactNumberImpl extends NumberSpecificationImpl implements ExactNum
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public boolean isExactUnlimited()
   {
     return exactUnlimited;
@@ -127,6 +130,7 @@ public class ExactNumberImpl extends NumberSpecificationImpl implements ExactNum
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setExactUnlimited(boolean newExactUnlimited)
   {
     boolean oldExactUnlimited = exactUnlimited;
@@ -221,7 +225,7 @@ public class ExactNumberImpl extends NumberSpecificationImpl implements ExactNum
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (exactNumber: ");
     result.append(exactNumber);
     result.append(", exactUnlimited: ");
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileDeclarationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileDeclarationImpl.java
index 16efc685..6860497c 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileDeclarationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileDeclarationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -66,6 +66,7 @@ public class FileDeclarationImpl extends DeclarationImpl implements FileDeclarat
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public FileSpecification getSpecification()
   {
     return specification;
@@ -93,6 +94,7 @@ public class FileDeclarationImpl extends DeclarationImpl implements FileDeclarat
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setSpecification(FileSpecification newSpecification)
   {
     if (newSpecification != specification)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileImpl.java
index a67c6210..4c32277a 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileReferenceImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileReferenceImpl.java
index ef9ae500..cb3b8f23 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileReferenceImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileReferenceImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -65,6 +65,7 @@ public class FileReferenceImpl extends FileImpl implements FileReference
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public FileDeclaration getReferred()
   {
     if (referred != null && referred.eIsProxy())
@@ -95,6 +96,7 @@ public class FileReferenceImpl extends FileImpl implements FileReference
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setReferred(FileDeclaration newReferred)
   {
     FileDeclaration oldReferred = referred;
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileSpecificationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileSpecificationImpl.java
index 3b728d0e..65364312 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileSpecificationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FileSpecificationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -73,6 +73,7 @@ public class FileSpecificationImpl extends FileImpl implements FileSpecification
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getPath()
   {
     return path;
@@ -83,6 +84,7 @@ public class FileSpecificationImpl extends FileImpl implements FileSpecification
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setPath(String newPath)
   {
     String oldPath = path;
@@ -167,7 +169,7 @@ public class FileSpecificationImpl extends FileImpl implements FileSpecification
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (path: ");
     result.append(path);
     result.append(')');
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FolderEntryImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FolderEntryImpl.java
index 63bf5f58..deddbe74 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FolderEntryImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/FolderEntryImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -70,6 +70,7 @@ public class FolderEntryImpl extends PartialModelEntryImpl implements FolderEntr
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<ModelEntry> getExclusion()
   {
     if (exclusion == null)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GenerationTaskImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GenerationTaskImpl.java
index 41874b35..b2df645a 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GenerationTaskImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GenerationTaskImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -265,6 +265,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Metamodel getMetamodel()
   {
     return metamodel;
@@ -292,6 +293,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setMetamodel(Metamodel newMetamodel)
   {
     if (newMetamodel != metamodel)
@@ -313,6 +315,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PartialModel getPartialModel()
   {
     return partialModel;
@@ -340,6 +343,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setPartialModel(PartialModel newPartialModel)
   {
     if (newPartialModel != partialModel)
@@ -361,6 +365,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public GraphPattern getPatterns()
   {
     return patterns;
@@ -388,6 +393,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setPatterns(GraphPattern newPatterns)
   {
     if (newPatterns != patterns)
@@ -409,6 +415,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Scope getScope()
   {
     return scope;
@@ -436,6 +443,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setScope(Scope newScope)
   {
     if (newScope != scope)
@@ -457,6 +465,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public boolean isNumberSpecified()
   {
     return numberSpecified;
@@ -467,6 +476,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setNumberSpecified(boolean newNumberSpecified)
   {
     boolean oldNumberSpecified = numberSpecified;
@@ -480,6 +490,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public int getNumber()
   {
     return number;
@@ -490,6 +501,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setNumber(int newNumber)
   {
     int oldNumber = number;
@@ -503,6 +515,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public boolean isRunSpecified()
   {
     return runSpecified;
@@ -513,6 +526,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setRunSpecified(boolean newRunSpecified)
   {
     boolean oldRunSpecified = runSpecified;
@@ -526,6 +540,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public int getRuns()
   {
     return runs;
@@ -536,6 +551,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setRuns(int newRuns)
   {
     int oldRuns = runs;
@@ -549,6 +565,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Solver getSolver()
   {
     return solver;
@@ -559,6 +576,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setSolver(Solver newSolver)
   {
     Solver oldSolver = solver;
@@ -572,6 +590,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Config getConfig()
   {
     return config;
@@ -599,6 +618,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setConfig(Config newConfig)
   {
     if (newConfig != config)
@@ -620,6 +640,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public File getDebugFolder()
   {
     return debugFolder;
@@ -647,6 +668,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setDebugFolder(File newDebugFolder)
   {
     if (newDebugFolder != debugFolder)
@@ -668,6 +690,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public File getTargetLogFile()
   {
     return targetLogFile;
@@ -695,6 +718,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setTargetLogFile(File newTargetLogFile)
   {
     if (newTargetLogFile != targetLogFile)
@@ -716,6 +740,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public File getTargetStatisticsFile()
   {
     return targetStatisticsFile;
@@ -743,6 +768,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setTargetStatisticsFile(File newTargetStatisticsFile)
   {
     if (newTargetStatisticsFile != targetStatisticsFile)
@@ -764,6 +790,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public File getTagetFolder()
   {
     return tagetFolder;
@@ -791,6 +818,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setTagetFolder(File newTagetFolder)
   {
     if (newTagetFolder != tagetFolder)
@@ -1045,7 +1073,7 @@ public class GenerationTaskImpl extends TaskImpl implements GenerationTask
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (numberSpecified: ");
     result.append(numberSpecified);
     result.append(", number: ");
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GraphPatternDeclarationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GraphPatternDeclarationImpl.java
index 894b951e..5a239301 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GraphPatternDeclarationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GraphPatternDeclarationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -66,6 +66,7 @@ public class GraphPatternDeclarationImpl extends DeclarationImpl implements Grap
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PatternSpecification getSpecification()
   {
     return specification;
@@ -93,6 +94,7 @@ public class GraphPatternDeclarationImpl extends DeclarationImpl implements Grap
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setSpecification(PatternSpecification newSpecification)
   {
     if (newSpecification != specification)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GraphPatternImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GraphPatternImpl.java
index 88512fde..45a44d92 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GraphPatternImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GraphPatternImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GraphPatternReferenceImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GraphPatternReferenceImpl.java
index 39093353..efd945a6 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GraphPatternReferenceImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/GraphPatternReferenceImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -65,6 +65,7 @@ public class GraphPatternReferenceImpl extends GraphPatternImpl implements Graph
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public GraphPatternDeclaration getReferred()
   {
     if (referred != null && referred.eIsProxy())
@@ -95,6 +96,7 @@ public class GraphPatternReferenceImpl extends GraphPatternImpl implements Graph
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setReferred(GraphPatternDeclaration newReferred)
   {
     GraphPatternDeclaration oldReferred = referred;
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ImportImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ImportImpl.java
index 3618fbba..b2ec8a64 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ImportImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ImportImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntEnumberationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntEnumberationImpl.java
index 0d851bc7..13af71e6 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntEnumberationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntEnumberationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -65,6 +65,7 @@ public class IntEnumberationImpl extends NumberSpecificationImpl implements IntE
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<Integer> getEntry()
   {
     if (entry == null)
@@ -152,7 +153,7 @@ public class IntEnumberationImpl extends NumberSpecificationImpl implements IntE
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (entry: ");
     result.append(entry);
     result.append(')');
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntegerReferenceImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntegerReferenceImpl.java
index b35e0d17..a04ea7d8 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntegerReferenceImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntegerReferenceImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntegerScopeImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntegerScopeImpl.java
index 6ccbcda5..3958c8f3 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntegerScopeImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntegerScopeImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntegerTypeScopeImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntegerTypeScopeImpl.java
index 438d59bc..c5f3dde8 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntegerTypeScopeImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntegerTypeScopeImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -66,6 +66,7 @@ public class IntegerTypeScopeImpl extends TypeScopeImpl implements IntegerTypeSc
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public IntegerReference getType()
   {
     return type;
@@ -93,6 +94,7 @@ public class IntegerTypeScopeImpl extends TypeScopeImpl implements IntegerTypeSc
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setType(IntegerReference newType)
   {
     if (newType != type)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntervallNumberImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntervallNumberImpl.java
index 98a96254..dcbaed1d 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntervallNumberImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/IntervallNumberImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -115,6 +115,7 @@ public class IntervallNumberImpl extends NumberSpecificationImpl implements Inte
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public int getMin()
   {
     return min;
@@ -125,6 +126,7 @@ public class IntervallNumberImpl extends NumberSpecificationImpl implements Inte
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setMin(int newMin)
   {
     int oldMin = min;
@@ -138,6 +140,7 @@ public class IntervallNumberImpl extends NumberSpecificationImpl implements Inte
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public int getMaxNumber()
   {
     return maxNumber;
@@ -148,6 +151,7 @@ public class IntervallNumberImpl extends NumberSpecificationImpl implements Inte
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setMaxNumber(int newMaxNumber)
   {
     int oldMaxNumber = maxNumber;
@@ -161,6 +165,7 @@ public class IntervallNumberImpl extends NumberSpecificationImpl implements Inte
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public boolean isMaxUnlimited()
   {
     return maxUnlimited;
@@ -171,6 +176,7 @@ public class IntervallNumberImpl extends NumberSpecificationImpl implements Inte
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setMaxUnlimited(boolean newMaxUnlimited)
   {
     boolean oldMaxUnlimited = maxUnlimited;
@@ -275,7 +281,7 @@ public class IntervallNumberImpl extends NumberSpecificationImpl implements Inte
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (min: ");
     result.append(min);
     result.append(", maxNumber: ");
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MemoryEntryImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MemoryEntryImpl.java
index 6595f13f..1379e2ea 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MemoryEntryImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MemoryEntryImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -73,6 +73,7 @@ public class MemoryEntryImpl extends ConfigEntryImpl implements MemoryEntry
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public int getMegabyteLimit()
   {
     return megabyteLimit;
@@ -83,6 +84,7 @@ public class MemoryEntryImpl extends ConfigEntryImpl implements MemoryEntry
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setMegabyteLimit(int newMegabyteLimit)
   {
     int oldMegabyteLimit = megabyteLimit;
@@ -167,7 +169,7 @@ public class MemoryEntryImpl extends ConfigEntryImpl implements MemoryEntry
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (megabyteLimit: ");
     result.append(megabyteLimit);
     result.append(')');
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelDeclarationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelDeclarationImpl.java
index b6da09af..59495fb5 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelDeclarationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelDeclarationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -66,6 +66,7 @@ public class MetamodelDeclarationImpl extends DeclarationImpl implements Metamod
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MetamodelSpecification getSpecification()
   {
     return specification;
@@ -93,6 +94,7 @@ public class MetamodelDeclarationImpl extends DeclarationImpl implements Metamod
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setSpecification(MetamodelSpecification newSpecification)
   {
     if (newSpecification != specification)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelElementImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelElementImpl.java
index 3395381e..045814f7 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelElementImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelElementImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -77,6 +77,7 @@ public class MetamodelElementImpl extends MetamodelEntryImpl implements Metamode
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClassifier getClassifier()
   {
     if (classifier != null && classifier.eIsProxy())
@@ -107,6 +108,7 @@ public class MetamodelElementImpl extends MetamodelEntryImpl implements Metamode
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setClassifier(EClassifier newClassifier)
   {
     EClassifier oldClassifier = classifier;
@@ -120,6 +122,7 @@ public class MetamodelElementImpl extends MetamodelEntryImpl implements Metamode
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ENamedElement getFeature()
   {
     if (feature != null && feature.eIsProxy())
@@ -150,6 +153,7 @@ public class MetamodelElementImpl extends MetamodelEntryImpl implements Metamode
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setFeature(ENamedElement newFeature)
   {
     ENamedElement oldFeature = feature;
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelEntryImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelEntryImpl.java
index af250b5b..94d09a82 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelEntryImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelEntryImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -66,6 +66,7 @@ public class MetamodelEntryImpl extends MinimalEObjectImpl.Container implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EPackage getPackage()
   {
     if (package_ != null && package_.eIsProxy())
@@ -96,6 +97,7 @@ public class MetamodelEntryImpl extends MinimalEObjectImpl.Container implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setPackage(EPackage newPackage)
   {
     EPackage oldPackage = package_;
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelImpl.java
index bca11595..3446fcf4 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelReferenceImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelReferenceImpl.java
index fb93bf8d..7556f014 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelReferenceImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelReferenceImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -65,6 +65,7 @@ public class MetamodelReferenceImpl extends MetamodelImpl implements MetamodelRe
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MetamodelDeclaration getReferred()
   {
     if (referred != null && referred.eIsProxy())
@@ -95,6 +96,7 @@ public class MetamodelReferenceImpl extends MetamodelImpl implements MetamodelRe
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setReferred(MetamodelDeclaration newReferred)
   {
     MetamodelDeclaration oldReferred = referred;
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelSpecificationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelSpecificationImpl.java
index 412b46e6..3d04a447 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelSpecificationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/MetamodelSpecificationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -70,6 +70,7 @@ public class MetamodelSpecificationImpl extends MetamodelImpl implements Metamod
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<MetamodelEntry> getEntries()
   {
     if (entries == null)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ModelEntryImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ModelEntryImpl.java
index 58c052fe..c716cbe1 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ModelEntryImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ModelEntryImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/NumberSpecificationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/NumberSpecificationImpl.java
index 124df0f6..9b6a8c8f 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/NumberSpecificationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/NumberSpecificationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ObjectReferenceImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ObjectReferenceImpl.java
index 9a014ed6..ea84742b 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ObjectReferenceImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ObjectReferenceImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ObjectTypeScopeImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ObjectTypeScopeImpl.java
index 51b9262b..764381ff 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ObjectTypeScopeImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ObjectTypeScopeImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -66,6 +66,7 @@ public class ObjectTypeScopeImpl extends TypeScopeImpl implements ObjectTypeScop
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ObjectReference getType()
   {
     return type;
@@ -93,6 +94,7 @@ public class ObjectTypeScopeImpl extends TypeScopeImpl implements ObjectTypeScop
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setType(ObjectReference newType)
   {
     if (newType != type)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelDeclarationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelDeclarationImpl.java
index 2932fa6e..385e4251 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelDeclarationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelDeclarationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -66,6 +66,7 @@ public class PartialModelDeclarationImpl extends DeclarationImpl implements Part
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PartialModelSpecification getSpecification()
   {
     return specification;
@@ -93,6 +94,7 @@ public class PartialModelDeclarationImpl extends DeclarationImpl implements Part
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setSpecification(PartialModelSpecification newSpecification)
   {
     if (newSpecification != specification)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelEntryImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelEntryImpl.java
index 23571a76..c37b4f0e 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelEntryImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelEntryImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -67,6 +67,7 @@ public class PartialModelEntryImpl extends MinimalEObjectImpl.Container implemen
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public File getPath()
   {
     return path;
@@ -94,6 +95,7 @@ public class PartialModelEntryImpl extends MinimalEObjectImpl.Container implemen
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setPath(File newPath)
   {
     if (newPath != path)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelImpl.java
index ccccd0cb..20863076 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelReferenceImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelReferenceImpl.java
index 1af7e8ad..7aea4c33 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelReferenceImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelReferenceImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -65,6 +65,7 @@ public class PartialModelReferenceImpl extends PartialModelImpl implements Parti
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PartialModelDeclaration getReferred()
   {
     if (referred != null && referred.eIsProxy())
@@ -95,6 +96,7 @@ public class PartialModelReferenceImpl extends PartialModelImpl implements Parti
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setReferred(PartialModelDeclaration newReferred)
   {
     PartialModelDeclaration oldReferred = referred;
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelSpecificationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelSpecificationImpl.java
index 5098cc3d..8cbbfc75 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelSpecificationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PartialModelSpecificationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -70,6 +70,7 @@ public class PartialModelSpecificationImpl extends PartialModelImpl implements P
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<PartialModelEntry> getEntry()
   {
     if (entry == null)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PatternElementImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PatternElementImpl.java
index 55391651..74f93f35 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PatternElementImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PatternElementImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -66,6 +66,7 @@ public class PatternElementImpl extends PatternEntryImpl implements PatternEleme
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Pattern getPattern()
   {
     if (pattern != null && pattern.eIsProxy())
@@ -96,6 +97,7 @@ public class PatternElementImpl extends PatternEntryImpl implements PatternEleme
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setPattern(Pattern newPattern)
   {
     Pattern oldPattern = pattern;
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PatternEntryImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PatternEntryImpl.java
index d00accae..8d1df054 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PatternEntryImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PatternEntryImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -67,6 +67,7 @@ public class PatternEntryImpl extends MinimalEObjectImpl.Container implements Pa
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PatternModel getPackage()
   {
     if (package_ != null && package_.eIsProxy())
@@ -97,6 +98,7 @@ public class PatternEntryImpl extends MinimalEObjectImpl.Container implements Pa
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setPackage(PatternModel newPackage)
   {
     PatternModel oldPackage = package_;
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PatternSpecificationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PatternSpecificationImpl.java
index 410ad21c..4f1d658b 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PatternSpecificationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/PatternSpecificationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -70,6 +70,7 @@ public class PatternSpecificationImpl extends GraphPatternImpl implements Patter
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<PatternEntry> getEntries()
   {
     if (entries == null)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealEnumerationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealEnumerationImpl.java
index d19d0bfb..3f816602 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealEnumerationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealEnumerationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -67,6 +67,7 @@ public class RealEnumerationImpl extends NumberSpecificationImpl implements Real
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<BigDecimal> getEntry()
   {
     if (entry == null)
@@ -154,7 +155,7 @@ public class RealEnumerationImpl extends NumberSpecificationImpl implements Real
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (entry: ");
     result.append(entry);
     result.append(')');
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealReferenceImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealReferenceImpl.java
index e34982fc..bb84a7a0 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealReferenceImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealReferenceImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealScopeImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealScopeImpl.java
index a936da12..0c056561 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealScopeImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealScopeImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealTypeScopeImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealTypeScopeImpl.java
index dc3d6fc9..d0e208ea 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealTypeScopeImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RealTypeScopeImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -66,6 +66,7 @@ public class RealTypeScopeImpl extends TypeScopeImpl implements RealTypeScope
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public RealReference getType()
   {
     return type;
@@ -93,6 +94,7 @@ public class RealTypeScopeImpl extends TypeScopeImpl implements RealTypeScope
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setType(RealReference newType)
   {
     if (newType != type)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RuntimeEntryImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RuntimeEntryImpl.java
index 9abb1448..cf1f7277 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RuntimeEntryImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/RuntimeEntryImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -73,6 +73,7 @@ public class RuntimeEntryImpl extends ConfigEntryImpl implements RuntimeEntry
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public int getMillisecLimit()
   {
     return millisecLimit;
@@ -83,6 +84,7 @@ public class RuntimeEntryImpl extends ConfigEntryImpl implements RuntimeEntry
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setMillisecLimit(int newMillisecLimit)
   {
     int oldMillisecLimit = millisecLimit;
@@ -167,7 +169,7 @@ public class RuntimeEntryImpl extends ConfigEntryImpl implements RuntimeEntry
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (millisecLimit: ");
     result.append(millisecLimit);
     result.append(')');
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeDeclarationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeDeclarationImpl.java
index c731abbb..f511fd58 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeDeclarationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeDeclarationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -66,6 +66,7 @@ public class ScopeDeclarationImpl extends DeclarationImpl implements ScopeDeclar
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ScopeSpecification getSpecification()
   {
     return specification;
@@ -93,6 +94,7 @@ public class ScopeDeclarationImpl extends DeclarationImpl implements ScopeDeclar
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setSpecification(ScopeSpecification newSpecification)
   {
     if (newSpecification != specification)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeImpl.java
index 92309b90..60c41361 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeReferenceImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeReferenceImpl.java
index 74f1c235..20690057 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeReferenceImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeReferenceImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -65,6 +65,7 @@ public class ScopeReferenceImpl extends ScopeImpl implements ScopeReference
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ScopeDeclaration getReferred()
   {
     if (referred != null && referred.eIsProxy())
@@ -95,6 +96,7 @@ public class ScopeReferenceImpl extends ScopeImpl implements ScopeReference
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setReferred(ScopeDeclaration newReferred)
   {
     ScopeDeclaration oldReferred = referred;
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeSpecificationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeSpecificationImpl.java
index b9e4f045..fa2dc2fa 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeSpecificationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ScopeSpecificationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -70,6 +70,7 @@ public class ScopeSpecificationImpl extends ScopeImpl implements ScopeSpecificat
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<TypeScope> getScopes()
   {
     if (scopes == null)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringEnumerationImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringEnumerationImpl.java
index 7e72525a..d7099377 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringEnumerationImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringEnumerationImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -65,6 +65,7 @@ public class StringEnumerationImpl extends NumberSpecificationImpl implements St
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<String> getEntry()
   {
     if (entry == null)
@@ -152,7 +153,7 @@ public class StringEnumerationImpl extends NumberSpecificationImpl implements St
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (entry: ");
     result.append(entry);
     result.append(')');
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringReferenceImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringReferenceImpl.java
index c6b29515..fdadc041 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringReferenceImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringReferenceImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringScopeImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringScopeImpl.java
index c9c60e7b..73954749 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringScopeImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringScopeImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringTypeScopeImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringTypeScopeImpl.java
index 1f0f0b2e..ca34c856 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringTypeScopeImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/StringTypeScopeImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -66,6 +66,7 @@ public class StringTypeScopeImpl extends TypeScopeImpl implements StringTypeScop
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public StringReference getType()
   {
     return type;
@@ -93,6 +94,7 @@ public class StringTypeScopeImpl extends TypeScopeImpl implements StringTypeScop
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setType(StringReference newType)
   {
     if (newType != type)
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/TaskImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/TaskImpl.java
index ace0d069..566ad8a8 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/TaskImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/TaskImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/TypeReferenceImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/TypeReferenceImpl.java
index 93ad169a..eecca2dc 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/TypeReferenceImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/TypeReferenceImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/TypeScopeImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/TypeScopeImpl.java
index 9ae4fe6e..7f88e02d 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/TypeScopeImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/TypeScopeImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -109,6 +109,7 @@ public class TypeScopeImpl extends MinimalEObjectImpl.Container implements TypeS
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public boolean isSetsNew()
   {
     return setsNew;
@@ -119,6 +120,7 @@ public class TypeScopeImpl extends MinimalEObjectImpl.Container implements TypeS
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setSetsNew(boolean newSetsNew)
   {
     boolean oldSetsNew = setsNew;
@@ -132,6 +134,7 @@ public class TypeScopeImpl extends MinimalEObjectImpl.Container implements TypeS
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public boolean isSetsSum()
   {
     return setsSum;
@@ -142,6 +145,7 @@ public class TypeScopeImpl extends MinimalEObjectImpl.Container implements TypeS
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setSetsSum(boolean newSetsSum)
   {
     boolean oldSetsSum = setsSum;
@@ -155,6 +159,7 @@ public class TypeScopeImpl extends MinimalEObjectImpl.Container implements TypeS
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public NumberSpecification getNumber()
   {
     return number;
@@ -182,6 +187,7 @@ public class TypeScopeImpl extends MinimalEObjectImpl.Container implements TypeS
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setNumber(NumberSpecification newNumber)
   {
     if (newNumber != number)
@@ -310,7 +316,7 @@ public class TypeScopeImpl extends MinimalEObjectImpl.Container implements TypeS
   {
     if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
+    StringBuilder result = new StringBuilder(super.toString());
     result.append(" (setsNew: ");
     result.append(setsNew);
     result.append(", setsSum: ");
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ViatraImportImpl.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ViatraImportImpl.java
index 1cd02845..bb635f63 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ViatraImportImpl.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/impl/ViatraImportImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.impl;
 
@@ -66,6 +66,7 @@ public class ViatraImportImpl extends ImportImpl implements ViatraImport
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PatternModel getImportedViatra()
   {
     if (importedViatra != null && importedViatra.eIsProxy())
@@ -96,6 +97,7 @@ public class ViatraImportImpl extends ImportImpl implements ViatraImport
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setImportedViatra(PatternModel newImportedViatra)
   {
     PatternModel oldImportedViatra = importedViatra;
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/util/ApplicationConfigurationAdapterFactory.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/util/ApplicationConfigurationAdapterFactory.java
index 836d841f..e577ddd2 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/util/ApplicationConfigurationAdapterFactory.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/util/ApplicationConfigurationAdapterFactory.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.util;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/util/ApplicationConfigurationSwitch.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/util/ApplicationConfigurationSwitch.java
index 313fce87..417a3ad1 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/util/ApplicationConfigurationSwitch.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/applicationConfiguration/util/ApplicationConfigurationSwitch.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.util;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/ApplicationConfigurationAntlrTokenFileProvider.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/ApplicationConfigurationAntlrTokenFileProvider.java
index 725ca8fb..fb9b562a 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/ApplicationConfigurationAntlrTokenFileProvider.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/ApplicationConfigurationAntlrTokenFileProvider.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.parser.antlr;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/ApplicationConfigurationParser.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/ApplicationConfigurationParser.java
index fa6ff883..f1d6ae3a 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/ApplicationConfigurationParser.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/ApplicationConfigurationParser.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.parser.antlr;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.g b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.g
index 455e7054..a532dabf 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.g
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.g
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 grammar InternalApplicationConfiguration;
 
@@ -4285,6 +4285,14 @@ ruleSolver returns [Enumerator current=null]
 				newLeafNode(enumLiteral_2, grammarAccess.getSolverAccess().getViatraSolverEnumLiteralDeclaration_2());
 			}
 		)
+		    |
+		(
+			enumLiteral_3='TPTPSolver'
+			{
+				$current = grammarAccess.getSolverAccess().getTPTPSolverEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
+				newLeafNode(enumLiteral_3, grammarAccess.getSolverAccess().getTPTPSolverEnumLiteralDeclaration_3());
+			}
+		)
 	)
 ;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.tokens b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.tokens
index 96730dbf..fe0abab9 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.tokens
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfiguration.tokens
@@ -11,6 +11,7 @@
 '>'=35
 'AlloySolver'=56
 'SMTSolver'=55
+'TPTPSolver'=58
 'ViatraSolver'=57
 'config'=28
 'constraints'=27
@@ -99,3 +100,4 @@ T__54=54
 T__55=55
 T__56=56
 T__57=57
+T__58=58
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationLexer.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationLexer.java
index 6e214569..f7343ead 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationLexer.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationLexer.java
@@ -25,6 +25,7 @@ public class InternalApplicationConfigurationLexer extends Lexer {
     public static final int T__13=13;
     public static final int T__57=57;
     public static final int T__14=14;
+    public static final int T__58=58;
     public static final int T__51=51;
     public static final int T__52=52;
     public static final int T__53=53;
@@ -1058,15 +1059,36 @@ public class InternalApplicationConfigurationLexer extends Lexer {
     }
     // $ANTLR end "T__57"
 
+    // $ANTLR start "T__58"
+    public final void mT__58() throws RecognitionException {
+        try {
+            int _type = T__58;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalApplicationConfiguration.g:58:7: ( 'TPTPSolver' )
+            // InternalApplicationConfiguration.g:58:9: 'TPTPSolver'
+            {
+            match("TPTPSolver"); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__58"
+
     // $ANTLR start "RULE_ID"
     public final void mRULE_ID() throws RecognitionException {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalApplicationConfiguration.g:4291:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // InternalApplicationConfiguration.g:4291:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalApplicationConfiguration.g:4299:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalApplicationConfiguration.g:4299:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // InternalApplicationConfiguration.g:4291:11: ( '^' )?
+            // InternalApplicationConfiguration.g:4299:11: ( '^' )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -1075,7 +1097,7 @@ public class InternalApplicationConfigurationLexer extends Lexer {
             }
             switch (alt1) {
                 case 1 :
-                    // InternalApplicationConfiguration.g:4291:11: '^'
+                    // InternalApplicationConfiguration.g:4299:11: '^'
                     {
                     match('^'); 
 
@@ -1093,7 +1115,7 @@ public class InternalApplicationConfigurationLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // InternalApplicationConfiguration.g:4291:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalApplicationConfiguration.g:4299:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop2:
             do {
                 int alt2=2;
@@ -1142,10 +1164,10 @@ public class InternalApplicationConfigurationLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalApplicationConfiguration.g:4293:10: ( ( '0' .. '9' )+ )
-            // InternalApplicationConfiguration.g:4293:12: ( '0' .. '9' )+
+            // InternalApplicationConfiguration.g:4301:10: ( ( '0' .. '9' )+ )
+            // InternalApplicationConfiguration.g:4301:12: ( '0' .. '9' )+
             {
-            // InternalApplicationConfiguration.g:4293:12: ( '0' .. '9' )+
+            // InternalApplicationConfiguration.g:4301:12: ( '0' .. '9' )+
             int cnt3=0;
             loop3:
             do {
@@ -1159,7 +1181,7 @@ public class InternalApplicationConfigurationLexer extends Lexer {
 
                 switch (alt3) {
             	case 1 :
-            	    // InternalApplicationConfiguration.g:4293:13: '0' .. '9'
+            	    // InternalApplicationConfiguration.g:4301:13: '0' .. '9'
             	    {
             	    matchRange('0','9'); 
 
@@ -1191,10 +1213,10 @@ public class InternalApplicationConfigurationLexer extends Lexer {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalApplicationConfiguration.g:4295:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // InternalApplicationConfiguration.g:4295:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalApplicationConfiguration.g:4303:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+            // InternalApplicationConfiguration.g:4303:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             {
-            // InternalApplicationConfiguration.g:4295:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalApplicationConfiguration.g:4303:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -1212,10 +1234,10 @@ public class InternalApplicationConfigurationLexer extends Lexer {
             }
             switch (alt6) {
                 case 1 :
-                    // InternalApplicationConfiguration.g:4295:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalApplicationConfiguration.g:4303:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
                     {
                     match('\"'); 
-                    // InternalApplicationConfiguration.g:4295:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+                    // InternalApplicationConfiguration.g:4303:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
                     loop4:
                     do {
                         int alt4=3;
@@ -1231,7 +1253,7 @@ public class InternalApplicationConfigurationLexer extends Lexer {
 
                         switch (alt4) {
                     	case 1 :
-                    	    // InternalApplicationConfiguration.g:4295:21: '\\\\' .
+                    	    // InternalApplicationConfiguration.g:4303:21: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1239,7 +1261,7 @@ public class InternalApplicationConfigurationLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // InternalApplicationConfiguration.g:4295:28: ~ ( ( '\\\\' | '\"' ) )
+                    	    // InternalApplicationConfiguration.g:4303:28: ~ ( ( '\\\\' | '\"' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1264,10 +1286,10 @@ public class InternalApplicationConfigurationLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalApplicationConfiguration.g:4295:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+                    // InternalApplicationConfiguration.g:4303:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
                     {
                     match('\''); 
-                    // InternalApplicationConfiguration.g:4295:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+                    // InternalApplicationConfiguration.g:4303:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
                     loop5:
                     do {
                         int alt5=3;
@@ -1283,7 +1305,7 @@ public class InternalApplicationConfigurationLexer extends Lexer {
 
                         switch (alt5) {
                     	case 1 :
-                    	    // InternalApplicationConfiguration.g:4295:54: '\\\\' .
+                    	    // InternalApplicationConfiguration.g:4303:54: '\\\\' .
                     	    {
                     	    match('\\'); 
                     	    matchAny(); 
@@ -1291,7 +1313,7 @@ public class InternalApplicationConfigurationLexer extends Lexer {
                     	    }
                     	    break;
                     	case 2 :
-                    	    // InternalApplicationConfiguration.g:4295:61: ~ ( ( '\\\\' | '\\'' ) )
+                    	    // InternalApplicationConfiguration.g:4303:61: ~ ( ( '\\\\' | '\\'' ) )
                     	    {
                     	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                     	        input.consume();
@@ -1334,12 +1356,12 @@ public class InternalApplicationConfigurationLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalApplicationConfiguration.g:4297:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalApplicationConfiguration.g:4297:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalApplicationConfiguration.g:4305:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalApplicationConfiguration.g:4305:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalApplicationConfiguration.g:4297:24: ( options {greedy=false; } : . )*
+            // InternalApplicationConfiguration.g:4305:24: ( options {greedy=false; } : . )*
             loop7:
             do {
                 int alt7=2;
@@ -1364,7 +1386,7 @@ public class InternalApplicationConfigurationLexer extends Lexer {
 
                 switch (alt7) {
             	case 1 :
-            	    // InternalApplicationConfiguration.g:4297:52: .
+            	    // InternalApplicationConfiguration.g:4305:52: .
             	    {
             	    matchAny(); 
 
@@ -1394,12 +1416,12 @@ public class InternalApplicationConfigurationLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalApplicationConfiguration.g:4299:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalApplicationConfiguration.g:4299:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalApplicationConfiguration.g:4307:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalApplicationConfiguration.g:4307:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // InternalApplicationConfiguration.g:4299:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalApplicationConfiguration.g:4307:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop8:
             do {
                 int alt8=2;
@@ -1412,7 +1434,7 @@ public class InternalApplicationConfigurationLexer extends Lexer {
 
                 switch (alt8) {
             	case 1 :
-            	    // InternalApplicationConfiguration.g:4299:24: ~ ( ( '\\n' | '\\r' ) )
+            	    // InternalApplicationConfiguration.g:4307:24: ~ ( ( '\\n' | '\\r' ) )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -1432,7 +1454,7 @@ public class InternalApplicationConfigurationLexer extends Lexer {
                 }
             } while (true);
 
-            // InternalApplicationConfiguration.g:4299:40: ( ( '\\r' )? '\\n' )?
+            // InternalApplicationConfiguration.g:4307:40: ( ( '\\r' )? '\\n' )?
             int alt10=2;
             int LA10_0 = input.LA(1);
 
@@ -1441,9 +1463,9 @@ public class InternalApplicationConfigurationLexer extends Lexer {
             }
             switch (alt10) {
                 case 1 :
-                    // InternalApplicationConfiguration.g:4299:41: ( '\\r' )? '\\n'
+                    // InternalApplicationConfiguration.g:4307:41: ( '\\r' )? '\\n'
                     {
-                    // InternalApplicationConfiguration.g:4299:41: ( '\\r' )?
+                    // InternalApplicationConfiguration.g:4307:41: ( '\\r' )?
                     int alt9=2;
                     int LA9_0 = input.LA(1);
 
@@ -1452,7 +1474,7 @@ public class InternalApplicationConfigurationLexer extends Lexer {
                     }
                     switch (alt9) {
                         case 1 :
-                            // InternalApplicationConfiguration.g:4299:41: '\\r'
+                            // InternalApplicationConfiguration.g:4307:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1484,10 +1506,10 @@ public class InternalApplicationConfigurationLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalApplicationConfiguration.g:4301:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalApplicationConfiguration.g:4301:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalApplicationConfiguration.g:4309:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalApplicationConfiguration.g:4309:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalApplicationConfiguration.g:4301:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalApplicationConfiguration.g:4309:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt11=0;
             loop11:
             do {
@@ -1541,8 +1563,8 @@ public class InternalApplicationConfigurationLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalApplicationConfiguration.g:4303:16: ( . )
-            // InternalApplicationConfiguration.g:4303:18: .
+            // InternalApplicationConfiguration.g:4311:16: ( . )
+            // InternalApplicationConfiguration.g:4311:18: .
             {
             matchAny(); 
 
@@ -1557,8 +1579,8 @@ public class InternalApplicationConfigurationLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // InternalApplicationConfiguration.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt12=54;
+        // InternalApplicationConfiguration.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt12=55;
         alt12 = dfa12.predict(input);
         switch (alt12) {
             case 1 :
@@ -1891,49 +1913,56 @@ public class InternalApplicationConfigurationLexer extends Lexer {
                 }
                 break;
             case 48 :
-                // InternalApplicationConfiguration.g:1:292: RULE_ID
+                // InternalApplicationConfiguration.g:1:292: T__58
                 {
-                mRULE_ID(); 
+                mT__58(); 
 
                 }
                 break;
             case 49 :
-                // InternalApplicationConfiguration.g:1:300: RULE_INT
+                // InternalApplicationConfiguration.g:1:298: RULE_ID
                 {
-                mRULE_INT(); 
+                mRULE_ID(); 
 
                 }
                 break;
             case 50 :
-                // InternalApplicationConfiguration.g:1:309: RULE_STRING
+                // InternalApplicationConfiguration.g:1:306: RULE_INT
                 {
-                mRULE_STRING(); 
+                mRULE_INT(); 
 
                 }
                 break;
             case 51 :
-                // InternalApplicationConfiguration.g:1:321: RULE_ML_COMMENT
+                // InternalApplicationConfiguration.g:1:315: RULE_STRING
                 {
-                mRULE_ML_COMMENT(); 
+                mRULE_STRING(); 
 
                 }
                 break;
             case 52 :
-                // InternalApplicationConfiguration.g:1:337: RULE_SL_COMMENT
+                // InternalApplicationConfiguration.g:1:327: RULE_ML_COMMENT
                 {
-                mRULE_SL_COMMENT(); 
+                mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 53 :
-                // InternalApplicationConfiguration.g:1:353: RULE_WS
+                // InternalApplicationConfiguration.g:1:343: RULE_SL_COMMENT
                 {
-                mRULE_WS(); 
+                mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 54 :
-                // InternalApplicationConfiguration.g:1:361: RULE_ANY_OTHER
+                // InternalApplicationConfiguration.g:1:359: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 55 :
+                // InternalApplicationConfiguration.g:1:367: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1947,106 +1976,105 @@ public class InternalApplicationConfigurationLexer extends Lexer {
 
     protected DFA12 dfa12 = new DFA12(this);
     static final String DFA12_eotS =
-        "\1\uffff\1\47\1\uffff\4\53\4\uffff\1\53\1\45\4\53\1\uffff\1\45\2\uffff\2\53\1\uffff\6\53\1\45\2\uffff\3\45\5\uffff\2\53\1\uffff\6\53\4\uffff\1\53\1\uffff\6\53\4\uffff\5\53\1\uffff\6\53\5\uffff\1\53\1\163\14\53\1\u0082\21\53\1\uffff\3\53\1\u0098\1\53\1\u009a\7\53\2\uffff\1\53\1\u00a3\1\u00a4\1\u00a5\1\u00a6\20\53\1\uffff\1\53\1\uffff\10\53\4\uffff\4\53\1\u00c4\2\53\1\u00c7\4\53\1\u00cc\2\53\1\u00cf\1\u00d0\3\53\1\u00d4\1\u00d5\1\53\1\u00d7\1\53\1\u00d9\1\u00da\1\u00db\1\53\1\uffff\1\u00dd\1\53\1\uffff\1\u00df\3\53\1\uffff\2\53\2\uffff\1\u00e5\2\53\2\uffff\1\53\1\uffff\1\u00e9\3\uffff\1\53\1\uffff\1\53\1\uffff\3\53\1\u00ef\1\53\2\uffff\2\53\1\uffff\1\53\1\u00f4\3\53\1\uffff\1\u00f8\1\u00f9\2\53\1\uffff\1\u00fc\2\53\2\uffff\1\53\1\u0100\1\uffff\2\53\1\u0103\1\uffff\1\u0104\1\53\2\uffff\1\u0106\1\uffff";
+        "\1\uffff\1\50\1\uffff\4\54\4\uffff\1\54\1\46\4\54\1\uffff\1\46\2\uffff\2\54\1\uffff\7\54\1\46\2\uffff\3\46\5\uffff\2\54\1\uffff\6\54\4\uffff\1\54\1\uffff\6\54\4\uffff\5\54\1\uffff\7\54\5\uffff\1\54\1\166\14\54\1\u0085\22\54\1\uffff\3\54\1\u009c\1\54\1\u009e\7\54\2\uffff\1\54\1\u00a7\1\u00a8\1\u00a9\1\u00aa\21\54\1\uffff\1\54\1\uffff\10\54\4\uffff\4\54\1\u00c9\2\54\1\u00cc\5\54\1\u00d2\2\54\1\u00d5\1\u00d6\3\54\1\u00da\1\u00db\1\54\1\u00dd\1\54\1\u00df\1\u00e0\1\u00e1\1\54\1\uffff\1\u00e3\1\54\1\uffff\1\u00e5\4\54\1\uffff\2\54\2\uffff\1\u00ec\2\54\2\uffff\1\54\1\uffff\1\u00f0\3\uffff\1\54\1\uffff\1\54\1\uffff\4\54\1\u00f7\1\54\2\uffff\2\54\1\uffff\1\54\1\u00fc\4\54\1\uffff\1\u0101\1\u0102\2\54\1\uffff\1\u0105\3\54\2\uffff\1\54\1\u010a\1\uffff\2\54\1\u010d\1\u010e\1\uffff\1\u010f\1\54\3\uffff\1\u0111\1\uffff";
     static final String DFA12_eofS =
-        "\u0107\uffff";
+        "\u0112\uffff";
     static final String DFA12_minS =
-        "\1\0\1\56\1\uffff\1\155\1\160\2\151\4\uffff\1\141\1\72\1\145\2\157\1\145\1\uffff\1\75\2\uffff\1\157\1\143\1\uffff\2\145\1\165\1\115\1\154\1\151\1\101\2\uffff\2\0\1\52\5\uffff\1\160\1\164\1\uffff\1\141\1\143\1\141\3\154\4\uffff\1\143\1\uffff\1\155\1\144\1\156\1\147\1\156\1\141\4\uffff\1\144\1\155\1\141\1\157\1\154\1\uffff\1\156\1\142\1\164\1\124\1\154\1\141\5\uffff\1\157\1\60\1\143\1\154\1\164\1\145\1\144\1\154\1\153\1\164\1\141\1\157\1\145\1\146\1\55\1\163\1\154\2\145\1\155\1\142\1\151\1\164\1\160\1\166\1\145\1\165\1\160\1\123\1\157\1\164\1\162\1\uffff\1\153\1\165\1\162\1\60\1\145\1\60\1\141\1\151\1\155\1\162\1\154\1\164\1\151\2\uffff\1\151\4\60\1\141\1\145\1\156\1\151\2\145\1\162\1\147\1\165\1\157\1\171\1\162\1\164\1\141\1\144\1\141\1\uffff\1\162\1\uffff\1\147\1\141\1\157\1\171\1\163\1\162\1\147\1\155\4\uffff\1\154\1\162\1\147\1\163\1\60\1\162\1\141\1\60\1\164\1\154\1\123\1\141\1\60\1\147\1\151\2\60\1\145\1\154\1\144\2\60\1\141\1\60\1\145\3\60\1\164\1\uffff\1\60\1\164\1\uffff\1\60\1\166\1\157\1\123\1\uffff\1\145\1\156\2\uffff\1\60\1\55\1\145\2\uffff\1\151\1\uffff\1\60\3\uffff\1\151\1\uffff\1\145\1\uffff\1\145\1\154\1\157\1\60\1\147\2\uffff\1\154\1\156\1\uffff\1\143\1\60\1\162\1\166\1\154\1\uffff\2\60\1\164\1\163\1\uffff\1\60\1\145\1\166\2\uffff\1\163\1\60\1\uffff\1\162\1\145\1\60\1\uffff\1\60\1\162\2\uffff\1\60\1\uffff";
+        "\1\0\1\56\1\uffff\1\155\1\160\2\151\4\uffff\1\141\1\72\1\145\2\157\1\145\1\uffff\1\75\2\uffff\1\157\1\143\1\uffff\2\145\1\165\1\115\1\154\1\151\1\120\1\101\2\uffff\2\0\1\52\5\uffff\1\160\1\164\1\uffff\1\141\1\143\1\141\3\154\4\uffff\1\143\1\uffff\1\155\1\144\1\156\1\147\1\156\1\141\4\uffff\1\144\1\155\1\141\1\157\1\154\1\uffff\1\156\1\142\1\164\1\124\1\154\1\141\1\124\5\uffff\1\157\1\60\1\143\1\154\1\164\1\145\1\144\1\154\1\153\1\164\1\141\1\157\1\145\1\146\1\55\1\163\1\154\2\145\1\155\1\142\1\151\1\164\1\160\1\166\1\145\1\165\1\160\1\123\1\157\1\164\1\120\1\162\1\uffff\1\153\1\165\1\162\1\60\1\145\1\60\1\141\1\151\1\155\1\162\1\154\1\164\1\151\2\uffff\1\151\4\60\1\141\1\145\1\156\1\151\2\145\1\162\1\147\1\165\1\157\1\171\1\162\1\123\1\164\1\141\1\144\1\141\1\uffff\1\162\1\uffff\1\147\1\141\1\157\1\171\1\163\1\162\1\147\1\155\4\uffff\1\154\1\162\1\147\1\163\1\60\1\162\1\141\1\60\1\164\1\154\1\123\1\141\1\157\1\60\1\147\1\151\2\60\1\145\1\154\1\144\2\60\1\141\1\60\1\145\3\60\1\164\1\uffff\1\60\1\164\1\uffff\1\60\1\166\1\157\1\123\1\154\1\uffff\1\145\1\156\2\uffff\1\60\1\55\1\145\2\uffff\1\151\1\uffff\1\60\3\uffff\1\151\1\uffff\1\145\1\uffff\1\145\1\154\1\157\1\166\1\60\1\147\2\uffff\1\154\1\156\1\uffff\1\143\1\60\1\162\1\166\1\154\1\145\1\uffff\2\60\1\164\1\163\1\uffff\1\60\1\145\1\166\1\162\2\uffff\1\163\1\60\1\uffff\1\162\1\145\2\60\1\uffff\1\60\1\162\3\uffff\1\60\1\uffff";
     static final String DFA12_maxS =
-        "\1\uffff\1\56\1\uffff\1\156\1\170\1\151\1\165\4\uffff\1\141\1\72\3\157\1\165\1\uffff\1\75\2\uffff\1\165\1\164\1\uffff\2\145\1\165\1\115\1\154\1\151\1\172\2\uffff\2\uffff\1\57\5\uffff\1\160\1\164\1\uffff\1\141\1\143\1\141\3\154\4\uffff\1\162\1\uffff\1\164\1\144\1\156\1\147\1\156\1\141\4\uffff\1\162\1\155\1\162\1\157\1\154\1\uffff\1\156\1\142\1\164\1\124\1\154\1\141\5\uffff\1\157\1\172\1\143\1\154\1\164\1\145\1\144\1\154\1\153\1\164\1\141\1\157\1\145\1\163\1\172\1\164\1\154\2\145\1\155\1\142\1\151\1\164\1\160\1\166\1\145\1\165\1\160\1\123\1\157\1\164\1\162\1\uffff\1\153\1\165\1\162\1\172\1\145\1\172\1\141\1\151\1\155\1\162\1\154\1\164\1\151\2\uffff\1\151\4\172\1\141\1\145\1\156\1\151\2\145\1\162\1\147\1\165\1\157\1\171\1\162\1\164\1\141\1\144\1\141\1\uffff\1\162\1\uffff\1\147\1\141\1\157\1\171\1\163\1\162\1\147\1\155\4\uffff\1\154\1\162\1\147\1\163\1\172\1\162\1\141\1\172\1\164\1\154\1\123\1\141\1\172\1\147\1\151\2\172\1\145\1\154\1\144\2\172\1\141\1\172\1\145\3\172\1\164\1\uffff\1\172\1\164\1\uffff\1\172\1\166\1\157\1\123\1\uffff\1\145\1\156\2\uffff\1\172\1\55\1\145\2\uffff\1\151\1\uffff\1\172\3\uffff\1\151\1\uffff\1\145\1\uffff\1\145\1\154\1\157\1\172\1\147\2\uffff\1\154\1\156\1\uffff\1\143\1\172\1\162\1\166\1\154\1\uffff\2\172\1\164\1\163\1\uffff\1\172\1\145\1\166\2\uffff\1\163\1\172\1\uffff\1\162\1\145\1\172\1\uffff\1\172\1\162\2\uffff\1\172\1\uffff";
+        "\1\uffff\1\56\1\uffff\1\156\1\170\1\151\1\165\4\uffff\1\141\1\72\3\157\1\165\1\uffff\1\75\2\uffff\1\165\1\164\1\uffff\2\145\1\165\1\115\1\154\1\151\1\120\1\172\2\uffff\2\uffff\1\57\5\uffff\1\160\1\164\1\uffff\1\141\1\143\1\141\3\154\4\uffff\1\162\1\uffff\1\164\1\144\1\156\1\147\1\156\1\141\4\uffff\1\162\1\155\1\162\1\157\1\154\1\uffff\1\156\1\142\1\164\1\124\1\154\1\141\1\124\5\uffff\1\157\1\172\1\143\1\154\1\164\1\145\1\144\1\154\1\153\1\164\1\141\1\157\1\145\1\163\1\172\1\164\1\154\2\145\1\155\1\142\1\151\1\164\1\160\1\166\1\145\1\165\1\160\1\123\1\157\1\164\1\120\1\162\1\uffff\1\153\1\165\1\162\1\172\1\145\1\172\1\141\1\151\1\155\1\162\1\154\1\164\1\151\2\uffff\1\151\4\172\1\141\1\145\1\156\1\151\2\145\1\162\1\147\1\165\1\157\1\171\1\162\1\123\1\164\1\141\1\144\1\141\1\uffff\1\162\1\uffff\1\147\1\141\1\157\1\171\1\163\1\162\1\147\1\155\4\uffff\1\154\1\162\1\147\1\163\1\172\1\162\1\141\1\172\1\164\1\154\1\123\1\141\1\157\1\172\1\147\1\151\2\172\1\145\1\154\1\144\2\172\1\141\1\172\1\145\3\172\1\164\1\uffff\1\172\1\164\1\uffff\1\172\1\166\1\157\1\123\1\154\1\uffff\1\145\1\156\2\uffff\1\172\1\55\1\145\2\uffff\1\151\1\uffff\1\172\3\uffff\1\151\1\uffff\1\145\1\uffff\1\145\1\154\1\157\1\166\1\172\1\147\2\uffff\1\154\1\156\1\uffff\1\143\1\172\1\162\1\166\1\154\1\145\1\uffff\2\172\1\164\1\163\1\uffff\1\172\1\145\1\166\1\162\2\uffff\1\163\1\172\1\uffff\1\162\1\145\2\172\1\uffff\1\172\1\162\3\uffff\1\172\1\uffff";
     static final String DFA12_acceptS =
-        "\2\uffff\1\2\4\uffff\1\7\1\10\1\11\1\12\6\uffff\1\26\1\uffff\1\30\1\31\2\uffff\1\36\7\uffff\1\60\1\61\3\uffff\1\65\1\66\1\37\1\1\1\2\2\uffff\1\60\6\uffff\1\7\1\10\1\11\1\12\1\uffff\1\15\6\uffff\1\26\1\27\1\30\1\31\5\uffff\1\36\6\uffff\1\61\1\62\1\63\1\64\1\65\40\uffff\1\33\15\uffff\1\23\1\47\25\uffff\1\6\1\uffff\1\54\10\uffff\1\44\1\34\1\32\1\52\35\uffff\1\40\2\uffff\1\46\4\uffff\1\3\2\uffff\1\5\1\17\3\uffff\1\25\1\20\1\uffff\1\22\1\uffff\1\53\1\43\1\35\1\uffff\1\45\1\uffff\1\51\5\uffff\1\13\1\42\2\uffff\1\24\5\uffff\1\4\4\uffff\1\41\3\uffff\1\14\1\16\2\uffff\1\55\3\uffff\1\50\2\uffff\1\21\1\56\1\uffff\1\57";
+        "\2\uffff\1\2\4\uffff\1\7\1\10\1\11\1\12\6\uffff\1\26\1\uffff\1\30\1\31\2\uffff\1\36\10\uffff\1\61\1\62\3\uffff\1\66\1\67\1\37\1\1\1\2\2\uffff\1\61\6\uffff\1\7\1\10\1\11\1\12\1\uffff\1\15\6\uffff\1\26\1\27\1\30\1\31\5\uffff\1\36\7\uffff\1\62\1\63\1\64\1\65\1\66\41\uffff\1\33\15\uffff\1\23\1\47\26\uffff\1\6\1\uffff\1\54\10\uffff\1\44\1\34\1\32\1\52\36\uffff\1\40\2\uffff\1\46\5\uffff\1\3\2\uffff\1\5\1\17\3\uffff\1\25\1\20\1\uffff\1\22\1\uffff\1\53\1\43\1\35\1\uffff\1\45\1\uffff\1\51\6\uffff\1\13\1\42\2\uffff\1\24\6\uffff\1\4\4\uffff\1\41\4\uffff\1\14\1\16\2\uffff\1\55\4\uffff\1\50\2\uffff\1\60\1\21\1\56\1\uffff\1\57";
     static final String DFA12_specialS =
-        "\1\1\40\uffff\1\2\1\0\u00e4\uffff}>";
+        "\1\0\41\uffff\1\1\1\2\u00ee\uffff}>";
     static final String[] DFA12_transitionS = {
-            "\11\45\2\44\2\45\1\44\22\45\1\44\1\45\1\41\1\21\3\45\1\42\2\45\1\27\1\22\1\11\1\2\1\1\1\43\12\40\1\14\1\45\1\23\1\7\1\24\2\45\1\34\21\37\1\33\2\37\1\35\4\37\3\45\1\36\1\37\1\45\2\37\1\16\1\31\1\4\1\6\1\30\1\37\1\3\2\37\1\17\1\15\1\25\1\32\1\13\1\37\1\20\1\26\2\37\1\5\4\37\1\10\1\45\1\12\uff82\45",
-            "\1\46",
+            "\11\46\2\45\2\46\1\45\22\46\1\45\1\46\1\42\1\21\3\46\1\43\2\46\1\27\1\22\1\11\1\2\1\1\1\44\12\41\1\14\1\46\1\23\1\7\1\24\2\46\1\34\21\40\1\33\1\36\1\40\1\35\4\40\3\46\1\37\1\40\1\46\2\40\1\16\1\31\1\4\1\6\1\30\1\40\1\3\2\40\1\17\1\15\1\25\1\32\1\13\1\40\1\20\1\26\2\40\1\5\4\40\1\10\1\46\1\12\uff82\46",
+            "\1\47",
             "",
-            "\1\51\1\52",
-            "\1\54\7\uffff\1\55",
-            "\1\56",
-            "\1\57\5\uffff\1\60\5\uffff\1\61",
+            "\1\52\1\53",
+            "\1\55\7\uffff\1\56",
+            "\1\57",
+            "\1\60\5\uffff\1\61\5\uffff\1\62",
             "",
             "",
             "",
             "",
-            "\1\66",
             "\1\67",
-            "\1\70\11\uffff\1\71",
-            "\1\72",
+            "\1\70",
+            "\1\71\11\uffff\1\72",
             "\1\73",
-            "\1\75\17\uffff\1\74",
+            "\1\74",
+            "\1\76\17\uffff\1\75",
             "",
-            "\1\77",
+            "\1\100",
             "",
             "",
-            "\1\102\5\uffff\1\103",
-            "\1\105\13\uffff\1\106\4\uffff\1\104",
+            "\1\103\5\uffff\1\104",
+            "\1\106\13\uffff\1\107\4\uffff\1\105",
             "",
-            "\1\110",
             "\1\111",
             "\1\112",
             "\1\113",
             "\1\114",
             "\1\115",
-            "\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\1\116",
+            "\1\117",
+            "\32\54\4\uffff\1\54\1\uffff\32\54",
             "",
             "",
-            "\0\117",
-            "\0\117",
-            "\1\120\4\uffff\1\121",
+            "\0\121",
+            "\0\121",
+            "\1\122\4\uffff\1\123",
             "",
             "",
             "",
             "",
             "",
-            "\1\123",
-            "\1\124",
-            "",
             "\1\125",
             "\1\126",
+            "",
             "\1\127",
             "\1\130",
             "\1\131",
             "\1\132",
+            "\1\133",
+            "\1\134",
             "",
             "",
             "",
             "",
-            "\1\133\16\uffff\1\134",
+            "\1\135\16\uffff\1\136",
             "",
-            "\1\136\6\uffff\1\135",
-            "\1\137",
-            "\1\140",
+            "\1\140\6\uffff\1\137",
             "\1\141",
             "\1\142",
             "\1\143",
+            "\1\144",
+            "\1\145",
             "",
             "",
             "",
             "",
-            "\1\144\11\uffff\1\145\3\uffff\1\146",
-            "\1\147",
-            "\1\151\20\uffff\1\150",
-            "\1\152",
-            "\1\153",
-            "",
+            "\1\146\11\uffff\1\147\3\uffff\1\150",
+            "\1\151",
+            "\1\153\20\uffff\1\152",
             "\1\154",
             "\1\155",
+            "",
             "\1\156",
             "\1\157",
             "\1\160",
             "\1\161",
+            "\1\162",
+            "\1\163",
+            "\1\164",
             "",
             "",
             "",
             "",
             "",
-            "\1\162",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\164",
             "\1\165",
-            "\1\166",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             "\1\167",
             "\1\170",
             "\1\171",
@@ -2055,12 +2083,12 @@ public class InternalApplicationConfigurationLexer extends Lexer {
             "\1\174",
             "\1\175",
             "\1\176",
-            "\1\u0080\14\uffff\1\177",
-            "\1\u0081\2\uffff\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\u0084\1\u0083",
-            "\1\u0085",
-            "\1\u0086",
-            "\1\u0087",
+            "\1\177",
+            "\1\u0080",
+            "\1\u0081",
+            "\1\u0083\14\uffff\1\u0082",
+            "\1\u0084\2\uffff\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "\1\u0087\1\u0086",
             "\1\u0088",
             "\1\u0089",
             "\1\u008a",
@@ -2074,31 +2102,31 @@ public class InternalApplicationConfigurationLexer extends Lexer {
             "\1\u0092",
             "\1\u0093",
             "\1\u0094",
-            "",
             "\1\u0095",
             "\1\u0096",
             "\1\u0097",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\1\u0098",
+            "",
             "\1\u0099",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\1\u009a",
             "\1\u009b",
-            "\1\u009c",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             "\1\u009d",
-            "\1\u009e",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             "\1\u009f",
             "\1\u00a0",
             "\1\u00a1",
+            "\1\u00a2",
+            "\1\u00a3",
+            "\1\u00a4",
+            "\1\u00a5",
             "",
             "",
-            "\1\u00a2",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\u00a7",
-            "\1\u00a8",
-            "\1\u00a9",
-            "\1\u00aa",
+            "\1\u00a6",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             "\1\u00ab",
             "\1\u00ac",
             "\1\u00ad",
@@ -2111,116 +2139,128 @@ public class InternalApplicationConfigurationLexer extends Lexer {
             "\1\u00b4",
             "\1\u00b5",
             "\1\u00b6",
-            "",
             "\1\u00b7",
-            "",
             "\1\u00b8",
             "\1\u00b9",
             "\1\u00ba",
             "\1\u00bb",
+            "",
             "\1\u00bc",
+            "",
             "\1\u00bd",
             "\1\u00be",
             "\1\u00bf",
-            "",
-            "",
-            "",
-            "",
             "\1\u00c0",
             "\1\u00c1",
             "\1\u00c2",
             "\1\u00c3",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\1\u00c4",
+            "",
+            "",
+            "",
+            "",
             "\1\u00c5",
             "\1\u00c6",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\1\u00c7",
             "\1\u00c8",
-            "\1\u00c9",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             "\1\u00ca",
             "\1\u00cb",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             "\1\u00cd",
             "\1\u00ce",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\1\u00cf",
+            "\1\u00d0",
             "\1\u00d1",
-            "\1\u00d2",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             "\1\u00d3",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\u00d6",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\1\u00d4",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "\1\u00d7",
             "\1\u00d8",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\1\u00d9",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             "\1\u00dc",
-            "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             "\1\u00de",
-            "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\u00e0",
-            "\1\u00e1",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             "\1\u00e2",
             "",
-            "\1\u00e3",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             "\1\u00e4",
             "",
-            "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             "\1\u00e6",
             "\1\u00e7",
-            "",
-            "",
             "\1\u00e8",
-            "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "",
-            "",
+            "\1\u00e9",
             "",
             "\1\u00ea",
-            "",
             "\1\u00eb",
             "",
-            "\1\u00ec",
+            "",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             "\1\u00ed",
             "\1\u00ee",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\u00f0",
+            "",
+            "",
+            "\1\u00ef",
+            "",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "",
             "",
             "",
             "\1\u00f1",
+            "",
             "\1\u00f2",
             "",
             "\1\u00f3",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\1\u00f4",
             "\1\u00f5",
             "\1\u00f6",
-            "\1\u00f7",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "\1\u00f8",
+            "",
             "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\1\u00f9",
             "\1\u00fa",
-            "\1\u00fb",
             "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\1\u00fb",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             "\1\u00fd",
             "\1\u00fe",
+            "\1\u00ff",
+            "\1\u0100",
             "",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "\1\u0103",
+            "\1\u0104",
             "",
-            "\1\u00ff",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "\1\u0106",
+            "\1\u0107",
+            "\1\u0108",
+            "",
+            "",
+            "\1\u0109",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "",
+            "\1\u010b",
+            "\1\u010c",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             "",
-            "\1\u0101",
-            "\1\u0102",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
+            "\1\u0110",
             "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
-            "\1\u0105",
             "",
             "",
-            "\12\53\7\uffff\32\53\4\uffff\1\53\1\uffff\32\53",
+            "\12\54\7\uffff\32\54\4\uffff\1\54\1\uffff\32\54",
             ""
     };
 
@@ -2254,23 +2294,13 @@ public class InternalApplicationConfigurationLexer extends Lexer {
             this.transition = DFA12_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             IntStream input = _input;
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA12_34 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA12_34>='\u0000' && LA12_34<='\uFFFF')) ) {s = 79;}
-
-                        else s = 37;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
                         int LA12_0 = input.LA(1);
 
                         s = -1;
@@ -2332,31 +2362,43 @@ public class InternalApplicationConfigurationLexer extends Lexer {
 
                         else if ( (LA12_0=='V') ) {s = 29;}
 
-                        else if ( (LA12_0=='^') ) {s = 30;}
+                        else if ( (LA12_0=='T') ) {s = 30;}
+
+                        else if ( (LA12_0=='^') ) {s = 31;}
 
-                        else if ( ((LA12_0>='B' && LA12_0<='R')||(LA12_0>='T' && LA12_0<='U')||(LA12_0>='W' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='b')||LA12_0=='h'||(LA12_0>='j' && LA12_0<='k')||LA12_0=='q'||(LA12_0>='t' && LA12_0<='u')||(LA12_0>='w' && LA12_0<='z')) ) {s = 31;}
+                        else if ( ((LA12_0>='B' && LA12_0<='R')||LA12_0=='U'||(LA12_0>='W' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='b')||LA12_0=='h'||(LA12_0>='j' && LA12_0<='k')||LA12_0=='q'||(LA12_0>='t' && LA12_0<='u')||(LA12_0>='w' && LA12_0<='z')) ) {s = 32;}
 
-                        else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 32;}
+                        else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 33;}
 
-                        else if ( (LA12_0=='\"') ) {s = 33;}
+                        else if ( (LA12_0=='\"') ) {s = 34;}
 
-                        else if ( (LA12_0=='\'') ) {s = 34;}
+                        else if ( (LA12_0=='\'') ) {s = 35;}
 
-                        else if ( (LA12_0=='/') ) {s = 35;}
+                        else if ( (LA12_0=='/') ) {s = 36;}
 
-                        else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 36;}
+                        else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 37;}
+
+                        else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='$' && LA12_0<='&')||(LA12_0>='(' && LA12_0<=')')||LA12_0==';'||(LA12_0>='?' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\uFFFF')) ) {s = 38;}
+
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA12_34 = input.LA(1);
+
+                        s = -1;
+                        if ( ((LA12_34>='\u0000' && LA12_34<='\uFFFF')) ) {s = 81;}
 
-                        else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='$' && LA12_0<='&')||(LA12_0>='(' && LA12_0<=')')||LA12_0==';'||(LA12_0>='?' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\uFFFF')) ) {s = 37;}
+                        else s = 38;
 
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA12_33 = input.LA(1);
+                        int LA12_35 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA12_33>='\u0000' && LA12_33<='\uFFFF')) ) {s = 79;}
+                        if ( ((LA12_35>='\u0000' && LA12_35<='\uFFFF')) ) {s = 81;}
 
-                        else s = 37;
+                        else s = 38;
 
                         if ( s>=0 ) return s;
                         break;
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationParser.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationParser.java
index 015e5da9..2d03a3fb 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationParser.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/parser/antlr/internal/InternalApplicationConfigurationParser.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 @SuppressWarnings("all")
 public class InternalApplicationConfigurationParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'.'", "'-'", "'import'", "'epackage'", "'viatra'", "'file'", "'='", "'{'", "','", "'}'", "'package'", "'excluding'", "'::'", "'metamodel'", "'folder'", "'models'", "'constraints'", "'config'", "'log-level'", "'runtime'", "'memory'", "'#'", "'+='", "'<'", "'>'", "'node'", "'int'", "'real'", "'string'", "'*'", "'..'", "'scope'", "'generate'", "'partial-model'", "'number'", "'runs'", "'solver'", "'debug'", "'log'", "'statistics'", "'output'", "'none'", "'normal'", "'full'", "'SMTSolver'", "'AlloySolver'", "'ViatraSolver'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'.'", "'-'", "'import'", "'epackage'", "'viatra'", "'file'", "'='", "'{'", "','", "'}'", "'package'", "'excluding'", "'::'", "'metamodel'", "'folder'", "'models'", "'constraints'", "'config'", "'log-level'", "'runtime'", "'memory'", "'#'", "'+='", "'<'", "'>'", "'node'", "'int'", "'real'", "'string'", "'*'", "'..'", "'scope'", "'generate'", "'partial-model'", "'number'", "'runs'", "'solver'", "'debug'", "'log'", "'statistics'", "'output'", "'none'", "'normal'", "'full'", "'SMTSolver'", "'AlloySolver'", "'ViatraSolver'", "'TPTPSolver'"
     };
     public static final int T__50=50;
     public static final int T__19=19;
@@ -37,6 +37,7 @@ public class InternalApplicationConfigurationParser extends AbstractInternalAntl
     public static final int T__13=13;
     public static final int T__57=57;
     public static final int T__14=14;
+    public static final int T__58=58;
     public static final int T__51=51;
     public static final int T__52=52;
     public static final int T__53=53;
@@ -11403,23 +11404,24 @@ public class InternalApplicationConfigurationParser extends AbstractInternalAntl
 
 
     // $ANTLR start "ruleSolver"
-    // InternalApplicationConfiguration.g:4257:1: ruleSolver returns [Enumerator current=null] : ( (enumLiteral_0= 'SMTSolver' ) | (enumLiteral_1= 'AlloySolver' ) | (enumLiteral_2= 'ViatraSolver' ) ) ;
+    // InternalApplicationConfiguration.g:4257:1: ruleSolver returns [Enumerator current=null] : ( (enumLiteral_0= 'SMTSolver' ) | (enumLiteral_1= 'AlloySolver' ) | (enumLiteral_2= 'ViatraSolver' ) | (enumLiteral_3= 'TPTPSolver' ) ) ;
     public final Enumerator ruleSolver() throws RecognitionException {
         Enumerator current = null;
 
         Token enumLiteral_0=null;
         Token enumLiteral_1=null;
         Token enumLiteral_2=null;
+        Token enumLiteral_3=null;
 
 
         	enterRule();
 
         try {
-            // InternalApplicationConfiguration.g:4263:2: ( ( (enumLiteral_0= 'SMTSolver' ) | (enumLiteral_1= 'AlloySolver' ) | (enumLiteral_2= 'ViatraSolver' ) ) )
-            // InternalApplicationConfiguration.g:4264:2: ( (enumLiteral_0= 'SMTSolver' ) | (enumLiteral_1= 'AlloySolver' ) | (enumLiteral_2= 'ViatraSolver' ) )
+            // InternalApplicationConfiguration.g:4263:2: ( ( (enumLiteral_0= 'SMTSolver' ) | (enumLiteral_1= 'AlloySolver' ) | (enumLiteral_2= 'ViatraSolver' ) | (enumLiteral_3= 'TPTPSolver' ) ) )
+            // InternalApplicationConfiguration.g:4264:2: ( (enumLiteral_0= 'SMTSolver' ) | (enumLiteral_1= 'AlloySolver' ) | (enumLiteral_2= 'ViatraSolver' ) | (enumLiteral_3= 'TPTPSolver' ) )
             {
-            // InternalApplicationConfiguration.g:4264:2: ( (enumLiteral_0= 'SMTSolver' ) | (enumLiteral_1= 'AlloySolver' ) | (enumLiteral_2= 'ViatraSolver' ) )
-            int alt56=3;
+            // InternalApplicationConfiguration.g:4264:2: ( (enumLiteral_0= 'SMTSolver' ) | (enumLiteral_1= 'AlloySolver' ) | (enumLiteral_2= 'ViatraSolver' ) | (enumLiteral_3= 'TPTPSolver' ) )
+            int alt56=4;
             switch ( input.LA(1) ) {
             case 55:
                 {
@@ -11436,6 +11438,11 @@ public class InternalApplicationConfigurationParser extends AbstractInternalAntl
                 alt56=3;
                 }
                 break;
+            case 58:
+                {
+                alt56=4;
+                }
+                break;
             default:
                 NoViableAltException nvae =
                     new NoViableAltException("", 56, 0, input);
@@ -11493,6 +11500,23 @@ public class InternalApplicationConfigurationParser extends AbstractInternalAntl
                     }
 
 
+                    }
+                    break;
+                case 4 :
+                    // InternalApplicationConfiguration.g:4289:3: (enumLiteral_3= 'TPTPSolver' )
+                    {
+                    // InternalApplicationConfiguration.g:4289:3: (enumLiteral_3= 'TPTPSolver' )
+                    // InternalApplicationConfiguration.g:4290:4: enumLiteral_3= 'TPTPSolver'
+                    {
+                    enumLiteral_3=(Token)match(input,58,FOLLOW_2); 
+
+                    				current = grammarAccess.getSolverAccess().getTPTPSolverEnumLiteralDeclaration_3().getEnumLiteral().getInstance();
+                    				newLeafNode(enumLiteral_3, grammarAccess.getSolverAccess().getTPTPSolverEnumLiteralDeclaration_3());
+                    			
+
+                    }
+
+
                     }
                     break;
 
@@ -11655,6 +11679,6 @@ public class InternalApplicationConfigurationParser extends AbstractInternalAntl
     public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000100040L});
     public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x000FF40019100000L});
     public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000000000040010L});
-    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0380000000000000L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0780000000000000L});
 
 }
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/scoping/AbstractApplicationConfigurationScopeProvider.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/scoping/AbstractApplicationConfigurationScopeProvider.java
index 045846b5..2e7de4fc 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/scoping/AbstractApplicationConfigurationScopeProvider.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/scoping/AbstractApplicationConfigurationScopeProvider.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.scoping;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/serializer/ApplicationConfigurationSemanticSequencer.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/serializer/ApplicationConfigurationSemanticSequencer.java
index 96e5a0e2..ff341a50 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/serializer/ApplicationConfigurationSemanticSequencer.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/serializer/ApplicationConfigurationSemanticSequencer.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.serializer;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/serializer/ApplicationConfigurationSyntacticSequencer.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/serializer/ApplicationConfigurationSyntacticSequencer.java
index 098fe405..948f728a 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/serializer/ApplicationConfigurationSyntacticSequencer.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/serializer/ApplicationConfigurationSyntacticSequencer.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.serializer;
 
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/services/ApplicationConfigurationGrammarAccess.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/services/ApplicationConfigurationGrammarAccess.java
index 47166823..cdcafecb 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/services/ApplicationConfigurationGrammarAccess.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/services/ApplicationConfigurationGrammarAccess.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.services;
 
@@ -1471,7 +1471,7 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen
 		//ClassReference
 		public RuleCall getTypeClassReferenceParserRuleCall_1_0() { return cTypeClassReferenceParserRuleCall_1_0; }
 		
-		//setsNew?='+=' | setsSum?='='
+		//(setsNew?='+=' | setsSum?='=')
 		public Alternatives getAlternatives_2() { return cAlternatives_2; }
 		
 		//setsNew?='+='
@@ -1486,7 +1486,7 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen
 		//'='
 		public Keyword getSetsSumEqualsSignKeyword_2_1_0() { return cSetsSumEqualsSignKeyword_2_1_0; }
 		
-		//number=ExactNumber | number=IntervallNumber
+		//(number=ExactNumber | number=IntervallNumber)
 		public Alternatives getAlternatives_3() { return cAlternatives_3; }
 		
 		//number=ExactNumber
@@ -1534,7 +1534,7 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen
 		//ObjectReference
 		public RuleCall getTypeObjectReferenceParserRuleCall_1_0() { return cTypeObjectReferenceParserRuleCall_1_0; }
 		
-		//setsNew?='+=' | setsSum?='='
+		//(setsNew?='+=' | setsSum?='=')
 		public Alternatives getAlternatives_2() { return cAlternatives_2; }
 		
 		//setsNew?='+='
@@ -1549,7 +1549,7 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen
 		//'='
 		public Keyword getSetsSumEqualsSignKeyword_2_1_0() { return cSetsSumEqualsSignKeyword_2_1_0; }
 		
-		//number=ExactNumber | number=IntervallNumber
+		//(number=ExactNumber | number=IntervallNumber)
 		public Alternatives getAlternatives_3() { return cAlternatives_3; }
 		
 		//number=ExactNumber
@@ -1601,7 +1601,7 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen
 		//IntegerReference
 		public RuleCall getTypeIntegerReferenceParserRuleCall_1_0() { return cTypeIntegerReferenceParserRuleCall_1_0; }
 		
-		//setsNew?='+=' | setsSum?='='
+		//(setsNew?='+=' | setsSum?='=')
 		public Alternatives getAlternatives_2() { return cAlternatives_2; }
 		
 		//setsNew?='+='
@@ -1616,7 +1616,7 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen
 		//'='
 		public Keyword getSetsSumEqualsSignKeyword_2_1_0() { return cSetsSumEqualsSignKeyword_2_1_0; }
 		
-		//number=ExactNumber | number=IntervallNumber | number=IntEnumberation
+		//(number=ExactNumber | number=IntervallNumber | number=IntEnumberation)
 		public Alternatives getAlternatives_3() { return cAlternatives_3; }
 		
 		//number=ExactNumber
@@ -1674,7 +1674,7 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen
 		//RealReference
 		public RuleCall getTypeRealReferenceParserRuleCall_1_0() { return cTypeRealReferenceParserRuleCall_1_0; }
 		
-		//setsNew?='+=' | setsSum?='='
+		//(setsNew?='+=' | setsSum?='=')
 		public Alternatives getAlternatives_2() { return cAlternatives_2; }
 		
 		//setsNew?='+='
@@ -1689,7 +1689,7 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen
 		//'='
 		public Keyword getSetsSumEqualsSignKeyword_2_1_0() { return cSetsSumEqualsSignKeyword_2_1_0; }
 		
-		//number=ExactNumber | number=IntervallNumber | number=RealEnumeration
+		//(number=ExactNumber | number=IntervallNumber | number=RealEnumeration)
 		public Alternatives getAlternatives_3() { return cAlternatives_3; }
 		
 		//number=ExactNumber
@@ -1747,7 +1747,7 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen
 		//StringReference
 		public RuleCall getTypeStringReferenceParserRuleCall_1_0() { return cTypeStringReferenceParserRuleCall_1_0; }
 		
-		//setsNew?='+=' | setsSum?='='
+		//(setsNew?='+=' | setsSum?='=')
 		public Alternatives getAlternatives_2() { return cAlternatives_2; }
 		
 		//setsNew?='+='
@@ -1762,7 +1762,7 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen
 		//'='
 		public Keyword getSetsSumEqualsSignKeyword_2_1_0() { return cSetsSumEqualsSignKeyword_2_1_0; }
 		
-		//number=ExactNumber | number=IntervallNumber | number=StringEnumeration
+		//(number=ExactNumber | number=IntervallNumber | number=StringEnumeration)
 		public Alternatives getAlternatives_3() { return cAlternatives_3; }
 		
 		//number=ExactNumber
@@ -2003,7 +2003,7 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen
 		//'..'
 		public Keyword getFullStopFullStopKeyword_1() { return cFullStopFullStopKeyword_1; }
 		
-		//maxNumber=INT | maxUnlimited?='*'
+		//(maxNumber=INT | maxUnlimited?='*')
 		public Alternatives getAlternatives_2() { return cAlternatives_2; }
 		
 		//maxNumber=INT
@@ -2346,11 +2346,11 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen
 		//'{'
 		public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
 		
-		//('metamodel' '=' metamodel=Metamodel)? & ('partial-model' '=' partialModel=PartialModel)? & ('constraints' '='
+		//(('metamodel' '=' metamodel=Metamodel)? & ('partial-model' '=' partialModel=PartialModel)? & ('constraints' '='
 		//patterns=GraphPattern)? & ('scope' '=' scope=Scope)? & (numberSpecified?='number' '=' number=INT)? &
 		//(runSpecified?='runs' '=' runs=INT)? & ('solver' '=' solver=Solver)? & ('config' '=' config=Config)? & ('debug' '='
 		//debugFolder=File)? & ('log' '=' targetLogFile=File)? & ('statistics' '=' targetStatisticsFile=File)? & ('output' '='
-		//tagetFolder=File)?
+		//tagetFolder=File)?)
 		public UnorderedGroup getUnorderedGroup_3() { return cUnorderedGroup_3; }
 		
 		//('metamodel' '=' metamodel=Metamodel)?
@@ -2587,12 +2587,14 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen
 		private final Keyword cAlloySolverAlloySolverKeyword_1_0 = (Keyword)cAlloySolverEnumLiteralDeclaration_1.eContents().get(0);
 		private final EnumLiteralDeclaration cViatraSolverEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
 		private final Keyword cViatraSolverViatraSolverKeyword_2_0 = (Keyword)cViatraSolverEnumLiteralDeclaration_2.eContents().get(0);
+		private final EnumLiteralDeclaration cTPTPSolverEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
+		private final Keyword cTPTPSolverTPTPSolverKeyword_3_0 = (Keyword)cTPTPSolverEnumLiteralDeclaration_3.eContents().get(0);
 		
 		//enum Solver:
-		//	SMTSolver | AlloySolver | ViatraSolver;
+		//	SMTSolver | AlloySolver | ViatraSolver | TPTPSolver;
 		public EnumRule getRule() { return rule; }
 		
-		//SMTSolver | AlloySolver | ViatraSolver
+		//SMTSolver | AlloySolver | ViatraSolver | TPTPSolver
 		public Alternatives getAlternatives() { return cAlternatives; }
 		
 		//SMTSolver
@@ -2612,6 +2614,12 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen
 		
 		//"ViatraSolver"
 		public Keyword getViatraSolverViatraSolverKeyword_2_0() { return cViatraSolverViatraSolverKeyword_2_0; }
+		
+		//TPTPSolver
+		public EnumLiteralDeclaration getTPTPSolverEnumLiteralDeclaration_3() { return cTPTPSolverEnumLiteralDeclaration_3; }
+		
+		//"TPTPSolver"
+		public Keyword getTPTPSolverTPTPSolverKeyword_3_0() { return cTPTPSolverTPTPSolverKeyword_3_0; }
 	}
 	
 	private final ConfigurationScriptElements pConfigurationScript;
@@ -3263,7 +3271,7 @@ public class ApplicationConfigurationGrammarAccess extends AbstractGrammarElemen
 	}
 	
 	//enum Solver:
-	//	SMTSolver | AlloySolver | ViatraSolver;
+	//	SMTSolver | AlloySolver | ViatraSolver | TPTPSolver;
 	public SolverElements getSolverAccess() {
 		return eSolver;
 	}
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/validation/AbstractApplicationConfigurationValidator.java b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/validation/AbstractApplicationConfigurationValidator.java
index 0ba1447c..ad783d33 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/validation/AbstractApplicationConfigurationValidator.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src-gen/hu/bme/mit/inf/dslreasoner/application/validation/AbstractApplicationConfigurationValidator.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.12.0
+ * generated by Xtext 2.21.0
  */
 package hu.bme.mit.inf.dslreasoner.application.validation;
 
@@ -16,5 +16,4 @@ public abstract class AbstractApplicationConfigurationValidator extends Abstract
 		result.add(hu.bme.mit.inf.dslreasoner.application.applicationConfiguration.ApplicationConfigurationPackage.eINSTANCE);
 		return result;
 	}
-	
 }
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext
index 6af31723..95dfe5a1 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/ApplicationConfiguration.xtext
@@ -26,7 +26,7 @@ Import: EPackageImport | ViatraImport;
 
 EPackageImport: "import" "epackage" importedPackage=[ecore::EPackage|STRING];
 ViatraImport: "import" "viatra" importedViatra=[viatra::PatternModel|STRING];
-
+
 ///////////////////////////////////////////////////
 // Declaration
 ///////////////////////////////////////////////////
@@ -95,8 +95,8 @@ GraphPattern: GraphPatternReference|PatternSpecification;
 ConfigSpecification: {ConfigSpecification}'{'
 		(entries += ConfigEntry ("," entries += ConfigEntry)*)?
 	'}';
-ConfigDeclaration :
-	'config' name = ID specification = ConfigSpecification
+ConfigDeclaration :
+	'config' name = ID specification = ConfigSpecification
 ;
 ConfigEntry: DocumentationEntry | RuntimeEntry | MemoryEntry | CustomEntry;
 DocumentationEntry: "log-level" '=' level = DocumentLevelSpecification; enum DocumentLevelSpecification: none | normal | full;
@@ -107,7 +107,7 @@ CustomEntry: key = STRING "=" value = STRING;
 ConfigReference: config = [ConfigDeclaration];
 Config: ConfigSpecification | ConfigReference;
 
-enum Solver: SMTSolver | AlloySolver | ViatraSolver;
+enum Solver: SMTSolver | AlloySolver | ViatraSolver | TPTPSolver;
 
 ScopeSpecification: {ScopeSpecification} '{' 
 		(scopes += TypeScope (',' scopes += TypeScope)*)?
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend
index 2fe69a47..b2241fe2 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend
@@ -15,31 +15,29 @@ import org.eclipse.xtext.xbase.lib.Functions.Function1
 import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualiser
 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DiversityDescriptor
 import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.builder.SolverConfiguration
+import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver
+import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration
+import ca.mcgill.ecse.dslreasoner.vampire.reasoner.BackendSolver
+import java.util.prefs.BackingStoreException
 
 class SolverLoader {
 	def loadSolver(Solver solver, Map<String, String> config) {
-		switch(solver) {
+		switch (solver) {
 			case ALLOY_SOLVER: return new AlloySolver
 			case SMT_SOLVER: return new SMTSolver
 			case VIATRA_SOLVER: return new ViatraReasoner
+			case TPTP_SOLVER: return new VampireSolver
 		}
 	}
-	
-	
-	
-	private def <Type>  Optional<Type> getAsType(
-		Map<String, String> config,
-		String key,
-		ScriptConsole console,
-		Function1<String,Type> parser,
-		Class<Type> requestedType)
-	{
-		if(config.containsKey(key)) {
+
+	private def <Type> Optional<Type> getAsType(Map<String, String> config, String key, ScriptConsole console,
+		Function1<String, Type> parser, Class<Type> requestedType) {
+		if (config.containsKey(key)) {
 			val stringValue = config.get(key)
-			try{
+			try {
 				val parsedValue = parser.apply(stringValue)
 				return Optional.of(parsedValue)
-			} catch(Exception e) {
+			} catch (Exception e) {
 				console.writeError('''Unable to parse configuration value for "«key»" to «requestedType.simpleName»!''')
 				return Optional::empty
 			}
@@ -47,103 +45,128 @@ class SolverLoader {
 			return Optional::empty
 		}
 	}
+
 	private def getAsInteger(Map<String, String> config, String key, ScriptConsole console) {
-		return getAsType(config,key,console,[x|Integer.parseInt(x)],Integer)
+		return getAsType(config, key, console, [x|Integer.parseInt(x)], Integer)
 	}
+
 	private def getAsBoolean(Map<String, String> config, String key, ScriptConsole console) {
-		return getAsType(config,key,console,[x|Boolean.parseBoolean(x)],Boolean)
+		return getAsType(config, key, console, [x|Boolean.parseBoolean(x)], Boolean)
 	}
+
 	private def getAsDouble(Map<String, String> config, String key, ScriptConsole console) {
-		return getAsType(config,key,console,[x|Double.parseDouble(x)],Double)
+		return getAsType(config, key, console, [x|Double.parseDouble(x)], Double)
 	}
-	
-	def loadSolverConfig(
-		Solver solver,
-		Map<String, String> config,
-		ScriptConsole console)
-	{
-		if(solver === Solver::ALLOY_SOLVER) {
-			return new AlloySolverConfiguration => [c|
-				config.getAsInteger("symmetry",console)
-					.ifPresent[c.symmetry = it]
-				config.getAsType("solver",console,[x|AlloyBackendSolver::valueOf(x)],AlloyBackendSolver)
-					.ifPresent[c.solver = it]
+
+	def loadSolverConfig(Solver solver, Map<String, String> config, ScriptConsole console) {
+		if (solver === Solver::ALLOY_SOLVER) {
+			return new AlloySolverConfiguration => [ c |
+				config.getAsInteger("symmetry", console).ifPresent[c.symmetry = it]
+				config.getAsType("solver", console, [x|AlloyBackendSolver::valueOf(x)], AlloyBackendSolver).ifPresent [
+					c.solver = it
+				]
 			]
-		} else if(solver === Solver::SMT_SOLVER) {
-			return new SmtSolverConfiguration => [c|
-				config.getAsBoolean("fixRandomSeed",console).ifPresent[c.fixRandomSeed = it]
-				config.getAsType("path",console,[it],String).ifPresent[c.solverPath = it]
+		} else if (solver === Solver::SMT_SOLVER) {
+			return new SmtSolverConfiguration => [ c |
+				config.getAsBoolean("fixRandomSeed", console).ifPresent[c.fixRandomSeed = it]
+				config.getAsType("path", console, [it], String).ifPresent[c.solverPath = it]
 			]
-		} else if(solver === Solver::VIATRA_SOLVER) {
-			return new ViatraReasonerConfiguration => [c|
+		} else if (solver === Solver::TPTP_SOLVER) {
+			return new VampireSolverConfiguration => [ c |
+				try {
+					val stringValue = config.get("solver")
+					c.solver = switch stringValue {						
+						case "cvc4": BackendSolver::CVC4
+						case "vampire": BackendSolver::VAMPIRE
+						case "vampire-local": BackendSolver::LOCVAMP
+						default: throw new Exception
+					}
+				} catch (Exception e) {
+						console.writeError('''Incorrect Solver specification, using default.''')
+				}
+				if (c.solver != BackendSolver::LOCVAMP) c.server = true
+					
+			]
+		} else if (solver === Solver::VIATRA_SOLVER) {
+			return new ViatraReasonerConfiguration => [ c |
 				c.debugCongiguration.partialInterpretatioVisualiser = new GraphvizVisualiser
-				if(config.containsKey("diversity-range")) {
+				if (config.containsKey("diversity-range")) {
 					val stringValue = config.get("diversity-range")
-					try{
+					try {
 						val range = Integer.parseInt(stringValue)
 						c.diversityRequirement = new DiversityDescriptor => [
 							it.ensureDiversity = true
 							it.range = range
 						]
-					} catch (NumberFormatException e) {console.writeError('''Malformed number format: «e.message»''')}
+					} catch (NumberFormatException e) {
+						console.writeError('''Malformed number format: «e.message»''')
+					}
 				}
-				if(config.containsKey("numeric-solver-at-end")) {
+				if (config.containsKey("numeric-solver-at-end")) {
 					val stringValue = config.get("numeric-solver-at-end")
-					if(stringValue.equals("true")) {
+					if (stringValue.equals("true")) {
 						println("numeric-solver-at-end")
 						c.runIntermediateNumericalConsistencyChecks = false
 					}
 				}
-				if(config.containsKey("fitness-punishSize")) {
+				if (config.containsKey("fitness-punishSize")) {
 					val stringValue = config.get("fitness-punishSize")
 					try {
 						c.punishSize = Boolean.parseBoolean(stringValue)
-					} catch(Exception e) {}
+					} catch (Exception e) {
+					}
 				}
-				if(config.containsKey("fitness-scope")) {
+				if (config.containsKey("fitness-scope")) {
 					val stringValue = config.get("fitness-scope")
 					try {
 						c.scopeWeight = Integer.parseInt(stringValue)
-					} catch(Exception e) {}
+					} catch (Exception e) {
+					}
 				}
-				if(config.containsKey("fitness-missing-containent")) {
+				if (config.containsKey("fitness-missing-containent")) {
 					val stringValue = config.get("fitness-missing-containent")
 					try {
 						c.conaintmentWeight = Integer.parseInt(stringValue)
-					} catch(Exception e) {}
+					} catch (Exception e) {
+					}
 				}
-				if(config.containsKey("fitness-missing-noncontainent")) {
+				if (config.containsKey("fitness-missing-noncontainent")) {
 					val stringValue = config.get("fitness-missing-noncontainent")
 					try {
 						c.nonContainmentWeight = Integer.parseInt(stringValue)
-					} catch(Exception e) {}
+					} catch (Exception e) {
+					}
 				}
-				if(config.containsKey("fitness-missing-wf")) {
+				if (config.containsKey("fitness-missing-wf")) {
 					val stringValue = config.get("fitness-missing-wf")
 					try {
 						c.unfinishedWFWeight = Integer.parseInt(stringValue)
-					} catch(Exception e) {}
+					} catch (Exception e) {
+					}
 				}
-				if(config.containsKey("fitness-objectCreationCosts")) {
+				if (config.containsKey("fitness-objectCreationCosts")) {
 					val stringValue = config.get("fitness-objectCreationCosts")
 					try {
 						c.calculateObjectCreationCosts = Boolean.parseBoolean(stringValue)
-					} catch(Exception e) {}
+					} catch (Exception e) {
+					}
 				}
 			]
 		} else {
 			throw new UnsupportedOperationException('''Unknown solver: «solver»''')
 		}
 	}
-	
-	def dispatch void setRunIndex(AlloySolverConfiguration config, Map<String, String> parameters, int runIndex, ScriptConsole console) {
-		parameters.getAsBoolean("randomize",console).ifPresent[
-			if(it) {
-				config.randomise = runIndex-1
+
+	def dispatch void setRunIndex(AlloySolverConfiguration config, Map<String, String> parameters, int runIndex,
+		ScriptConsole console) {
+		parameters.getAsBoolean("randomize", console).ifPresent [
+			if (it) {
+				config.randomise = runIndex - 1
 			}
 		]
 	}
-	def dispatch void setRunIndex(LogicSolverConfiguration config, Map<String, String> parameters, int runIndex, ScriptConsole console) {
-		
+
+	def dispatch void setRunIndex(LogicSolverConfiguration config, Map<String, String> parameters, int runIndex,
+		ScriptConsole console) {
 	}
-}
\ No newline at end of file
+}
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java b/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java
index dbe4b17b..0b5b8f03 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 package hu.bme.mit.inf.dslreasoner.application.validation;
 
 import com.google.common.collect.Iterables;
@@ -85,91 +84,3 @@ public class QueryAndMetamodelValidator {
     return Iterables.<ENamedElement>concat(ListExtensions.<EObject, Iterable<ENamedElement>>map(elements, _function));
   }
 }
-=======
-package hu.bme.mit.inf.dslreasoner.application.validation;
-
-import com.google.common.collect.Iterables;
-import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;
-import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.viatra.query.patternlanguage.emf.vql.Pattern;
-import org.eclipse.xtend2.lib.StringConcatenation;
-import org.eclipse.xtext.xbase.lib.CollectionLiterals;
-import org.eclipse.xtext.xbase.lib.Functions.Function1;
-import org.eclipse.xtext.xbase.lib.IterableExtensions;
-import org.eclipse.xtext.xbase.lib.IteratorExtensions;
-import org.eclipse.xtext.xbase.lib.ListExtensions;
-import org.eclipse.xtext.xbase.lib.Pair;
-
-@SuppressWarnings("all")
-public class QueryAndMetamodelValidator {
-  public LinkedList<String> validateQueryAndMetamodel(final EcoreMetamodelDescriptor metamodel, final Pair<ViatraQuerySetDescriptor, Set<Pattern>> viatra) {
-    final Set<Pattern> patterns = viatra.getValue();
-    List<EClass> _classes = metamodel.getClasses();
-    List<EEnum> _enums = metamodel.getEnums();
-    Iterable<EClassifier> _plus = Iterables.<EClassifier>concat(_classes, _enums);
-    List<EEnumLiteral> _literals = metamodel.getLiterals();
-    Iterable<ENamedElement> _plus_1 = Iterables.<ENamedElement>concat(_plus, _literals);
-    List<EAttribute> _attributes = metamodel.getAttributes();
-    Iterable<ENamedElement> _plus_2 = Iterables.<ENamedElement>concat(_plus_1, _attributes);
-    List<EReference> _references = metamodel.getReferences();
-    final Set<ENamedElement> elementsInMetamodel = IterableExtensions.<ENamedElement>toSet(Iterables.<ENamedElement>concat(_plus_2, _references));
-    final LinkedList<String> errors = new LinkedList<String>();
-    for (final Pattern pattern : patterns) {
-      {
-        final Iterable<ENamedElement> elements = this.getReferredNamedElements(pattern);
-        for (final ENamedElement element : elements) {
-          boolean _contains = elementsInMetamodel.contains(element);
-          boolean _not = (!_contains);
-          if (_not) {
-            StringConcatenation _builder = new StringConcatenation();
-            _builder.append("Pattern \"");
-            String _name = pattern.getName();
-            _builder.append(_name);
-            _builder.append("\" refers to an element \"");
-            _builder.append(element);
-            _builder.append("\" that is not included to the selected metamodel!");
-            errors.add(_builder.toString());
-          }
-        }
-      }
-    }
-    return errors;
-  }
-  
-  public Iterable<ENamedElement> getReferredNamedElements(final Pattern pattern) {
-    final List<EObject> elements = IteratorExtensions.<EObject>toList(pattern.eAllContents());
-    final Function1<EObject, Iterable<ENamedElement>> _function = (EObject element) -> {
-      final EList<EReference> references = element.eClass().getEAllReferences();
-      final Function1<EReference, Iterable<ENamedElement>> _function_1 = (EReference r) -> {
-        boolean _isMany = r.isMany();
-        if (_isMany) {
-          Object _eGet = element.eGet(r);
-          return Iterables.<ENamedElement>filter(((List<?>) _eGet), ENamedElement.class);
-        } else {
-          final Object value = element.eGet(r);
-          if ((value instanceof ENamedElement)) {
-            return Collections.<ENamedElement>unmodifiableList(CollectionLiterals.<ENamedElement>newArrayList(((ENamedElement)value)));
-          } else {
-            return Collections.<ENamedElement>unmodifiableList(CollectionLiterals.<ENamedElement>newArrayList());
-          }
-        }
-      };
-      return Iterables.<ENamedElement>filter((Iterables.<ENamedElement>concat(ListExtensions.<EReference, Iterable<ENamedElement>>map(references, _function_1))), ENamedElement.class);
-    };
-    return Iterables.<ENamedElement>concat(ListExtensions.<EObject, Iterable<ENamedElement>>map(elements, _function));
-  }
-}
->>>>>>> 8ecc73c4... VAMPIRE: Rebase on Master
-- 
cgit v1.2.3-54-g00ecf