diff --git a/.gitignore b/.gitignore
index e161d57..5840e20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,11 +9,11 @@ utils/
 # Log file
 *.log
 
-# BlueJ files
-*.ctxt
+# Xtend binary serialization file
+*.xtendbin
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+# Xtext trace files
+*.java._trace
 
 # Package Files #
 *.jar
diff --git a/org.xtext.unipampa.erdsl.tests/test-bin/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin b/org.xtext.unipampa.erdsl.tests/test-bin/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin
index e61b708..561154d 100644
Binary files a/org.xtext.unipampa.erdsl.tests/test-bin/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin and b/org.xtext.unipampa.erdsl.tests/test-bin/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.tests/xtend-gen/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin b/org.xtext.unipampa.erdsl.tests/xtend-gen/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin
index e61b708..561154d 100644
Binary files a/org.xtext.unipampa.erdsl.tests/xtend-gen/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin and b/org.xtext.unipampa.erdsl.tests/xtend-gen/org/xtext/unipampa/erdsl/tests/.ErDslParsingTest.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin
index 4b0fecd..c3de7d6 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin
index 30d4de1..3dba8de 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin
index 58b8b1c..5cbf78b 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin
index 642ab72..04c8a39 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin
index b96754f..880cf30 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin
index 26fce5a..0c1792f 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin
index 4de7182..929058a 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin
index 040f269..f896758 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin
index a4f86a4..a51866a 100644
Binary files a/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/bin/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin
index 4b0fecd..c3de7d6 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/.ErDslUiModule.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin
index 30d4de1..3dba8de 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/codemining/.ErDslCodeMiningProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin
index 58b8b1c..5cbf78b 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/contentassist/.ErDslProposalProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin
index 642ab72..04c8a39 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslDescriptionLabelProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin
index b96754f..880cf30 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/labeling/.ErDslLabelProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin
index 26fce5a..0c1792f 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/outline/.ErDslOutlineTreeProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin
index 4de7182..929058a 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/quickfix/.ErDslQuickfixProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin
index 040f269..f896758 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslFileTemplateProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin
index a4f86a4..a51866a 100644
Binary files a/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin and b/org.xtext.unipampa.erdsl.ui/xtend-gen/org/xtext/unipampa/erdsl/ui/wizard/.ErDslProjectTemplateProvider.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin
index 52b23ba..28b4a2f 100644
Binary files a/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin and b/org.xtext.unipampa.erdsl/bin/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin differ
diff --git a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin
index 52b23ba..28b4a2f 100644
Binary files a/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin and b/org.xtext.unipampa.erdsl/xtend-gen/org/xtext/unipampa/erdsl/generator/.OccurrenceDiagramGenerator.xtendbin differ