diff --git a/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.DslIdeModule.xtendbin b/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.DslIdeModule.xtendbin
index 87296db493c8eb6c9396cfca6531d39ce65437d2..be6e89bff3c24812fe29d09deab23c5aa46f8d38 100644
Binary files a/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.DslIdeModule.xtendbin and b/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.DslIdeModule.xtendbin differ
diff --git a/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.DslIdeSetup.xtendbin b/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.DslIdeSetup.xtendbin
index 7afaef133cfa8d30173c76530ce30e63df14afa4..db645f3c5c08c274502e01c3570b2e9a8a0376d1 100644
Binary files a/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.DslIdeSetup.xtendbin and b/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.DslIdeSetup.xtendbin differ
diff --git a/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.gitignore b/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.gitignore
index 6b161120256d8deba73f6148ccac746aaad23153..ddae281582749c77cd82fbcb98a5e12ca1c7f14c 100644
--- a/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.gitignore
+++ b/org.framed.iorm.editpolicydsl.ide/xtend-gen/org/framed/iorm/editpolicydsl/ide/.gitignore
@@ -1,2 +1,6 @@
 /.DslIdeModule.java._trace
 /.DslIdeSetup.java._trace
+/.DslIdeModule.xtendbin
+/.DslIdeSetup.xtendbin
+/DslIdeModule.java
+/DslIdeSetup.java
diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/.DslUiModule.xtendbin b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/.DslUiModule.xtendbin
index d100260a0075cec2c768e33c4ccf359919ef6736..9a5b81520806d2cab74f60e3e51043795694cf89 100644
Binary files a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/.DslUiModule.xtendbin and b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/.DslUiModule.xtendbin differ
diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/.gitignore b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/.gitignore
index 3d352f14a967f2193042f080ce5593d6752c1305..fbe2a287e73a93c65f5f42b79ae03ab4c3097322 100644
--- a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/.gitignore
+++ b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/.gitignore
@@ -1 +1,3 @@
 /.DslUiModule.java._trace
+/.DslUiModule.xtendbin
+/DslUiModule.java
diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/contentassist/.DslProposalProvider.xtendbin b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/contentassist/.DslProposalProvider.xtendbin
index e113b3c5dc6e1b1ddd57d895deb3e6d6b9719979..6bc64ea8a4aaf3196b8b3c289bfea50e063bbbd6 100644
Binary files a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/contentassist/.DslProposalProvider.xtendbin and b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/contentassist/.DslProposalProvider.xtendbin differ
diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/contentassist/.gitignore b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/contentassist/.gitignore
index a832923e8f09bf076a39a1e4aa10d444810355da..196a61ef9ac3dcc23ea7a86621b118fe09e1ccec 100644
--- a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/contentassist/.gitignore
+++ b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/contentassist/.gitignore
@@ -1 +1,3 @@
 /.DslProposalProvider.java._trace
+/.DslProposalProvider.xtendbin
+/DslProposalProvider.java
diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.DslDescriptionLabelProvider.xtendbin b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.DslDescriptionLabelProvider.xtendbin
index 74f3fe606b1bbc6468c320fe8376409761099dc6..8cf2eff7e1f22f4a71d80eb7c45c900421fc163d 100644
Binary files a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.DslDescriptionLabelProvider.xtendbin and b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.DslDescriptionLabelProvider.xtendbin differ
diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.DslLabelProvider.xtendbin b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.DslLabelProvider.xtendbin
index a55dcdb65f4152d3827d3f2fd32fccf1cffbfbe7..9452df2120215da5b934ad8dce0c1c87b5703bc6 100644
Binary files a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.DslLabelProvider.xtendbin and b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.DslLabelProvider.xtendbin differ
diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.gitignore b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.gitignore
index 42f90a0b8cc0f57c35b6fa15e23ffbaf07020661..c7d175ecd577211aaf36c6bc40b9c8cd09800363 100644
--- a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.gitignore
+++ b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/labeling/.gitignore
@@ -1,2 +1,6 @@
 /.DslDescriptionLabelProvider.java._trace
 /.DslLabelProvider.java._trace
+/.DslDescriptionLabelProvider.xtendbin
+/.DslLabelProvider.xtendbin
+/DslDescriptionLabelProvider.java
+/DslLabelProvider.java
diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/outline/.DslOutlineTreeProvider.xtendbin b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/outline/.DslOutlineTreeProvider.xtendbin
index c44ebe697fd1b3560a1854fc42373842a19abc26..b2510fb55ddba71c46f773e097ddd0f120a01da3 100644
Binary files a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/outline/.DslOutlineTreeProvider.xtendbin and b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/outline/.DslOutlineTreeProvider.xtendbin differ
diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/outline/.gitignore b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/outline/.gitignore
index 1a94c2a65f11905664e13af9bd5052a374ec7eaa..4b52d3f4aba2643e4022cbd7c152159824420b02 100644
--- a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/outline/.gitignore
+++ b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/outline/.gitignore
@@ -1 +1,3 @@
 /.DslOutlineTreeProvider.java._trace
+/.DslOutlineTreeProvider.xtendbin
+/DslOutlineTreeProvider.java
diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/quickfix/.DslQuickfixProvider.xtendbin b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/quickfix/.DslQuickfixProvider.xtendbin
index 288c104c6b4522c002581a23ba35185e9a19b68e..a4b5288d5e5e5f32a23038c44b2cffaf75b27142 100644
Binary files a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/quickfix/.DslQuickfixProvider.xtendbin and b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/quickfix/.DslQuickfixProvider.xtendbin differ
diff --git a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/quickfix/.gitignore b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/quickfix/.gitignore
index d04813107413a27980bb746c40075eaeda01f047..9fa0e5792a7ce0531470008e5caf9182f0bc75ed 100644
--- a/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/quickfix/.gitignore
+++ b/org.framed.iorm.editpolicydsl.ui/xtend-gen/org/framed/iorm/editpolicydsl/ui/quickfix/.gitignore
@@ -1 +1,3 @@
 /.DslQuickfixProvider.java._trace
+/.DslQuickfixProvider.xtendbin
+/DslQuickfixProvider.java
diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.DslRuntimeModule.xtendbin b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.DslRuntimeModule.xtendbin
index c0c543fe5272384086cc18910ae475fa0f161ab3..b0414b47f6b0a6ba6a72276078bfbd764ea84f05 100644
Binary files a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.DslRuntimeModule.xtendbin and b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.DslRuntimeModule.xtendbin differ
diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.DslStandaloneSetup.xtendbin b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.DslStandaloneSetup.xtendbin
index bcc72362c45edb442f2a188425c74d8b05777bb9..4632666180282ac670ad11a9df8fe718f3198224 100644
Binary files a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.DslStandaloneSetup.xtendbin and b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.DslStandaloneSetup.xtendbin differ
diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.gitignore b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.gitignore
index 7a7b3f9aacb96bbab55851b6ff011559648e28de..081a3adc0cdc6a0ba4df70448e2ce1db7a5f8e37 100644
--- a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.gitignore
+++ b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/.gitignore
@@ -1,2 +1,6 @@
 /.DslRuntimeModule.java._trace
 /.DslStandaloneSetup.java._trace
+/.DslRuntimeModule.xtendbin
+/.DslStandaloneSetup.xtendbin
+/DslRuntimeModule.java
+/DslStandaloneSetup.java
diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/formatting2/.DslFormatter.xtendbin b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/formatting2/.DslFormatter.xtendbin
index 88907cea012c6401e1620de8dfe5d3607b3902f4..3e57967ed10e7d3b9b8680bc19dbd447f7f46524 100644
Binary files a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/formatting2/.DslFormatter.xtendbin and b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/formatting2/.DslFormatter.xtendbin differ
diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/formatting2/.gitignore b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/formatting2/.gitignore
index 43e5d334053ee481d405a64ffffce118956f25c5..625874964499cf9b024dac82c15ff6ee9934942e 100644
--- a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/formatting2/.gitignore
+++ b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/formatting2/.gitignore
@@ -1 +1,3 @@
 /.DslFormatter.java._trace
+/.DslFormatter.xtendbin
+/DslFormatter.java
diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/generator/.DslGenerator.xtendbin b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/generator/.DslGenerator.xtendbin
index a1380b2e7abf42c77582abe6edbff99d25567caf..1fd7c44ca0987f3f88190cca8c9f0d63b552b490 100644
Binary files a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/generator/.DslGenerator.xtendbin and b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/generator/.DslGenerator.xtendbin differ
diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/generator/.gitignore b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/generator/.gitignore
index 3548ffd508fe2809e59f2afc6a78ce99f72fb5cd..aef33840e0e17470554ba6c085f8a0572fabfdd2 100644
--- a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/generator/.gitignore
+++ b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/generator/.gitignore
@@ -1 +1,3 @@
 /.DslGenerator.java._trace
+/.DslGenerator.xtendbin
+/DslGenerator.java
diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/scoping/.DslScopeProvider.xtendbin b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/scoping/.DslScopeProvider.xtendbin
index eb95f62dfba2e589639a865f9ed366e321ca617f..cd609509301dd2df7c33b8da44d3ecd5f4054a6c 100644
Binary files a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/scoping/.DslScopeProvider.xtendbin and b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/scoping/.DslScopeProvider.xtendbin differ
diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/scoping/.gitignore b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/scoping/.gitignore
index 9735d986c5fbde221dd7beebd1456972608a3605..df6cdbd9e9bae0b05ab425524a448a6f2be6e162 100644
--- a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/scoping/.gitignore
+++ b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/scoping/.gitignore
@@ -1 +1,3 @@
 /.DslScopeProvider.java._trace
+/.DslScopeProvider.xtendbin
+/DslScopeProvider.java
diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/validation/.DslValidator.xtendbin b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/validation/.DslValidator.xtendbin
index 377076038449c99b2fc8341a10ccfeadb3c477a7..4c1a2a55807f969945fb0c7f523a7dae4b47f762 100644
Binary files a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/validation/.DslValidator.xtendbin and b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/validation/.DslValidator.xtendbin differ
diff --git a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/validation/.gitignore b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/validation/.gitignore
index ef5c5e4520e41b4d56079537006bde79328a414f..18e6cefa94449b3e0b77a2dd6b280b53e2a835d5 100644
--- a/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/validation/.gitignore
+++ b/org.framed.iorm.editpolicydsl/xtend-gen/org/framed/iorm/editpolicydsl/validation/.gitignore
@@ -1 +1,3 @@
 /.DslValidator.java._trace
+/.DslValidator.xtendbin
+/DslValidator.java