diff --git a/graphicsclasses_diagram.mdj b/graphicsclasses_diagram.mdj
index 760c213..a3e3a9e 100644
--- a/graphicsclasses_diagram.mdj
+++ b/graphicsclasses_diagram.mdj
@@ -3168,7 +3168,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": 16,
+											"left": -16,
 											"top": -1184,
 											"width": 0,
 											"height": 13,
@@ -3192,7 +3192,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": 221,
+											"left": 205,
 											"top": 39,
 											"width": 80.7548828125,
 											"height": 13,
@@ -3217,7 +3217,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": 16,
+											"left": -16,
 											"top": -1184,
 											"width": 73,
 											"height": 13,
@@ -3242,7 +3242,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": 16,
+											"left": -16,
 											"top": -1184,
 											"width": 0,
 											"height": 13,
@@ -3261,7 +3261,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 216,
+									"left": 200,
 									"top": 32,
 									"width": 90.7548828125,
 									"height": 25,
@@ -3307,7 +3307,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": 221,
+											"left": 205,
 											"top": 62,
 											"width": 80.7548828125,
 											"height": 13,
@@ -3327,7 +3327,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 216,
+									"left": 200,
 									"top": 57,
 									"width": 90.7548828125,
 									"height": 23,
@@ -3351,7 +3351,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 216,
+									"left": 200,
 									"top": 80,
 									"width": 90.7548828125,
 									"height": 10,
@@ -3375,7 +3375,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 8,
+									"left": -8,
 									"top": -592,
 									"width": 10,
 									"height": 10,
@@ -3399,7 +3399,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 8,
+									"left": -8,
 									"top": -592,
 									"width": 10,
 									"height": 10,
@@ -3415,7 +3415,7 @@
 							"showShadow": true,
 							"containerChangeable": true,
 							"containerExtending": false,
-							"left": 216,
+							"left": 200,
 							"top": 32,
 							"width": 90.7548828125,
 							"height": 58,
@@ -3482,7 +3482,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": -64,
+											"left": -80,
 											"top": -1200,
 											"width": 0,
 											"height": 13,
@@ -3506,7 +3506,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": 317,
+											"left": 309,
 											"top": 39,
 											"width": 76.451171875,
 											"height": 13,
@@ -3531,7 +3531,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": -64,
+											"left": -80,
 											"top": -1200,
 											"width": 73,
 											"height": 13,
@@ -3556,7 +3556,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": -64,
+											"left": -80,
 											"top": -1200,
 											"width": 0,
 											"height": 13,
@@ -3575,7 +3575,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 312,
+									"left": 304,
 									"top": 32,
 									"width": 86.451171875,
 									"height": 25,
@@ -3621,7 +3621,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": 317,
+											"left": 309,
 											"top": 62,
 											"width": 76.451171875,
 											"height": 13,
@@ -3641,7 +3641,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 312,
+									"left": 304,
 									"top": 57,
 									"width": 86.451171875,
 									"height": 23,
@@ -3665,7 +3665,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 312,
+									"left": 304,
 									"top": 80,
 									"width": 86.451171875,
 									"height": 10,
@@ -3689,7 +3689,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": -32,
+									"left": -40,
 									"top": -600,
 									"width": 10,
 									"height": 10,
@@ -3713,7 +3713,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": -32,
+									"left": -40,
 									"top": -600,
 									"width": 10,
 									"height": 10,
@@ -3729,7 +3729,7 @@
 							"showShadow": true,
 							"containerChangeable": true,
 							"containerExtending": false,
-							"left": 312,
+							"left": 304,
 							"top": 32,
 							"width": 86.451171875,
 							"height": 58,
@@ -4110,7 +4110,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": 208,
+											"left": 224,
 											"top": -1488,
 											"width": 0,
 											"height": 13,
@@ -4134,7 +4134,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": 509,
+											"left": 517,
 											"top": 39,
 											"width": 87,
 											"height": 13,
@@ -4159,7 +4159,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": 208,
+											"left": 224,
 											"top": -1488,
 											"width": 73,
 											"height": 13,
@@ -4184,7 +4184,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": 208,
+											"left": 224,
 											"top": -1488,
 											"width": 0,
 											"height": 13,
@@ -4203,7 +4203,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 504,
+									"left": 512,
 									"top": 32,
 									"width": 97,
 									"height": 25,
@@ -4249,7 +4249,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": 509,
+											"left": 517,
 											"top": 62,
 											"width": 87,
 											"height": 13,
@@ -4269,7 +4269,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 504,
+									"left": 512,
 									"top": 57,
 									"width": 97,
 									"height": 23,
@@ -4293,7 +4293,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 504,
+									"left": 512,
 									"top": 80,
 									"width": 97,
 									"height": 10,
@@ -4317,7 +4317,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 104,
+									"left": 112,
 									"top": -744,
 									"width": 10,
 									"height": 10,
@@ -4341,7 +4341,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 104,
+									"left": 112,
 									"top": -744,
 									"width": 10,
 									"height": 10,
@@ -4357,7 +4357,7 @@
 							"showShadow": true,
 							"containerChangeable": true,
 							"containerExtending": false,
-							"left": 504,
+							"left": 512,
 							"top": 32,
 							"width": 97,
 							"height": 58,
@@ -4424,7 +4424,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": -16,
+											"left": 0,
 											"top": -1488,
 											"width": 0,
 											"height": 13,
@@ -4448,7 +4448,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": 621,
+											"left": 629,
 											"top": 39,
 											"width": 114,
 											"height": 13,
@@ -4473,7 +4473,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": -16,
+											"left": 0,
 											"top": -1488,
 											"width": 73,
 											"height": 13,
@@ -4498,7 +4498,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": -16,
+											"left": 0,
 											"top": -1488,
 											"width": 0,
 											"height": 13,
@@ -4517,7 +4517,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 616,
+									"left": 624,
 									"top": 32,
 									"width": 124,
 									"height": 25,
@@ -4563,7 +4563,7 @@
 											"showShadow": true,
 											"containerChangeable": false,
 											"containerExtending": false,
-											"left": 621,
+											"left": 629,
 											"top": 62,
 											"width": 114,
 											"height": 13,
@@ -4583,7 +4583,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 616,
+									"left": 624,
 									"top": 57,
 									"width": 124,
 									"height": 23,
@@ -4607,7 +4607,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 616,
+									"left": 624,
 									"top": 80,
 									"width": 124,
 									"height": 10,
@@ -4631,7 +4631,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": -8,
+									"left": 0,
 									"top": -744,
 									"width": 10,
 									"height": 10,
@@ -4655,7 +4655,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": -8,
+									"left": 0,
 									"top": -744,
 									"width": 10,
 									"height": 10,
@@ -4671,7 +4671,7 @@
 							"showShadow": true,
 							"containerChangeable": true,
 							"containerExtending": false,
-							"left": 616,
+							"left": 624,
 							"top": 32,
 							"width": 124,
 							"height": 58,
@@ -4731,8 +4731,8 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 392,
-									"top": 106,
+									"left": 384,
+									"top": 105,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -4764,8 +4764,8 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 399,
-									"top": 93,
+									"left": 390,
+									"top": 91,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -4797,8 +4797,8 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 379,
-									"top": 133,
+									"left": 371,
+									"top": 132,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -4829,7 +4829,7 @@
 								"$ref": "AAAAAAFUbCbO8AAdX7Y="
 							},
 							"lineStyle": 1,
-							"points": "307:87;465.302001953125:165.582275390625",
+							"points": "291:86;465.302001953125:165.951171875",
 							"stereotypeDisplay": "label",
 							"showVisibility": true,
 							"showProperty": true,
@@ -4871,7 +4871,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 433,
+									"left": 430,
 									"top": 107,
 									"width": 0,
 									"height": 13,
@@ -4904,8 +4904,8 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 443,
-									"top": 96,
+									"left": 440,
+									"top": 95,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -4937,7 +4937,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 414,
+									"left": 411,
 									"top": 130,
 									"width": 0,
 									"height": 13,
@@ -4969,7 +4969,7 @@
 								"$ref": "AAAAAAFUbCb2dQBr7VE="
 							},
 							"lineStyle": 1,
-							"points": "383:90;465.302001953125:160.78662109375",
+							"points": "377:90;465.302001953125:161.5244140625",
 							"stereotypeDisplay": "label",
 							"showVisibility": true,
 							"showProperty": true,
@@ -5151,8 +5151,8 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 523,
-									"top": 125,
+									"left": 525,
+									"top": 126,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -5184,8 +5184,8 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 535,
-									"top": 133,
+									"left": 537,
+									"top": 135,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -5217,8 +5217,8 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 498,
-									"top": 108,
+									"left": 502,
+									"top": 107,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -5249,7 +5249,7 @@
 								"$ref": "AAAAAAFUbCdrDAEHwA0="
 							},
 							"lineStyle": 1,
-							"points": "534:90;488.302001953125:156.28981711647728",
+							"points": "540:90;488.302001953125:156.8489990234375",
 							"stereotypeDisplay": "label",
 							"showVisibility": true,
 							"showProperty": true,
@@ -5291,7 +5291,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 566,
+									"left": 568,
 									"top": 134,
 									"width": 0,
 									"height": 13,
@@ -5324,7 +5324,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 573,
+									"left": 575,
 									"top": 147,
 									"width": 0,
 									"height": 13,
@@ -5357,7 +5357,7 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 551,
+									"left": 555,
 									"top": 107,
 									"width": 0,
 									"height": 13,
@@ -5389,7 +5389,7 @@
 								"$ref": "AAAAAAFUbCeFbAFVI4E="
 							},
 							"lineStyle": 1,
-							"points": "630:90;488.302001953125:164.98419386340726",
+							"points": "636:90;488.302001953125:164.98419386340726",
 							"stereotypeDisplay": "label",
 							"showVisibility": true,
 							"showProperty": true,
@@ -7128,7 +7128,7 @@
 											"containerExtending": false,
 											"left": 661,
 											"top": 319,
-											"width": 89,
+											"width": 96.30029296875,
 											"height": 13,
 											"autoResize": false,
 											"underline": false,
@@ -7197,7 +7197,7 @@
 									"containerExtending": false,
 									"left": 656,
 									"top": 312,
-									"width": 99,
+									"width": 106.30029296875,
 									"height": 25,
 									"autoResize": false,
 									"stereotypeLabel": {
@@ -7233,7 +7233,7 @@
 									"containerExtending": false,
 									"left": 656,
 									"top": 337,
-									"width": 99,
+									"width": 106.30029296875,
 									"height": 10,
 									"autoResize": false
 								},
@@ -7257,7 +7257,7 @@
 									"containerExtending": false,
 									"left": 656,
 									"top": 347,
-									"width": 99,
+									"width": 106.30029296875,
 									"height": 10,
 									"autoResize": false
 								},
@@ -7321,7 +7321,7 @@
 							"containerExtending": false,
 							"left": 656,
 							"top": 312,
-							"width": 99,
+							"width": 106.30029296875,
 							"height": 45,
 							"autoResize": false,
 							"stereotypeDisplay": "label",
@@ -8514,6 +8514,460 @@
 							"headQualifiersCompartment": {
 								"$ref": "AAAAAAFUbEZUPEnH8C0="
 							}
+						},
+						{
+							"_type": "UMLClassView",
+							"_id": "AAAAAAFUbMS+mwyxKjQ=",
+							"_parent": {
+								"$ref": "AAAAAAFF+qBtyKM79qY="
+							},
+							"model": {
+								"$ref": "AAAAAAFUbMS+mQyvZaU="
+							},
+							"subViews": [
+								{
+									"_type": "UMLNameCompartmentView",
+									"_id": "AAAAAAFUbMS+mwyyhZU=",
+									"_parent": {
+										"$ref": "AAAAAAFUbMS+mwyxKjQ="
+									},
+									"model": {
+										"$ref": "AAAAAAFUbMS+mQyvZaU="
+									},
+									"subViews": [
+										{
+											"_type": "LabelView",
+											"_id": "AAAAAAFUbMS+mwyz/Dk=",
+											"_parent": {
+												"$ref": "AAAAAAFUbMS+mwyyhZU="
+											},
+											"visible": false,
+											"enabled": true,
+											"lineColor": "#000000",
+											"fillColor": "#ffffff",
+											"fontColor": "#000000",
+											"font": "Arial;13;0",
+											"showShadow": true,
+											"containerChangeable": false,
+											"containerExtending": false,
+											"left": 0,
+											"top": 0,
+											"width": 0,
+											"height": 13,
+											"autoResize": false,
+											"underline": false,
+											"horizontalAlignment": 2,
+											"verticalAlignment": 5
+										},
+										{
+											"_type": "LabelView",
+											"_id": "AAAAAAFUbMS+nAy0hdc=",
+											"_parent": {
+												"$ref": "AAAAAAFUbMS+mwyyhZU="
+											},
+											"visible": true,
+											"enabled": true,
+											"lineColor": "#000000",
+											"fillColor": "#ffffff",
+											"fontColor": "#000000",
+											"font": "Arial;13;1",
+											"showShadow": true,
+											"containerChangeable": false,
+											"containerExtending": false,
+											"left": 101,
+											"top": 39,
+											"width": 76,
+											"height": 13,
+											"autoResize": false,
+											"underline": false,
+											"text": "GapDrawer",
+											"horizontalAlignment": 2,
+											"verticalAlignment": 5
+										},
+										{
+											"_type": "LabelView",
+											"_id": "AAAAAAFUbMS+nAy1nco=",
+											"_parent": {
+												"$ref": "AAAAAAFUbMS+mwyyhZU="
+											},
+											"visible": false,
+											"enabled": true,
+											"lineColor": "#000000",
+											"fillColor": "#ffffff",
+											"fontColor": "#000000",
+											"font": "Arial;13;0",
+											"showShadow": true,
+											"containerChangeable": false,
+											"containerExtending": false,
+											"left": 0,
+											"top": 0,
+											"width": 73,
+											"height": 13,
+											"autoResize": false,
+											"underline": false,
+											"text": "(from Model)",
+											"horizontalAlignment": 2,
+											"verticalAlignment": 5
+										},
+										{
+											"_type": "LabelView",
+											"_id": "AAAAAAFUbMS+nAy29Ns=",
+											"_parent": {
+												"$ref": "AAAAAAFUbMS+mwyyhZU="
+											},
+											"visible": false,
+											"enabled": true,
+											"lineColor": "#000000",
+											"fillColor": "#ffffff",
+											"fontColor": "#000000",
+											"font": "Arial;13;0",
+											"showShadow": true,
+											"containerChangeable": false,
+											"containerExtending": false,
+											"left": 0,
+											"top": 0,
+											"width": 0,
+											"height": 13,
+											"autoResize": false,
+											"underline": false,
+											"horizontalAlignment": 1,
+											"verticalAlignment": 5
+										}
+									],
+									"visible": true,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 96,
+									"top": 32,
+									"width": 86,
+									"height": 25,
+									"autoResize": false,
+									"stereotypeLabel": {
+										"$ref": "AAAAAAFUbMS+mwyz/Dk="
+									},
+									"nameLabel": {
+										"$ref": "AAAAAAFUbMS+nAy0hdc="
+									},
+									"namespaceLabel": {
+										"$ref": "AAAAAAFUbMS+nAy1nco="
+									},
+									"propertyLabel": {
+										"$ref": "AAAAAAFUbMS+nAy29Ns="
+									}
+								},
+								{
+									"_type": "UMLAttributeCompartmentView",
+									"_id": "AAAAAAFUbMS+nAy3r/k=",
+									"_parent": {
+										"$ref": "AAAAAAFUbMS+mwyxKjQ="
+									},
+									"model": {
+										"$ref": "AAAAAAFUbMS+mQyvZaU="
+									},
+									"subViews": [
+										{
+											"_type": "UMLAttributeView",
+											"_id": "AAAAAAFUbMWSfhFLZi0=",
+											"_parent": {
+												"$ref": "AAAAAAFUbMS+nAy3r/k="
+											},
+											"model": {
+												"$ref": "AAAAAAFUbMWSZBE5ldk="
+											},
+											"visible": true,
+											"enabled": true,
+											"lineColor": "#000000",
+											"fillColor": "#ffffff",
+											"fontColor": "#000000",
+											"font": "Arial;13;0",
+											"showShadow": true,
+											"containerChangeable": false,
+											"containerExtending": false,
+											"left": 101,
+											"top": 62,
+											"width": 76,
+											"height": 13,
+											"autoResize": false,
+											"underline": false,
+											"text": "-gap: Gap",
+											"horizontalAlignment": 0,
+											"verticalAlignment": 5
+										}
+									],
+									"visible": true,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 96,
+									"top": 57,
+									"width": 86,
+									"height": 23,
+									"autoResize": false
+								},
+								{
+									"_type": "UMLOperationCompartmentView",
+									"_id": "AAAAAAFUbMS+nQy4AJ4=",
+									"_parent": {
+										"$ref": "AAAAAAFUbMS+mwyxKjQ="
+									},
+									"model": {
+										"$ref": "AAAAAAFUbMS+mQyvZaU="
+									},
+									"visible": true,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 96,
+									"top": 80,
+									"width": 86,
+									"height": 10,
+									"autoResize": false
+								},
+								{
+									"_type": "UMLReceptionCompartmentView",
+									"_id": "AAAAAAFUbMS+nQy5Pu8=",
+									"_parent": {
+										"$ref": "AAAAAAFUbMS+mwyxKjQ="
+									},
+									"model": {
+										"$ref": "AAAAAAFUbMS+mQyvZaU="
+									},
+									"visible": false,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 0,
+									"top": 0,
+									"width": 10,
+									"height": 10,
+									"autoResize": false
+								},
+								{
+									"_type": "UMLTemplateParameterCompartmentView",
+									"_id": "AAAAAAFUbMS+nQy6Ibs=",
+									"_parent": {
+										"$ref": "AAAAAAFUbMS+mwyxKjQ="
+									},
+									"model": {
+										"$ref": "AAAAAAFUbMS+mQyvZaU="
+									},
+									"visible": false,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 0,
+									"top": 0,
+									"width": 10,
+									"height": 10,
+									"autoResize": false
+								}
+							],
+							"visible": true,
+							"enabled": true,
+							"lineColor": "#000000",
+							"fillColor": "#ffffff",
+							"fontColor": "#000000",
+							"font": "Arial;13;0",
+							"showShadow": true,
+							"containerChangeable": true,
+							"containerExtending": false,
+							"left": 96,
+							"top": 32,
+							"width": 86,
+							"height": 58,
+							"autoResize": false,
+							"stereotypeDisplay": "label",
+							"showVisibility": true,
+							"showNamespace": false,
+							"showProperty": true,
+							"showType": true,
+							"nameCompartment": {
+								"$ref": "AAAAAAFUbMS+mwyyhZU="
+							},
+							"wordWrap": false,
+							"suppressAttributes": false,
+							"suppressOperations": false,
+							"suppressReceptions": true,
+							"showMultiplicity": true,
+							"showOperationSignature": true,
+							"attributeCompartment": {
+								"$ref": "AAAAAAFUbMS+nAy3r/k="
+							},
+							"operationCompartment": {
+								"$ref": "AAAAAAFUbMS+nQy4AJ4="
+							},
+							"receptionCompartment": {
+								"$ref": "AAAAAAFUbMS+nQy5Pu8="
+							},
+							"templateParameterCompartment": {
+								"$ref": "AAAAAAFUbMS+nQy6Ibs="
+							}
+						},
+						{
+							"_type": "UMLInterfaceRealizationView",
+							"_id": "AAAAAAFUbMXbbRH2f5o=",
+							"_parent": {
+								"$ref": "AAAAAAFF+qBtyKM79qY="
+							},
+							"model": {
+								"$ref": "AAAAAAFUbMXbbRH1jxo="
+							},
+							"subViews": [
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFUbMXbbhH3N0A=",
+									"_parent": {
+										"$ref": "AAAAAAFUbMXbbRH2f5o="
+									},
+									"model": {
+										"$ref": "AAAAAAFUbMXbbRH1jxo="
+									},
+									"visible": false,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 327,
+									"top": 101,
+									"width": 0,
+									"height": 13,
+									"autoResize": false,
+									"alpha": 1.5707963267948966,
+									"distance": 15,
+									"hostEdge": {
+										"$ref": "AAAAAAFUbMXbbRH2f5o="
+									},
+									"edgePosition": 1,
+									"underline": false,
+									"horizontalAlignment": 2,
+									"verticalAlignment": 5
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFUbMXbbhH40tQ=",
+									"_parent": {
+										"$ref": "AAAAAAFUbMXbbRH2f5o="
+									},
+									"model": {
+										"$ref": "AAAAAAFUbMXbbRH1jxo="
+									},
+									"visible": null,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 332,
+									"top": 87,
+									"width": 0,
+									"height": 13,
+									"autoResize": false,
+									"alpha": 1.5707963267948966,
+									"distance": 30,
+									"hostEdge": {
+										"$ref": "AAAAAAFUbMXbbRH2f5o="
+									},
+									"edgePosition": 1,
+									"underline": false,
+									"horizontalAlignment": 2,
+									"verticalAlignment": 5
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFUbMXbbhH5vbs=",
+									"_parent": {
+										"$ref": "AAAAAAFUbMXbbRH2f5o="
+									},
+									"model": {
+										"$ref": "AAAAAAFUbMXbbRH1jxo="
+									},
+									"visible": false,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 318,
+									"top": 130,
+									"width": 0,
+									"height": 13,
+									"autoResize": false,
+									"alpha": -1.5707963267948966,
+									"distance": 15,
+									"hostEdge": {
+										"$ref": "AAAAAAFUbMXbbRH2f5o="
+									},
+									"edgePosition": 1,
+									"underline": false,
+									"horizontalAlignment": 2,
+									"verticalAlignment": 5
+								}
+							],
+							"visible": true,
+							"enabled": true,
+							"lineColor": "#000000",
+							"fillColor": "#ffffff",
+							"fontColor": "#000000",
+							"font": "Arial;13;0",
+							"showShadow": true,
+							"containerChangeable": false,
+							"containerExtending": false,
+							"head": {
+								"$ref": "AAAAAAFUbCKRCP6Cs6s="
+							},
+							"tail": {
+								"$ref": "AAAAAAFUbMS+mwyxKjQ="
+							},
+							"lineStyle": 1,
+							"points": "182:77;465.302001953125:167.795654296875",
+							"stereotypeDisplay": "label",
+							"showVisibility": true,
+							"showProperty": true,
+							"nameLabel": {
+								"$ref": "AAAAAAFUbMXbbhH3N0A="
+							},
+							"stereotypeLabel": {
+								"$ref": "AAAAAAFUbMXbbhH40tQ="
+							},
+							"propertyLabel": {
+								"$ref": "AAAAAAFUbMXbbhH5vbs="
+							}
 						}
 					]
 				},
@@ -9275,6 +9729,55 @@
 					"isFinalSpecialization": false,
 					"isLeaf": false,
 					"isActive": false
+				},
+				{
+					"_type": "UMLClass",
+					"_id": "AAAAAAFUbMS+mQyvZaU=",
+					"_parent": {
+						"$ref": "AAAAAAFF+qBWK6M3Z8Y="
+					},
+					"name": "GapDrawer",
+					"ownedElements": [
+						{
+							"_type": "UMLInterfaceRealization",
+							"_id": "AAAAAAFUbMXbbRH1jxo=",
+							"_parent": {
+								"$ref": "AAAAAAFUbMS+mQyvZaU="
+							},
+							"source": {
+								"$ref": "AAAAAAFUbMS+mQyvZaU="
+							},
+							"target": {
+								"$ref": "AAAAAAFUbCKRB/6AmKI="
+							},
+							"visibility": "public"
+						}
+					],
+					"visibility": "public",
+					"attributes": [
+						{
+							"_type": "UMLAttribute",
+							"_id": "AAAAAAFUbMWSZBE5ldk=",
+							"_parent": {
+								"$ref": "AAAAAAFUbMS+mQyvZaU="
+							},
+							"name": "gap",
+							"visibility": "private",
+							"isStatic": false,
+							"isLeaf": false,
+							"type": "Gap",
+							"isReadOnly": false,
+							"isOrdered": false,
+							"isUnique": false,
+							"isDerived": false,
+							"aggregation": "none",
+							"isID": false
+						}
+					],
+					"isAbstract": false,
+					"isFinalSpecialization": false,
+					"isLeaf": false,
+					"isActive": false
 				}
 			],
 			"visibility": "public"