diff --git a/de.cau.cs.se.kieker.record.analyser/META-INF/MANIFEST.MF b/de.cau.cs.se.kieker.record.analyser/META-INF/MANIFEST.MF
index e37096da773b94fb5bb61bc32fa7cb411c8a3e80..209327e0c0b1b4273c944893233107441ad4e436 100644
--- a/de.cau.cs.se.kieker.record.analyser/META-INF/MANIFEST.MF
+++ b/de.cau.cs.se.kieker.record.analyser/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.xtext.xbase.lib;visibility:=reexport,
+ org.eclipse.emf.ecore.xcore.lib,
  org.eclipse.core.resources;bundle-version="3.8.101",
  org.eclipse.jdt;bundle-version="3.9.1",
  org.eclipse.jdt.core;bundle-version="3.9.2",
diff --git a/de.cau.cs.se.kieker.record.analyser/build.properties b/de.cau.cs.se.kieker.record.analyser/build.properties
index 7b957bb843df9aa78f5d86be88c6225b05073edd..dfd6ea7c24ae17674dd51be06210b326196e69e5 100644
--- a/de.cau.cs.se.kieker.record.analyser/build.properties
+++ b/de.cau.cs.se.kieker.record.analyser/build.properties
@@ -1,4 +1,6 @@
-source.. = src/, src-gen/
+source.. = src/,\
+	src-gen/,\
+	xtend-gen/
 output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
diff --git a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/Model.java b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/Model.java
index 64bf265d7e6d424e213717e9f12bfc477b8d9968..21205e29c410a1bd867a8b9c5bdbbf07a73f3800 100644
--- a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/Model.java
+++ b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/Model.java
@@ -13,31 +13,30 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.Model#getRecords <em>Records</em>}</li>
  * </ul>
- * </p>
  *
  * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getModel()
  * @model
  * @generated
  */
-public interface Model extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Records</b></em>' containment reference list.
-   * The list contents are of type {@link de.cau.cs.se.kieker.record.analyser.model.Record}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Records</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>Records</em>' containment reference list.
-   * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getModel_Records()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Record> getRecords();
+public interface Model extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Records</b></em>' containment reference list.
+	 * The list contents are of type {@link de.cau.cs.se.kieker.record.analyser.model.Record}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Records</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>Records</em>' containment reference list.
+	 * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getModel_Records()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<Record> getRecords();
 
 } // Model
diff --git a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/ModelFactory.java b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/ModelFactory.java
index c1c01df321f772eb03d253c0024b6c22357110b2..0369270102410cf4ac57b3cbece3694511ebc3e2 100644
--- a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/ModelFactory.java
+++ b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/ModelFactory.java
@@ -12,50 +12,49 @@ import org.eclipse.emf.ecore.EFactory;
  * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage
  * @generated
  */
-public interface ModelFactory extends EFactory
-{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  ModelFactory eINSTANCE = de.cau.cs.se.kieker.record.analyser.model.impl.ModelFactoryImpl.init();
+public interface ModelFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ModelFactory eINSTANCE = de.cau.cs.se.kieker.record.analyser.model.impl.ModelFactoryImpl.init();
 
-  /**
-   * Returns a new object of class '<em>Model</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Model</em>'.
-   * @generated
-   */
-  Model createModel();
+	/**
+	 * Returns a new object of class '<em>Model</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Model</em>'.
+	 * @generated
+	 */
+	Model createModel();
 
-  /**
-   * Returns a new object of class '<em>Record</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Record</em>'.
-   * @generated
-   */
-  Record createRecord();
+	/**
+	 * Returns a new object of class '<em>Record</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Record</em>'.
+	 * @generated
+	 */
+	Record createRecord();
 
-  /**
-   * Returns a new object of class '<em>Parameter</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Parameter</em>'.
-   * @generated
-   */
-  Parameter createParameter();
+	/**
+	 * Returns a new object of class '<em>Parameter</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Parameter</em>'.
+	 * @generated
+	 */
+	Parameter createParameter();
 
-  /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated
-   */
-  ModelPackage getModelPackage();
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	ModelPackage getModelPackage();
 
 } //ModelFactory
diff --git a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/ModelPackage.java b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/ModelPackage.java
index 847cf9031dbb37e152974473a33c87c4c11bd5d9..958cb8911adc3a141a7d019cf9e9ca5d9d3f5780 100644
--- a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/ModelPackage.java
+++ b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/ModelPackage.java
@@ -24,405 +24,403 @@ import org.eclipse.emf.ecore.EReference;
  *        annotation="http://www.eclipse.org/emf/2002/GenModel basePackage='de.cau.cs.se.kieker.record.analyser'"
  * @generated
  */
-public interface ModelPackage extends EPackage
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "model";
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "de.cau.cs.se.kieker.record.analyser.model";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "model";
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  ModelPackage eINSTANCE = de.cau.cs.se.kieker.record.analyser.model.impl.ModelPackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link de.cau.cs.se.kieker.record.analyser.model.impl.ModelImpl <em>Model</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelImpl
-   * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelPackageImpl#getModel()
-   * @generated
-   */
-  int MODEL = 0;
-
-  /**
-   * The feature id for the '<em><b>Records</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MODEL__RECORDS = 0;
-
-  /**
-   * The number of structural features of the '<em>Model</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MODEL_FEATURE_COUNT = 1;
-
-  /**
-   * The number of operations of the '<em>Model</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MODEL_OPERATION_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl <em>Record</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl
-   * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelPackageImpl#getRecord()
-   * @generated
-   */
-  int RECORD = 1;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int RECORD__NAME = 0;
-
-  /**
-   * The feature id for the '<em><b>Abstract Class</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int RECORD__ABSTRACT_CLASS = 1;
-
-  /**
-   * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int RECORD__PARAMETERS = 2;
-
-  /**
-   * The feature id for the '<em><b>Parent</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int RECORD__PARENT = 3;
-
-  /**
-   * The number of structural features of the '<em>Record</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int RECORD_FEATURE_COUNT = 4;
-
-  /**
-   * The number of operations of the '<em>Record</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int RECORD_OPERATION_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link de.cau.cs.se.kieker.record.analyser.model.impl.ParameterImpl <em>Parameter</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see de.cau.cs.se.kieker.record.analyser.model.impl.ParameterImpl
-   * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelPackageImpl#getParameter()
-   * @generated
-   */
-  int PARAMETER = 2;
-
-  /**
-   * The feature id for the '<em><b>Dtype</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARAMETER__DTYPE = 0;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARAMETER__NAME = 1;
-
-  /**
-   * The number of structural features of the '<em>Parameter</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARAMETER_FEATURE_COUNT = 2;
-
-  /**
-   * The number of operations of the '<em>Parameter</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PARAMETER_OPERATION_COUNT = 0;
-
-
-  /**
-   * Returns the meta object for class '{@link de.cau.cs.se.kieker.record.analyser.model.Model <em>Model</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Model</em>'.
-   * @see de.cau.cs.se.kieker.record.analyser.model.Model
-   * @generated
-   */
-  EClass getModel();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link de.cau.cs.se.kieker.record.analyser.model.Model#getRecords <em>Records</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Records</em>'.
-   * @see de.cau.cs.se.kieker.record.analyser.model.Model#getRecords()
-   * @see #getModel()
-   * @generated
-   */
-  EReference getModel_Records();
-
-  /**
-   * Returns the meta object for class '{@link de.cau.cs.se.kieker.record.analyser.model.Record <em>Record</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Record</em>'.
-   * @see de.cau.cs.se.kieker.record.analyser.model.Record
-   * @generated
-   */
-  EClass getRecord();
-
-  /**
-   * Returns the meta object for the attribute '{@link de.cau.cs.se.kieker.record.analyser.model.Record#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see de.cau.cs.se.kieker.record.analyser.model.Record#getName()
-   * @see #getRecord()
-   * @generated
-   */
-  EAttribute getRecord_Name();
-
-  /**
-   * Returns the meta object for the attribute '{@link de.cau.cs.se.kieker.record.analyser.model.Record#isAbstractClass <em>Abstract Class</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Abstract Class</em>'.
-   * @see de.cau.cs.se.kieker.record.analyser.model.Record#isAbstractClass()
-   * @see #getRecord()
-   * @generated
-   */
-  EAttribute getRecord_AbstractClass();
-
-  /**
-   * Returns the meta object for the containment reference list '{@link de.cau.cs.se.kieker.record.analyser.model.Record#getParameters <em>Parameters</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Parameters</em>'.
-   * @see de.cau.cs.se.kieker.record.analyser.model.Record#getParameters()
-   * @see #getRecord()
-   * @generated
-   */
-  EReference getRecord_Parameters();
-
-  /**
-   * Returns the meta object for the reference '{@link de.cau.cs.se.kieker.record.analyser.model.Record#getParent <em>Parent</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>Parent</em>'.
-   * @see de.cau.cs.se.kieker.record.analyser.model.Record#getParent()
-   * @see #getRecord()
-   * @generated
-   */
-  EReference getRecord_Parent();
-
-  /**
-   * Returns the meta object for class '{@link de.cau.cs.se.kieker.record.analyser.model.Parameter <em>Parameter</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Parameter</em>'.
-   * @see de.cau.cs.se.kieker.record.analyser.model.Parameter
-   * @generated
-   */
-  EClass getParameter();
-
-  /**
-   * Returns the meta object for the attribute '{@link de.cau.cs.se.kieker.record.analyser.model.Parameter#getDtype <em>Dtype</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Dtype</em>'.
-   * @see de.cau.cs.se.kieker.record.analyser.model.Parameter#getDtype()
-   * @see #getParameter()
-   * @generated
-   */
-  EAttribute getParameter_Dtype();
-
-  /**
-   * Returns the meta object for the attribute '{@link de.cau.cs.se.kieker.record.analyser.model.Parameter#getName <em>Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see de.cau.cs.se.kieker.record.analyser.model.Parameter#getName()
-   * @see #getParameter()
-   * @generated
-   */
-  EAttribute getParameter_Name();
-
-  /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the factory that creates the instances of the model.
-   * @generated
-   */
-  ModelFactory getModelFactory();
-
-  /**
-   * <!-- begin-user-doc -->
-   * Defines literals for the meta objects that represent
-   * <ul>
-   *   <li>each class,</li>
-   *   <li>each feature of each class,</li>
-   *   <li>each operation of each class,</li>
-   *   <li>each enum,</li>
-   *   <li>and each data type</li>
-   * </ul>
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  interface Literals
-  {
-    /**
-     * The meta object literal for the '{@link de.cau.cs.se.kieker.record.analyser.model.impl.ModelImpl <em>Model</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelImpl
-     * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelPackageImpl#getModel()
-     * @generated
-     */
-    EClass MODEL = eINSTANCE.getModel();
-
-    /**
-     * The meta object literal for the '<em><b>Records</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference MODEL__RECORDS = eINSTANCE.getModel_Records();
-
-    /**
-     * The meta object literal for the '{@link de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl <em>Record</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl
-     * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelPackageImpl#getRecord()
-     * @generated
-     */
-    EClass RECORD = eINSTANCE.getRecord();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute RECORD__NAME = eINSTANCE.getRecord_Name();
-
-    /**
-     * The meta object literal for the '<em><b>Abstract Class</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute RECORD__ABSTRACT_CLASS = eINSTANCE.getRecord_AbstractClass();
-
-    /**
-     * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference RECORD__PARAMETERS = eINSTANCE.getRecord_Parameters();
-
-    /**
-     * The meta object literal for the '<em><b>Parent</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference RECORD__PARENT = eINSTANCE.getRecord_Parent();
-
-    /**
-     * The meta object literal for the '{@link de.cau.cs.se.kieker.record.analyser.model.impl.ParameterImpl <em>Parameter</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see de.cau.cs.se.kieker.record.analyser.model.impl.ParameterImpl
-     * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelPackageImpl#getParameter()
-     * @generated
-     */
-    EClass PARAMETER = eINSTANCE.getParameter();
-
-    /**
-     * The meta object literal for the '<em><b>Dtype</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute PARAMETER__DTYPE = eINSTANCE.getParameter_Dtype();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute PARAMETER__NAME = eINSTANCE.getParameter_Name();
-
-  }
+public interface ModelPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "model";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "de.cau.cs.se.kieker.record.analyser.model";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "model";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ModelPackage eINSTANCE = de.cau.cs.se.kieker.record.analyser.model.impl.ModelPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link de.cau.cs.se.kieker.record.analyser.model.impl.ModelImpl <em>Model</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelImpl
+	 * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelPackageImpl#getModel()
+	 * @generated
+	 */
+	int MODEL = 0;
+
+	/**
+	 * The feature id for the '<em><b>Records</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL__RECORDS = 0;
+
+	/**
+	 * The number of structural features of the '<em>Model</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL_FEATURE_COUNT = 1;
+
+	/**
+	 * The number of operations of the '<em>Model</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MODEL_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl <em>Record</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl
+	 * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelPackageImpl#getRecord()
+	 * @generated
+	 */
+	int RECORD = 1;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECORD__NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Abstract Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECORD__ABSTRACT_CLASS = 1;
+
+	/**
+	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECORD__PARAMETERS = 2;
+
+	/**
+	 * The feature id for the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECORD__PARENT = 3;
+
+	/**
+	 * The number of structural features of the '<em>Record</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECORD_FEATURE_COUNT = 4;
+
+	/**
+	 * The number of operations of the '<em>Record</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECORD_OPERATION_COUNT = 0;
+
+	/**
+	 * The meta object id for the '{@link de.cau.cs.se.kieker.record.analyser.model.impl.ParameterImpl <em>Parameter</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see de.cau.cs.se.kieker.record.analyser.model.impl.ParameterImpl
+	 * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelPackageImpl#getParameter()
+	 * @generated
+	 */
+	int PARAMETER = 2;
+
+	/**
+	 * The feature id for the '<em><b>Dtype</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER__DTYPE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER__NAME = 1;
+
+	/**
+	 * The number of structural features of the '<em>Parameter</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_FEATURE_COUNT = 2;
+
+	/**
+	 * The number of operations of the '<em>Parameter</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_OPERATION_COUNT = 0;
+
+
+	/**
+	 * Returns the meta object for class '{@link de.cau.cs.se.kieker.record.analyser.model.Model <em>Model</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Model</em>'.
+	 * @see de.cau.cs.se.kieker.record.analyser.model.Model
+	 * @generated
+	 */
+	EClass getModel();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link de.cau.cs.se.kieker.record.analyser.model.Model#getRecords <em>Records</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Records</em>'.
+	 * @see de.cau.cs.se.kieker.record.analyser.model.Model#getRecords()
+	 * @see #getModel()
+	 * @generated
+	 */
+	EReference getModel_Records();
+
+	/**
+	 * Returns the meta object for class '{@link de.cau.cs.se.kieker.record.analyser.model.Record <em>Record</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Record</em>'.
+	 * @see de.cau.cs.se.kieker.record.analyser.model.Record
+	 * @generated
+	 */
+	EClass getRecord();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.cau.cs.se.kieker.record.analyser.model.Record#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see de.cau.cs.se.kieker.record.analyser.model.Record#getName()
+	 * @see #getRecord()
+	 * @generated
+	 */
+	EAttribute getRecord_Name();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.cau.cs.se.kieker.record.analyser.model.Record#isAbstractClass <em>Abstract Class</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Abstract Class</em>'.
+	 * @see de.cau.cs.se.kieker.record.analyser.model.Record#isAbstractClass()
+	 * @see #getRecord()
+	 * @generated
+	 */
+	EAttribute getRecord_AbstractClass();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link de.cau.cs.se.kieker.record.analyser.model.Record#getParameters <em>Parameters</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Parameters</em>'.
+	 * @see de.cau.cs.se.kieker.record.analyser.model.Record#getParameters()
+	 * @see #getRecord()
+	 * @generated
+	 */
+	EReference getRecord_Parameters();
+
+	/**
+	 * Returns the meta object for the reference '{@link de.cau.cs.se.kieker.record.analyser.model.Record#getParent <em>Parent</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Parent</em>'.
+	 * @see de.cau.cs.se.kieker.record.analyser.model.Record#getParent()
+	 * @see #getRecord()
+	 * @generated
+	 */
+	EReference getRecord_Parent();
+
+	/**
+	 * Returns the meta object for class '{@link de.cau.cs.se.kieker.record.analyser.model.Parameter <em>Parameter</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Parameter</em>'.
+	 * @see de.cau.cs.se.kieker.record.analyser.model.Parameter
+	 * @generated
+	 */
+	EClass getParameter();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.cau.cs.se.kieker.record.analyser.model.Parameter#getDtype <em>Dtype</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Dtype</em>'.
+	 * @see de.cau.cs.se.kieker.record.analyser.model.Parameter#getDtype()
+	 * @see #getParameter()
+	 * @generated
+	 */
+	EAttribute getParameter_Dtype();
+
+	/**
+	 * Returns the meta object for the attribute '{@link de.cau.cs.se.kieker.record.analyser.model.Parameter#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see de.cau.cs.se.kieker.record.analyser.model.Parameter#getName()
+	 * @see #getParameter()
+	 * @generated
+	 */
+	EAttribute getParameter_Name();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	ModelFactory getModelFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link de.cau.cs.se.kieker.record.analyser.model.impl.ModelImpl <em>Model</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelImpl
+		 * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelPackageImpl#getModel()
+		 * @generated
+		 */
+		EClass MODEL = eINSTANCE.getModel();
+
+		/**
+		 * The meta object literal for the '<em><b>Records</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference MODEL__RECORDS = eINSTANCE.getModel_Records();
+
+		/**
+		 * The meta object literal for the '{@link de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl <em>Record</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl
+		 * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelPackageImpl#getRecord()
+		 * @generated
+		 */
+		EClass RECORD = eINSTANCE.getRecord();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute RECORD__NAME = eINSTANCE.getRecord_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Abstract Class</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute RECORD__ABSTRACT_CLASS = eINSTANCE.getRecord_AbstractClass();
+
+		/**
+		 * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference RECORD__PARAMETERS = eINSTANCE.getRecord_Parameters();
+
+		/**
+		 * The meta object literal for the '<em><b>Parent</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference RECORD__PARENT = eINSTANCE.getRecord_Parent();
+
+		/**
+		 * The meta object literal for the '{@link de.cau.cs.se.kieker.record.analyser.model.impl.ParameterImpl <em>Parameter</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see de.cau.cs.se.kieker.record.analyser.model.impl.ParameterImpl
+		 * @see de.cau.cs.se.kieker.record.analyser.model.impl.ModelPackageImpl#getParameter()
+		 * @generated
+		 */
+		EClass PARAMETER = eINSTANCE.getParameter();
+
+		/**
+		 * The meta object literal for the '<em><b>Dtype</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PARAMETER__DTYPE = eINSTANCE.getParameter_Dtype();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PARAMETER__NAME = eINSTANCE.getParameter_Name();
+
+	}
 
 } //ModelPackage
diff --git a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/Parameter.java b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/Parameter.java
index b548efca41be56930979bca974230dbe86e337d1..fc231eb5e08c96589721a26004c057ee6efb9962 100644
--- a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/Parameter.java
+++ b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/Parameter.java
@@ -11,68 +11,67 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.Parameter#getDtype <em>Dtype</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.Parameter#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getParameter()
  * @model
  * @generated
  */
-public interface Parameter extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Dtype</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Dtype</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Dtype</em>' attribute.
-   * @see #setDtype(String)
-   * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getParameter_Dtype()
-   * @model unique="false"
-   * @generated
-   */
-  String getDtype();
+public interface Parameter extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Dtype</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Dtype</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Dtype</em>' attribute.
+	 * @see #setDtype(String)
+	 * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getParameter_Dtype()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getDtype();
 
-  /**
-   * Sets the value of the '{@link de.cau.cs.se.kieker.record.analyser.model.Parameter#getDtype <em>Dtype</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Dtype</em>' attribute.
-   * @see #getDtype()
-   * @generated
-   */
-  void setDtype(String value);
+	/**
+	 * Sets the value of the '{@link de.cau.cs.se.kieker.record.analyser.model.Parameter#getDtype <em>Dtype</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Dtype</em>' attribute.
+	 * @see #getDtype()
+	 * @generated
+	 */
+	void setDtype(String value);
 
-  /**
-   * 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)
-   * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getParameter_Name()
-   * @model unique="false"
-   * @generated
-   */
-  String getName();
+	/**
+	 * 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)
+	 * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getParameter_Name()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getName();
 
-  /**
-   * Sets the value of the '{@link de.cau.cs.se.kieker.record.analyser.model.Parameter#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
+	/**
+	 * Sets the value of the '{@link de.cau.cs.se.kieker.record.analyser.model.Parameter#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
 
 } // Parameter
diff --git a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/Record.java b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/Record.java
index 695a22489f40d83bd224be99f9792d0273dd124b..13dd6b64a94184dc2524b87d8b1d1fa49965ac8d 100644
--- a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/Record.java
+++ b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/Record.java
@@ -13,112 +13,111 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.Record#getName <em>Name</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.Record#isAbstractClass <em>Abstract Class</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.Record#getParameters <em>Parameters</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.Record#getParent <em>Parent</em>}</li>
  * </ul>
- * </p>
  *
  * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getRecord()
  * @model
  * @generated
  */
-public interface Record extends EObject
-{
-  /**
-   * 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)
-   * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getRecord_Name()
-   * @model unique="false"
-   * @generated
-   */
-  String getName();
+public interface Record extends EObject {
+	/**
+	 * 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)
+	 * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getRecord_Name()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getName();
 
-  /**
-   * Sets the value of the '{@link de.cau.cs.se.kieker.record.analyser.model.Record#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
+	/**
+	 * Sets the value of the '{@link de.cau.cs.se.kieker.record.analyser.model.Record#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
 
-  /**
-   * Returns the value of the '<em><b>Abstract Class</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Abstract Class</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Abstract Class</em>' attribute.
-   * @see #setAbstractClass(boolean)
-   * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getRecord_AbstractClass()
-   * @model unique="false"
-   * @generated
-   */
-  boolean isAbstractClass();
+	/**
+	 * Returns the value of the '<em><b>Abstract Class</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Abstract Class</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Abstract Class</em>' attribute.
+	 * @see #setAbstractClass(boolean)
+	 * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getRecord_AbstractClass()
+	 * @model unique="false"
+	 * @generated
+	 */
+	boolean isAbstractClass();
 
-  /**
-   * Sets the value of the '{@link de.cau.cs.se.kieker.record.analyser.model.Record#isAbstractClass <em>Abstract Class</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Abstract Class</em>' attribute.
-   * @see #isAbstractClass()
-   * @generated
-   */
-  void setAbstractClass(boolean value);
+	/**
+	 * Sets the value of the '{@link de.cau.cs.se.kieker.record.analyser.model.Record#isAbstractClass <em>Abstract Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Abstract Class</em>' attribute.
+	 * @see #isAbstractClass()
+	 * @generated
+	 */
+	void setAbstractClass(boolean value);
 
-  /**
-   * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
-   * The list contents are of type {@link de.cau.cs.se.kieker.record.analyser.model.Parameter}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Parameters</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>Parameters</em>' containment reference list.
-   * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getRecord_Parameters()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Parameter> getParameters();
+	/**
+	 * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
+	 * The list contents are of type {@link de.cau.cs.se.kieker.record.analyser.model.Parameter}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Parameters</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>Parameters</em>' containment reference list.
+	 * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getRecord_Parameters()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<Parameter> getParameters();
 
-  /**
-   * Returns the value of the '<em><b>Parent</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Parent</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Parent</em>' reference.
-   * @see #setParent(Record)
-   * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getRecord_Parent()
-   * @model
-   * @generated
-   */
-  Record getParent();
+	/**
+	 * Returns the value of the '<em><b>Parent</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Parent</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Parent</em>' reference.
+	 * @see #setParent(Record)
+	 * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#getRecord_Parent()
+	 * @model
+	 * @generated
+	 */
+	Record getParent();
 
-  /**
-   * Sets the value of the '{@link de.cau.cs.se.kieker.record.analyser.model.Record#getParent <em>Parent</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Parent</em>' reference.
-   * @see #getParent()
-   * @generated
-   */
-  void setParent(Record value);
+	/**
+	 * Sets the value of the '{@link de.cau.cs.se.kieker.record.analyser.model.Record#getParent <em>Parent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Parent</em>' reference.
+	 * @see #getParent()
+	 * @generated
+	 */
+	void setParent(Record value);
 
 } // Record
diff --git a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ModelFactoryImpl.java b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ModelFactoryImpl.java
index 3fd31941f1d290a21311daacdb81c03bf781e535..b3b963cc3d1b6ce7170be52985a6da6f8a1b9bc5 100644
--- a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ModelFactoryImpl.java
+++ b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ModelFactoryImpl.java
@@ -18,113 +18,100 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory
-{
-  /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static ModelFactory init()
-  {
-    try
-    {
-      ModelFactory theModelFactory = (ModelFactory)EPackage.Registry.INSTANCE.getEFactory(ModelPackage.eNS_URI);
-      if (theModelFactory != null)
-      {
-        return theModelFactory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new ModelFactoryImpl();
-  }
+public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static ModelFactory init() {
+		try {
+			ModelFactory theModelFactory = (ModelFactory)EPackage.Registry.INSTANCE.getEFactory(ModelPackage.eNS_URI);
+			if (theModelFactory != null) {
+				return theModelFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new ModelFactoryImpl();
+	}
 
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ModelFactoryImpl()
-  {
-    super();
-  }
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ModelFactoryImpl() {
+		super();
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-      case ModelPackage.MODEL: return createModel();
-      case ModelPackage.RECORD: return createRecord();
-      case ModelPackage.PARAMETER: return createParameter();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-    }
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case ModelPackage.MODEL: return createModel();
+			case ModelPackage.RECORD: return createRecord();
+			case ModelPackage.PARAMETER: return createParameter();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Model createModel()
-  {
-    ModelImpl model = new ModelImpl();
-    return model;
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Model createModel() {
+		ModelImpl model = new ModelImpl();
+		return model;
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Record createRecord()
-  {
-    RecordImpl record = new RecordImpl();
-    return record;
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Record createRecord() {
+		RecordImpl record = new RecordImpl();
+		return record;
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Parameter createParameter()
-  {
-    ParameterImpl parameter = new ParameterImpl();
-    return parameter;
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Parameter createParameter() {
+		ParameterImpl parameter = new ParameterImpl();
+		return parameter;
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ModelPackage getModelPackage()
-  {
-    return (ModelPackage)getEPackage();
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ModelPackage getModelPackage() {
+		return (ModelPackage)getEPackage();
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
-  @Deprecated
-  public static ModelPackage getPackage()
-  {
-    return ModelPackage.eINSTANCE;
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static ModelPackage getPackage() {
+		return ModelPackage.eINSTANCE;
+	}
 
 } //ModelFactoryImpl
diff --git a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ModelImpl.java b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ModelImpl.java
index 7577d1e61a67f3d3990dcf69c80ac63cd229d853..bd57ac83663f873a95b2f280ee67141707275f4a 100644
--- a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ModelImpl.java
+++ b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ModelImpl.java
@@ -26,142 +26,127 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.impl.ModelImpl#getRecords <em>Records</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class ModelImpl extends MinimalEObjectImpl.Container implements Model
-{
-  /**
-   * The cached value of the '{@link #getRecords() <em>Records</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getRecords()
-   * @generated
-   * @ordered
-   */
-  protected EList<Record> records;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ModelImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return ModelPackage.Literals.MODEL;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<Record> getRecords()
-  {
-    if (records == null)
-    {
-      records = new EObjectContainmentEList<Record>(Record.class, this, ModelPackage.MODEL__RECORDS);
-    }
-    return records;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case ModelPackage.MODEL__RECORDS:
-        return ((InternalEList<?>)getRecords()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case ModelPackage.MODEL__RECORDS:
-        return getRecords();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case ModelPackage.MODEL__RECORDS:
-        getRecords().clear();
-        getRecords().addAll((Collection<? extends Record>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case ModelPackage.MODEL__RECORDS:
-        getRecords().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case ModelPackage.MODEL__RECORDS:
-        return records != null && !records.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
+public class ModelImpl extends MinimalEObjectImpl.Container implements Model {
+	/**
+	 * The cached value of the '{@link #getRecords() <em>Records</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRecords()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Record> records;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ModelImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ModelPackage.Literals.MODEL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<Record> getRecords() {
+		if (records == null) {
+			records = new EObjectContainmentEList<Record>(Record.class, this, ModelPackage.MODEL__RECORDS);
+		}
+		return records;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ModelPackage.MODEL__RECORDS:
+				return ((InternalEList<?>)getRecords()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ModelPackage.MODEL__RECORDS:
+				return getRecords();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ModelPackage.MODEL__RECORDS:
+				getRecords().clear();
+				getRecords().addAll((Collection<? extends Record>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ModelPackage.MODEL__RECORDS:
+				getRecords().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ModelPackage.MODEL__RECORDS:
+				return records != null && !records.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
 
 } //ModelImpl
diff --git a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ModelPackageImpl.java b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ModelPackageImpl.java
index f81bc24d73432cc1e43d2ada8df7a8a3603833da..66581719b041350656007a10a5be96ec071fa677 100644
--- a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ModelPackageImpl.java
+++ b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ModelPackageImpl.java
@@ -22,288 +22,272 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ModelPackageImpl extends EPackageImpl implements ModelPackage
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass modelEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass recordEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass parameterEClass = null;
-
-  /**
-   * Creates an instance of the model <b>Package</b>, registered with
-   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-   * package URI value.
-   * <p>Note: the correct way to create the package is via the static
-   * factory method {@link #init init()}, which also performs
-   * initialization of the package, or returns the registered package,
-   * if one already exists.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.emf.ecore.EPackage.Registry
-   * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private ModelPackageImpl()
-  {
-    super(eNS_URI, ModelFactory.eINSTANCE);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static boolean isInited = false;
-
-  /**
-   * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
-   * <p>This method is used to initialize {@link ModelPackage#eINSTANCE} when that field is accessed.
-   * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static ModelPackage init()
-  {
-    if (isInited) return (ModelPackage)EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI);
-
-    // Obtain or create and register package
-    ModelPackageImpl theModelPackage = (ModelPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ModelPackageImpl());
-
-    isInited = true;
-
-    // Initialize simple dependencies
-    EcorePackage.eINSTANCE.eClass();
-
-    // Create package meta-data objects
-    theModelPackage.createPackageContents();
-
-    // Initialize created meta-data
-    theModelPackage.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theModelPackage.freeze();
+public class ModelPackageImpl extends EPackageImpl implements ModelPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass modelEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass recordEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass parameterEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private ModelPackageImpl() {
+		super(eNS_URI, ModelFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link ModelPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static ModelPackage init() {
+		if (isInited) return (ModelPackage)EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI);
+
+		// Obtain or create and register package
+		ModelPackageImpl theModelPackage = (ModelPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ModelPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		EcorePackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theModelPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theModelPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theModelPackage.freeze();
 
   
-    // Update the registry and return the package
-    EPackage.Registry.INSTANCE.put(ModelPackage.eNS_URI, theModelPackage);
-    return theModelPackage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getModel()
-  {
-    return modelEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getModel_Records()
-  {
-    return (EReference)modelEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getRecord()
-  {
-    return recordEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getRecord_Name()
-  {
-    return (EAttribute)recordEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getRecord_AbstractClass()
-  {
-    return (EAttribute)recordEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getRecord_Parameters()
-  {
-    return (EReference)recordEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getRecord_Parent()
-  {
-    return (EReference)recordEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getParameter()
-  {
-    return parameterEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getParameter_Dtype()
-  {
-    return (EAttribute)parameterEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getParameter_Name()
-  {
-    return (EAttribute)parameterEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ModelFactory getModelFactory()
-  {
-    return (ModelFactory)getEFactoryInstance();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isCreated = false;
-
-  /**
-   * Creates the meta-model objects for the package.  This method is
-   * guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void createPackageContents()
-  {
-    if (isCreated) return;
-    isCreated = true;
-
-    // Create classes and their features
-    modelEClass = createEClass(MODEL);
-    createEReference(modelEClass, MODEL__RECORDS);
-
-    recordEClass = createEClass(RECORD);
-    createEAttribute(recordEClass, RECORD__NAME);
-    createEAttribute(recordEClass, RECORD__ABSTRACT_CLASS);
-    createEReference(recordEClass, RECORD__PARAMETERS);
-    createEReference(recordEClass, RECORD__PARENT);
-
-    parameterEClass = createEClass(PARAMETER);
-    createEAttribute(parameterEClass, PARAMETER__DTYPE);
-    createEAttribute(parameterEClass, PARAMETER__NAME);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isInitialized = false;
-
-  /**
-   * Complete the initialization of the package and its meta-model.  This
-   * method is guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void initializePackageContents()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Initialize package
-    setName(eNAME);
-    setNsPrefix(eNS_PREFIX);
-    setNsURI(eNS_URI);
-
-    // Obtain other dependent packages
-    EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-    // Create type parameters
-
-    // Set bounds for type parameters
-
-    // Add supertypes to classes
-
-    // Initialize classes, features, and operations; add parameters
-    initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getModel_Records(), this.getRecord(), null, "records", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(recordEClass, Record.class, "Record", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getRecord_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getRecord_AbstractClass(), theEcorePackage.getEBoolean(), "abstractClass", null, 0, 1, Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRecord_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getRecord_Parent(), this.getRecord(), null, "parent", null, 0, 1, Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getParameter_Dtype(), theEcorePackage.getEString(), "dtype", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getParameter_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    // Create resource
-    createResource(eNS_URI);
-  }
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(ModelPackage.eNS_URI, theModelPackage);
+		return theModelPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getModel() {
+		return modelEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getModel_Records() {
+		return (EReference)modelEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getRecord() {
+		return recordEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getRecord_Name() {
+		return (EAttribute)recordEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getRecord_AbstractClass() {
+		return (EAttribute)recordEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getRecord_Parameters() {
+		return (EReference)recordEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getRecord_Parent() {
+		return (EReference)recordEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getParameter() {
+		return parameterEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getParameter_Dtype() {
+		return (EAttribute)parameterEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getParameter_Name() {
+		return (EAttribute)parameterEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ModelFactory getModelFactory() {
+		return (ModelFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		modelEClass = createEClass(MODEL);
+		createEReference(modelEClass, MODEL__RECORDS);
+
+		recordEClass = createEClass(RECORD);
+		createEAttribute(recordEClass, RECORD__NAME);
+		createEAttribute(recordEClass, RECORD__ABSTRACT_CLASS);
+		createEReference(recordEClass, RECORD__PARAMETERS);
+		createEReference(recordEClass, RECORD__PARENT);
+
+		parameterEClass = createEClass(PARAMETER);
+		createEAttribute(parameterEClass, PARAMETER__DTYPE);
+		createEAttribute(parameterEClass, PARAMETER__NAME);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getModel_Records(), this.getRecord(), null, "records", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(recordEClass, Record.class, "Record", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getRecord_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getRecord_AbstractClass(), theEcorePackage.getEBoolean(), "abstractClass", null, 0, 1, Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getRecord_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getRecord_Parent(), this.getRecord(), null, "parent", null, 0, 1, Record.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getParameter_Dtype(), theEcorePackage.getEString(), "dtype", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getParameter_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+	}
 
 } //ModelPackageImpl
diff --git a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ParameterImpl.java b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ParameterImpl.java
index 4d8968818e8f8af5eb06ee11a01a0c53ceaf24f2..bfb89e7a6d4fdc1abda80c8ae5b18d30a6bb6855 100644
--- a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ParameterImpl.java
+++ b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/ParameterImpl.java
@@ -18,216 +18,200 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.impl.ParameterImpl#getDtype <em>Dtype</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.impl.ParameterImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class ParameterImpl extends MinimalEObjectImpl.Container implements Parameter
-{
-  /**
-   * The default value of the '{@link #getDtype() <em>Dtype</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getDtype()
-   * @generated
-   * @ordered
-   */
-  protected static final String DTYPE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getDtype() <em>Dtype</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getDtype()
-   * @generated
-   * @ordered
-   */
-  protected String dtype = DTYPE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ParameterImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return ModelPackage.Literals.PARAMETER;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getDtype()
-  {
-    return dtype;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setDtype(String newDtype)
-  {
-    String oldDtype = dtype;
-    dtype = newDtype;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PARAMETER__DTYPE, oldDtype, dtype));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PARAMETER__NAME, oldName, name));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case ModelPackage.PARAMETER__DTYPE:
-        return getDtype();
-      case ModelPackage.PARAMETER__NAME:
-        return getName();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case ModelPackage.PARAMETER__DTYPE:
-        setDtype((String)newValue);
-        return;
-      case ModelPackage.PARAMETER__NAME:
-        setName((String)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case ModelPackage.PARAMETER__DTYPE:
-        setDtype(DTYPE_EDEFAULT);
-        return;
-      case ModelPackage.PARAMETER__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case ModelPackage.PARAMETER__DTYPE:
-        return DTYPE_EDEFAULT == null ? dtype != null : !DTYPE_EDEFAULT.equals(dtype);
-      case ModelPackage.PARAMETER__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (dtype: ");
-    result.append(dtype);
-    result.append(", name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
+public class ParameterImpl extends MinimalEObjectImpl.Container implements Parameter {
+	/**
+	 * The default value of the '{@link #getDtype() <em>Dtype</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDtype()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DTYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDtype() <em>Dtype</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDtype()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dtype = DTYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ParameterImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ModelPackage.Literals.PARAMETER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDtype() {
+		return dtype;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDtype(String newDtype) {
+		String oldDtype = dtype;
+		dtype = newDtype;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PARAMETER__DTYPE, oldDtype, dtype));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PARAMETER__NAME, oldName, name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ModelPackage.PARAMETER__DTYPE:
+				return getDtype();
+			case ModelPackage.PARAMETER__NAME:
+				return getName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ModelPackage.PARAMETER__DTYPE:
+				setDtype((String)newValue);
+				return;
+			case ModelPackage.PARAMETER__NAME:
+				setName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ModelPackage.PARAMETER__DTYPE:
+				setDtype(DTYPE_EDEFAULT);
+				return;
+			case ModelPackage.PARAMETER__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ModelPackage.PARAMETER__DTYPE:
+				return DTYPE_EDEFAULT == null ? dtype != null : !DTYPE_EDEFAULT.equals(dtype);
+			case ModelPackage.PARAMETER__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (dtype: ");
+		result.append(dtype);
+		result.append(", name: ");
+		result.append(name);
+		result.append(')');
+		return result.toString();
+	}
 
 } //ParameterImpl
diff --git a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/RecordImpl.java b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/RecordImpl.java
index 6fb2a85ce31c9565c7ae0e90de7c9c379af771a4..3de4fe88d1b83c8247a1e9fd1f8bb0f310558be7 100644
--- a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/RecordImpl.java
+++ b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/impl/RecordImpl.java
@@ -28,334 +28,309 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl#getName <em>Name</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl#isAbstractClass <em>Abstract Class</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl#getParameters <em>Parameters</em>}</li>
  *   <li>{@link de.cau.cs.se.kieker.record.analyser.model.impl.RecordImpl#getParent <em>Parent</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class RecordImpl extends MinimalEObjectImpl.Container implements Record
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
+public class RecordImpl extends MinimalEObjectImpl.Container implements Record {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
 
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
 
-  /**
-   * The default value of the '{@link #isAbstractClass() <em>Abstract Class</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isAbstractClass()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean ABSTRACT_CLASS_EDEFAULT = false;
+	/**
+	 * The default value of the '{@link #isAbstractClass() <em>Abstract Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isAbstractClass()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean ABSTRACT_CLASS_EDEFAULT = false;
 
-  /**
-   * The cached value of the '{@link #isAbstractClass() <em>Abstract Class</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isAbstractClass()
-   * @generated
-   * @ordered
-   */
-  protected boolean abstractClass = ABSTRACT_CLASS_EDEFAULT;
+	/**
+	 * The cached value of the '{@link #isAbstractClass() <em>Abstract Class</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isAbstractClass()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean abstractClass = ABSTRACT_CLASS_EDEFAULT;
 
-  /**
-   * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParameters()
-   * @generated
-   * @ordered
-   */
-  protected EList<Parameter> parameters;
+	/**
+	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParameters()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Parameter> parameters;
 
-  /**
-   * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParent()
-   * @generated
-   * @ordered
-   */
-  protected Record parent;
+	/**
+	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParent()
+	 * @generated
+	 * @ordered
+	 */
+	protected Record parent;
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected RecordImpl()
-  {
-    super();
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected RecordImpl() {
+		super();
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return ModelPackage.Literals.RECORD;
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ModelPackage.Literals.RECORD;
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getName() {
+		return name;
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.RECORD__NAME, oldName, name));
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.RECORD__NAME, oldName, name));
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isAbstractClass()
-  {
-    return abstractClass;
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isAbstractClass() {
+		return abstractClass;
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setAbstractClass(boolean newAbstractClass)
-  {
-    boolean oldAbstractClass = abstractClass;
-    abstractClass = newAbstractClass;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.RECORD__ABSTRACT_CLASS, oldAbstractClass, abstractClass));
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAbstractClass(boolean newAbstractClass) {
+		boolean oldAbstractClass = abstractClass;
+		abstractClass = newAbstractClass;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.RECORD__ABSTRACT_CLASS, oldAbstractClass, abstractClass));
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList<Parameter> getParameters()
-  {
-    if (parameters == null)
-    {
-      parameters = new EObjectContainmentEList<Parameter>(Parameter.class, this, ModelPackage.RECORD__PARAMETERS);
-    }
-    return parameters;
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<Parameter> getParameters() {
+		if (parameters == null) {
+			parameters = new EObjectContainmentEList<Parameter>(Parameter.class, this, ModelPackage.RECORD__PARAMETERS);
+		}
+		return parameters;
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Record getParent()
-  {
-    if (parent != null && parent.eIsProxy())
-    {
-      InternalEObject oldParent = (InternalEObject)parent;
-      parent = (Record)eResolveProxy(oldParent);
-      if (parent != oldParent)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.RECORD__PARENT, oldParent, parent));
-      }
-    }
-    return parent;
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Record getParent() {
+		if (parent != null && parent.eIsProxy()) {
+			InternalEObject oldParent = (InternalEObject)parent;
+			parent = (Record)eResolveProxy(oldParent);
+			if (parent != oldParent) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.RECORD__PARENT, oldParent, parent));
+			}
+		}
+		return parent;
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Record basicGetParent()
-  {
-    return parent;
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Record basicGetParent() {
+		return parent;
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setParent(Record newParent)
-  {
-    Record oldParent = parent;
-    parent = newParent;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.RECORD__PARENT, oldParent, parent));
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setParent(Record newParent) {
+		Record oldParent = parent;
+		parent = newParent;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.RECORD__PARENT, oldParent, parent));
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case ModelPackage.RECORD__PARAMETERS:
-        return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ModelPackage.RECORD__PARAMETERS:
+				return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case ModelPackage.RECORD__NAME:
-        return getName();
-      case ModelPackage.RECORD__ABSTRACT_CLASS:
-        return isAbstractClass();
-      case ModelPackage.RECORD__PARAMETERS:
-        return getParameters();
-      case ModelPackage.RECORD__PARENT:
-        if (resolve) return getParent();
-        return basicGetParent();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case ModelPackage.RECORD__NAME:
+				return getName();
+			case ModelPackage.RECORD__ABSTRACT_CLASS:
+				return isAbstractClass();
+			case ModelPackage.RECORD__PARAMETERS:
+				return getParameters();
+			case ModelPackage.RECORD__PARENT:
+				if (resolve) return getParent();
+				return basicGetParent();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case ModelPackage.RECORD__NAME:
-        setName((String)newValue);
-        return;
-      case ModelPackage.RECORD__ABSTRACT_CLASS:
-        setAbstractClass((Boolean)newValue);
-        return;
-      case ModelPackage.RECORD__PARAMETERS:
-        getParameters().clear();
-        getParameters().addAll((Collection<? extends Parameter>)newValue);
-        return;
-      case ModelPackage.RECORD__PARENT:
-        setParent((Record)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ModelPackage.RECORD__NAME:
+				setName((String)newValue);
+				return;
+			case ModelPackage.RECORD__ABSTRACT_CLASS:
+				setAbstractClass((Boolean)newValue);
+				return;
+			case ModelPackage.RECORD__PARAMETERS:
+				getParameters().clear();
+				getParameters().addAll((Collection<? extends Parameter>)newValue);
+				return;
+			case ModelPackage.RECORD__PARENT:
+				setParent((Record)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case ModelPackage.RECORD__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-      case ModelPackage.RECORD__ABSTRACT_CLASS:
-        setAbstractClass(ABSTRACT_CLASS_EDEFAULT);
-        return;
-      case ModelPackage.RECORD__PARAMETERS:
-        getParameters().clear();
-        return;
-      case ModelPackage.RECORD__PARENT:
-        setParent((Record)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ModelPackage.RECORD__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case ModelPackage.RECORD__ABSTRACT_CLASS:
+				setAbstractClass(ABSTRACT_CLASS_EDEFAULT);
+				return;
+			case ModelPackage.RECORD__PARAMETERS:
+				getParameters().clear();
+				return;
+			case ModelPackage.RECORD__PARENT:
+				setParent((Record)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case ModelPackage.RECORD__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case ModelPackage.RECORD__ABSTRACT_CLASS:
-        return abstractClass != ABSTRACT_CLASS_EDEFAULT;
-      case ModelPackage.RECORD__PARAMETERS:
-        return parameters != null && !parameters.isEmpty();
-      case ModelPackage.RECORD__PARENT:
-        return parent != null;
-    }
-    return super.eIsSet(featureID);
-  }
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ModelPackage.RECORD__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case ModelPackage.RECORD__ABSTRACT_CLASS:
+				return abstractClass != ABSTRACT_CLASS_EDEFAULT;
+			case ModelPackage.RECORD__PARAMETERS:
+				return parameters != null && !parameters.isEmpty();
+			case ModelPackage.RECORD__PARENT:
+				return parent != null;
+		}
+		return super.eIsSet(featureID);
+	}
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
 
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(", abstractClass: ");
-    result.append(abstractClass);
-    result.append(')');
-    return result.toString();
-  }
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(", abstractClass: ");
+		result.append(abstractClass);
+		result.append(')');
+		return result.toString();
+	}
 
 } //RecordImpl
diff --git a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/util/ModelAdapterFactory.java b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/util/ModelAdapterFactory.java
index 10baab5b80e01fb30f5c1947016f4184e7c64f9f..0d4b51165dd5a409e58752e7f95b6afb7237bd80 100644
--- a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/util/ModelAdapterFactory.java
+++ b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/util/ModelAdapterFactory.java
@@ -19,154 +19,138 @@ import org.eclipse.emf.ecore.EObject;
  * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage
  * @generated
  */
-public class ModelAdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static ModelPackage modelPackage;
+public class ModelAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ModelPackage modelPackage;
 
-  /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ModelAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = ModelPackage.eINSTANCE;
-    }
-  }
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ModelAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = ModelPackage.eINSTANCE;
+		}
+	}
 
-  /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc -->
-   * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-   * <!-- end-user-doc -->
-   * @return whether this factory is applicable for the type of the object.
-   * @generated
-   */
-  @Override
-  public boolean isFactoryForType(Object object)
-  {
-    if (object == modelPackage)
-    {
-      return true;
-    }
-    if (object instanceof EObject)
-    {
-      return ((EObject)object).eClass().getEPackage() == modelPackage;
-    }
-    return false;
-  }
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
 
-  /**
-   * The switch that delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ModelSwitch<Adapter> modelSwitch =
-    new ModelSwitch<Adapter>()
-    {
-      @Override
-      public Adapter caseModel(Model object)
-      {
-        return createModelAdapter();
-      }
-      @Override
-      public Adapter caseRecord(Record object)
-      {
-        return createRecordAdapter();
-      }
-      @Override
-      public Adapter caseParameter(Parameter object)
-      {
-        return createParameterAdapter();
-      }
-      @Override
-      public Adapter defaultCase(EObject object)
-      {
-        return createEObjectAdapter();
-      }
-    };
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ModelSwitch<Adapter> modelSwitch =
+		new ModelSwitch<Adapter>() {
+			@Override
+			public Adapter caseModel(Model object) {
+				return createModelAdapter();
+			}
+			@Override
+			public Adapter caseRecord(Record object) {
+				return createRecordAdapter();
+			}
+			@Override
+			public Adapter caseParameter(Parameter object) {
+				return createParameterAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
 
-  /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param target the object to adapt.
-   * @return the adapter for the <code>target</code>.
-   * @generated
-   */
-  @Override
-  public Adapter createAdapter(Notifier target)
-  {
-    return modelSwitch.doSwitch((EObject)target);
-  }
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
 
 
-  /**
-   * Creates a new adapter for an object of class '{@link de.cau.cs.se.kieker.record.analyser.model.Model <em>Model</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see de.cau.cs.se.kieker.record.analyser.model.Model
-   * @generated
-   */
-  public Adapter createModelAdapter()
-  {
-    return null;
-  }
+	/**
+	 * Creates a new adapter for an object of class '{@link de.cau.cs.se.kieker.record.analyser.model.Model <em>Model</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see de.cau.cs.se.kieker.record.analyser.model.Model
+	 * @generated
+	 */
+	public Adapter createModelAdapter() {
+		return null;
+	}
 
-  /**
-   * Creates a new adapter for an object of class '{@link de.cau.cs.se.kieker.record.analyser.model.Record <em>Record</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see de.cau.cs.se.kieker.record.analyser.model.Record
-   * @generated
-   */
-  public Adapter createRecordAdapter()
-  {
-    return null;
-  }
+	/**
+	 * Creates a new adapter for an object of class '{@link de.cau.cs.se.kieker.record.analyser.model.Record <em>Record</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see de.cau.cs.se.kieker.record.analyser.model.Record
+	 * @generated
+	 */
+	public Adapter createRecordAdapter() {
+		return null;
+	}
 
-  /**
-   * Creates a new adapter for an object of class '{@link de.cau.cs.se.kieker.record.analyser.model.Parameter <em>Parameter</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see de.cau.cs.se.kieker.record.analyser.model.Parameter
-   * @generated
-   */
-  public Adapter createParameterAdapter()
-  {
-    return null;
-  }
+	/**
+	 * Creates a new adapter for an object of class '{@link de.cau.cs.se.kieker.record.analyser.model.Parameter <em>Parameter</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see de.cau.cs.se.kieker.record.analyser.model.Parameter
+	 * @generated
+	 */
+	public Adapter createParameterAdapter() {
+		return null;
+	}
 
-  /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @generated
-   */
-  public Adapter createEObjectAdapter()
-  {
-    return null;
-  }
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
 
 } //ModelAdapterFactory
diff --git a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/util/ModelSwitch.java b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/util/ModelSwitch.java
index 35618f65f1bd32c5d88b043ed74c86b97dad8e6c..e45c2558083171ab3f2ae755685a11c6cd2e28b3 100644
--- a/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/util/ModelSwitch.java
+++ b/de.cau.cs.se.kieker.record.analyser/src-gen/de/cau/cs/se/kieker/record/analyser/model/util/ModelSwitch.java
@@ -22,144 +22,131 @@ import org.eclipse.emf.ecore.util.Switch;
  * @see de.cau.cs.se.kieker.record.analyser.model.ModelPackage
  * @generated
  */
-public class ModelSwitch<T> extends Switch<T>
-{
-  /**
-   * The cached model package
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected static ModelPackage modelPackage;
+public class ModelSwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ModelPackage modelPackage;
 
-  /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ModelSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = ModelPackage.eINSTANCE;
-    }
-  }
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ModelSwitch() {
+		if (modelPackage == null) {
+			modelPackage = ModelPackage.eINSTANCE;
+		}
+	}
 
-  /**
-   * Checks whether this is a switch for the given package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @parameter ePackage the package in question.
-   * @return whether this is a switch for the given package.
-   * @generated
-   */
-  @Override
-  protected boolean isSwitchFor(EPackage ePackage)
-  {
-    return ePackage == modelPackage;
-  }
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
 
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  @Override
-  protected T doSwitch(int classifierID, EObject theEObject)
-  {
-    switch (classifierID)
-    {
-      case ModelPackage.MODEL:
-      {
-        Model model = (Model)theEObject;
-        T result = caseModel(model);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case ModelPackage.RECORD:
-      {
-        Record record = (Record)theEObject;
-        T result = caseRecord(record);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case ModelPackage.PARAMETER:
-      {
-        Parameter parameter = (Parameter)theEObject;
-        T result = caseParameter(parameter);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      default: return defaultCase(theEObject);
-    }
-  }
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case ModelPackage.MODEL: {
+				Model model = (Model)theEObject;
+				T result = caseModel(model);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ModelPackage.RECORD: {
+				Record record = (Record)theEObject;
+				T result = caseRecord(record);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ModelPackage.PARAMETER: {
+				Parameter parameter = (Parameter)theEObject;
+				T result = caseParameter(parameter);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
 
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Model</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Model</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseModel(Model object)
-  {
-    return null;
-  }
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Model</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Model</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseModel(Model object) {
+		return null;
+	}
 
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Record</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Record</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseRecord(Record object)
-  {
-    return null;
-  }
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Record</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Record</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseRecord(Record object) {
+		return null;
+	}
 
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Parameter</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Parameter</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseParameter(Parameter object)
-  {
-    return null;
-  }
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Parameter</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Parameter</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseParameter(Parameter object) {
+		return null;
+	}
 
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-   * @generated
-   */
-  @Override
-  public T defaultCase(EObject object)
-  {
-    return null;
-  }
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
 
 } //ModelSwitch
diff --git a/de.cau.cs.se.kieker.record.analyser/src/de/cau/cs/se/kieker/record/analyser/generator/UnitTestGenerator.xtend b/de.cau.cs.se.kieker.record.analyser/src/de/cau/cs/se/kieker/record/analyser/generator/UnitTestGenerator.xtend
index 2e84c192018b96af87fadf5f264c76c619f479ce..82dde939412bb0f3ea727347b49d479bd7d6a917 100644
--- a/de.cau.cs.se.kieker.record.analyser/src/de/cau/cs/se/kieker/record/analyser/generator/UnitTestGenerator.xtend
+++ b/de.cau.cs.se.kieker.record.analyser/src/de/cau/cs/se/kieker/record/analyser/generator/UnitTestGenerator.xtend
@@ -52,9 +52,9 @@ class UnitTestGenerator {
 			/**
 			 * Test API of {@link «record.name»}.
 			 * 
-			 * @author Reiner Jung
+			 * @author API Checker
 			 * 
-			 * @since 1.10
+			 * @since 1.12
 			 */
 			public class Test«record.className»PropertyOrder extends AbstractKiekerTest {
 			
diff --git a/de.cau.cs.se.kieker.record.analyser/src/de/cau/cs/se/kieker/record/analyser/handlers/KiekerRecordSignatureExtractorHandler.java b/de.cau.cs.se.kieker.record.analyser/src/de/cau/cs/se/kieker/record/analyser/handlers/KiekerRecordSignatureExtractorHandler.java
index fa302ca541bb61bf1e9c33515ecf9642d0fcac05..884e8ee355afd2e131a884a87309b631426152e7 100644
--- a/de.cau.cs.se.kieker.record.analyser/src/de/cau/cs/se/kieker/record/analyser/handlers/KiekerRecordSignatureExtractorHandler.java
+++ b/de.cau.cs.se.kieker.record.analyser/src/de/cau/cs/se/kieker/record/analyser/handlers/KiekerRecordSignatureExtractorHandler.java
@@ -40,13 +40,13 @@ import de.cau.cs.se.kieker.record.analyser.model.Record;
 
 public class KiekerRecordSignatureExtractorHandler extends AbstractHandler {
 
-	private static final String KIEKER_PROJECT_NAME = "Kieker";
+	private static final String KIEKER_PROJECT_NAME = "kieker-common";
 	private static final String KIEKER_PACKAGE_ROOT = "kieker.common.record";
 	private static final Object KIEKER_TYPES_FIELD = "TYPES";
 	private static final Object KIEKER_SIZE_FIELD = "SIZE";
 	private static final Object KIEKER_API_ROOT_RECORD = KIEKER_PACKAGE_ROOT + ".AbstractMonitoringRecord";
 	private static final Object KIEKER_API_REGISTRY_RECORD = KIEKER_PACKAGE_ROOT + ".misc.RegistryRecord";
-	private static final String KIEKER_TEST_PACKAGE_ROOT_PATH = "test-gen/api";
+	private static final String KIEKER_TEST_PACKAGE_ROOT_PATH = "test-gen";
 
 	/**
 	 * Main handler method to be executed when the handle is triggered.
diff --git a/de.cau.cs.se.kieker.record.analyser/xtend-gen/de/cau/cs/se/kieker/record/analyser/generator/UnitTestGenerator.java b/de.cau.cs.se.kieker.record.analyser/xtend-gen/de/cau/cs/se/kieker/record/analyser/generator/UnitTestGenerator.java
index cea374ae3bc444c3803cfaa9af916da973312750..79a310fa7395c3d3d1a83c165c6e0260343907f8 100644
--- a/de.cau.cs.se.kieker.record.analyser/xtend-gen/de/cau/cs/se/kieker/record/analyser/generator/UnitTestGenerator.java
+++ b/de.cau.cs.se.kieker.record.analyser/xtend-gen/de/cau/cs/se/kieker/record/analyser/generator/UnitTestGenerator.java
@@ -1,6 +1,5 @@
 package de.cau.cs.se.kieker.record.analyser.generator;
 
-import com.google.common.base.Objects;
 import de.cau.cs.se.kieker.record.analyser.model.Parameter;
 import de.cau.cs.se.kieker.record.analyser.model.Record;
 import java.util.ArrayList;
@@ -123,13 +122,13 @@ public class UnitTestGenerator {
     _builder.append("* ");
     _builder.newLine();
     _builder.append(" ");
-    _builder.append("* @author Reiner Jung");
+    _builder.append("* @author API Checker");
     _builder.newLine();
     _builder.append(" ");
     _builder.append("* ");
     _builder.newLine();
     _builder.append(" ");
-    _builder.append("* @since 1.10");
+    _builder.append("* @since 1.12");
     _builder.newLine();
     _builder.append(" ");
     _builder.append("*/");
@@ -154,15 +153,15 @@ public class UnitTestGenerator {
     _builder.newLine();
     _builder.append("\t");
     EList<Parameter> _parameters = record.getParameters();
-    final Function1<Parameter,CharSequence> _function = new Function1<Parameter,CharSequence>() {
+    final Function1<Parameter, CharSequence> _function = new Function1<Parameter, CharSequence>() {
+      @Override
       public CharSequence apply(final Parameter it) {
-        CharSequence _createConstant = UnitTestGenerator.this.createConstant(it);
-        return _createConstant;
+        return UnitTestGenerator.this.createConstant(it);
       }
     };
     List<CharSequence> _map = ListExtensions.<Parameter, CharSequence>map(_parameters, _function);
     String _join = IterableExtensions.join(_map);
-    _builder.append(_join, "	");
+    _builder.append(_join, "\t");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t\t\t\t\t\t");
     _builder.newLine();
@@ -178,7 +177,7 @@ public class UnitTestGenerator {
     _builder.append("\t");
     _builder.append("public Test");
     String _className_1 = this.getClassName(record);
-    _builder.append(_className_1, "	");
+    _builder.append(_className_1, "\t");
     _builder.append("PropertyOrder() {");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
@@ -194,7 +193,7 @@ public class UnitTestGenerator {
     _builder.append("\t ");
     _builder.append("* Test property order processing of {@link ");
     String _name_2 = record.getName();
-    _builder.append(_name_2, "	 ");
+    _builder.append(_name_2, "\t ");
     _builder.append("} constructors and");
     _builder.newLineIfNotEmpty();
     _builder.append("\t ");
@@ -209,7 +208,7 @@ public class UnitTestGenerator {
     _builder.append("\t");
     _builder.append("public void test");
     String _className_2 = this.getClassName(record);
-    _builder.append(_className_2, "	");
+    _builder.append(_className_2, "\t");
     _builder.append("PropertyOrder() { // NOPMD");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
@@ -220,15 +219,15 @@ public class UnitTestGenerator {
     _builder.newLine();
     _builder.append("\t\t\t");
     EList<Parameter> _parameters_1 = record.getParameters();
-    final Function1<Parameter,CharSequence> _function_1 = new Function1<Parameter,CharSequence>() {
+    final Function1<Parameter, CharSequence> _function_1 = new Function1<Parameter, CharSequence>() {
+      @Override
       public CharSequence apply(final Parameter it) {
-        CharSequence _createConstantName = UnitTestGenerator.this.createConstantName(it);
-        return _createConstantName;
+        return UnitTestGenerator.this.createConstantName(it);
       }
     };
     List<CharSequence> _map_1 = ListExtensions.<Parameter, CharSequence>map(_parameters_1, _function_1);
     String _join_1 = IterableExtensions.join(_map_1, ",\n");
-    _builder.append(_join_1, "			");
+    _builder.append(_join_1, "\t\t\t");
     _builder.append(",");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
@@ -237,7 +236,7 @@ public class UnitTestGenerator {
     _builder.append("\t\t");
     _builder.append("final ByteBuffer inputBuffer = APIEvaluationFunctions.createByteBuffer(");
     String _className_3 = this.getClassName(record);
-    _builder.append(_className_3, "		");
+    _builder.append(_className_3, "\t\t");
     _builder.append(".SIZE, ");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t\t");
@@ -248,23 +247,23 @@ public class UnitTestGenerator {
     _builder.append("\t\t");
     _builder.append("final ");
     String _className_4 = this.getClassName(record);
-    _builder.append(_className_4, "		");
+    _builder.append(_className_4, "\t\t");
     _builder.append(" recordInitParameter = new ");
     String _className_5 = this.getClassName(record);
-    _builder.append(_className_5, "		");
+    _builder.append(_className_5, "\t\t");
     _builder.append("(");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t\t");
     EList<Parameter> _parameters_2 = record.getParameters();
-    final Function1<Parameter,CharSequence> _function_2 = new Function1<Parameter,CharSequence>() {
+    final Function1<Parameter, CharSequence> _function_2 = new Function1<Parameter, CharSequence>() {
+      @Override
       public CharSequence apply(final Parameter it) {
-        CharSequence _createConstantName = UnitTestGenerator.this.createConstantName(it);
-        return _createConstantName;
+        return UnitTestGenerator.this.createConstantName(it);
       }
     };
     List<CharSequence> _map_2 = ListExtensions.<Parameter, CharSequence>map(_parameters_2, _function_2);
     String _join_2 = IterableExtensions.join(_map_2, ",\n");
-    _builder.append(_join_2, "			");
+    _builder.append(_join_2, "\t\t\t");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
     _builder.append(");");
@@ -272,19 +271,19 @@ public class UnitTestGenerator {
     _builder.append("\t\t");
     _builder.append("final ");
     String _className_6 = this.getClassName(record);
-    _builder.append(_className_6, "		");
+    _builder.append(_className_6, "\t\t");
     _builder.append(" recordInitBuffer = new ");
     String _className_7 = this.getClassName(record);
-    _builder.append(_className_7, "		");
+    _builder.append(_className_7, "\t\t");
     _builder.append("(inputBuffer, this.makeStringRegistry());");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
     _builder.append("final ");
     String _className_8 = this.getClassName(record);
-    _builder.append(_className_8, "		");
+    _builder.append(_className_8, "\t\t");
     _builder.append(" recordInitArray = new ");
     String _className_9 = this.getClassName(record);
-    _builder.append(_className_9, "		");
+    _builder.append(_className_9, "\t\t");
     _builder.append("(values);");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
@@ -292,19 +291,19 @@ public class UnitTestGenerator {
     _builder.append("\t\t");
     _builder.append("this.assert");
     String _className_10 = this.getClassName(record);
-    _builder.append(_className_10, "		");
+    _builder.append(_className_10, "\t\t");
     _builder.append("(recordInitParameter);");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
     _builder.append("this.assert");
     String _className_11 = this.getClassName(record);
-    _builder.append(_className_11, "		");
+    _builder.append(_className_11, "\t\t");
     _builder.append("(recordInitBuffer);");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
     _builder.append("this.assert");
     String _className_12 = this.getClassName(record);
-    _builder.append(_className_12, "		");
+    _builder.append(_className_12, "\t\t");
     _builder.append("(recordInitArray);");
     _builder.newLineIfNotEmpty();
     _builder.newLine();
@@ -336,7 +335,7 @@ public class UnitTestGenerator {
     _builder.append("\t\t");
     _builder.append("final ByteBuffer outputBufferParameter = ByteBuffer.allocate(");
     String _className_13 = this.getClassName(record);
-    _builder.append(_className_13, "		");
+    _builder.append(_className_13, "\t\t");
     _builder.append(".SIZE);");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
@@ -349,7 +348,7 @@ public class UnitTestGenerator {
     _builder.append("\t\t");
     _builder.append("final ByteBuffer outputBufferBuffer = ByteBuffer.allocate(");
     String _className_14 = this.getClassName(record);
-    _builder.append(_className_14, "		");
+    _builder.append(_className_14, "\t\t");
     _builder.append(".SIZE);");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
@@ -362,7 +361,7 @@ public class UnitTestGenerator {
     _builder.append("\t\t");
     _builder.append("final ByteBuffer outputBufferArray = ByteBuffer.allocate(");
     String _className_15 = this.getClassName(record);
-    _builder.append(_className_15, "		");
+    _builder.append(_className_15, "\t\t");
     _builder.append(".SIZE);");
     _builder.newLineIfNotEmpty();
     _builder.append("\t\t");
@@ -381,7 +380,7 @@ public class UnitTestGenerator {
     _builder.append("\t ");
     _builder.append("* Assertions for ");
     String _className_16 = this.getClassName(record);
-    _builder.append(_className_16, "	 ");
+    _builder.append(_className_16, "\t ");
     _builder.append(".");
     _builder.newLineIfNotEmpty();
     _builder.append("\t ");
@@ -390,10 +389,10 @@ public class UnitTestGenerator {
     _builder.append("\t");
     _builder.append("private void assert");
     String _className_17 = this.getClassName(record);
-    _builder.append(_className_17, "	");
+    _builder.append(_className_17, "\t");
     _builder.append("(final ");
     String _className_18 = this.getClassName(record);
-    _builder.append(_className_18, "	");
+    _builder.append(_className_18, "\t");
     _builder.append(" record) {");
     _builder.newLineIfNotEmpty();
     {
@@ -408,19 +407,19 @@ public class UnitTestGenerator {
           } else {
             String _dtype_1 = parameter.getDtype();
             boolean _equals_1 = "double".equals(_dtype_1);
-            _or = (_equals || _equals_1);
+            _or = _equals_1;
           }
           if (_or) {
             _builder.append("\t\t");
             _builder.append("Assert.assertEquals(\"\'");
             String _name_3 = parameter.getName();
-            _builder.append(_name_3, "		");
+            _builder.append(_name_3, "\t\t");
             _builder.append("\' value assertion failed.\", record.get");
             String _methodName = this.getMethodName(parameter);
-            _builder.append(_methodName, "		");
+            _builder.append(_methodName, "\t\t");
             _builder.append("(), ");
             CharSequence _createConstantName = this.createConstantName(parameter);
-            _builder.append(_createConstantName, "		");
+            _builder.append(_createConstantName, "\t\t");
             _builder.append(", 0.1);");
             _builder.newLineIfNotEmpty();
           } else {
@@ -430,26 +429,26 @@ public class UnitTestGenerator {
               _builder.append("\t\t");
               _builder.append("Assert.assertEquals(\"\'");
               String _name_4 = parameter.getName();
-              _builder.append(_name_4, "		");
+              _builder.append(_name_4, "\t\t");
               _builder.append("\' value assertion failed.\", record.is");
               String _methodName_1 = this.getMethodName(parameter);
-              _builder.append(_methodName_1, "		");
+              _builder.append(_methodName_1, "\t\t");
               _builder.append("(), ");
               CharSequence _createConstantName_1 = this.createConstantName(parameter);
-              _builder.append(_createConstantName_1, "		");
+              _builder.append(_createConstantName_1, "\t\t");
               _builder.append(");");
               _builder.newLineIfNotEmpty();
             } else {
               _builder.append("\t\t");
               _builder.append("Assert.assertEquals(\"\'");
               String _name_5 = parameter.getName();
-              _builder.append(_name_5, "		");
+              _builder.append(_name_5, "\t\t");
               _builder.append("\' value assertion failed.\", record.get");
               String _methodName_2 = this.getMethodName(parameter);
-              _builder.append(_methodName_2, "		");
+              _builder.append(_methodName_2, "\t\t");
               _builder.append("(), ");
               CharSequence _createConstantName_2 = this.createConstantName(parameter);
-              _builder.append(_createConstantName_2, "		");
+              _builder.append(_createConstantName_2, "\t\t");
               _builder.append(");");
               _builder.newLineIfNotEmpty();
             }
@@ -482,11 +481,11 @@ public class UnitTestGenerator {
     _builder.newLine();
     {
       EList<Parameter> _parameters_4 = record.getParameters();
-      final Function1<Parameter,Boolean> _function_3 = new Function1<Parameter,Boolean>() {
+      final Function1<Parameter, Boolean> _function_3 = new Function1<Parameter, Boolean>() {
+        @Override
         public Boolean apply(final Parameter it) {
           String _dtype = it.getDtype();
-          boolean _equals = "String".equals(_dtype);
-          return Boolean.valueOf(_equals);
+          return Boolean.valueOf("String".equals(_dtype));
         }
       };
       Iterable<Parameter> _filter = IterableExtensions.<Parameter>filter(_parameters_4, _function_3);
@@ -494,7 +493,7 @@ public class UnitTestGenerator {
         _builder.append("\t\t");
         _builder.append("stringRegistry.get(");
         CharSequence _createConstantName_3 = this.createConstantName(parameter_1);
-        _builder.append(_createConstantName_3, "		");
+        _builder.append(_createConstantName_3, "\t\t");
         _builder.append(");");
         _builder.newLineIfNotEmpty();
       }
@@ -530,16 +529,14 @@ public class UnitTestGenerator {
           System.out.println("found");
           String _name_3 = parameter.getName();
           String _substring = _name_3.substring(1);
-          String _firstUpper = StringExtensions.toFirstUpper(_substring);
-          _xblockexpression_1 = (_firstUpper);
+          _xblockexpression_1 = StringExtensions.toFirstUpper(_substring);
         }
         _xifexpression = _xblockexpression_1;
       } else {
         String _name_3 = parameter.getName();
-        String _firstUpper = StringExtensions.toFirstUpper(_name_3);
-        _xifexpression = _firstUpper;
+        _xifexpression = StringExtensions.toFirstUpper(_name_3);
       }
-      _xblockexpression = (_xifexpression);
+      _xblockexpression = _xifexpression;
     }
     return _xblockexpression;
   }
@@ -568,101 +565,59 @@ public class UnitTestGenerator {
   public CharSequence createConstantValue(final Parameter parameter) {
     CharSequence _switchResult = null;
     String _dtype = parameter.getDtype();
-    final String _switchValue = _dtype;
-    boolean _matched = false;
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"boolean")) {
-        _matched=true;
+    switch (_dtype) {
+      case "boolean":
         StringConcatenation _builder = new StringConcatenation();
-        boolean _not = (!this.booleanCounter);
-        boolean _booleanCounter = this.booleanCounter = _not;
-        _builder.append(_booleanCounter, "");
+        _builder.append(this.booleanCounter = (!this.booleanCounter), "");
         _switchResult = _builder;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"byte")) {
-        _matched=true;
+        break;
+      case "byte":
         StringConcatenation _builder_1 = new StringConcatenation();
-        int _plus = (this.byteCounter + 1);
-        int _byteCounter = this.byteCounter = _plus;
-        _builder_1.append(_byteCounter, "");
+        _builder_1.append(this.byteCounter = (this.byteCounter + 1), "");
         _switchResult = _builder_1;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"char")) {
-        _matched=true;
+        break;
+      case "char":
         StringConcatenation _builder_2 = new StringConcatenation();
         int _numericValue = Character.getNumericValue(this.charCounter);
-        int _plus_1 = (_numericValue + 1);
-        char _charCounter = this.charCounter = ((char) _plus_1);
-        _builder_2.append(_charCounter, "");
+        int _plus = (_numericValue + 1);
+        _builder_2.append(this.charCounter = ((char) _plus), "");
         _switchResult = _builder_2;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"double")) {
-        _matched=true;
+        break;
+      case "double":
         StringConcatenation _builder_3 = new StringConcatenation();
-        double _plus_2 = (this.doubleCounter + 1.0);
-        double _doubleCounter = this.doubleCounter = _plus_2;
-        _builder_3.append(_doubleCounter, "");
+        _builder_3.append(this.doubleCounter = (this.doubleCounter + 1.0), "");
         _switchResult = _builder_3;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"float")) {
-        _matched=true;
+        break;
+      case "float":
         StringConcatenation _builder_4 = new StringConcatenation();
-        float _plus_3 = (this.floatCounter + 1);
-        float _floatCounter = this.floatCounter = _plus_3;
-        _builder_4.append(_floatCounter, "");
+        _builder_4.append(this.floatCounter = (this.floatCounter + 1), "");
         _builder_4.append("f");
         _switchResult = _builder_4;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"int")) {
-        _matched=true;
+        break;
+      case "int":
         StringConcatenation _builder_5 = new StringConcatenation();
-        int _plus_4 = (this.intCounter + 1);
-        int _intCounter = this.intCounter = _plus_4;
-        _builder_5.append(_intCounter, "");
+        _builder_5.append(this.intCounter = (this.intCounter + 1), "");
         _switchResult = _builder_5;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"long")) {
-        _matched=true;
+        break;
+      case "long":
         StringConcatenation _builder_6 = new StringConcatenation();
-        long _plus_5 = (this.longCounter + 1);
-        long _longCounter = this.longCounter = _plus_5;
-        _builder_6.append(_longCounter, "");
+        _builder_6.append(this.longCounter = (this.longCounter + 1), "");
         _builder_6.append("L");
         _switchResult = _builder_6;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"short")) {
-        _matched=true;
+        break;
+      case "short":
         StringConcatenation _builder_7 = new StringConcatenation();
-        int _plus_6 = (this.shortCounter + 1);
-        int _shortCounter = this.shortCounter = _plus_6;
-        _builder_7.append(_shortCounter, "");
+        _builder_7.append(this.shortCounter = (this.shortCounter + 1), "");
         _switchResult = _builder_7;
-      }
-    }
-    if (!_matched) {
-      if (Objects.equal(_switchValue,"String")) {
-        _matched=true;
+        break;
+      case "String":
         StringConcatenation _builder_8 = new StringConcatenation();
         _builder_8.append("\"<");
         String _name = parameter.getName();
         _builder_8.append(_name, "");
         _builder_8.append(">\"");
         _switchResult = _builder_8;
-      }
+        break;
     }
     return _switchResult;
   }
@@ -688,8 +643,7 @@ public class UnitTestGenerator {
   public String getPackageName(final Record record) {
     String _name = record.getName();
     String[] _split = _name.split("\\.");
-    ArrayList<String> _arrayList = new ArrayList<String>(((Collection<? extends String>)Conversions.doWrapArray(_split)));
-    final List<String> path = _arrayList;
+    final List<String> path = new ArrayList<String>((Collection<? extends String>)Conversions.doWrapArray(_split));
     int _length = ((Object[])Conversions.unwrapArray(path, Object.class)).length;
     int _minus = (_length - 1);
     path.remove(_minus);
@@ -705,14 +659,14 @@ public class UnitTestGenerator {
       } else {
         String _get_1 = path.get(1);
         boolean _equals_1 = _get_1.equals("common");
-        _and_1 = (_equals && _equals_1);
+        _and_1 = _equals_1;
       }
       if (!_and_1) {
         _and = false;
       } else {
         String _get_2 = path.get(2);
         boolean _equals_2 = _get_2.equals("record");
-        _and = (_and_1 && _equals_2);
+        _and = _equals_2;
       }
       if (_and) {
         path.remove(0);