diff --git a/languages/SemAnno.sandbox/models/SemAnno.sandbox.mps b/languages/SemAnno.sandbox/models/SemAnno.sandbox.mps
index a8e4f60..954cbeb 100644
--- a/languages/SemAnno.sandbox/models/SemAnno.sandbox.mps
+++ b/languages/SemAnno.sandbox/models/SemAnno.sandbox.mps
@@ -7,19 +7,17 @@
-
-
-
+
+
-
-
-
+
+
-
-
+
+
-
-
+
+
@@ -28,41 +26,19 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/languages/SemAnno/models/SemAnno.editor.mps b/languages/SemAnno/models/SemAnno.editor.mps
index 406fdee..207df07 100644
--- a/languages/SemAnno/models/SemAnno.editor.mps
+++ b/languages/SemAnno/models/SemAnno.editor.mps
@@ -37,40 +37,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -83,46 +55,65 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
diff --git a/languages/SemAnno/models/SemAnno.structure.mps b/languages/SemAnno/models/SemAnno.structure.mps
index e5621d3..7987ee8 100644
--- a/languages/SemAnno/models/SemAnno.structure.mps
+++ b/languages/SemAnno/models/SemAnno.structure.mps
@@ -11,6 +11,7 @@
+
@@ -40,26 +41,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -70,40 +51,63 @@
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/languages/SemAnno/models/SemAnno.textGen.mps b/languages/SemAnno/models/SemAnno.textGen.mps
index 05f6298..eda516a 100644
--- a/languages/SemAnno/models/SemAnno.textGen.mps
+++ b/languages/SemAnno/models/SemAnno.textGen.mps
@@ -15,6 +15,9 @@
+
+
+
@@ -22,18 +25,23 @@
+
+
+
+
+
+
+
+
-
-
-
@@ -43,6 +51,7 @@
+
@@ -51,42 +60,65 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -94,32 +126,116 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+