diff --git a/org.emoflon.roam.roamslang.tests/.classpath b/org.emoflon.roam.roamslang.tests/.classpath
new file mode 100644
index 00000000..720219f1
--- /dev/null
+++ b/org.emoflon.roam.roamslang.tests/.classpath
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="test-bin" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="test-bin" path="src-gen">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="test-bin" path="xtend-gen">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.emoflon.roam.roamslang.tests/.project b/org.emoflon.roam.roamslang.tests/.project
new file mode 100644
index 00000000..e9821a25
--- /dev/null
+++ b/org.emoflon.roam.roamslang.tests/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.emoflon.roam.roamslang.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.emoflon.roam.roamslang.tests/.settings/org.eclipse.core.resources.prefs b/org.emoflon.roam.roamslang.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000..99f26c02
--- /dev/null
+++ b/org.emoflon.roam.roamslang.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.emoflon.roam.roamslang.tests/.settings/org.eclipse.jdt.core.prefs b/org.emoflon.roam.roamslang.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..7adc0fb9
--- /dev/null
+++ b/org.emoflon.roam.roamslang.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,10 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.emoflon.roam.roamslang.tests/META-INF/MANIFEST.MF b/org.emoflon.roam.roamslang.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..baedccc9
--- /dev/null
+++ b/org.emoflon.roam.roamslang.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: org.emoflon.roam.roamslang.tests
+Bundle-ManifestVersion: 2
+Bundle-Name: org.emoflon.roam.roamslang.tests
+Bundle-Vendor: Real-Time Systems Lab - TU Darmstadt
+Bundle-Version: 1.0.0.qualifier
+Bundle-SymbolicName: org.emoflon.roam.roamslang.tests;singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.emoflon.roam.roamslang,
+ org.junit.jupiter.api;bundle-version="[5.1.0,6.0.0)",
+ org.eclipse.xtext.testing,
+ org.eclipse.xtext.xbase.testing,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
+ org.emoflon.ibex.gt.editor;bundle-version="1.1.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-16
+Export-Package: org.emoflon.roam.roamslang.tests;x-internal=true
diff --git a/org.emoflon.roam.roamslang.tests/build.properties b/org.emoflon.roam.roamslang.tests/build.properties
new file mode 100644
index 00000000..4c654e9b
--- /dev/null
+++ b/org.emoflon.roam.roamslang.tests/build.properties
@@ -0,0 +1,6 @@
+source.. = src/,\
+           src-gen/,\
+           xtend-gen/
+bin.includes = .,\
+               META-INF/
+bin.excludes = **/*.xtend
diff --git a/org.emoflon.roam.roamslang.tests/src/org/emoflon/roam/roamslang/tests/RoamSLangParsingTest.xtend b/org.emoflon.roam.roamslang.tests/src/org/emoflon/roam/roamslang/tests/RoamSLangParsingTest.xtend
new file mode 100644
index 00000000..4f90e5ff
--- /dev/null
+++ b/org.emoflon.roam.roamslang.tests/src/org/emoflon/roam/roamslang/tests/RoamSLangParsingTest.xtend
@@ -0,0 +1,316 @@
+/*
+ * generated by Xtext 2.25.0
+ */
+package org.emoflon.roam.roamslang.tests
+
+import com.google.inject.Inject
+import org.eclipse.xtext.testing.InjectWith
+import org.eclipse.xtext.testing.extensions.InjectionExtension
+import org.eclipse.xtext.testing.validation.ValidationTestHelper
+import org.eclipse.xtext.testing.util.ParseHelper
+import org.emoflon.roam.roamslang.roamSLang.EditorGTFile
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.^extension.ExtendWith
+import org.emoflon.roam.roamslang.roamSLang.RoamMappingContext
+import org.emoflon.roam.roamslang.roamSLang.RoamTypeContext
+
+@ExtendWith(InjectionExtension)
+@InjectWith(RoamSLangInjectorProvider)
+class RoamSLangParsingTest {
+	
+	//
+	// Variables and constants
+	//
+	
+	public static val ecoreImport = 'http://www.eclipse.org/emf/2002/Ecore'
+	
+	@Inject
+	ParseHelper<EditorGTFile> parseHelper
+	
+	@Inject extension ValidationTestHelper validationHelper
+	
+	//
+	// Tests
+	//
+	
+	@Test
+	def void loadModel() {
+		val result = parseHelper.parse('''
+			import "«ecoreImport»"
+			rule testRule {
+				package: EPackage
+			}
+		''')
+		Assertions.assertNotNull(result)
+		val errors = result.eResource.errors
+		Assertions.assertTrue(errors.isEmpty, '''Unexpected errors: «errors.join(", ")»''')
+	}
+	
+	@Test
+	def void testNonEmptyMappings() {
+		val result = parseHelper.parse('''
+			import "«ecoreImport»"
+			pattern testPattern {
+				p: EPackage
+			}
+			mapping map with testPattern;
+		''')
+		assertValid(result)
+		val mappings = result.mappings
+		Assertions.assertFalse(mappings.isEmpty)
+	}
+	
+	@Test
+	def void testNonEmptyConstraints() {
+		val result = parseHelper.parse('''
+			import "«ecoreImport»"
+			pattern testPattern {
+				p: EPackage
+			}
+			mapping map with testPattern;
+			constraint -> mapping::map {
+				1 != 2
+			}
+		''')
+		assertValid(result)
+		val constraints = result.constraints
+		Assertions.assertFalse(constraints.isEmpty)
+	}
+	
+	@Test
+	def void testNonEmptyObjectives() {
+		val result = parseHelper.parse('''
+			import "«ecoreImport»"
+			pattern testPattern {
+				p: EPackage
+			}
+			mapping map with testPattern;
+			objective obj -> mapping::map {
+				1
+			}
+		''')
+		assertValid(result)
+		val objectives = result.objectives
+		Assertions.assertFalse(objectives.isEmpty)
+	}
+	
+	@Test
+	def void testNonEmptyGlobalObjectives() {
+		val result = parseHelper.parse('''
+			import "«ecoreImport»"
+			pattern testPattern {
+				p: EPackage
+			}
+			mapping map with testPattern;
+			objective obj -> mapping::map {
+				1
+			}
+			global objective : min {
+				2 * obj
+			}
+		''')
+		assertValid(result)
+		Assertions.assertNotNull(result.globalObjective)
+	}
+	
+	// Wrong naming / uniqueness tests
+	@Test
+	def void testMappingNameNotUnique() {
+		val result = parseHelper.parse('''
+			import "«ecoreImport»"
+			pattern testPattern {
+				p: EPackage
+			}
+			mapping map with testPattern;
+			mapping map with testPattern;
+		''')
+		assertInvalid(result, 1, 0)
+	}
+	
+	@Test
+	def void testObjectiveNameNotUnique() {
+		val result = parseHelper.parse('''
+			import "«ecoreImport»"
+			pattern testPattern {
+				p: EPackage
+			}
+			mapping map with testPattern;
+			objective o -> mapping::map {
+				1
+			}
+			objective 0 -> mapping::map {
+				2
+			}
+		''')
+		assertInvalid(result, 1, 0)
+	}
+	
+	@Test
+	def void testGlobalObjectiveNotUnique() {
+		val result = parseHelper.parse('''
+			import "«ecoreImport»"
+			pattern testPattern {
+				p: EPackage
+			}
+			mapping map with testPattern;
+			objective o -> mapping::map {
+				1
+			}
+			global objective : min {
+				2*o
+			}
+			global objective : min {
+				2*o
+			}
+		''')
+		assertInvalid(result, 1, 0)
+	}
+	
+	@Test
+	def void testObjectiveIsUselessWarning() {
+		val result = parseHelper.parse('''
+			import "«ecoreImport»"
+			pattern testPattern {
+				p: EPackage
+			}
+			mapping map with testPattern;
+			objective o -> mapping::map {
+				0
+			}
+		''')
+		assertInvalid(result, 0, 1)
+	}
+	
+	@Test
+	def void testMappingFromRule() {
+		val result = parseHelper.parse('''
+			import "«ecoreImport»"
+			rule testRule {
+				c: EClassifier {
+					.name := "Test"
+				}
+			}
+			mapping map with testRule;
+		''')
+		assertValid(result)
+		Assertions.assertFalse(result.mappings.isEmpty)
+		Assertions.assertEquals(1, result.mappings.size)
+		val map = result.mappings.get(0)
+		Assertions.assertEquals("testRule", map.rule.name)
+		Assertions.assertEquals("map", map.name)
+	}
+	
+	@Test
+	def void testConstraintOnMapping() {
+		val result = parseHelper.parse('''
+			import "«ecoreImport»"
+			rule testRule {
+				c: EClassifier {
+					.name := "Test"
+				}
+			}
+			mapping map with testRule;
+			constraint -> mapping::map {
+				1 != 2
+			}
+		''')
+		assertValid(result)
+		Assertions.assertFalse(result.constraints.isEmpty)
+		Assertions.assertEquals(1, result.constraints.size)
+		val cstr = result.constraints.get(0)
+		val mappingContext = cstr.context as RoamMappingContext
+		Assertions.assertEquals("map", mappingContext.mapping.name)
+	}
+	
+	@Test
+	def void testObjectiveOnMapping() {
+		val result = parseHelper.parse('''
+			import "«ecoreImport»"
+			rule testRule {
+				c: EClassifier {
+					.name := "Test"
+				}
+			}
+			mapping map with testRule;
+			objective obj -> mapping::map {
+				3
+			}
+		''')
+		assertValid(result)
+		Assertions.assertFalse(result.objectives.isEmpty)
+		Assertions.assertEquals(1, result.objectives.size)
+		val obj = result.objectives.get(0)
+		val mappingContext = obj.context as RoamMappingContext
+		Assertions.assertEquals("map", mappingContext.mapping.name)
+	}
+	
+	@Test
+	def void testObjectiveOnClass() {
+		val result = parseHelper.parse('''
+			import "«ecoreImport»"
+			objective obj -> class::EClass {
+				3
+			}
+		''')
+		assertValid(result)
+		Assertions.assertFalse(result.objectives.isEmpty)
+		Assertions.assertEquals(1, result.objectives.size)
+		val obj = result.objectives.get(0)
+		val typeContext = obj.context as RoamTypeContext
+		Assertions.assertEquals("EClass", typeContext.type.name)
+	}
+	
+	@Test
+	def void testGlobalObjectiveGoal() {
+		val result = parseHelper.parse('''
+			import "«ecoreImport»"
+			objective obja -> class::EClass {
+				3
+			}
+			global objective : min {
+				obja
+			}
+		''')
+		assertValid(result)
+		Assertions.assertFalse(result.objectives.isEmpty)
+		Assertions.assertEquals(1, result.objectives.size)
+		val gobj = result.globalObjective
+		Assertions.assertNotNull(gobj)
+		Assertions.assertEquals("MIN", gobj.objectiveGoal.getName)
+	}
+	
+	//
+	// Utility methods
+	//
+	
+	def void assertValid(EditorGTFile file) {
+		Assertions.assertNotNull(file)
+		this.validationHelper.assertNoIssues(file)
+		assertFile(file)
+	}
+	
+	static def void assertValidResource(EditorGTFile file) {
+		Assertions.assertNotNull(file)
+		Assertions.assertTrue(file.eResource.errors.isEmpty)
+		Assertions.assertTrue(file.eResource.warnings.isEmpty)
+	}
+	
+	static def void assertFile(EditorGTFile file) {
+		assertValidResource(file)
+		Assertions.assertEquals(1, file.imports.size)
+		Assertions.assertEquals(ecoreImport, file.imports.get(0).name)
+	}
+	
+	def void assertInvalid(EditorGTFile file, int noOfErr, int noOfWarn) {
+		Assertions.assertNotNull(file)
+		assertInvalidResource(file, noOfErr, noOfWarn)
+	}
+	
+	static def void assertInvalidResource(EditorGTFile file, int noOfErr, int noOfWarn) {
+		Assertions.assertNotNull(file)
+		Assertions.assertEquals(noOfErr, file.eResource.errors.size)
+		Assertions.assertEquals(noOfWarn, file.eResource.warnings.size)
+	}
+	
+}
diff --git a/org.emoflon.roam.roamslang.tests/test-bin/.gitignore b/org.emoflon.roam.roamslang.tests/test-bin/.gitignore
new file mode 100644
index 00000000..cf1db2ee
--- /dev/null
+++ b/org.emoflon.roam.roamslang.tests/test-bin/.gitignore
@@ -0,0 +1 @@
+/org/
diff --git a/org.emoflon.roam.roamslang.ui.tests/META-INF/MANIFEST.MF b/org.emoflon.roam.roamslang.ui.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..ced57535
--- /dev/null
+++ b/org.emoflon.roam.roamslang.ui.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.emoflon.roam.roamslang.ui.tests
+Bundle-SymbolicName: org.emoflon.roam.roamslang.ui.tests;singleton:=true
+Bundle-Version: 0.0.1.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Export-Package: org.emoflon.roam.roamslang.ui.tests;x-internal=true
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui.workbench;resolution:=optional,
+ org.eclipse.xtext.testing,
+ org.eclipse.xtext.ui.testing,
+ org.eclipse.xtext.xbase.junit,
+ org.eclipse.xtext.xbase.testing
+Automatic-Module-Name: org.emoflon.roam.roamslang.ui.tests
diff --git a/org.emoflon.roam.roamslang.ui/plugin.xml_gen b/org.emoflon.roam.roamslang.ui/plugin.xml_gen
new file mode 100644
index 00000000..f91e07a3
--- /dev/null
+++ b/org.emoflon.roam.roamslang.ui/plugin.xml_gen
@@ -0,0 +1,434 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+	<extension
+		point="org.eclipse.ui.editors">
+		<editor
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
+			contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
+			default="true"
+			extensions="rslang"
+			id="org.emoflon.roam.roamslang.RoamSLang"
+			name="RoamSLang Editor">
+		</editor>
+	</extension>
+	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="org.emoflon.roam.roamslang.RoamSLang.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+		<handler
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
+			commandId="org.emoflon.roam.roamslang.RoamSLang.validate">
+			<activeWhen>
+				<reference
+					definitionId="org.emoflon.roam.roamslang.RoamSLang.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+		<!-- copy qualified name -->
+		<handler
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
+			commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
+			<activeWhen>
+				<reference definitionId="org.emoflon.roam.roamslang.RoamSLang.Editor.opened" />
+			</activeWhen>
+		</handler>
+		<handler
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
+			commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
+			<activeWhen>
+				<and>
+					<reference definitionId="org.emoflon.roam.roamslang.RoamSLang.XtextEditor.opened" />
+					<iterate>
+						<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+					</iterate>
+				</and>
+			</activeWhen>
+		</handler>
+	</extension>
+	<extension point="org.eclipse.core.expressions.definitions">
+		<definition id="org.emoflon.roam.roamslang.RoamSLang.Editor.opened">
+			<and>
+				<reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
+				<with variable="activeEditor">
+					<test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+						value="org.emoflon.roam.roamslang.RoamSLang"
+						forcePluginActivation="true"/>
+				</with>
+			</and>
+		</definition>
+		<definition id="org.emoflon.roam.roamslang.RoamSLang.XtextEditor.opened">
+			<and>
+				<reference definitionId="isXtextEditorActive"/>
+				<with variable="activeEditor">
+					<test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+						value="org.emoflon.roam.roamslang.RoamSLang"
+						forcePluginActivation="true"/>
+				</with>
+			</and>
+		</definition>
+	</extension>
+	<extension
+			point="org.eclipse.ui.preferencePages">
+		<page
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+			id="org.emoflon.roam.roamslang.RoamSLang"
+			name="RoamSLang">
+			<keywordReference id="org.emoflon.roam.roamslang.ui.keyword_RoamSLang"/>
+		</page>
+		<page
+			category="org.emoflon.roam.roamslang.RoamSLang"
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"
+			id="org.emoflon.roam.roamslang.RoamSLang.coloring"
+			name="Syntax Coloring">
+			<keywordReference id="org.emoflon.roam.roamslang.ui.keyword_RoamSLang"/>
+		</page>
+		<page
+			category="org.emoflon.roam.roamslang.RoamSLang"
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"
+			id="org.emoflon.roam.roamslang.RoamSLang.templates"
+			name="Templates">
+			<keywordReference id="org.emoflon.roam.roamslang.ui.keyword_RoamSLang"/>
+		</page>
+	</extension>
+	<extension
+			point="org.eclipse.ui.propertyPages">
+		<page
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+			id="org.emoflon.roam.roamslang.RoamSLang"
+			name="RoamSLang">
+			<keywordReference id="org.emoflon.roam.roamslang.ui.keyword_RoamSLang"/>
+			<enabledWhen>
+				<adapt type="org.eclipse.core.resources.IProject"/>
+			</enabledWhen>
+			<filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
+		</page>
+	</extension>
+	<extension
+		point="org.eclipse.ui.keywords">
+		<keyword
+			id="org.emoflon.roam.roamslang.ui.keyword_RoamSLang"
+			label="RoamSLang"/>
+	</extension>
+	<extension
+		point="org.eclipse.ui.commands">
+		<command
+			description="Trigger expensive validation"
+			id="org.emoflon.roam.roamslang.RoamSLang.validate"
+			name="Validate">
+		</command>
+		<!-- copy qualified name -->
+		<command
+			id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+			categoryId="org.eclipse.ui.category.edit"
+			description="Copy the qualified name for the selected element"
+			name="Copy Qualified Name">
+		</command>
+		<command
+			id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+			categoryId="org.eclipse.ui.category.edit"
+			description="Copy the qualified name for the selected element"
+			name="Copy Qualified Name">
+		</command>
+	</extension>
+	<extension point="org.eclipse.ui.menus">
+		<menuContribution
+			locationURI="popup:#TextEditorContext?after=group.edit">
+			<command
+				commandId="org.emoflon.roam.roamslang.RoamSLang.validate"
+				style="push"
+				tooltip="Trigger expensive validation">
+				<visibleWhen checkEnabled="false">
+					<reference
+						definitionId="org.emoflon.roam.roamslang.RoamSLang.Editor.opened">
+					</reference>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+		<!-- copy qualified name -->
+		<menuContribution locationURI="popup:#TextEditorContext?after=copy">
+			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+				style="push" tooltip="Copy Qualified Name">
+				<visibleWhen checkEnabled="false">
+					<reference definitionId="org.emoflon.roam.roamslang.RoamSLang.Editor.opened" />
+				</visibleWhen>
+			</command>
+		</menuContribution>
+		<menuContribution locationURI="menu:edit?after=copy">
+			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+				style="push" tooltip="Copy Qualified Name">
+				<visibleWhen checkEnabled="false">
+					<reference definitionId="org.emoflon.roam.roamslang.RoamSLang.Editor.opened" />
+				</visibleWhen>
+			</command>
+		</menuContribution>
+		<menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
+			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+				style="push" tooltip="Copy Qualified Name">
+				<visibleWhen checkEnabled="false">
+					<and>
+						<reference definitionId="org.emoflon.roam.roamslang.RoamSLang.XtextEditor.opened" />
+						<iterate>
+							<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+						</iterate>
+					</and>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
+			<command commandId="org.eclipse.xtext.ui.editor.FindReferences">
+				<visibleWhen checkEnabled="false">
+					<reference definitionId="org.emoflon.roam.roamslang.RoamSLang.Editor.opened">
+					</reference>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"
+			commandId="org.eclipse.xtext.ui.editor.FindReferences">
+			<activeWhen>
+				<reference
+					definitionId="org.emoflon.roam.roamslang.RoamSLang.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	<extension point="org.eclipse.core.contenttype.contentTypes">
+		<content-type
+			base-type="org.eclipse.core.runtime.text"
+			file-extensions="rslang"
+			id="org.emoflon.roam.roamslang.RoamSLang.contenttype"
+			name="RoamSLang File"
+			priority="normal">
+		</content-type>
+	</extension>
+	<!-- adding resource factories -->
+	<extension
+		point="org.eclipse.emf.ecore.extension_parser">
+		<parser
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory"
+			type="rslang">
+		</parser>
+	</extension>
+	<extension point="org.eclipse.xtext.extension_resourceServiceProvider">
+		<resourceServiceProvider
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"
+			uriExtension="rslang">
+		</resourceServiceProvider>
+	</extension>
+	<!-- marker definitions for org.emoflon.roam.roamslang.RoamSLang -->
+	<extension
+			id="roamslang.check.fast"
+			name="RoamSLang Problem"
+			point="org.eclipse.core.resources.markers">
+		<super type="org.eclipse.xtext.ui.check.fast"/>
+		<persistent value="true"/>
+	</extension>
+	<extension
+			id="roamslang.check.normal"
+			name="RoamSLang Problem"
+			point="org.eclipse.core.resources.markers">
+		<super type="org.eclipse.xtext.ui.check.normal"/>
+		<persistent value="true"/>
+	</extension>
+	<extension
+			id="roamslang.check.expensive"
+			name="RoamSLang Problem"
+			point="org.eclipse.core.resources.markers">
+		<super type="org.eclipse.xtext.ui.check.expensive"/>
+		<persistent value="true"/>
+	</extension>
+	<extension point="org.eclipse.ui.preferencePages">
+		<page
+			category="org.emoflon.roam.roamslang.RoamSLang"
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.validation.ValidatorPreferencePage"
+			id="org.emoflon.roam.roamslang.RoamSLang.validator.preferencePage"
+			name="Errors/Warnings">
+			<keywordReference id="org.emoflon.roam.roamslang.ui.keyword_RoamSLang"/>
+		</page>
+	</extension>
+	<extension point="org.eclipse.xtext.builder.participant">
+		<participant
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
+			fileExtensions="rslang"/>
+	</extension>
+	<extension point="org.eclipse.ui.preferencePages">
+		<page
+			category="org.emoflon.roam.roamslang.RoamSLang"
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
+			id="org.emoflon.roam.roamslang.RoamSLang.compiler.preferencePage"
+			name="Compiler">
+			<keywordReference id="org.emoflon.roam.roamslang.ui.keyword_RoamSLang"/>
+		</page>
+	</extension>
+	<extension point="org.eclipse.ui.propertyPages">
+		<page
+			category="org.emoflon.roam.roamslang.RoamSLang"
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
+			id="org.emoflon.roam.roamslang.RoamSLang.compiler.propertyPage"
+			name="Compiler">
+			<keywordReference id="org.emoflon.roam.roamslang.ui.keyword_RoamSLang"/>
+			<enabledWhen>
+				<adapt type="org.eclipse.core.resources.IProject"/>
+			</enabledWhen>
+			<filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
+		</page>
+	</extension>
+	<extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">
+			<command
+				commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"
+				id="org.emoflon.roam.roamslang.RoamSLang.OpenGeneratedCode"
+				style="push">
+				<visibleWhen checkEnabled="false">
+					<reference definitionId="org.emoflon.roam.roamslang.RoamSLang.Editor.opened" />
+				</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
+			commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
+			<activeWhen>
+				<reference definitionId="org.emoflon.roam.roamslang.RoamSLang.Editor.opened" />
+			</activeWhen>
+		</handler>
+	</extension>
+	<!-- Quick Outline -->
+	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
+			commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
+			<activeWhen>
+				<reference
+					definitionId="org.emoflon.roam.roamslang.RoamSLang.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	<extension
+		point="org.eclipse.ui.commands">
+		<command
+			description="Open the quick outline."
+			id="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+			name="Quick Outline">
+		</command>
+	</extension>
+	<extension point="org.eclipse.ui.menus">
+		<menuContribution
+			locationURI="popup:#TextEditorContext?after=group.open">
+			<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+				style="push"
+				tooltip="Open Quick Outline">
+				<visibleWhen checkEnabled="false">
+					<reference definitionId="org.emoflon.roam.roamslang.RoamSLang.Editor.opened"/>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<!-- quickfix marker resolution generator for org.emoflon.roam.roamslang.RoamSLang -->
+	<extension
+			point="org.eclipse.ui.ide.markerResolution">
+		<markerResolutionGenerator
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+			markerType="org.emoflon.roam.roamslang.ui.roamslang.check.fast">
+			<attribute
+				name="FIXABLE_KEY"
+				value="true">
+			</attribute>
+		</markerResolutionGenerator>
+		<markerResolutionGenerator
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+			markerType="org.emoflon.roam.roamslang.ui.roamslang.check.normal">
+			<attribute
+				name="FIXABLE_KEY"
+				value="true">
+			</attribute>
+		</markerResolutionGenerator>
+		<markerResolutionGenerator
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+			markerType="org.emoflon.roam.roamslang.ui.roamslang.check.expensive">
+			<attribute
+				name="FIXABLE_KEY"
+				value="true">
+			</attribute>
+		</markerResolutionGenerator>
+	</extension>
+	<!-- Rename Refactoring -->
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"
+			commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
+			<activeWhen>
+				<reference
+					definitionId="org.emoflon.roam.roamslang.RoamSLang.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	<extension point="org.eclipse.ui.menus">
+		<menuContribution
+			locationURI="popup:#TextEditorContext?after=group.edit">
+			<command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"
+				style="push">
+				<visibleWhen checkEnabled="false">
+					<reference
+						definitionId="org.emoflon.roam.roamslang.RoamSLang.Editor.opened">
+					</reference>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.preferencePages">
+		<page
+			category="org.emoflon.roam.roamslang.RoamSLang"
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage"
+			id="org.emoflon.roam.roamslang.RoamSLang.refactoring"
+			name="Refactoring">
+			<keywordReference id="org.emoflon.roam.roamslang.ui.keyword_RoamSLang"/>
+		</page>
+	</extension>
+	<extension point="org.eclipse.compare.contentViewers">
+		<viewer id="org.emoflon.roam.roamslang.RoamSLang.compare.contentViewers"
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
+			extensions="rslang">
+		</viewer>
+		<contentTypeBinding
+			contentTypeId="org.emoflon.roam.roamslang.RoamSLang.contenttype"
+			contentViewerId="org.emoflon.roam.roamslang.RoamSLang.compare.contentViewers" />
+	</extension>
+	<extension point="org.eclipse.compare.contentMergeViewers">
+		<viewer id="org.emoflon.roam.roamslang.RoamSLang.compare.contentMergeViewers"
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
+			extensions="rslang" label="RoamSLang Compare">
+		</viewer>
+		<contentTypeBinding
+			contentTypeId="org.emoflon.roam.roamslang.RoamSLang.contenttype"
+			contentMergeViewerId="org.emoflon.roam.roamslang.RoamSLang.compare.contentMergeViewers" />
+	</extension>
+	<extension point="org.eclipse.ui.editors.documentProviders">
+		<provider id="org.emoflon.roam.roamslang.RoamSLang.editors.documentProviders"
+			class="org.emoflon.roam.roamslang.ui.RoamSLangExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider"
+			extensions="rslang">
+		</provider>
+	</extension>
+	<extension point="org.eclipse.team.core.fileTypes">
+		<fileTypes
+			extension="rslang"
+			type="text">
+		</fileTypes>
+	</extension>
+</plugin>
diff --git a/org.emoflon.roam.roamslang/src/org/emoflon/roam/roamslang/GenerateRoamSLang.mwe2 b/org.emoflon.roam.roamslang/src/org/emoflon/roam/roamslang/GenerateRoamSLang.mwe2
index a434ba2e..6898d5a4 100644
--- a/org.emoflon.roam.roamslang/src/org/emoflon/roam/roamslang/GenerateRoamSLang.mwe2
+++ b/org.emoflon.roam.roamslang/src/org/emoflon/roam/roamslang/GenerateRoamSLang.mwe2
@@ -21,13 +21,13 @@ Workflow {
 				baseName = "org.emoflon.roam.roamslang"
 				rootPath = rootPath
 				runtimeTest = {
-					enabled = false
+					enabled = true
 				}
 				eclipsePlugin = {
 					enabled = true
 				}
 				eclipsePluginTest = {
-					enabled = false
+					enabled = true
 				}
 				createEclipseMetaData = true
 			}