Inclusão de relacionamento entre competição e exame nos documentos.

Api/components/schemas/Phase.yaml

@@ -5,6 +5,7 @@ Competition:
     - uri
     - id
     - status
+    - exams
   properties:
     id:
       type: integer  
@@ -18,11 +19,15 @@ Competition:
       type: string
       enum:
         - ACTIVE
-        - INACTIVE
+        - INACTIVE    
     subscription:
       $ref: 'https://gitlab.dev.evologica.com.br/Competify/Docs/raw/master/Api/components/schemas/Subscription.yaml/#/Subscription'
     token:
-      type: string      
+      type: string
+    exams:
+      type: arrays
+      items:
+        $ref: 'https://gitlab.dev.evologica.com.br/Competify/Docs/raw/master/Api/components/schemas/Exam.yaml/#/Exam'      
 Phase:
   required:
     - label

uml/Competify.mdj

@@ -255,7 +255,7 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 224,
+											"left": 80,
 											"top": -16,
 											"height": 13
 										},
@@ -267,7 +267,7 @@
 											},
 											"fillColor": "#ffadad",
 											"font": "Arial;13;3",
-											"left": 621,
+											"left": 549,
 											"top": 375,
 											"width": 93,
 											"height": 13,
@@ -282,7 +282,7 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 224,
+											"left": 80,
 											"top": -16,
 											"width": 72,
 											"height": 13,
@@ -297,7 +297,7 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 224,
+											"left": 80,
 											"top": -16,
 											"height": 13,
 											"horizontalAlignment": 1
@@ -305,7 +305,7 @@
 									],
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 616,
+									"left": 544,
 									"top": 368,
 									"width": 103,
 									"height": 25,
@@ -343,7 +343,7 @@
 											},
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 621,
+											"left": 549,
 											"top": 398,
 											"width": 93,
 											"height": 13,
@@ -361,7 +361,7 @@
 											},
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 621,
+											"left": 549,
 											"top": 413,
 											"width": 93,
 											"height": 13,
@@ -371,7 +371,7 @@
 									],
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 616,
+									"left": 544,
 									"top": 393,
 									"width": 103,
 									"height": 38
@@ -387,7 +387,7 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 616,
+									"left": 544,
 									"top": 431,
 									"width": 103,
 									"height": 10
@@ -404,7 +404,7 @@
 									"visible": false,
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 112,
+									"left": 40,
 									"top": -8,
 									"width": 10,
 									"height": 10
@@ -421,7 +421,7 @@
 									"visible": false,
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 112,
+									"left": 40,
 									"top": -8,
 									"width": 10,
 									"height": 10
@@ -430,7 +430,7 @@
 							"fillColor": "#ffadad",
 							"font": "Arial;13;0",
 							"containerChangeable": true,
-							"left": 616,
+							"left": 544,
 							"top": 368,
 							"width": 103,
 							"height": 73,
@@ -479,8 +479,8 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 880,
-											"top": 144,
+											"left": 416,
+											"top": 224,
 											"height": 13
 										},
 										{
@@ -491,8 +491,8 @@
 											},
 											"fillColor": "#ffadad",
 											"font": "Arial;13;1",
-											"left": 917,
-											"top": 639,
+											"left": 685,
+											"top": 679,
 											"width": 116,
 											"height": 13,
 											"text": "Alternative"
@@ -506,8 +506,8 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 880,
-											"top": 144,
+											"left": 416,
+											"top": 224,
 											"width": 72,
 											"height": 13,
 											"text": "(from Exam)"
@@ -521,16 +521,16 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 880,
-											"top": 144,
+											"left": 416,
+											"top": 224,
 											"height": 13,
 											"horizontalAlignment": 1
 										}
 									],
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 912,
-									"top": 632,
+									"left": 680,
+									"top": 672,
 									"width": 126,
 									"height": 25,
 									"stereotypeLabel": {
@@ -567,8 +567,8 @@
 											},
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 917,
-											"top": 662,
+											"left": 685,
+											"top": 702,
 											"width": 116,
 											"height": 13,
 											"text": "+order: Integer",
@@ -585,8 +585,8 @@
 											},
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 917,
-											"top": 677,
+											"left": 685,
+											"top": 717,
 											"width": 116,
 											"height": 13,
 											"text": "+statement: String",
@@ -595,8 +595,8 @@
 									],
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 912,
-									"top": 657,
+									"left": 680,
+									"top": 697,
 									"width": 126,
 									"height": 38
 								},
@@ -611,8 +611,8 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 912,
-									"top": 695,
+									"left": 680,
+									"top": 735,
 									"width": 126,
 									"height": 10
 								},
@@ -628,8 +628,8 @@
 									"visible": false,
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 440,
-									"top": 72,
+									"left": 208,
+									"top": 112,
 									"width": 10,
 									"height": 10
 								},
@@ -645,8 +645,8 @@
 									"visible": false,
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 440,
-									"top": 72,
+									"left": 208,
+									"top": 112,
 									"width": 10,
 									"height": 10
 								}
@@ -654,8 +654,8 @@
 							"fillColor": "#ffadad",
 							"font": "Arial;13;0",
 							"containerChangeable": true,
-							"left": 912,
-							"top": 632,
+							"left": 680,
+							"top": 672,
 							"width": 126,
 							"height": 73,
 							"nameCompartment": {
@@ -695,7 +695,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 663,
+									"left": 610,
 									"top": 257,
 									"height": 13,
 									"alpha": 1.5707963267948966,
@@ -716,7 +716,7 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 678,
+									"left": 625,
 									"top": 257,
 									"height": 13,
 									"alpha": 1.5707963267948966,
@@ -737,7 +737,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 633,
+									"left": 580,
 									"top": 258,
 									"height": 13,
 									"alpha": -1.5707963267948966,
@@ -825,7 +825,7 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 566,
+									"left": 513,
 									"top": 336,
 									"width": 64,
 									"height": 13,
@@ -847,7 +847,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 676,
+									"left": 623,
 									"top": 333,
 									"height": 13,
 									"alpha": -0.7853981633974483,
@@ -867,7 +867,7 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 655,
+									"left": 602,
 									"top": 344,
 									"width": 7,
 									"height": 13,
@@ -921,7 +921,7 @@
 							"tail": {
 								"$ref": "AAAAAAFjAgUnfIBwcFs="
 							},
-							"points": "504:264;648:264;648:368",
+							"points": "504:264;595:264;595:368",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFjAgYeG4ExqnA="
@@ -978,8 +978,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 782,
-									"top": 651,
+									"left": 862,
+									"top": 625,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 15,
@@ -999,8 +999,8 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 782,
-									"top": 636,
+									"left": 877,
+									"top": 625,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 30,
@@ -1020,8 +1020,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 782,
-									"top": 681,
+									"left": 833,
+									"top": 626,
 									"height": 13,
 									"alpha": -1.5707963267948966,
 									"distance": 15,
@@ -1041,8 +1041,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 797,
-									"top": 599,
+									"left": 822,
+									"top": 539,
 									"height": 13,
 									"alpha": 0.5235987755982988,
 									"distance": 30,
@@ -1062,8 +1062,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 810,
-									"top": 602,
+									"left": 825,
+									"top": 525,
 									"height": 13,
 									"alpha": 0.7853981633974483,
 									"distance": 40,
@@ -1083,8 +1083,8 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 766,
-									"top": 595,
+									"left": 815,
+									"top": 566,
 									"width": 7.22998046875,
 									"height": 13,
 									"alpha": -0.5235987755982988,
@@ -1106,8 +1106,8 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 823,
-									"top": 650,
+									"left": 819,
+									"top": 713,
 									"width": 75,
 									"height": 13,
 									"alpha": -0.28083777583322966,
@@ -1128,8 +1128,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 883,
-									"top": 637,
+									"left": 833,
+									"top": 726,
 									"height": 13,
 									"alpha": -0.7853981633974483,
 									"distance": 40,
@@ -1148,12 +1148,12 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 880,
-									"top": 678,
+									"left": 804,
+									"top": 715,
 									"width": 20,
 									"height": 13,
-									"alpha": 0.5235987755982988,
-									"distance": 25,
+									"alpha": -1.0390723975577683,
+									"distance": 19.72308292331602,
 									"hostEdge": {
 										"$ref": "AAAAAAFjAgdXooKo8eQ="
 									},
@@ -1202,7 +1202,7 @@
 							"tail": {
 								"$ref": "AAAAAAFjAhKHDqURXiU="
 							},
-							"points": "782:580;782:672;912:672",
+							"points": "797:560;848:560;848:704;805:704",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFjAgdXo4KpR1Y="
@@ -1771,8 +1771,8 @@
 											},
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 885,
-											"top": 381,
+											"left": 773,
+											"top": 389,
 											"width": 103,
 											"height": 13,
 											"text": "«enum»"
@@ -1785,8 +1785,8 @@
 											},
 											"fillColor": "#ffadad",
 											"font": "Arial;13;1",
-											"left": 885,
-											"top": 396,
+											"left": 773,
+											"top": 404,
 											"width": 103,
 											"height": 13,
 											"text": "QuestionType"
@@ -1800,7 +1800,8 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": -320,
+											"left": -544,
+											"top": 16,
 											"width": 72,
 											"height": 13,
 											"text": "(from Exam)"
@@ -1814,15 +1815,16 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": -320,
+											"left": -544,
+											"top": 16,
 											"height": 13,
 											"horizontalAlignment": 1
 										}
 									],
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 880,
-									"top": 376,
+									"left": 768,
+									"top": 384,
 									"width": 113,
 									"height": 38,
 									"stereotypeLabel": {
@@ -1859,8 +1861,8 @@
 											},
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 885,
-											"top": 419,
+											"left": 773,
+											"top": 427,
 											"width": 103,
 											"height": 13,
 											"text": "+label: String",
@@ -1869,8 +1871,8 @@
 									],
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 880,
-									"top": 414,
+									"left": 768,
+									"top": 422,
 									"width": 113,
 									"height": 23
 								},
@@ -1885,8 +1887,8 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 880,
-									"top": 437,
+									"left": 768,
+									"top": 445,
 									"width": 113,
 									"height": 10
 								},
@@ -1902,8 +1904,7 @@
 									"visible": false,
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": -168,
-									"top": -8,
+									"left": -280,
 									"width": 10,
 									"height": 10
 								},
@@ -1919,8 +1920,7 @@
 									"visible": false,
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": -168,
-									"top": -8,
+									"left": -280,
 									"width": 10,
 									"height": 10
 								}
@@ -1928,8 +1928,8 @@
 							"fillColor": "#ffadad",
 							"font": "Arial;13;0",
 							"containerChangeable": true,
-							"left": 880,
-							"top": 376,
+							"left": 768,
+							"top": 384,
 							"width": 113,
 							"height": 71,
 							"nameCompartment": {
@@ -1969,7 +1969,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 799,
+									"left": 707,
 									"top": 393,
 									"height": 13,
 									"alpha": 1.5707963267948966,
@@ -1990,7 +1990,7 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 799,
+									"left": 707,
 									"top": 378,
 									"height": 13,
 									"alpha": 1.5707963267948966,
@@ -2011,7 +2011,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 799,
+									"left": 707,
 									"top": 423,
 									"height": 13,
 									"alpha": -1.5707963267948966,
@@ -2032,7 +2032,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 743,
+									"left": 671,
 									"top": 393,
 									"height": 13,
 									"alpha": 0.5235987755982988,
@@ -2053,7 +2053,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 746,
+									"left": 674,
 									"top": 379,
 									"height": 13,
 									"alpha": 0.7853981633974483,
@@ -2074,7 +2074,7 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 736,
+									"left": 664,
 									"top": 420,
 									"width": 7,
 									"height": 13,
@@ -2097,7 +2097,7 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 838,
+									"left": 726,
 									"top": 393,
 									"width": 33,
 									"height": 13,
@@ -2119,7 +2119,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 851,
+									"left": 739,
 									"top": 379,
 									"height": 13,
 									"alpha": -0.7853981633974483,
@@ -2139,7 +2139,7 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 855,
+									"left": 743,
 									"top": 420,
 									"width": 7.22998046875,
 									"height": 13,
@@ -2193,7 +2193,7 @@
 							"tail": {
 								"$ref": "AAAAAAFjAgVLtICcfNY="
 							},
-							"points": "718:414;880:414",
+							"points": "646:414;768:414",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFjAhDTCJVOsfU="
@@ -2464,7 +2464,7 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": -480,
+											"left": -576,
 											"top": 64,
 											"height": 13
 										},
@@ -2476,7 +2476,7 @@
 											},
 											"fillColor": "#ffadad",
 											"font": "Arial;13;1",
-											"left": 725,
+											"left": 677,
 											"top": 543,
 											"width": 116,
 											"height": 13,
@@ -2491,7 +2491,7 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": -480,
+											"left": -576,
 											"top": 64,
 											"width": 72,
 											"height": 13,
@@ -2506,7 +2506,7 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": -480,
+											"left": -576,
 											"top": 64,
 											"height": 13,
 											"horizontalAlignment": 1
@@ -2514,7 +2514,7 @@
 									],
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 720,
+									"left": 672,
 									"top": 536,
 									"width": 126,
 									"height": 25,
@@ -2542,7 +2542,7 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 720,
+									"left": 672,
 									"top": 561,
 									"width": 126,
 									"height": 10
@@ -2558,7 +2558,7 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 720,
+									"left": 672,
 									"top": 571,
 									"width": 126,
 									"height": 10
@@ -2575,7 +2575,7 @@
 									"visible": false,
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": -240,
+									"left": -288,
 									"top": 32,
 									"width": 10,
 									"height": 10
@@ -2592,7 +2592,7 @@
 									"visible": false,
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": -240,
+									"left": -288,
 									"top": 32,
 									"width": 10,
 									"height": 10
@@ -2601,7 +2601,7 @@
 							"fillColor": "#ffadad",
 							"font": "Arial;13;0",
 							"containerChangeable": true,
-							"left": 720,
+							"left": 672,
 							"top": 536,
 							"width": 126,
 							"height": 45,
@@ -2642,7 +2642,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 620,
+									"left": 581,
 									"top": 475,
 									"height": 13,
 									"alpha": 1.5707963267948966,
@@ -2663,7 +2663,7 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 620,
+									"left": 581,
 									"top": 460,
 									"height": 13,
 									"alpha": 1.5707963267948966,
@@ -2684,7 +2684,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 620,
+									"left": 581,
 									"top": 505,
 									"height": 13,
 									"alpha": -1.5707963267948966,
@@ -2703,7 +2703,7 @@
 							"tail": {
 								"$ref": "AAAAAAFjAhJPYKMCYcE="
 							},
-							"points": "592:536;592:496;648:496;648:440",
+							"points": "568:536;568:496;595:496;595:440",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFjAhLt66g0w1c="
@@ -2736,7 +2736,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 715,
+									"left": 663,
 									"top": 505,
 									"height": 13,
 									"alpha": 1.5707963267948966,
@@ -2757,7 +2757,7 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 715,
+									"left": 663,
 									"top": 520,
 									"height": 13,
 									"alpha": 1.5707963267948966,
@@ -2778,7 +2778,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 716,
+									"left": 664,
 									"top": 475,
 									"height": 13,
 									"alpha": -1.5707963267948966,
@@ -2797,7 +2797,7 @@
 							"tail": {
 								"$ref": "AAAAAAFjAhKHDqURXiU="
 							},
-							"points": "784:536;784:496;648:496;648:440",
+							"points": "734:536;734:496;595:496;595:440",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFjAhL646jYT3s="
@@ -2830,8 +2830,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 990,
-									"top": 553,
+									"left": 718,
+									"top": 619,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 15,
@@ -2851,8 +2851,8 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 1005,
-									"top": 553,
+									"left": 733,
+									"top": 619,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 30,
@@ -2872,8 +2872,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 961,
-									"top": 554,
+									"left": 689,
+									"top": 620,
 									"height": 13,
 									"alpha": -1.5707963267948966,
 									"distance": 15,
@@ -2893,8 +2893,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 870,
-									"top": 539,
+									"left": 719,
+									"top": 599,
 									"height": 13,
 									"alpha": 0.5235987755982988,
 									"distance": 30,
@@ -2914,8 +2914,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 873,
-									"top": 525,
+									"left": 732,
+									"top": 602,
 									"height": 13,
 									"alpha": 0.7853981633974483,
 									"distance": 40,
@@ -2935,8 +2935,8 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 863,
-									"top": 566,
+									"left": 688,
+									"top": 595,
 									"width": 7.22998046875,
 									"height": 13,
 									"alpha": -0.5235987755982988,
@@ -2958,8 +2958,8 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 982,
-									"top": 607,
+									"left": 710,
+									"top": 647,
 									"width": 72,
 									"height": 13,
 									"alpha": -1.1743549875223407,
@@ -2980,8 +2980,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 1004,
-									"top": 597,
+									"left": 732,
+									"top": 637,
 									"height": 13,
 									"alpha": -0.7853981633974483,
 									"distance": 40,
@@ -3000,8 +3000,8 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 943,
-									"top": 607,
+									"left": 671,
+									"top": 647,
 									"width": 22,
 									"height": 13,
 									"alpha": -5.398118575174426,
@@ -3052,7 +3052,7 @@
 							"tail": {
 								"$ref": "AAAAAAFjAhKHDqURXiU="
 							},
-							"points": "845:560;976:560;976:632",
+							"points": "704:580;704:672",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFjAhtfUM4YZYc="
@@ -5315,8 +5315,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 489,
-									"top": 591,
+									"left": 481,
+									"top": 599,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 15,
@@ -5336,8 +5336,8 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 474,
-									"top": 591,
+									"left": 466,
+									"top": 599,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 30,
@@ -5357,8 +5357,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 519,
-									"top": 592,
+									"left": 511,
+									"top": 600,
 									"height": 13,
 									"alpha": -1.5707963267948966,
 									"distance": 15,
@@ -5379,7 +5379,7 @@
 									"visible": false,
 									"font": "Arial;13;0",
 									"left": 351,
-									"top": 751,
+									"top": 759,
 									"height": 13,
 									"alpha": 0.5235987755982988,
 									"distance": 30,
@@ -5400,7 +5400,7 @@
 									"visible": false,
 									"font": "Arial;13;0",
 									"left": 354,
-									"top": 737,
+									"top": 745,
 									"height": 13,
 									"alpha": 0.7853981633974483,
 									"distance": 40,
@@ -5420,7 +5420,7 @@
 									},
 									"font": "Arial;13;0",
 									"left": 344,
-									"top": 778,
+									"top": 786,
 									"width": 7,
 									"height": 13,
 									"alpha": -0.5235987755982988,
@@ -5441,8 +5441,8 @@
 										"$ref": "AAAAAAFjJ23EcJytAyo="
 									},
 									"font": "Arial;13;0",
-									"left": 550,
-									"top": 454,
+									"left": 478,
+									"top": 462,
 									"width": 57,
 									"height": 13,
 									"alpha": 0.7583778212507272,
@@ -5463,8 +5463,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 587,
-									"top": 389,
+									"left": 515,
+									"top": 397,
 									"height": 13,
 									"alpha": -0.7853981633974483,
 									"distance": 40,
@@ -5482,8 +5482,8 @@
 										"$ref": "AAAAAAFjJ23EcJytAyo="
 									},
 									"font": "Arial;13;0",
-									"left": 591,
-									"top": 430,
+									"left": 519,
+									"top": 438,
 									"width": 7.22998046875,
 									"height": 13,
 									"alpha": 0.5235987755982988,
@@ -5504,7 +5504,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"top": 48,
+									"left": -8,
+									"top": 56,
 									"width": 10,
 									"height": 10
 								},
@@ -5519,7 +5520,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"top": 48,
+									"left": -8,
+									"top": 56,
 									"width": 10,
 									"height": 10
 								}
@@ -5531,7 +5533,7 @@
 							"tail": {
 								"$ref": "AAAAAAFjJ2eyuGypJss="
 							},
-							"points": "326:772;504:772;504:424;616:424",
+							"points": "326:780;496:780;496:432;544:432",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFjJ23EcZywbmQ="
@@ -5588,7 +5590,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 435,
+									"left": 399,
 									"top": 401,
 									"height": 13,
 									"alpha": 1.5707963267948966,
@@ -5609,7 +5611,7 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 435,
+									"left": 399,
 									"top": 416,
 									"height": 13,
 									"alpha": 1.5707963267948966,
@@ -5630,7 +5632,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 436,
+									"left": 400,
 									"top": 371,
 									"height": 13,
 									"alpha": -1.5707963267948966,
@@ -5651,7 +5653,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 590,
+									"left": 518,
 									"top": 400,
 									"height": 13,
 									"alpha": 0.5235987755982988,
@@ -5672,7 +5674,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 587,
+									"left": 515,
 									"top": 414,
 									"height": 13,
 									"alpha": 0.7853981633974483,
@@ -5692,7 +5694,7 @@
 										"$ref": "AAAAAAFjK2cKTxGRcO4="
 									},
 									"font": "Arial;13;0",
-									"left": 591,
+									"left": 519,
 									"top": 373,
 									"width": 7,
 									"height": 13,
@@ -5802,7 +5804,7 @@
 							"tail": {
 								"$ref": "AAAAAAFjAgVLtICcfNY="
 							},
-							"points": "616:392;256:392",
+							"points": "544:392;256:392",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFjK2cKURGVdmE="
@@ -5867,8 +5869,8 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 80,
-											"top": 32,
+											"left": -192,
+											"top": -64,
 											"height": 13
 										},
 										{
@@ -5879,8 +5881,8 @@
 											},
 											"fillColor": "#ffadad",
 											"font": "Arial;13;1",
-											"left": 757,
-											"top": 143,
+											"left": 621,
+											"top": 95,
 											"width": 93,
 											"height": 13,
 											"text": "ExamCover"
@@ -5894,8 +5896,8 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 80,
-											"top": 32,
+											"left": -192,
+											"top": -64,
 											"width": 72,
 											"height": 13,
 											"text": "(from Exam)"
@@ -5909,16 +5911,16 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 80,
-											"top": 32,
+											"left": -192,
+											"top": -64,
 											"height": 13,
 											"horizontalAlignment": 1
 										}
 									],
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 752,
-									"top": 136,
+									"left": 616,
+									"top": 88,
 									"width": 103,
 									"height": 25,
 									"stereotypeLabel": {
@@ -5955,8 +5957,8 @@
 											},
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 757,
-											"top": 166,
+											"left": 621,
+											"top": 118,
 											"width": 93,
 											"height": 13,
 											"text": "+content: String",
@@ -5965,8 +5967,8 @@
 									],
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 752,
-									"top": 161,
+									"left": 616,
+									"top": 113,
 									"width": 103,
 									"height": 23
 								},
@@ -5981,8 +5983,8 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 752,
-									"top": 184,
+									"left": 616,
+									"top": 136,
 									"width": 103,
 									"height": 10
 								},
@@ -5998,8 +6000,8 @@
 									"visible": false,
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 40,
-									"top": 16,
+									"left": -96,
+									"top": -32,
 									"width": 10,
 									"height": 10
 								},
@@ -6015,8 +6017,8 @@
 									"visible": false,
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 40,
-									"top": 16,
+									"left": -96,
+									"top": -32,
 									"width": 10,
 									"height": 10
 								}
@@ -6024,8 +6026,8 @@
 							"fillColor": "#ffadad",
 							"font": "Arial;13;0",
 							"containerChangeable": true,
-							"left": 752,
-							"top": 136,
+							"left": 616,
+							"top": 88,
 							"width": 103,
 							"height": 58,
 							"nameCompartment": {
@@ -6065,8 +6067,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 786,
-									"top": 225,
+									"left": 625,
+									"top": 209,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 15,
@@ -6086,8 +6088,8 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 771,
-									"top": 225,
+									"left": 610,
+									"top": 209,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 30,
@@ -6107,8 +6109,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 815,
-									"top": 226,
+									"left": 654,
+									"top": 210,
 									"height": 13,
 									"alpha": -1.5707963267948966,
 									"distance": 15,
@@ -6129,7 +6131,7 @@
 									"visible": false,
 									"font": "Arial;13;0",
 									"left": 529,
-									"top": 211,
+									"top": 195,
 									"height": 13,
 									"alpha": 0.5235987755982988,
 									"distance": 30,
@@ -6150,7 +6152,7 @@
 									"visible": false,
 									"font": "Arial;13;0",
 									"left": 532,
-									"top": 197,
+									"top": 181,
 									"height": 13,
 									"alpha": 0.7853981633974483,
 									"distance": 40,
@@ -6170,7 +6172,7 @@
 									},
 									"font": "Arial;13;0",
 									"left": 522,
-									"top": 238,
+									"top": 222,
 									"width": 7.22998046875,
 									"height": 13,
 									"alpha": -0.5235987755982988,
@@ -6191,8 +6193,8 @@
 										"$ref": "AAAAAAFjK2taChxObUw="
 									},
 									"font": "Arial;13;0",
-									"left": 750,
-									"top": 207,
+									"left": 589,
+									"top": 159,
 									"width": 40,
 									"height": 13,
 									"alpha": -0.9600704622163565,
@@ -6213,8 +6215,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 772,
-									"top": 215,
+									"left": 611,
+									"top": 167,
 									"height": 13,
 									"alpha": -0.7853981633974483,
 									"distance": 40,
@@ -6232,8 +6234,8 @@
 										"$ref": "AAAAAAFjK2taChxObUw="
 									},
 									"font": "Arial;13;0",
-									"left": 810,
-									"top": 208,
+									"left": 649,
+									"top": 160,
 									"width": 7.22998046875,
 									"height": 13,
 									"alpha": 0.5235987755982988,
@@ -6279,7 +6281,7 @@
 							"tail": {
 								"$ref": "AAAAAAFjAgUnfIBwcFs="
 							},
-							"points": "504:232;801:232;801:193",
+							"points": "504:216;640:216;640:145",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFjK2taDBxRGNY="
@@ -6344,8 +6346,8 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": -288,
-											"top": 16,
+											"left": -352,
+											"top": 32,
 											"height": 13
 										},
 										{
@@ -6356,8 +6358,8 @@
 											},
 											"fillColor": "#ffadad",
 											"font": "Arial;13;1",
-											"left": 741,
-											"top": 287,
+											"left": 709,
+											"top": 295,
 											"width": 121,
 											"height": 13,
 											"text": "QuestionStatement"
@@ -6371,8 +6373,8 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": -288,
-											"top": 16,
+											"left": -352,
+											"top": 32,
 											"width": 72,
 											"height": 13,
 											"text": "(from Exam)"
@@ -6386,16 +6388,16 @@
 											"visible": false,
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": -288,
-											"top": 16,
+											"left": -352,
+											"top": 32,
 											"height": 13,
 											"horizontalAlignment": 1
 										}
 									],
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 736,
-									"top": 280,
+									"left": 704,
+									"top": 288,
 									"width": 131,
 									"height": 25,
 									"stereotypeLabel": {
@@ -6432,8 +6434,8 @@
 											},
 											"fillColor": "#ffadad",
 											"font": "Arial;13;0",
-											"left": 741,
-											"top": 310,
+											"left": 709,
+											"top": 318,
 											"width": 121,
 											"height": 13,
 											"text": "+content: String",
@@ -6442,8 +6444,8 @@
 									],
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 736,
-									"top": 305,
+									"left": 704,
+									"top": 313,
 									"width": 131,
 									"height": 23
 								},
@@ -6458,8 +6460,8 @@
 									},
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": 736,
-									"top": 328,
+									"left": 704,
+									"top": 336,
 									"width": 131,
 									"height": 10
 								},
@@ -6475,8 +6477,8 @@
 									"visible": false,
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": -144,
-									"top": 8,
+									"left": -176,
+									"top": 16,
 									"width": 10,
 									"height": 10
 								},
@@ -6492,8 +6494,8 @@
 									"visible": false,
 									"fillColor": "#ffadad",
 									"font": "Arial;13;0",
-									"left": -144,
-									"top": 8,
+									"left": -176,
+									"top": 16,
 									"width": 10,
 									"height": 10
 								}
@@ -6501,8 +6503,8 @@
 							"fillColor": "#ffadad",
 							"font": "Arial;13;0",
 							"containerChangeable": true,
-							"left": 736,
-							"top": 280,
+							"left": 704,
+							"top": 288,
 							"width": 131,
 							"height": 58,
 							"nameCompartment": {
@@ -6542,7 +6544,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 728,
+									"left": 688,
 									"top": 375,
 									"width": 66,
 									"height": 13,
@@ -6565,7 +6567,7 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 746,
+									"left": 706,
 									"top": 375,
 									"height": 13,
 									"alpha": 1.5707963267948966,
@@ -6586,7 +6588,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 790,
+									"left": 750,
 									"top": 376,
 									"height": 13,
 									"alpha": -1.5707963267948966,
@@ -6607,7 +6609,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 743,
+									"left": 671,
 									"top": 361,
 									"height": 13,
 									"alpha": 0.5235987755982988,
@@ -6628,7 +6630,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 746,
+									"left": 674,
 									"top": 347,
 									"height": 13,
 									"alpha": 0.7853981633974483,
@@ -6648,7 +6650,7 @@
 										"$ref": "AAAAAAFjK7lt8DW09mM="
 									},
 									"font": "Arial;13;0",
-									"left": 736,
+									"left": 664,
 									"top": 388,
 									"width": 7.22998046875,
 									"height": 13,
@@ -6670,8 +6672,8 @@
 										"$ref": "AAAAAAFjK7lt8TW1b90="
 									},
 									"font": "Arial;13;0",
-									"left": 798,
-									"top": 344,
+									"left": 758,
+									"top": 352,
 									"width": 66,
 									"height": 13,
 									"alpha": 1.342693515627067,
@@ -6692,8 +6694,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 747,
-									"top": 359,
+									"left": 707,
+									"top": 367,
 									"height": 13,
 									"alpha": -0.7853981633974483,
 									"distance": 40,
@@ -6711,8 +6713,8 @@
 										"$ref": "AAAAAAFjK7lt8TW1b90="
 									},
 									"font": "Arial;13;0",
-									"left": 785,
-									"top": 352,
+									"left": 745,
+									"top": 360,
 									"width": 7.22998046875,
 									"height": 13,
 									"alpha": 0.5235987755982988,
@@ -6758,7 +6760,7 @@
 							"tail": {
 								"$ref": "AAAAAAFjAgVLtICcfNY="
 							},
-							"points": "718:382;776:382;776:337",
+							"points": "646:382;736:382;736:345",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFjK7lt9DW4ur4="
@@ -6815,8 +6817,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 438,
-									"top": 457,
+									"left": 430,
+									"top": 465,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 15,
@@ -6836,8 +6838,8 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 453,
-									"top": 457,
+									"left": 445,
+									"top": 465,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 30,
@@ -6857,8 +6859,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 409,
-									"top": 458,
+									"left": 401,
+									"top": 466,
 									"height": 13,
 									"alpha": -1.5707963267948966,
 									"distance": 15,
@@ -6878,8 +6880,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 590,
-									"top": 416,
+									"left": 518,
+									"top": 424,
 									"height": 13,
 									"alpha": 0.5235987755982988,
 									"distance": 30,
@@ -6899,8 +6901,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 587,
-									"top": 430,
+									"left": 515,
+									"top": 438,
 									"height": 13,
 									"alpha": 0.7853981633974483,
 									"distance": 40,
@@ -6919,8 +6921,8 @@
 										"$ref": "AAAAAAFjLAB3iHRA/Ic="
 									},
 									"font": "Arial;13;0",
-									"left": 591,
-									"top": 389,
+									"left": 519,
+									"top": 397,
 									"width": 7,
 									"height": 13,
 									"alpha": -0.5235987755982988,
@@ -6942,7 +6944,7 @@
 									},
 									"font": "Arial;13;0",
 									"left": 347,
-									"top": 528,
+									"top": 536,
 									"width": 44,
 									"height": 13,
 									"alpha": -0.5235987755982988,
@@ -6964,7 +6966,7 @@
 									"visible": false,
 									"font": "Arial;13;0",
 									"left": 372,
-									"top": 542,
+									"top": 550,
 									"height": 13,
 									"alpha": -0.7853981633974483,
 									"distance": 40,
@@ -6983,7 +6985,7 @@
 									},
 									"font": "Arial;13;0",
 									"left": 362,
-									"top": 501,
+									"top": 509,
 									"width": 7.22998046875,
 									"height": 13,
 									"alpha": 0.5235987755982988,
@@ -7004,7 +7006,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"top": 48,
+									"left": -8,
+									"top": 56,
 									"width": 10,
 									"height": 10
 								},
@@ -7019,7 +7022,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"top": 48,
+									"left": -8,
+									"top": 56,
 									"width": 10,
 									"height": 10
 								}
@@ -7031,7 +7035,7 @@
 							"tail": {
 								"$ref": "AAAAAAFjAgVLtICcfNY="
 							},
-							"points": "616:408;424:408;424:520;344:520",
+							"points": "544:416;416:416;416:528;344:528",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFjLAB3jXRE+1k="
@@ -7066,6 +7070,511 @@
 							"headQualifiersCompartment": {
 								"$ref": "AAAAAAFjLAB3j3ROiYU="
 							}
+						},
+						{
+							"_type": "UMLClassView",
+							"_id": "AAAAAAFkFBi41RIjqFM=",
+							"_parent": {
+								"$ref": "AAAAAAFF+qBtyKM79qY="
+							},
+							"model": {
+								"$ref": "AAAAAAFjAwbOHpTN/AE="
+							},
+							"subViews": [
+								{
+									"_type": "UMLNameCompartmentView",
+									"_id": "AAAAAAFkFBi41hIkEcc=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBi41RIjqFM="
+									},
+									"model": {
+										"$ref": "AAAAAAFjAwbOHpTN/AE="
+									},
+									"subViews": [
+										{
+											"_type": "LabelView",
+											"_id": "AAAAAAFkFBi41hIlnhM=",
+											"_parent": {
+												"$ref": "AAAAAAFkFBi41hIkEcc="
+											},
+											"visible": false,
+											"fillColor": "#d1ffa3",
+											"font": "Arial;13;0",
+											"height": 13
+										},
+										{
+											"_type": "LabelView",
+											"_id": "AAAAAAFkFBi41hImvx8=",
+											"_parent": {
+												"$ref": "AAAAAAFkFBi41hIkEcc="
+											},
+											"fillColor": "#d1ffa3",
+											"font": "Arial;13;1",
+											"left": 979,
+											"top": 98,
+											"width": 111.642578125,
+											"height": 13,
+											"text": "Competition"
+										},
+										{
+											"_type": "LabelView",
+											"_id": "AAAAAAFkFBi41hInYTw=",
+											"_parent": {
+												"$ref": "AAAAAAFkFBi41hIkEcc="
+											},
+											"fillColor": "#d1ffa3",
+											"font": "Arial;13;0",
+											"left": 979,
+											"top": 113,
+											"width": 111.642578125,
+											"height": 13,
+											"text": "(from Competition)"
+										},
+										{
+											"_type": "LabelView",
+											"_id": "AAAAAAFkFBi41hIoDB8=",
+											"_parent": {
+												"$ref": "AAAAAAFkFBi41hIkEcc="
+											},
+											"visible": false,
+											"fillColor": "#d1ffa3",
+											"font": "Arial;13;0",
+											"height": 13,
+											"horizontalAlignment": 1
+										}
+									],
+									"fillColor": "#d1ffa3",
+									"font": "Arial;13;0",
+									"left": 974,
+									"top": 91,
+									"width": 121.642578125,
+									"height": 40,
+									"stereotypeLabel": {
+										"$ref": "AAAAAAFkFBi41hIlnhM="
+									},
+									"nameLabel": {
+										"$ref": "AAAAAAFkFBi41hImvx8="
+									},
+									"namespaceLabel": {
+										"$ref": "AAAAAAFkFBi41hInYTw="
+									},
+									"propertyLabel": {
+										"$ref": "AAAAAAFkFBi41hIoDB8="
+									}
+								},
+								{
+									"_type": "UMLAttributeCompartmentView",
+									"_id": "AAAAAAFkFBi41xIpNdU=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBi41RIjqFM="
+									},
+									"model": {
+										"$ref": "AAAAAAFjAwbOHpTN/AE="
+									},
+									"subViews": [
+										{
+											"_type": "UMLAttributeView",
+											"_id": "AAAAAAFkFBi5IxKWc80=",
+											"_parent": {
+												"$ref": "AAAAAAFkFBi41xIpNdU="
+											},
+											"model": {
+												"$ref": "AAAAAAFjJ1X3LltTL/k="
+											},
+											"fillColor": "#d1ffa3",
+											"font": "Arial;13;0",
+											"left": 979,
+											"top": 136,
+											"width": 111.642578125,
+											"height": 13,
+											"text": "+name: String",
+											"horizontalAlignment": 0
+										},
+										{
+											"_type": "UMLAttributeView",
+											"_id": "AAAAAAFkFBi5JBKZZJQ=",
+											"_parent": {
+												"$ref": "AAAAAAFkFBi41xIpNdU="
+											},
+											"model": {
+												"$ref": "AAAAAAFjKGHrMRRoc1k="
+											},
+											"fillColor": "#d1ffa3",
+											"font": "Arial;13;0",
+											"left": 979,
+											"top": 151,
+											"width": 111.642578125,
+											"height": 13,
+											"text": "+description: String",
+											"horizontalAlignment": 0
+										},
+										{
+											"_type": "UMLAttributeView",
+											"_id": "AAAAAAFkFBi5JBKcVcc=",
+											"_parent": {
+												"$ref": "AAAAAAFkFBi41xIpNdU="
+											},
+											"model": {
+												"$ref": "AAAAAAFj+T4p95cTLZo="
+											},
+											"fillColor": "#d1ffa3",
+											"font": "Arial;13;0",
+											"left": 979,
+											"top": 166,
+											"width": 111.642578125,
+											"height": 13,
+											"text": "+uri: String",
+											"horizontalAlignment": 0
+										}
+									],
+									"fillColor": "#d1ffa3",
+									"font": "Arial;13;0",
+									"left": 974,
+									"top": 131,
+									"width": 121.642578125,
+									"height": 53
+								},
+								{
+									"_type": "UMLOperationCompartmentView",
+									"_id": "AAAAAAFkFBi41xIq6tE=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBi41RIjqFM="
+									},
+									"model": {
+										"$ref": "AAAAAAFjAwbOHpTN/AE="
+									},
+									"fillColor": "#d1ffa3",
+									"font": "Arial;13;0",
+									"left": 974,
+									"top": 184,
+									"width": 121.642578125,
+									"height": 10
+								},
+								{
+									"_type": "UMLReceptionCompartmentView",
+									"_id": "AAAAAAFkFBi41xIrpXo=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBi41RIjqFM="
+									},
+									"model": {
+										"$ref": "AAAAAAFjAwbOHpTN/AE="
+									},
+									"visible": false,
+									"fillColor": "#d1ffa3",
+									"font": "Arial;13;0",
+									"width": 10,
+									"height": 10
+								},
+								{
+									"_type": "UMLTemplateParameterCompartmentView",
+									"_id": "AAAAAAFkFBi41xIsDCg=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBi41RIjqFM="
+									},
+									"model": {
+										"$ref": "AAAAAAFjAwbOHpTN/AE="
+									},
+									"visible": false,
+									"fillColor": "#d1ffa3",
+									"font": "Arial;13;0",
+									"width": 10,
+									"height": 10
+								}
+							],
+							"fillColor": "#d1ffa3",
+							"font": "Arial;13;0",
+							"containerChangeable": true,
+							"left": 974,
+							"top": 91,
+							"width": 121.642578125,
+							"height": 103,
+							"showNamespace": true,
+							"nameCompartment": {
+								"$ref": "AAAAAAFkFBi41hIkEcc="
+							},
+							"attributeCompartment": {
+								"$ref": "AAAAAAFkFBi41xIpNdU="
+							},
+							"operationCompartment": {
+								"$ref": "AAAAAAFkFBi41xIq6tE="
+							},
+							"receptionCompartment": {
+								"$ref": "AAAAAAFkFBi41xIrpXo="
+							},
+							"templateParameterCompartment": {
+								"$ref": "AAAAAAFkFBi41xIsDCg="
+							}
+						},
+						{
+							"_type": "UMLAssociationView",
+							"_id": "AAAAAAFkFBkkFBgHYPM=",
+							"_parent": {
+								"$ref": "AAAAAAFF+qBtyKM79qY="
+							},
+							"model": {
+								"$ref": "AAAAAAFkFBkkEhgDBik="
+							},
+							"subViews": [
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFkFBkkFBgI+Uc=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"model": {
+										"$ref": "AAAAAAFkFBkkEhgDBik="
+									},
+									"visible": false,
+									"font": "Arial;13;0",
+									"left": 1019,
+									"top": 233,
+									"height": 13,
+									"alpha": 1.5707963267948966,
+									"distance": 15,
+									"hostEdge": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"edgePosition": 1
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFkFBkkFBgJnvs=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"model": {
+										"$ref": "AAAAAAFkFBkkEhgDBik="
+									},
+									"visible": null,
+									"font": "Arial;13;0",
+									"left": 1004,
+									"top": 233,
+									"height": 13,
+									"alpha": 1.5707963267948966,
+									"distance": 30,
+									"hostEdge": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"edgePosition": 1
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFkFBkkFBgKFUk=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"model": {
+										"$ref": "AAAAAAFkFBkkEhgDBik="
+									},
+									"visible": false,
+									"font": "Arial;13;0",
+									"left": 1048,
+									"top": 234,
+									"height": 13,
+									"alpha": -1.5707963267948966,
+									"distance": 15,
+									"hostEdge": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"edgePosition": 1
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFkFBkkFBgLpYQ=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"model": {
+										"$ref": "AAAAAAFkFBkkExgE7MM="
+									},
+									"font": "Arial;13;0",
+									"left": 528,
+									"top": 224,
+									"width": 45.880859375,
+									"height": 13,
+									"alpha": 0.21406063843747708,
+									"distance": 47.07440918375928,
+									"hostEdge": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"edgePosition": 2,
+									"text": "+exams"
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFkFBkkFBgMBLI=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"model": {
+										"$ref": "AAAAAAFkFBkkExgE7MM="
+									},
+									"visible": false,
+									"font": "Arial;13;0",
+									"left": 532,
+									"top": 205,
+									"height": 13,
+									"alpha": 0.7853981633974483,
+									"distance": 40,
+									"hostEdge": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"edgePosition": 2
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFkFBkkFBgNvvg=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"model": {
+										"$ref": "AAAAAAFkFBkkExgE7MM="
+									},
+									"font": "Arial;13;0",
+									"left": 516,
+									"top": 246,
+									"width": 19.5126953125,
+									"height": 13,
+									"alpha": -0.5235987755982988,
+									"distance": 25,
+									"hostEdge": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"edgePosition": 2,
+									"text": "0..*"
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFkFBkkFBgO2Kc=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"model": {
+										"$ref": "AAAAAAFkFBkkExgFuh0="
+									},
+									"visible": false,
+									"font": "Arial;13;0",
+									"left": 1019,
+									"top": 212,
+									"height": 13,
+									"alpha": -0.5235987755982988,
+									"distance": 30,
+									"hostEdge": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									}
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFkFBkkFBgPWpc=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"model": {
+										"$ref": "AAAAAAFkFBkkExgFuh0="
+									},
+									"visible": false,
+									"font": "Arial;13;0",
+									"left": 1005,
+									"top": 215,
+									"height": 13,
+									"alpha": -0.7853981633974483,
+									"distance": 40,
+									"hostEdge": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									}
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFkFBkkFBgQueU=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"model": {
+										"$ref": "AAAAAAFkFBkkExgFuh0="
+									},
+									"font": "Arial;13;0",
+									"left": 1036,
+									"top": 208,
+									"width": 21.68359375,
+									"height": 13,
+									"alpha": 0.5235987755982988,
+									"distance": 25,
+									"hostEdge": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"text": "0..1"
+								},
+								{
+									"_type": "UMLQualifierCompartmentView",
+									"_id": "AAAAAAFkFBkkFBgRHws=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"model": {
+										"$ref": "AAAAAAFkFBkkExgE7MM="
+									},
+									"visible": false,
+									"font": "Arial;13;0",
+									"width": 10,
+									"height": 10
+								},
+								{
+									"_type": "UMLQualifierCompartmentView",
+									"_id": "AAAAAAFkFBkkFBgSYl0=",
+									"_parent": {
+										"$ref": "AAAAAAFkFBkkFBgHYPM="
+									},
+									"model": {
+										"$ref": "AAAAAAFkFBkkExgFuh0="
+									},
+									"visible": false,
+									"font": "Arial;13;0",
+									"width": 10,
+									"height": 10
+								}
+							],
+							"font": "Arial;13;0",
+							"head": {
+								"$ref": "AAAAAAFkFBi41RIjqFM="
+							},
+							"tail": {
+								"$ref": "AAAAAAFjAgUnfIBwcFs="
+							},
+							"points": "504:240;1034:240;1034:193",
+							"showVisibility": true,
+							"nameLabel": {
+								"$ref": "AAAAAAFkFBkkFBgI+Uc="
+							},
+							"stereotypeLabel": {
+								"$ref": "AAAAAAFkFBkkFBgJnvs="
+							},
+							"propertyLabel": {
+								"$ref": "AAAAAAFkFBkkFBgKFUk="
+							},
+							"tailRoleNameLabel": {
+								"$ref": "AAAAAAFkFBkkFBgLpYQ="
+							},
+							"tailPropertyLabel": {
+								"$ref": "AAAAAAFkFBkkFBgMBLI="
+							},
+							"tailMultiplicityLabel": {
+								"$ref": "AAAAAAFkFBkkFBgNvvg="
+							},
+							"headRoleNameLabel": {
+								"$ref": "AAAAAAFkFBkkFBgO2Kc="
+							},
+							"headPropertyLabel": {
+								"$ref": "AAAAAAFkFBkkFBgPWpc="
+							},
+							"headMultiplicityLabel": {
+								"$ref": "AAAAAAFkFBkkFBgQueU="
+							},
+							"tailQualifiersCompartment": {
+								"$ref": "AAAAAAFkFBkkFBgRHws="
+							},
+							"headQualifiersCompartment": {
+								"$ref": "AAAAAAFkFBkkFBgSYl0="
+							}
 						}
 					]
 				},
@@ -7202,6 +7711,37 @@
 								},
 								"multiplicity": "1"
 							}
+						},
+						{
+							"_type": "UMLAssociation",
+							"_id": "AAAAAAFkFBkkEhgDBik=",
+							"_parent": {
+								"$ref": "AAAAAAFjAgUneoBuTug="
+							},
+							"end1": {
+								"_type": "UMLAssociationEnd",
+								"_id": "AAAAAAFkFBkkExgE7MM=",
+								"_parent": {
+									"$ref": "AAAAAAFkFBkkEhgDBik="
+								},
+								"name": "exams",
+								"reference": {
+									"$ref": "AAAAAAFjAgUneoBuTug="
+								},
+								"multiplicity": "0..*"
+							},
+							"end2": {
+								"_type": "UMLAssociationEnd",
+								"_id": "AAAAAAFkFBkkExgFuh0=",
+								"_parent": {
+									"$ref": "AAAAAAFkFBkkEhgDBik="
+								},
+								"reference": {
+									"$ref": "AAAAAAFjAwbOHpTN/AE="
+								},
+								"navigable": false,
+								"multiplicity": "0..1"
+							}
 						}
 					],
 					"attributes": [
@@ -14350,9 +14890,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 640,
+									"left": 639,
 									"top": 573,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -0.5235987755982988,
 									"distance": 25,
@@ -14631,9 +15171,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 810,
+									"left": 809,
 									"top": 508,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -0.5235987755982988,
 									"distance": 25,
@@ -15258,9 +15798,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 1329,
+									"left": 1328,
 									"top": 828,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": 0.5235987755982988,
 									"distance": 25,
@@ -15801,9 +16341,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 623,
+									"left": 622,
 									"top": 740,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -0.5070988152841751,
 									"distance": 20.591260281974,
@@ -16807,6 +17347,7 @@
 											"model": {
 												"$ref": "AAAAAAFj+T4p95cTLZo="
 											},
+											"fillColor": "#ff8056",
 											"font": "Arial;13;0",
 											"left": 653,
 											"top": 268,
@@ -16880,7 +17421,7 @@
 							"left": 648,
 							"top": 208,
 							"width": 123,
-							"height": 73,
+							"height": 88,
 							"nameCompartment": {
 								"$ref": "AAAAAAFjAwbOIpTQkSg="
 							},
@@ -16919,7 +17460,7 @@
 									"visible": false,
 									"font": "Arial;13;0",
 									"left": 711,
-									"top": 401,
+									"top": 408,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 15,
@@ -16940,7 +17481,7 @@
 									"visible": null,
 									"font": "Arial;13;0",
 									"left": 726,
-									"top": 401,
+									"top": 408,
 									"height": 13,
 									"alpha": 1.5707963267948966,
 									"distance": 30,
@@ -16961,7 +17502,7 @@
 									"visible": false,
 									"font": "Arial;13;0",
 									"left": 681,
-									"top": 402,
+									"top": 409,
 									"height": 13,
 									"alpha": -1.5707963267948966,
 									"distance": 15,
@@ -16982,7 +17523,7 @@
 									"visible": false,
 									"font": "Arial;13;0",
 									"left": 711,
-									"top": 299,
+									"top": 314,
 									"height": 13,
 									"alpha": 0.5235987755982988,
 									"distance": 30,
@@ -17003,7 +17544,7 @@
 									"visible": false,
 									"font": "Arial;13;0",
 									"left": 724,
-									"top": 302,
+									"top": 317,
 									"height": 13,
 									"alpha": 0.7853981633974483,
 									"distance": 40,
@@ -17024,7 +17565,7 @@
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
 									"left": 680,
-									"top": 295,
+									"top": 310,
 									"width": 7.22998046875,
 									"height": 13,
 									"alpha": -0.5235987755982988,
@@ -17088,9 +17629,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 681,
+									"left": 680,
 									"top": 508,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": 0.5235987755982988,
 									"distance": 25,
@@ -17142,7 +17683,7 @@
 							"tail": {
 								"$ref": "AAAAAAFjAwbOIZTPtjc="
 							},
-							"points": "696:280;696:536",
+							"points": "696:295;696:536",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFjAwcu/JhhLAg="
@@ -18099,9 +18640,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 760,
+									"left": 759,
 									"top": 792,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -0.3671741225734262,
 									"distance": 27.85677655436824,
@@ -18666,9 +19207,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 760,
+									"left": 759,
 									"top": 935,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -0.354705862761979,
 									"distance": 28.792360097775937,
@@ -19171,9 +19712,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 778,
+									"left": 777,
 									"top": 1116,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": 0.5235987755982988,
 									"distance": 25,
@@ -19874,9 +20415,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 704,
+									"left": 703,
 									"top": 987,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -0.5235987755982988,
 									"distance": 25,
@@ -20655,9 +21196,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 878,
+									"left": 877,
 									"top": 990,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -0.5235987755982988,
 									"distance": 25,
@@ -21424,9 +21965,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 1416,
+									"left": 1415,
 									"top": 504,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -0.876058338482838,
 									"distance": 15.620499351813308,
@@ -22006,9 +22547,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 485,
+									"left": 484,
 									"top": 413,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": 0.5235987755982988,
 									"distance": 25,
@@ -22428,9 +22969,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 411,
+									"left": 410,
 									"top": 364,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -0.5235987755982988,
 									"distance": 25,
@@ -24037,9 +24578,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 1272,
+									"left": 1271,
 									"top": 1127,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -5.695182921580836,
 									"distance": 21.633307652783937,
@@ -24314,9 +24855,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 1537,
+									"left": 1536,
 									"top": 1111,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -5.657700465385348,
 									"distance": 22.20360331117452,
@@ -25066,9 +25607,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 1829,
+									"left": 1828,
 									"top": 1046,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -0.5235987755982988,
 									"distance": 25,
@@ -25620,9 +26161,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 1417,
+									"left": 1416,
 									"top": 1075,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -0.5235987755982988,
 									"distance": 25,
@@ -26121,9 +26662,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 1627,
+									"left": 1626,
 									"top": 1166,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -0.5235987755982988,
 									"distance": 25,
@@ -26604,9 +27145,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 1420,
+									"left": 1419,
 									"top": 891,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -0.5235987755982988,
 									"distance": 25,
@@ -27142,9 +27683,9 @@
 									},
 									"fillColor": "#ff8056",
 									"font": "Arial;13;0",
-									"left": 1000,
+									"left": 999,
 									"top": 498,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": 0.5235987755982988,
 									"distance": 25,
@@ -28199,7 +28740,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 754,
+									"left": 756,
 									"top": 147,
 									"height": 13,
 									"alpha": 1.5707963267948966,
@@ -28220,7 +28761,7 @@
 									},
 									"visible": null,
 									"font": "Arial;13;0",
-									"left": 742,
+									"left": 744,
 									"top": 138,
 									"height": 13,
 									"alpha": 1.5707963267948966,
@@ -28241,7 +28782,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 779,
+									"left": 781,
 									"top": 164,
 									"height": 13,
 									"alpha": -1.5707963267948966,
@@ -28262,7 +28803,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 737,
+									"left": 741,
 									"top": 171,
 									"height": 13,
 									"alpha": 0.5235987755982988,
@@ -28283,7 +28824,7 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 728,
+									"left": 731,
 									"top": 161,
 									"height": 13,
 									"alpha": 0.7853981633974483,
@@ -28303,9 +28844,9 @@
 										"$ref": "AAAAAAFj8/eVRHoASGA="
 									},
 									"font": "Arial;13;0",
-									"left": 755,
+									"left": 758,
 									"top": 190,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -0.5235987755982988,
 									"distance": 25,
@@ -28325,7 +28866,7 @@
 										"$ref": "AAAAAAFj8/eVRHoB0e8="
 									},
 									"font": "Arial;13;0",
-									"left": 750,
+									"left": 751,
 									"top": 124,
 									"width": 42.275390625,
 									"height": 13,
@@ -28347,8 +28888,8 @@
 									},
 									"visible": false,
 									"font": "Arial;13;0",
-									"left": 759,
-									"top": 118,
+									"left": 760,
+									"top": 119,
 									"height": 13,
 									"alpha": -0.7853981633974483,
 									"distance": 40,
@@ -28366,7 +28907,7 @@
 										"$ref": "AAAAAAFj8/eVRHoB0e8="
 									},
 									"font": "Arial;13;0",
-									"left": 793,
+									"left": 795,
 									"top": 136,
 									"width": 7.22998046875,
 									"height": 13,
@@ -28414,7 +28955,7 @@
 								"$ref": "AAAAAAFjAwbOIZTPtjc="
 							},
 							"lineStyle": 1,
-							"points": "735:207;799:118",
+							"points": "739:207;800:118",
 							"showVisibility": true,
 							"nameLabel": {
 								"$ref": "AAAAAAFj+Tji9ojqsMg="
@@ -40740,6 +41281,7 @@
 											"model": {
 												"$ref": "AAAAAAFj+T4p95cTLZo="
 											},
+											"fillColor": "#ff8056",
 											"font": "Arial;13;0",
 											"left": 93,
 											"top": 339,
@@ -40813,7 +41355,7 @@
 							"left": 88,
 							"top": 264,
 							"width": 123,
-							"height": 88,
+							"height": 103,
 							"showNamespace": true,
 							"nameCompartment": {
 								"$ref": "AAAAAAFjKshwiEN8xGo="
@@ -55970,9 +56512,9 @@
 												"$ref": "AAAAAAFj/69baFYl/iE="
 											},
 											"font": "Arial;13;0",
-											"left": 127,
+											"left": 126,
 											"top": 607,
-											"width": 5.05908203125,
+											"width": 7,
 											"height": 13,
 											"alpha": -0.5235987755982988,
 											"distance": 25,
@@ -60092,6 +60634,7 @@
 											"model": {
 												"$ref": "AAAAAAFj+T4p95cTLZo="
 											},
+											"fillColor": "#ff8056",
 											"font": "Arial;13;0",
 											"left": 277,
 											"top": 267,
@@ -60763,9 +61306,9 @@
 										"$ref": "AAAAAAFj8/eVRHoASGA="
 									},
 									"font": "Arial;13;0",
-									"left": 695,
+									"left": 694,
 									"top": 225,
-									"width": 5.05908203125,
+									"width": 7,
 									"height": 13,
 									"alpha": -0.5235987755982988,
 									"distance": 25,