*** empty log message ***
diff --git a/deprecated/plugins/org.eclipse.uml2/model/U2P-UML-Super-v2-040516.cat b/deprecated/plugins/org.eclipse.uml2/model/U2P-UML-Super-v2-040516.cat
index 23bbaf9..616308c 100644
--- a/deprecated/plugins/org.eclipse.uml2/model/U2P-UML-Super-v2-040516.cat
+++ b/deprecated/plugins/org.eclipse.uml2/model/U2P-UML-Super-v2-040516.cat
@@ -1,7 +1,7 @@
 

 (object Petal

-    version    	47

-    _written   	"Rose 8.0.0303.1400"

+    version    	48

+    _written   	"Rose 8.1.0307.0900"

     charSet    	0)

 

 (object Class_Category "UML"

@@ -46,6 +46,7 @@
 		    logical_models 	(list unit_reference_list

 			(object Class "Class"

 			    quid       	"3D5EC6DD001C"

+			    documentation 	"Extends the metaclass Class with the capability to have an internal structure and ports. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3D5EC6FE01E6"

@@ -176,6 +177,7 @@
 		    logical_models 	(list unit_reference_list

 			(object Class "CollaborationOccurrence"

 			    quid       	"3B8851380231"

+			    documentation 	"A collaboration occurrence represents one particular use of a collaboration to explain the relationships between the properties of a classifier. A collaboration occurrence indicates a set of roles and connectors that cooperate within the classifier according to a given collaboration, indicated by the type of the collaboration occurrence. There may be multiple occurrences of a given collaboration within a classifier, each involving a different set of roles and connectors. A given role or connector may be involved in multiple occurrences of the same or different collaborations. Associated dependencies map features of the collaboration type to features in the classifier. These dependencies indicate which role in the classifier plays which role in the collaboration. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3DFE32020032"

@@ -183,6 +185,7 @@
 				    quidu      	"3CAAECB901B0")))

 			(object Class "Collaboration"

 			    quid       	"337A47290078"

+			    documentation 	"A collaboration is represented as a kind of classifier and defines a set of cooperating entities to be played by instances (its roles), as well as a set of connectors that define communication paths between the participating instances. The cooperating entities are the properties of the collaboration (see “Property” on page 161). A collaboration specifies a view (or projection) of a set of cooperating classifiers. It describes the required links between instances that play the roles of the collaboration, as well as the features required of the classifiers that specify the participating instances. Several collaborations may describe different projections of the same set of classifiers. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CCB577200C8"

@@ -199,6 +202,7 @@
 			    language   	"none")

 			(object Class "Classifier"

 			    quid       	"3CC1A6A70282"

+			    documentation 	"Classifier is extended with the capability to own collaboration occurrences. These collaboration occurrences link a collaboration with the classifier to give a description of the workings of the classifier. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E82252401AC"

@@ -365,7 +369,7 @@
 				    height     	212

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$8" @8

-				    location   	(1075, 556)

+				    location   	(1075, 572)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -380,7 +384,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "collaborationRole" @9

 					    Parent_View 	@8

-					    location   	(673, -308)

+					    location   	(673, -292)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -392,7 +396,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @10

 						Parent_View 	@9

-						location   	(970, 591)

+						location   	(970, 607)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -416,11 +420,11 @@
 					    client     	@8

 					    supplier   	@6

 					    line_style 	3

-					    origin_attachment 	(1075, 556)

-					    terminal_attachment 	(804, 556)

+					    origin_attachment 	(1075, 572)

+					    terminal_attachment 	(804, 572)

 					    label      	(object SegLabel @11

 						Parent_View 	@9

-						location   	(861, 523)

+						location   	(861, 539)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -441,7 +445,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @12

 						Parent_View 	@9

-						location   	(955, 636)

+						location   	(955, 652)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -462,7 +466,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$9" @13

 					    Parent_View 	@8

-					    location   	(673, -308)

+					    location   	(673, -292)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -477,11 +481,11 @@
 					    client     	@8

 					    supplier   	@7

 					    line_style 	3

-					    origin_attachment 	(1075, 556)

-					    terminal_attachment 	(1346, 556)

+					    origin_attachment 	(1075, 572)

+					    terminal_attachment 	(1346, 572)

 					    label      	(object SegLabel @14

 						Parent_View 	@13

-						location   	(1276, 524)

+						location   	(1276, 540)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -723,7 +727,7 @@
 				    height     	225

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$4" @25

-				    location   	(2053, 757)

+				    location   	(2053, 673)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -738,7 +742,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$5" @26

 					    Parent_View 	@25

-					    location   	(613, -23)

+					    location   	(613, -107)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -753,11 +757,11 @@
 					    client     	@25

 					    supplier   	@21

 					    line_style 	3

-					    origin_attachment 	(2053, 757)

-					    terminal_attachment 	(2359, 757)

+					    origin_attachment 	(2053, 673)

+					    terminal_attachment 	(2359, 673)

 					    label      	(object SegLabel @27

 						Parent_View 	@26

-						location   	(2261, 728)

+						location   	(2261, 644)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -778,7 +782,7 @@
 						orientation 	0))

 					(object RoleView "representation" @28

 					    Parent_View 	@25

-					    location   	(613, -23)

+					    location   	(613, -107)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -790,7 +794,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @29

 						Parent_View 	@28

-						location   	(1953, 799)

+						location   	(1953, 715)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -814,11 +818,11 @@
 					    client     	@25

 					    supplier   	@24

 					    line_style 	3

-					    origin_attachment 	(2053, 757)

-					    terminal_attachment 	(1747, 757)

+					    origin_attachment 	(2053, 673)

+					    terminal_attachment 	(1747, 673)

 					    label      	(object SegLabel @30

 						Parent_View 	@28

-						location   	(1839, 724)

+						location   	(1839, 640)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -839,7 +843,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @31

 						Parent_View 	@28

-						location   	(2025, 840)

+						location   	(2025, 756)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -859,7 +863,7 @@
 						height     	83

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$6" @32

-				    location   	(2053, 588)

+				    location   	(2053, 673)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -874,7 +878,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "occurrence" @33

 					    Parent_View 	@32

-					    location   	(-437, -108)

+					    location   	(-437, -23)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -886,7 +890,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @34

 						Parent_View 	@33

-						location   	(1922, 626)

+						location   	(1922, 711)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -910,11 +914,11 @@
 					    client     	@32

 					    supplier   	@24

 					    line_style 	3

-					    origin_attachment 	(2053, 588)

-					    terminal_attachment 	(1747, 588)

+					    origin_attachment 	(2053, 673)

+					    terminal_attachment 	(1747, 673)

 					    label      	(object SegLabel @35

 						Parent_View 	@33

-						location   	(1795, 562)

+						location   	(1795, 647)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -935,7 +939,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @36

 						Parent_View 	@33

-						location   	(2040, 664)

+						location   	(2040, 749)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -956,7 +960,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$7" @37

 					    Parent_View 	@32

-					    location   	(-437, -108)

+					    location   	(-437, -23)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -971,11 +975,11 @@
 					    client     	@32

 					    supplier   	@21

 					    line_style 	3

-					    origin_attachment 	(2053, 588)

-					    terminal_attachment 	(2359, 588)

+					    origin_attachment 	(2053, 673)

+					    terminal_attachment 	(2359, 673)

 					    label      	(object SegLabel @38

 						Parent_View 	@37

-						location   	(2267, 555)

+						location   	(2267, 640)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -995,13 +999,13 @@
 						height     	34

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$2" @39

-				    location   	(954, 662)

+				    location   	(954, 690)

 				    stereotype 	TRUE

 				    quidu      	"3B885138027E"

 				    roleview_list 	(list RoleViews

 					(object RoleView "roleBinding" @40

 					    Parent_View 	@39

-					    location   	(353, -46)

+					    location   	(353, -18)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -1013,7 +1017,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @41

 						Parent_View 	@40

-						location   	(785, 623)

+						location   	(785, 651)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -1038,11 +1042,11 @@
 					    client     	@39

 					    supplier   	@22

 					    line_style 	3

-					    origin_attachment 	(954, 662)

-					    terminal_attachment 	(656, 662)

+					    origin_attachment 	(954, 690)

+					    terminal_attachment 	(656, 690)

 					    label      	(object SegLabel @42

 						Parent_View 	@40

-						location   	(719, 710)

+						location   	(719, 738)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -1063,7 +1067,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @43

 						Parent_View 	@40

-						location   	(896, 579)

+						location   	(896, 607)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -1084,7 +1088,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$3" @44

 					    Parent_View 	@39

-					    location   	(353, -46)

+					    location   	(353, -18)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -1096,7 +1100,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @45

 						Parent_View 	@44

-						location   	(1079, 706)

+						location   	(1079, 734)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -1122,11 +1126,11 @@
 					    client     	@39

 					    supplier   	@24

 					    line_style 	3

-					    origin_attachment 	(954, 662)

-					    terminal_attachment 	(1253, 662)

+					    origin_attachment 	(954, 690)

+					    terminal_attachment 	(1253, 690)

 					    label      	(object SegLabel @46

 						Parent_View 	@44

-						location   	(1170, 621)

+						location   	(1170, 649)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -1146,7 +1150,7 @@
 						height     	42

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$0" @47

-				    location   	(1481, 891)

+				    location   	(1500, 891)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -1161,7 +1165,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "type" @48

 					    Parent_View 	@47

-					    location   	(-37, 33)

+					    location   	(-18, 33)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -1173,7 +1177,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @49

 						Parent_View 	@48

-						location   	(1567, 953)

+						location   	(1586, 953)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -1197,11 +1201,11 @@
 					    client     	@47

 					    supplier   	@23

 					    line_style 	3

-					    origin_attachment 	(1481, 891)

-					    terminal_attachment 	(1481, 1004)

+					    origin_attachment 	(1500, 891)

+					    terminal_attachment 	(1500, 1005)

 					    label      	(object SegLabel @50

 						Parent_View 	@48

-						location   	(1430, 956)

+						location   	(1449, 956)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -1222,7 +1226,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$1" @51

 					    Parent_View 	@47

-					    location   	(-37, 33)

+					    location   	(-18, 33)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -1237,11 +1241,11 @@
 					    client     	@47

 					    supplier   	@24

 					    line_style 	3

-					    origin_attachment 	(1481, 891)

-					    terminal_attachment 	(1481, 778)

+					    origin_attachment 	(1500, 891)

+					    terminal_attachment 	(1500, 778)

 					    label      	(object SegLabel @52

 						Parent_View 	@51

-						location   	(1430, 819)

+						location   	(1449, 819)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -1321,6 +1325,7 @@
 		    logical_models 	(list unit_reference_list

 			(object Class "Port"

 			    quid       	"3BAFE2B3012C"

+			    documentation 	"Ports represent interaction points between a classifier and its environment. The interfaces associated with a port specify the nature of the interactions that may occur over a port. The required interfaces of a port characterize the requests which may be made from the classifier to its environment through this port. The provided interfaces of a port characterize requests to the classifier that its environment may make through this port. A port has the ability to specify that any requests arriving at this port are handled by the behavior of the instance of the owning classifier, rather than being forwarded to any contained instances, if any. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3BAF6FE003E4"

@@ -1338,17 +1343,16 @@
 				(object ClassAttribute "isBehavior"

 				    quid       	"3CC172EC02B1"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")

 				(object ClassAttribute "isService"

 				    quid       	"3CECF626014B"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"true"

 				    exportControl 	"Public")))

 			(object Class "EncapsulatedClassifier"

 			    quid       	"3D02622E0223"

+			    documentation 	"Extends a classifier with the ability to own ports as specific and type checked interaction points. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3D5EC6A50011"

@@ -1565,7 +1569,7 @@
 				    width      	481

 				    height     	144)

 				(object AssociationViewNew "$UNNAMED$18" @59

-				    location   	(463, 945)

+				    location   	(480, 945)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -1580,7 +1584,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "partWithPort" @60

 					    Parent_View 	@59

-					    location   	(-32, -50)

+					    location   	(-15, -50)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -1592,7 +1596,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @61

 						Parent_View 	@60

-						location   	(607, 989)

+						location   	(624, 989)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -1616,11 +1620,11 @@
 					    client     	@59

 					    supplier   	@57

 					    line_style 	3

-					    origin_attachment 	(463, 945)

-					    terminal_attachment 	(463, 1027)

+					    origin_attachment 	(480, 945)

+					    terminal_attachment 	(480, 1027)

 					    label      	(object SegLabel @62

 						Parent_View 	@60

-						location   	(399, 985)

+						location   	(416, 985)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -1641,14 +1645,14 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$19" @63

 					    Parent_View 	@59

-					    location   	(-32, -50)

+					    location   	(-15, -50)

 					    stereotype 	TRUE

 					    quidu      	"3DFDFE26032B"

 					    client     	@59

 					    supplier   	@58

 					    line_style 	3

-					    origin_attachment 	(463, 945)

-					    terminal_attachment 	(463, 864))))

+					    origin_attachment 	(480, 945)

+					    terminal_attachment 	(480, 864))))

 				(object ClassView "Class" "Logical View::UML::Classes::Interfaces::Interface" @64

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressAttribute 	TRUE

@@ -1855,7 +1859,7 @@
 						height     	33

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$12" @74

-				    location   	(2189, 600)

+				    location   	(2189, 708)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -1867,7 +1871,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @75

 					Parent_View 	@74

-					location   	(2208, 638)

+					location   	(2208, 746)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -1892,7 +1896,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "/required" @76

 					    Parent_View 	@74

-					    location   	(65, -462)

+					    location   	(65, -354)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -1904,7 +1908,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @77

 						Parent_View 	@76

-						location   	(2277, 546)

+						location   	(2277, 654)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -1928,11 +1932,11 @@
 					    client     	@74

 					    supplier   	@64

 					    line_style 	3

-					    origin_attachment 	(2189, 600)

-					    terminal_attachment 	(2381, 600)

+					    origin_attachment 	(2189, 708)

+					    terminal_attachment 	(2381, 708)

 					    label      	(object SegLabel @78

 						Parent_View 	@76

-						location   	(2362, 654)

+						location   	(2362, 762)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -1953,7 +1957,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$13" @79

 					    Parent_View 	@74

-					    location   	(65, -462)

+					    location   	(65, -354)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -1968,11 +1972,11 @@
 					    client     	@74

 					    supplier   	@65

 					    line_style 	3

-					    origin_attachment 	(2189, 600)

-					    terminal_attachment 	(1998, 600)

+					    origin_attachment 	(2189, 708)

+					    terminal_attachment 	(1998, 708)

 					    label      	(object SegLabel @80

 						Parent_View 	@79

-						location   	(2025, 642)

+						location   	(2025, 750)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -1992,7 +1996,7 @@
 						height     	42

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$16" @81

-				    location   	(2189, 803)

+				    location   	(2189, 708)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -2007,7 +2011,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "/provided" @82

 					    Parent_View 	@81

-					    location   	(551, -265)

+					    location   	(551, -360)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -2019,7 +2023,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @83

 						Parent_View 	@82

-						location   	(2276, 757)

+						location   	(2276, 662)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2043,11 +2047,11 @@
 					    client     	@81

 					    supplier   	@64

 					    line_style 	3

-					    origin_attachment 	(2189, 803)

-					    terminal_attachment 	(2381, 803)

+					    origin_attachment 	(2189, 708)

+					    terminal_attachment 	(2381, 708)

 					    label      	(object SegLabel @84

 						Parent_View 	@82

-						location   	(2362, 857)

+						location   	(2362, 762)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2068,7 +2072,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$17" @85

 					    Parent_View 	@81

-					    location   	(551, -265)

+					    location   	(551, -360)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -2083,11 +2087,11 @@
 					    client     	@81

 					    supplier   	@65

 					    line_style 	3

-					    origin_attachment 	(2189, 803)

-					    terminal_attachment 	(1998, 803)

+					    origin_attachment 	(2189, 708)

+					    terminal_attachment 	(1998, 708)

 					    label      	(object SegLabel @86

 						Parent_View 	@85

-						location   	(2018, 857)

+						location   	(2018, 762)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2141,7 +2145,7 @@
 				    origin_attachment 	(472, 466)

 				    terminal_attachment 	(472, 221))

 				(object AssociationViewNew "$UNNAMED$10" @89

-				    location   	(1094, 569)

+				    location   	(1094, 570)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -2156,7 +2160,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "ownedPort" @90

 					    Parent_View 	@89

-					    location   	(818, 53)

+					    location   	(818, 54)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -2168,7 +2172,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @91

 						Parent_View 	@90

-						location   	(1339, 524)

+						location   	(1339, 525)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2192,11 +2196,11 @@
 					    client     	@89

 					    supplier   	@65

 					    line_style 	3

-					    origin_attachment 	(1094, 569)

-					    terminal_attachment 	(1462, 569)

+					    origin_attachment 	(1094, 570)

+					    terminal_attachment 	(1462, 570)

 					    label      	(object SegLabel @92

 						Parent_View 	@90

-						location   	(1424, 623)

+						location   	(1424, 624)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2217,7 +2221,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @93

 						Parent_View 	@90

-						location   	(1228, 455)

+						location   	(1228, 456)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2241,7 +2245,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$11" @94

 					    Parent_View 	@89

-					    location   	(818, 53)

+					    location   	(818, 54)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -2256,11 +2260,11 @@
 					    client     	@89

 					    supplier   	@87

 					    line_style 	3

-					    origin_attachment 	(1094, 569)

-					    terminal_attachment 	(726, 569)

+					    origin_attachment 	(1094, 570)

+					    terminal_attachment 	(726, 570)

 					    label      	(object SegLabel @95

 						Parent_View 	@94

-						location   	(787, 521)

+						location   	(787, 522)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2281,7 +2285,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @96

 						Parent_View 	@94

-						location   	(1013, 617)

+						location   	(1013, 618)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2366,6 +2370,7 @@
 			    abstract   	TRUE)

 			(object Class "Trigger"

 			    quid       	"3E11EB4B013B"

+			    documentation 	"A trigger specification may be qualified by the port on which the event occurred. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E11EB70006C"

@@ -2493,13 +2498,13 @@
 				    height     	138

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$22" @102

-				    location   	(798, 319)

+				    location   	(798, 353)

 				    stereotype 	TRUE

 				    quidu      	"3E022603035F"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$23" @103

 					    Parent_View 	@102

-					    location   	(-482, -1681)

+					    location   	(-482, -1647)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -2511,7 +2516,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @104

 						Parent_View 	@103

-						location   	(648, 361)

+						location   	(648, 395)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2536,11 +2541,11 @@
 					    client     	@102

 					    supplier   	@99

 					    line_style 	3

-					    origin_attachment 	(798, 319)

-					    terminal_attachment 	(611, 319)

+					    origin_attachment 	(798, 353)

+					    terminal_attachment 	(611, 353)

 					    label      	(object SegLabel @105

 						Parent_View 	@103

-						location   	(629, 373)

+						location   	(629, 407)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2561,7 +2566,7 @@
 						orientation 	0))

 					(object RoleView "onPort" @106

 					    Parent_View 	@102

-					    location   	(-482, -1681)

+					    location   	(-482, -1647)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -2573,7 +2578,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @107

 						Parent_View 	@106

-						location   	(862, 279)

+						location   	(862, 313)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2597,11 +2602,11 @@
 					    client     	@102

 					    supplier   	@101

 					    line_style 	3

-					    origin_attachment 	(798, 319)

-					    terminal_attachment 	(986, 319)

+					    origin_attachment 	(798, 353)

+					    terminal_attachment 	(986, 353)

 					    label      	(object SegLabel @108

 						Parent_View 	@106

-						location   	(911, 361)

+						location   	(911, 395)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2621,13 +2626,13 @@
 						height     	42

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$20" @109

-				    location   	(1576, 325)

+				    location   	(1576, 345)

 				    stereotype 	TRUE

 				    quidu      	"3DF3E93A0396"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$21" @110

 					    Parent_View 	@109

-					    location   	(1308, 207)

+					    location   	(1308, 227)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -2639,7 +2644,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @111

 						Parent_View 	@110

-						location   	(1773, 367)

+						location   	(1773, 387)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2664,11 +2669,11 @@
 					    client     	@109

 					    supplier   	@100

 					    line_style 	3

-					    origin_attachment 	(1576, 325)

-					    terminal_attachment 	(1823, 325)

+					    origin_attachment 	(1576, 345)

+					    terminal_attachment 	(1823, 345)

 					    label      	(object SegLabel @112

 						Parent_View 	@110

-						location   	(1778, 296)

+						location   	(1778, 316)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2689,7 +2694,7 @@
 						orientation 	0))

 					(object RoleView "port" @113

 					    Parent_View 	@109

-					    location   	(1308, 207)

+					    location   	(1308, 227)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -2701,7 +2706,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @114

 						Parent_View 	@113

-						location   	(1447, 369)

+						location   	(1447, 389)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2725,11 +2730,11 @@
 					    client     	@109

 					    supplier   	@101

 					    line_style 	3

-					    origin_attachment 	(1576, 325)

-					    terminal_attachment 	(1330, 325)

+					    origin_attachment 	(1576, 345)

+					    terminal_attachment 	(1330, 345)

 					    label      	(object SegLabel @115

 						Parent_View 	@113

-						location   	(1388, 296)

+						location   	(1388, 316)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -2772,6 +2777,7 @@
 		    logical_models 	(list unit_reference_list

 			(object Class "ConnectorEnd"

 			    quid       	"3B6D744E008C"

+			    documentation 	"A connector end is an endpoint of a connector, which attaches the connector to a connectable element. Each connector end is part of one connector. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3DFFB5D6036F"

@@ -2779,6 +2785,7 @@
 				    quidu      	"3CAAFD5202DC")))

 			(object Class "Connector"

 			    quid       	"3B6D7514038E"

+			    documentation 	"Each connector may be attached to two or more connectable elements, each representing a set of instances. Each connector end "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3B6D767D00E6"

@@ -2786,6 +2793,7 @@
 				    quidu      	"3CAAFD220337")))

 			(object Class "Property"

 			    quid       	"3B99825E03B4"

+			    documentation 	"In the metamodel, Property is a specialization of DeploymentTarget. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CC16F5A00DA"

@@ -2797,6 +2805,7 @@
 				    quidu      	"3CAB1D790101")))

 			(object Class "StructuredClassifier"

 			    quid       	"3CC16E2301C0"

+			    documentation 	"A structured classifier is an abstract metaclass that represents any classifier whose behavior can be fully or partly described by the collaboration of owned or referenced instances. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3D0B984801D5"

@@ -2809,6 +2818,7 @@
 			    abstract   	TRUE)

 			(object Class "ConnectableElement"

 			    quid       	"3CC16F5A00A4"

+			    documentation 	"A ConnectableElement is an abstract metaclass representing a set of instances that are owned by a containing classifier instance. Connectable elements may be joined by attached connectors and specify configurations of linked instances to be created within an instance of the containing classifier. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3D03CEE303AC"

@@ -3090,7 +3100,7 @@
 				    width      	518

 				    height     	157)

 				(object AssociationViewNew "$UNNAMED$24" @120

-				    location   	(2400, 712)

+				    location   	(2397, 712)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -3102,7 +3112,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @121

 					Parent_View 	@120

-					location   	(2363, 701)

+					location   	(2360, 701)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -3127,7 +3137,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "type" @122

 					    Parent_View 	@120

-					    location   	(924, 250)

+					    location   	(921, 250)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -3139,7 +3149,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @123

 						Parent_View 	@122

-						location   	(2489, 791)

+						location   	(2486, 791)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -3163,11 +3173,11 @@
 					    client     	@120

 					    supplier   	@118

 					    line_style 	3

-					    origin_attachment 	(2400, 712)

-					    terminal_attachment 	(2400, 837)

+					    origin_attachment 	(2397, 712)

+					    terminal_attachment 	(2397, 837)

 					    label      	(object SegLabel @124

 						Parent_View 	@122

-						location   	(2338, 797)

+						location   	(2335, 797)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -3188,7 +3198,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$25" @125

 					    Parent_View 	@120

-					    location   	(924, 250)

+					    location   	(921, 250)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -3203,11 +3213,11 @@
 					    client     	@120

 					    supplier   	@119

 					    line_style 	3

-					    origin_attachment 	(2400, 712)

-					    terminal_attachment 	(2400, 588)

+					    origin_attachment 	(2397, 712)

+					    terminal_attachment 	(2397, 588)

 					    label      	(object SegLabel @126

 						Parent_View 	@125

-						location   	(2351, 619)

+						location   	(2348, 619)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -3836,13 +3846,13 @@
 				    height     	725

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$26" @158

-				    location   	(868, 856)

+				    location   	(868, 912)

 				    stereotype 	TRUE

 				    quidu      	"3BC8B2610260"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$27" @159

 					    Parent_View 	@158

-					    location   	(-356, 568)

+					    location   	(-356, 624)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -3854,7 +3864,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @160

 						Parent_View 	@159

-						location   	(555, 815)

+						location   	(555, 871)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -3879,11 +3889,11 @@
 					    client     	@158

 					    supplier   	@157

 					    line_style 	3

-					    origin_attachment 	(868, 856)

-					    terminal_attachment 	(476, 856)

+					    origin_attachment 	(868, 912)

+					    terminal_attachment 	(476, 912)

 					    label      	(object SegLabel @161

 						Parent_View 	@159

-						location   	(551, 815)

+						location   	(551, 871)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -3904,7 +3914,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @162

 						Parent_View 	@159

-						location   	(698, 895)

+						location   	(698, 951)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -3925,7 +3935,7 @@
 						orientation 	0))

 					(object RoleView "ownedAttribute" @163

 					    Parent_View 	@158

-					    location   	(-356, 568)

+					    location   	(-356, 624)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -3937,7 +3947,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @164

 						Parent_View 	@163

-						location   	(1107, 818)

+						location   	(1107, 874)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -3961,11 +3971,11 @@
 					    client     	@158

 					    supplier   	@153

 					    line_style 	3

-					    origin_attachment 	(868, 856)

-					    terminal_attachment 	(1260, 856)

+					    origin_attachment 	(868, 912)

+					    terminal_attachment 	(1260, 912)

 					    label      	(object SegLabel @165

 						Parent_View 	@163

-						location   	(1220, 910)

+						location   	(1220, 966)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -3986,7 +3996,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @166

 						Parent_View 	@163

-						location   	(1037, 740)

+						location   	(1037, 796)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -4009,7 +4019,7 @@
 						height     	117

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$28" @167

-				    location   	(868, 994)

+				    location   	(868, 912)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -4024,7 +4034,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "/part" @168

 					    Parent_View 	@167

-					    location   	(598, 130)

+					    location   	(598, 48)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -4036,7 +4046,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @169

 						Parent_View 	@168

-						location   	(1164, 954)

+						location   	(1164, 872)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -4060,11 +4070,11 @@
 					    client     	@167

 					    supplier   	@153

 					    line_style 	3

-					    origin_attachment 	(868, 994)

-					    terminal_attachment 	(1260, 994)

+					    origin_attachment 	(868, 912)

+					    terminal_attachment 	(1260, 912)

 					    label      	(object SegLabel @170

 						Parent_View 	@168

-						location   	(1208, 1029)

+						location   	(1208, 947)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -4085,7 +4095,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$29" @171

 					    Parent_View 	@167

-					    location   	(598, 130)

+					    location   	(598, 48)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -4100,11 +4110,11 @@
 					    client     	@167

 					    supplier   	@157

 					    line_style 	3

-					    origin_attachment 	(868, 994)

-					    terminal_attachment 	(476, 994)

+					    origin_attachment 	(868, 912)

+					    terminal_attachment 	(476, 912)

 					    label      	(object SegLabel @172

 						Parent_View 	@171

-						location   	(551, 965)

+						location   	(551, 883)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -4288,7 +4298,7 @@
 				    height     	162

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$32" @181

-				    location   	(866, 1184)

+				    location   	(866, 1175)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -4303,7 +4313,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "ownedConnector" @182

 					    Parent_View 	@181

-					    location   	(596, 320)

+					    location   	(596, 311)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -4315,7 +4325,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @183

 						Parent_View 	@182

-						location   	(1080, 1151)

+						location   	(1080, 1142)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -4339,11 +4349,11 @@
 					    client     	@181

 					    supplier   	@180

 					    line_style 	3

-					    origin_attachment 	(866, 1184)

-					    terminal_attachment 	(1257, 1184)

+					    origin_attachment 	(866, 1175)

+					    terminal_attachment 	(1257, 1175)

 					    label      	(object SegLabel @184

 						Parent_View 	@182

-						location   	(1217, 1238)

+						location   	(1217, 1229)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -4364,7 +4374,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @185

 						Parent_View 	@182

-						location   	(876, 1108)

+						location   	(876, 1099)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -4385,7 +4395,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$33" @186

 					    Parent_View 	@181

-					    location   	(596, 320)

+					    location   	(596, 311)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -4400,11 +4410,11 @@
 					    client     	@181

 					    supplier   	@157

 					    line_style 	3

-					    origin_attachment 	(866, 1184)

-					    terminal_attachment 	(476, 1184)

+					    origin_attachment 	(866, 1175)

+					    terminal_attachment 	(476, 1175)

 					    label      	(object SegLabel @187

 						Parent_View 	@186

-						location   	(586, 1220)

+						location   	(586, 1211)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -4425,7 +4435,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @188

 						Parent_View 	@186

-						location   	(805, 1264)

+						location   	(805, 1255)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -4639,6 +4649,7 @@
 		    logical_models 	(list unit_reference_list

 			(object Class "Variable"

 			    quid       	"3E8A06DF0286"

+			    documentation 	"A variable is considered a connectable element. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E8A07600033"

@@ -5474,6 +5485,7 @@
 			    language   	"none")

 			(object Class "ChangeTrigger"

 			    quid       	"3B9D229602A9"

+			    documentation 	"A change trigger specifies an event that occurs when a Boolean-valued expression becomes true as a result of a change in "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3B9D229602A8"

@@ -5482,6 +5494,7 @@
 			    language   	"none")

 			(object Class "Class"

 			    quid       	"3BC8C05E0205"

+			    documentation 	"A class may be designated as active, i.e., each of its instance having its own thread of control, or passive, i.e., each of its instance executing within the context of some other object. A class may also specify which signals the instances of this class handle. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3D0BAF88036E"

@@ -5495,10 +5508,10 @@
 				(object ClassAttribute "isActive"

 				    quid       	"3CC0D7E00108"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    exportControl 	"Public")))

 			(object Class "Trigger"

 			    quid       	"3B9D229602A5"

+			    documentation 	"A trigger specifies the an event that may cause the execution of an associated behavior. An event is often ultimately caused by the execution of an action, but need not be. Trigger is an abstract metaclass. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"40AB7F9F0103"

@@ -5508,6 +5521,7 @@
 			    abstract   	TRUE)

 			(object Class "Interface"

 			    quid       	"3CC0D8B0028E"

+			    documentation 	"Adds the capability for interfaces to include receptions (in addition to operations). "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E11EAAF0032"

@@ -5515,6 +5529,7 @@
 				    quidu      	"3342A195014D")))

 			(object Class "Reception"

 			    quid       	"33EC13250140"

+			    documentation 	"A reception is a declaration stating that a classifier is prepared to react to the receipt of a signal. A reception designates a signal and specifies the expected behavioral response. The details of handling a signal are specified by the behavior associated with the reception or the classifier itself. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"33F2372D0172"

@@ -5523,6 +5538,7 @@
 			    language   	"none")

 			(object Class "Signal"

 			    quid       	"3389030B00E6"

+			    documentation 	"A signal is a specification of type of send request instances communicated between objects. The receiving object handles the signal instance as specified by its receptions. The data carried by a send request and passed to it by the occurrence of the send invocation event that caused the request is represented as attributes of the signal instance. A signal is defined independently of the classifiers handling the signal. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3D09AF53037A"

@@ -5539,6 +5555,7 @@
 			    language   	"none")

 			(object Class "TimeTrigger"

 			    quid       	"3B9D2296029B"

+			    documentation 	"A time trigger specifies a time event, which models the expiration of a specific deadline. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3B9D2296029C"

@@ -5548,7 +5565,6 @@
 				(object ClassAttribute "isRelative"

 				    quid       	"3D3918CC003A"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    exportControl 	"Public"))

 			    language   	"none")

 			(object Class "CallConcurrencyKind"

@@ -5558,6 +5574,7 @@
 				    name       	"CORBA Declaration"

 				    value      	"enum CallConcurrencyKind { cck_sequential, cck_guarded, cck_concurrent } ;"))

 			    quid       	"33F0EC2002BC"

+			    documentation 	"CallConcurrencyKind is an enumeration with the following literals: • sequential No concurrency management mechanism is associated with the operation and, therefore, concurrency conflicts may occur. Instances that invoke a behavioral feature need to coordinate so that only one invocation to a target on any behavioral feature occurs at once. • guarded Multiple invocations of a behavioral feature may occur simultaneously to one instance, but only one is allowed to commence. The others are blocked until the performance of the first behavioral feature is complete. It is the responsibility of the system designer to ensure that deadlocks do not occur due to simultaneous blocks. • concurrent Multiple invocations of a behavioral feature may occur simultaneously to one instance and all of them may proceed concurrently. "

 			    stereotype 	"enumeration"

 			    class_attributes 	(list class_attribute_list

 				(object ClassAttribute "sequential"

@@ -5572,6 +5589,7 @@
 			    language   	"none")

 			(object Class "MessageTrigger"

 			    quid       	"3E5B966A02F2"

+			    documentation 	"A message trigger specifies the an observable event caused by a either a call or a signal. MessageTrigger is an abstract metaclass. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E5B96D802E6"

@@ -5580,6 +5598,7 @@
 			    abstract   	TRUE)

 			(object Class "AnyTrigger"

 			    quid       	"3E5B982E0298"

+			    documentation 	"An AnyTrigger for a given state specifies that the transition is triggered for all applicable message triggers except for those specified explicitly on other transitions for this state. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E5B985F02AC"

@@ -5827,13 +5846,13 @@
 				    height     	138

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$45" @237

-				    location   	(674, 1564)

+				    location   	(683, 1564)

 				    stereotype 	TRUE

 				    quidu      	"3B94A19E0137"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$46" @238

 					    Parent_View 	@237

-					    location   	(-365, -1560)

+					    location   	(-356, -1560)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -5845,7 +5864,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @239

 						Parent_View 	@238

-						location   	(633, 1484)

+						location   	(642, 1484)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -5870,11 +5889,11 @@
 					    client     	@237

 					    supplier   	@235

 					    line_style 	3

-					    origin_attachment 	(674, 1564)

-					    terminal_attachment 	(674, 1464)

+					    origin_attachment 	(683, 1564)

+					    terminal_attachment 	(683, 1464)

 					    label      	(object SegLabel @240

 						Parent_View 	@238

-						location   	(719, 1494)

+						location   	(728, 1494)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -5895,7 +5914,7 @@
 						orientation 	1))

 					(object RoleView "signal" @241

 					    Parent_View 	@237

-					    location   	(-365, -1560)

+					    location   	(-356, -1560)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -5907,7 +5926,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @242

 						Parent_View 	@241

-						location   	(547, 1631)

+						location   	(556, 1631)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -5931,11 +5950,11 @@
 					    client     	@237

 					    supplier   	@236

 					    line_style 	3

-					    origin_attachment 	(674, 1564)

-					    terminal_attachment 	(674, 1664)

+					    origin_attachment 	(683, 1564)

+					    terminal_attachment 	(683, 1665)

 					    label      	(object SegLabel @243

 						Parent_View 	@241

-						location   	(703, 1633)

+						location   	(712, 1633)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -6008,7 +6027,7 @@
 				    width      	298

 				    height     	146)

 				(object AssociationViewNew "$UNNAMED$43" @246

-				    location   	(1160, 1566)

+				    location   	(1162, 1566)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -6023,7 +6042,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "operation" @247

 					    Parent_View 	@246

-					    location   	(-457, -1290)

+					    location   	(-455, -1290)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -6035,7 +6054,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @248

 						Parent_View 	@247

-						location   	(1029, 1637)

+						location   	(1031, 1637)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -6059,11 +6078,11 @@
 					    client     	@246

 					    supplier   	@244

 					    line_style 	3

-					    origin_attachment 	(1160, 1566)

-					    terminal_attachment 	(1160, 1667)

+					    origin_attachment 	(1162, 1566)

+					    terminal_attachment 	(1162, 1668)

 					    label      	(object SegLabel @249

 						Parent_View 	@247

-						location   	(1208, 1640)

+						location   	(1210, 1640)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -6084,7 +6103,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$44" @250

 					    Parent_View 	@246

-					    location   	(-457, -1290)

+					    location   	(-455, -1290)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -6096,7 +6115,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @251

 						Parent_View 	@250

-						location   	(1119, 1486)

+						location   	(1121, 1486)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -6121,11 +6140,11 @@
 					    client     	@246

 					    supplier   	@245

 					    line_style 	3

-					    origin_attachment 	(1160, 1566)

-					    terminal_attachment 	(1160, 1465)

+					    origin_attachment 	(1162, 1566)

+					    terminal_attachment 	(1162, 1465)

 					    label      	(object SegLabel @252

 						Parent_View 	@250

-						location   	(1209, 1505)

+						location   	(1211, 1505)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -6198,7 +6217,7 @@
 				    width      	375

 				    height     	157)

 				(object AssociationViewNew "$UNNAMED$53" @255

-				    location   	(2190, 1244)

+				    location   	(2196, 1244)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -6213,7 +6232,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "changeExpression" @256

 					    Parent_View 	@255

-					    location   	(96, 218)

+					    location   	(102, 218)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -6225,7 +6244,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @257

 						Parent_View 	@256

-						location   	(1984, 1353)

+						location   	(1990, 1353)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -6249,11 +6268,11 @@
 					    client     	@255

 					    supplier   	@253

 					    line_style 	3

-					    origin_attachment 	(2190, 1244)

-					    terminal_attachment 	(2190, 1396)

+					    origin_attachment 	(2196, 1244)

+					    terminal_attachment 	(2196, 1396)

 					    label      	(object SegLabel @258

 						Parent_View 	@256

-						location   	(2243, 1358)

+						location   	(2249, 1358)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -6274,7 +6293,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @259

 						Parent_View 	@256

-						location   	(2194, 1589)

+						location   	(2200, 1589)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -6295,14 +6314,14 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$54" @260

 					    Parent_View 	@255

-					    location   	(96, 218)

+					    location   	(102, 218)

 					    stereotype 	TRUE

 					    quidu      	"3BD1DE300033"

 					    client     	@255

 					    supplier   	@254

 					    line_style 	3

-					    origin_attachment 	(2190, 1244)

-					    terminal_attachment 	(2190, 1092))))

+					    origin_attachment 	(2196, 1244)

+					    terminal_attachment 	(2196, 1092))))

 				(object ClassView "Class" "Logical View::UML::CommonBehaviors::Communications::Trigger" @261

 				    SuppressOperation 	TRUE

 				    location   	(1518, 642)

@@ -6490,22 +6509,6 @@
 					label      	"TimeTrigger")

 				    icon_style 	"Icon"

 				    quidu      	"3B9D2296029B"

-				    compartment 	(object Compartment

-					Parent_View 	@272

-					location   	(1497, 1018)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	1

-					max_width  	365)

 				    width      	409

 				    height     	145)

 				(object InheritView "" @273

@@ -6518,7 +6521,7 @@
 				    terminal_attachment 	(1692, 859)

 				    drawSupplier 	@262)

 				(object AssociationViewNew "$UNNAMED$51" @274

-				    location   	(1670, 1247)

+				    location   	(1692, 1247)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -6533,7 +6536,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "when" @275

 					    Parent_View 	@274

-					    location   	(290, 221)

+					    location   	(312, 221)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -6545,7 +6548,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @276

 						Parent_View 	@275

-						location   	(1587, 1362)

+						location   	(1609, 1362)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -6569,11 +6572,11 @@
 					    client     	@274

 					    supplier   	@271

 					    line_style 	3

-					    origin_attachment 	(1670, 1247)

-					    terminal_attachment 	(1670, 1409)

+					    origin_attachment 	(1692, 1247)

+					    terminal_attachment 	(1692, 1409)

 					    label      	(object SegLabel @277

 						Parent_View 	@275

-						location   	(1704, 1361)

+						location   	(1726, 1361)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -6594,7 +6597,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @278

 						Parent_View 	@275

-						location   	(1666, 1604)

+						location   	(1688, 1604)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -6615,14 +6618,14 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$52" @279

 					    Parent_View 	@274

-					    location   	(290, 221)

+					    location   	(312, 221)

 					    stereotype 	TRUE

 					    quidu      	"3BD1DDCD00A8"

 					    client     	@274

 					    supplier   	@272

 					    line_style 	3

-					    origin_attachment 	(1670, 1247)

-					    terminal_attachment 	(1670, 1086))))

+					    origin_attachment 	(1692, 1247)

+					    terminal_attachment 	(1692, 1086))))

 				(object ClassView "Class" "Logical View::UML::CommonBehaviors::BasicBehaviors::BehavioredClassifier" @280

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressAttribute 	TRUE

@@ -6678,27 +6681,40 @@
 				    line_color 	3342489

 				    fill_color 	13434879

 				    quidu      	"3CAAECB901B0"

-				    compartment 	(object Compartment

-					Parent_View 	@281

-					location   	(1196, 178)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					fill_color 	13434879

-					anchor     	2

-					nlines     	4

-					max_width  	553)

 				    width      	650

 				    height     	310

 				    annotation 	8)

-				(object ClassView "Class" "Logical View::UML::CommonBehaviors::Communications::BehavioredClassifier" @282

+				(object ClassView "Class" "Logical View::UML::CommonBehaviors::Communications::Trigger" @282

+				    SuppressOperation 	TRUE

+				    location   	(1518, 642)

+				    font       	(object Font

+					size       	10

+					face       	"Arial"

+					bold       	FALSE

+					italics    	TRUE

+					underline  	FALSE

+					strike     	FALSE

+					color      	0

+					default_color 	TRUE)

+				    label      	(object ItemLabel

+					Parent_View 	@282

+					location   	(1262, 576)

+					nlines     	1

+					max_width  	512

+					justify    	0

+					label      	"Trigger")

+				    icon_style 	"Icon"

+				    quidu      	"3B9D229602A5"

+				    width      	530

+				    height     	158)

+				(object InheritView "" @283

+				    stereotype 	TRUE

+				    line_color 	3342489

+				    quidu      	"40AB7F9F0103"

+				    client     	@282

+				    supplier   	@281

+				    line_style 	0)

+				(object ClassView "Class" "Logical View::UML::CommonBehaviors::Communications::BehavioredClassifier" @284

 				    ShowCompartmentStereotypes 	TRUE

 				    IncludeAttribute 	TRUE

 				    IncludeOperation 	TRUE

@@ -6713,7 +6729,7 @@
 					color      	0

 					default_color 	TRUE)

 				    label      	(object ItemLabel

-					Parent_View 	@282

+					Parent_View 	@284

 					location   	(472, 578)

 					fill_color 	13434879

 					nlines     	2

@@ -6727,42 +6743,12 @@
 				    width      	250

 				    height     	148

 				    annotation 	8)

-				(object InheritView "" @283

-				    stereotype 	TRUE

-				    line_color 	3342489

-				    quidu      	"40AB863C0273"

-				    client     	@282

-				    supplier   	@280

-				    line_style 	0)

-				(object ClassView "Class" "Logical View::UML::CommonBehaviors::Communications::Trigger" @284

-				    SuppressOperation 	TRUE

-				    location   	(1518, 642)

-				    font       	(object Font

-					size       	10

-					face       	"Arial"

-					bold       	FALSE

-					italics    	TRUE

-					underline  	FALSE

-					strike     	FALSE

-					color      	0

-					default_color 	TRUE)

-				    label      	(object ItemLabel

-					Parent_View 	@284

-					location   	(1262, 576)

-					nlines     	1

-					max_width  	512

-					justify    	0

-					label      	"Trigger")

-				    icon_style 	"Icon"

-				    quidu      	"3B9D229602A5"

-				    width      	530

-				    height     	158)

 				(object InheritView "" @285

 				    stereotype 	TRUE

 				    line_color 	3342489

-				    quidu      	"40AB7F9F0103"

+				    quidu      	"40AB863C0273"

 				    client     	@284

-				    supplier   	@281

+				    supplier   	@280

 				    line_style 	0)

 				(object AssociationViewNew "$UNNAMED$58" @286

 				    location   	(982, 642)

@@ -6806,7 +6792,7 @@
 						anchor     	1

 						anchor_loc 	1

 						nlines     	1

-						max_width  	233

+						max_width  	265

 						justify    	0

 						label      	"+ownedTrigger"

 						pctDist    	0.592593

@@ -6816,7 +6802,7 @@
 					    line_color 	3342489

 					    quidu      	"40AB86790135"

 					    client     	@286

-					    supplier   	@284

+					    supplier   	@282

 					    line_style 	0

 					    label      	(object SegLabel @289

 						Parent_View 	@287

@@ -6876,7 +6862,7 @@
 					    line_color 	3342489

 					    quidu      	"40AB86790149"

 					    client     	@286

-					    supplier   	@282

+					    supplier   	@284

 					    line_style 	0

 					    label      	(object SegLabel @292

 						Parent_View 	@291

@@ -7049,7 +7035,7 @@
 				    width      	443

 				    height     	275)

 				(object AssociationViewNew "$UNNAMED$49" @299

-				    location   	(1776, 530)

+				    location   	(1776, 545)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -7064,7 +7050,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "ownedReception" @300

 					    Parent_View 	@299

-					    location   	(-264, -496)

+					    location   	(-264, -481)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -7076,7 +7062,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @301

 						Parent_View 	@300

-						location   	(1691, 567)

+						location   	(1691, 582)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7100,11 +7086,11 @@
 					    client     	@299

 					    supplier   	@298

 					    line_style 	3

-					    origin_attachment 	(1776, 530)

-					    terminal_attachment 	(1517, 530)

+					    origin_attachment 	(1776, 545)

+					    terminal_attachment 	(1517, 545)

 					    label      	(object SegLabel @302

 						Parent_View 	@300

-						location   	(1550, 501)

+						location   	(1550, 516)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7125,7 +7111,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @303

 						Parent_View 	@300

-						location   	(1616, 429)

+						location   	(1616, 444)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7149,7 +7135,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$50" @304

 					    Parent_View 	@299

-					    location   	(-264, -496)

+					    location   	(-264, -481)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -7164,11 +7150,11 @@
 					    client     	@299

 					    supplier   	@295

 					    line_style 	3

-					    origin_attachment 	(1776, 530)

-					    terminal_attachment 	(2035, 530)

+					    origin_attachment 	(1776, 545)

+					    terminal_attachment 	(2035, 545)

 					    label      	(object SegLabel @305

 						Parent_View 	@304

-						location   	(1943, 498)

+						location   	(1943, 513)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7188,7 +7174,7 @@
 						height     	33

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$47" @306

-				    location   	(1780, 742)

+				    location   	(1780, 730)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -7203,7 +7189,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "ownedReception" @307

 					    Parent_View 	@306

-					    location   	(-260, -464)

+					    location   	(-260, -476)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -7215,7 +7201,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @308

 						Parent_View 	@307

-						location   	(1689, 785)

+						location   	(1689, 773)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7239,11 +7225,11 @@
 					    client     	@306

 					    supplier   	@298

 					    line_style 	3

-					    origin_attachment 	(1780, 742)

-					    terminal_attachment 	(1517, 742)

+					    origin_attachment 	(1780, 730)

+					    terminal_attachment 	(1517, 730)

 					    label      	(object SegLabel @309

 						Parent_View 	@307

-						location   	(1549, 725)

+						location   	(1549, 713)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7264,7 +7250,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @310

 						Parent_View 	@307

-						location   	(1575, 868)

+						location   	(1575, 856)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7288,7 +7274,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$48" @311

 					    Parent_View 	@306

-					    location   	(-260, -464)

+					    location   	(-260, -476)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -7303,11 +7289,11 @@
 					    client     	@306

 					    supplier   	@297

 					    line_style 	3

-					    origin_attachment 	(1780, 742)

-					    terminal_attachment 	(2044, 742)

+					    origin_attachment 	(1780, 730)

+					    terminal_attachment 	(2044, 730)

 					    label      	(object SegLabel @312

 						Parent_View 	@311

-						location   	(1957, 713)

+						location   	(1957, 701)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7519,14 +7505,14 @@
 				    width      	375

 				    height     	119)

 				(object AssociationViewNew "$UNNAMED$57" @323

-				    location   	(604, 1029)

+				    location   	(594, 1029)

 				    stereotype 	TRUE

 				    line_color 	3342489

 				    quidu      	"3CFAE1F002A6"

 				    roleview_list 	(list RoleViews

 					(object RoleView "owningSignal" @324

 					    Parent_View 	@323

-					    location   	(232, -189)

+					    location   	(222, -189)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -7538,7 +7524,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @325

 						Parent_View 	@324

-						location   	(773, 899)

+						location   	(763, 899)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7563,11 +7549,11 @@
 					    client     	@323

 					    supplier   	@314

 					    line_style 	3

-					    origin_attachment 	(604, 1029)

-					    terminal_attachment 	(604, 858)

+					    origin_attachment 	(594, 1029)

+					    terminal_attachment 	(594, 858)

 					    label      	(object SegLabel @326

 						Parent_View 	@324

-						location   	(530, 891)

+						location   	(520, 891)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7588,7 +7574,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @327

 						Parent_View 	@324

-						location   	(1261, 956)

+						location   	(1251, 956)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7609,7 +7595,7 @@
 						orientation 	1))

 					(object RoleView "ownedAttribute" @328

 					    Parent_View 	@323

-					    location   	(232, -189)

+					    location   	(222, -189)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -7621,7 +7607,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @329

 						Parent_View 	@328

-						location   	(792, 1106)

+						location   	(782, 1106)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7646,11 +7632,11 @@
 					    client     	@323

 					    supplier   	@322

 					    line_style 	3

-					    origin_attachment 	(604, 1029)

-					    terminal_attachment 	(604, 1201)

+					    origin_attachment 	(594, 1029)

+					    terminal_attachment 	(594, 1200)

 					    label      	(object SegLabel @330

 						Parent_View 	@328

-						location   	(541, 1148)

+						location   	(531, 1148)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7671,7 +7657,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @331

 						Parent_View 	@328

-						location   	(1112, 1152)

+						location   	(1102, 1152)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7789,7 +7775,7 @@
 				    width      	662

 				    height     	194)

 				(object AssociationViewNew "$UNNAMED$55" @335

-				    location   	(1088, 231)

+				    location   	(1088, 222)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -7804,7 +7790,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "raisedException" @336

 					    Parent_View 	@335

-					    location   	(-190, -2103)

+					    location   	(-190, -2112)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -7816,7 +7802,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @337

 						Parent_View 	@336

-						location   	(912, 270)

+						location   	(912, 261)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7840,11 +7826,11 @@
 					    client     	@335

 					    supplier   	@333

 					    line_style 	3

-					    origin_attachment 	(1088, 231)

-					    terminal_attachment 	(719, 231)

+					    origin_attachment 	(1088, 222)

+					    terminal_attachment 	(719, 222)

 					    label      	(object SegLabel @338

 						Parent_View 	@336

-						location   	(756, 178)

+						location   	(756, 169)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7865,7 +7851,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @339

 						Parent_View 	@336

-						location   	(1018, 314)

+						location   	(1018, 305)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7886,7 +7872,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$56" @340

 					    Parent_View 	@335

-					    location   	(-190, -2103)

+					    location   	(-190, -2112)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -7898,7 +7884,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @341

 						Parent_View 	@340

-						location   	(1351, 196)

+						location   	(1351, 187)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7923,11 +7909,11 @@
 					    client     	@335

 					    supplier   	@334

 					    line_style 	3

-					    origin_attachment 	(1088, 231)

-					    terminal_attachment 	(1457, 231)

+					    origin_attachment 	(1088, 222)

+					    terminal_attachment 	(1457, 222)

 					    label      	(object SegLabel @342

 						Parent_View 	@340

-						location   	(1417, 278)

+						location   	(1417, 269)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -7963,6 +7949,7 @@
 		    logical_models 	(list unit_reference_list

 			(object Class "Behavior"

 			    quid       	"3B9A6F4F0008"

+			    documentation 	"Behavior is a specification of how its context classifier changes state over time. This specification may be either a definition of possible behavior execution or emergent behavior, or a selective illustration of an interesting subset of possible executions. The latter form is typically used for capturing examples, such as a trace of a particular execution. A classifier behavior is always a definition of behavior and not an illustration. It describes the sequence of state changes an instance of a classifier may undergo in the course of its lifetime. Its precise semantics depends on the kind of classifier. For example, the classifier behavior of a collaboration represents emergent behavior of all the parts, whereas the classifier behavior of a class is just the behavior of instances of the class separated from the behaviors of any of its parts. When a behavior is associated as the method of a behavioral feature, it defines the implementation of that feature; i.e., the computation that generates the effects of the behavioral feature. As a classifier, a behavior can be specialized. Instantiating a behavior is referred to as “invocating” the behavior, an instantiated behavior is also called a behavior “execution.” A behavior may be invoked directly or its invocation may be the result of invoking the behavioral feature that specifies this behavior. A behavior can also be instantiated as an object in virtue of it being a class. The specification of a behavior can take a number of forms, as described in the subclasses of Behavior. Behavior is an abstract metaclass factoring out the commonalities of these different specification mechanisms. When a behavior is invoked, its execution receives a set of input values that are used to affect the course of execution and as a result of its execution it produces a set of output values which are returned, as specified by its parameters. The observable effects of a behavior execution may include changes of values of various objects involved in the execution, the creation and destruction of objects, generation of communications between objects, as well as an explicit set of output values. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3DAA1A3F0053"

@@ -7972,11 +7959,11 @@
 				(object ClassAttribute "isReentrant"

 				    quid       	"3DF40D330167"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    exportControl 	"Public"))

 			    abstract   	TRUE)

 			(object Class "BehavioredClassifier"

 			    quid       	"3CC0D5FF02D3"

+			    documentation 	"A classifier can have behavior specifications defined in its namespace. One of these may specify the behavior of the classifier itself. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3D0B90F900E4"

@@ -7985,6 +7972,7 @@
 			    abstract   	TRUE)

 			(object Class "OpaqueExpression"

 			    quid       	"3CEB52F70346"

+			    documentation 	"Provides a mechanism for precisely defining the behavior of an opaque expression. An opaque expression is defined by a behavior restricted to return one result. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E11EA340072"

@@ -7992,6 +7980,7 @@
 				    quidu      	"3CAAF87D0107")))

 			(object Class "BehavioralFeature"

 			    quid       	"3D0380EA009C"

+			    documentation 	"A behavioral feature is implemented (realized) by a behavior. A behavioral feature specifies that a classifier will respond to a designated request by invoking its implementing method. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E11EA07010D"

@@ -8000,11 +7989,11 @@
 			    class_attributes 	(list class_attribute_list

 				(object ClassAttribute "isAbstract"

 				    quid       	"3D03812500D3"

-				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"))

+				    type       	"Boolean"))

 			    abstract   	TRUE)

 			(object Class "Activity"

 			    quid       	"3E0CEE6A03A5"

+			    documentation 	"An activity contains a language-specific text string used to describe a computation, and an optional specification of the language. OCL, natural language, or programming languages may be used to specify an activity. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E0CEE8701A8"

@@ -8015,13 +8004,11 @@
 				    quid       	"3CE1BC290123"

 				    stereotype 	"0..1"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public")

 				(object ClassAttribute "language"

 				    quid       	"3CE1BC2F01FD"

 				    stereotype 	"0..1"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public")))

 			(object Association "$UNNAMED$60"

 			    quid       	"3B9A6F8B0090"

@@ -8543,13 +8530,13 @@
 						height     	43

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$65" @357

-				    location   	(998, 1334)

+				    location   	(998, 1380)

 				    stereotype 	TRUE

 				    quidu      	"3C672C52025E"

 				    roleview_list 	(list RoleViews

 					(object RoleView "method" @358

 					    Parent_View 	@357

-					    location   	(704, 254)

+					    location   	(704, 300)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -8561,7 +8548,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @359

 						Parent_View 	@358

-						location   	(1268, 1293)

+						location   	(1268, 1339)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -8585,11 +8572,11 @@
 					    client     	@357

 					    supplier   	@349

 					    line_style 	3

-					    origin_attachment 	(998, 1334)

-					    terminal_attachment 	(1361, 1334)

+					    origin_attachment 	(998, 1380)

+					    terminal_attachment 	(1361, 1380)

 					    label      	(object SegLabel @360

 						Parent_View 	@358

-						location   	(1334, 1382)

+						location   	(1334, 1428)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -8610,7 +8597,7 @@
 						orientation 	1))

 					(object RoleView "specification" @361

 					    Parent_View 	@357

-					    location   	(704, 254)

+					    location   	(704, 300)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -8622,7 +8609,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @362

 						Parent_View 	@361

-						location   	(794, 1295)

+						location   	(794, 1341)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -8646,11 +8633,11 @@
 					    client     	@357

 					    supplier   	@345

 					    line_style 	3

-					    origin_attachment 	(998, 1334)

-					    terminal_attachment 	(635, 1334)

+					    origin_attachment 	(998, 1380)

+					    terminal_attachment 	(635, 1380)

 					    label      	(object SegLabel @363

 						Parent_View 	@361

-						location   	(692, 1382)

+						location   	(692, 1428)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -8670,13 +8657,13 @@
 						height     	48

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$60" @364

-				    location   	(999, 837)

+				    location   	(999, 1004)

 				    stereotype 	TRUE

 				    quidu      	"3B9A6F8B0090"

 				    roleview_list 	(list RoleViews

 					(object RoleView "context" @365

 					    Parent_View 	@364

-					    location   	(-609, -33)

+					    location   	(-609, 134)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -8688,7 +8675,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @366

 						Parent_View 	@365

-						location   	(762, 871)

+						location   	(762, 1038)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -8712,11 +8699,11 @@
 					    client     	@364

 					    supplier   	@346

 					    line_style 	3

-					    origin_attachment 	(999, 837)

-					    terminal_attachment 	(638, 837)

+					    origin_attachment 	(999, 1004)

+					    terminal_attachment 	(638, 1004)

 					    label      	(object SegLabel @367

 						Parent_View 	@365

-						location   	(724, 801)

+						location   	(724, 968)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -8737,7 +8724,7 @@
 						orientation 	1))

 					(object RoleView "ownedBehavior" @368

 					    Parent_View 	@364

-					    location   	(-609, -33)

+					    location   	(-609, 134)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -8749,7 +8736,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @369

 						Parent_View 	@368

-						location   	(1194, 768)

+						location   	(1194, 935)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -8773,11 +8760,11 @@
 					    client     	@364

 					    supplier   	@349

 					    line_style 	3

-					    origin_attachment 	(999, 837)

-					    terminal_attachment 	(1361, 837)

+					    origin_attachment 	(999, 1004)

+					    terminal_attachment 	(1361, 1004)

 					    label      	(object SegLabel @370

 						Parent_View 	@368

-						location   	(1317, 891)

+						location   	(1317, 1058)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -8798,7 +8785,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @371

 						Parent_View 	@368

-						location   	(1127, 803)

+						location   	(1127, 970)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -8818,7 +8805,7 @@
 						height     	35

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$61" @372

-				    location   	(999, 1041)

+				    location   	(999, 1004)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -8833,7 +8820,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "classifierBehavior" @373

 					    Parent_View 	@372

-					    location   	(723, 333)

+					    location   	(723, 296)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -8845,7 +8832,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @374

 						Parent_View 	@373

-						location   	(1177, 960)

+						location   	(1177, 923)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -8869,11 +8856,11 @@
 					    client     	@372

 					    supplier   	@349

 					    line_style 	3

-					    origin_attachment 	(999, 1041)

-					    terminal_attachment 	(1361, 1041)

+					    origin_attachment 	(999, 1004)

+					    terminal_attachment 	(1361, 1004)

 					    label      	(object SegLabel @375

 						Parent_View 	@373

-						location   	(1315, 1077)

+						location   	(1315, 1040)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -8894,7 +8881,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @376

 						Parent_View 	@373

-						location   	(1131, 1006)

+						location   	(1131, 969)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -8915,7 +8902,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$62" @377

 					    Parent_View 	@372

-					    location   	(723, 333)

+					    location   	(723, 296)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -8930,11 +8917,11 @@
 					    client     	@372

 					    supplier   	@346

 					    line_style 	3

-					    origin_attachment 	(999, 1041)

-					    terminal_attachment 	(638, 1041)

+					    origin_attachment 	(999, 1004)

+					    terminal_attachment 	(638, 1004)

 					    label      	(object SegLabel @378

 						Parent_View 	@377

-						location   	(731, 1008)

+						location   	(731, 971)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -8962,7 +8949,7 @@
 				    origin_attachment 	(1597, 788)

 				    terminal_attachment 	(1597, 575))

 				(object AssociationViewNew "$UNNAMED$66" @380

-				    location   	(2208, 875)

+				    location   	(2208, 1086)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -8977,7 +8964,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "parameter" @381

 					    Parent_View 	@380

-					    location   	(1518, -1213)

+					    location   	(1518, -1002)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -8989,7 +8976,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @382

 						Parent_View 	@381

-						location   	(2418, 828)

+						location   	(2418, 1039)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9013,11 +9000,11 @@
 					    client     	@380

 					    supplier   	@348

 					    line_style 	3

-					    origin_attachment 	(2208, 875)

-					    terminal_attachment 	(2550, 875)

+					    origin_attachment 	(2208, 1086)

+					    terminal_attachment 	(2550, 1086)

 					    label      	(object SegLabel @383

 						Parent_View 	@381

-						location   	(2512, 927)

+						location   	(2512, 1138)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9038,7 +9025,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @384

 						Parent_View 	@381

-						location   	(2230, 787)

+						location   	(2230, 998)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9059,7 +9046,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$67" @385

 					    Parent_View 	@380

-					    location   	(1518, -1213)

+					    location   	(1518, -1002)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -9074,11 +9061,11 @@
 					    client     	@380

 					    supplier   	@349

 					    line_style 	3

-					    origin_attachment 	(2208, 875)

-					    terminal_attachment 	(1867, 875)

+					    origin_attachment 	(2208, 1086)

+					    terminal_attachment 	(1867, 1086)

 					    label      	(object SegLabel @386

 						Parent_View 	@385

-						location   	(1935, 834)

+						location   	(1935, 1045)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9098,7 +9085,7 @@
 						height     	42

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$68" @387

-				    location   	(2208, 1059)

+				    location   	(2208, 1086)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -9110,7 +9097,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @388

 					Parent_View 	@387

-					location   	(2221, 1088)

+					location   	(2221, 1115)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -9135,7 +9122,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "/formalParameter" @389

 					    Parent_View 	@387

-					    location   	(1518, -1029)

+					    location   	(1518, -1002)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -9147,7 +9134,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @390

 						Parent_View 	@389

-						location   	(2357, 1022)

+						location   	(2357, 1049)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9171,11 +9158,11 @@
 					    client     	@387

 					    supplier   	@348

 					    line_style 	3

-					    origin_attachment 	(2208, 1059)

-					    terminal_attachment 	(2550, 1059)

+					    origin_attachment 	(2208, 1086)

+					    terminal_attachment 	(2550, 1086)

 					    label      	(object SegLabel @391

 						Parent_View 	@389

-						location   	(2513, 1104)

+						location   	(2513, 1131)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9196,7 +9183,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @392

 						Parent_View 	@389

-						location   	(2357, 1094)

+						location   	(2357, 1121)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9217,7 +9204,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$69" @393

 					    Parent_View 	@387

-					    location   	(1518, -1029)

+					    location   	(1518, -1002)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -9232,11 +9219,11 @@
 					    client     	@387

 					    supplier   	@349

 					    line_style 	3

-					    origin_attachment 	(2208, 1059)

-					    terminal_attachment 	(1867, 1059)

+					    origin_attachment 	(2208, 1086)

+					    terminal_attachment 	(1867, 1086)

 					    label      	(object SegLabel @394

 						Parent_View 	@393

-						location   	(1949, 1102)

+						location   	(1949, 1129)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9256,7 +9243,7 @@
 						height     	43

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$70" @395

-				    location   	(2208, 1259)

+				    location   	(2208, 1086)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -9268,7 +9255,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @396

 					Parent_View 	@395

-					location   	(2209, 1291)

+					location   	(2209, 1118)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -9293,7 +9280,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "/returnResult" @397

 					    Parent_View 	@395

-					    location   	(1518, -829)

+					    location   	(1518, -1002)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -9305,7 +9292,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @398

 						Parent_View 	@397

-						location   	(2404, 1224)

+						location   	(2404, 1051)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9329,11 +9316,11 @@
 					    client     	@395

 					    supplier   	@348

 					    line_style 	3

-					    origin_attachment 	(2208, 1259)

-					    terminal_attachment 	(2550, 1259)

+					    origin_attachment 	(2208, 1086)

+					    terminal_attachment 	(2550, 1086)

 					    label      	(object SegLabel @399

 						Parent_View 	@397

-						location   	(2523, 1312)

+						location   	(2523, 1139)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9354,7 +9341,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @400

 						Parent_View 	@397

-						location   	(2365, 1301)

+						location   	(2365, 1128)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9375,7 +9362,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$71" @401

 					    Parent_View 	@395

-					    location   	(1518, -829)

+					    location   	(1518, -1002)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -9390,11 +9377,11 @@
 					    client     	@395

 					    supplier   	@349

 					    line_style 	3

-					    origin_attachment 	(2208, 1259)

-					    terminal_attachment 	(1867, 1259)

+					    origin_attachment 	(2208, 1086)

+					    terminal_attachment 	(1867, 1086)

 					    label      	(object SegLabel @402

 						Parent_View 	@401

-						location   	(1931, 1314)

+						location   	(1931, 1141)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9537,7 +9524,7 @@
 				    width      	437

 				    height     	257)

 				(object AssociationViewNew "$UNNAMED$72" @408

-				    location   	(1086, 634)

+				    location   	(1086, 686)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -9552,7 +9539,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "/result" @409

 					    Parent_View 	@408

-					    location   	(90, -536)

+					    location   	(90, -484)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -9564,7 +9551,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @410

 						Parent_View 	@409

-						location   	(1284, 589)

+						location   	(1284, 641)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9588,11 +9575,11 @@
 					    client     	@408

 					    supplier   	@405

 					    line_style 	3

-					    origin_attachment 	(1086, 634)

-					    terminal_attachment 	(1400, 634)

+					    origin_attachment 	(1086, 686)

+					    terminal_attachment 	(1400, 686)

 					    label      	(object SegLabel @411

 						Parent_View 	@409

-						location   	(1337, 675)

+						location   	(1337, 727)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9613,7 +9600,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$73" @412

 					    Parent_View 	@408

-					    location   	(90, -536)

+					    location   	(90, -484)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -9628,11 +9615,11 @@
 					    client     	@408

 					    supplier   	@407

 					    line_style 	3

-					    origin_attachment 	(1086, 634)

-					    terminal_attachment 	(773, 634)

+					    origin_attachment 	(1086, 686)

+					    terminal_attachment 	(773, 686)

 					    label      	(object SegLabel @413

 						Parent_View 	@412

-						location   	(804, 688)

+						location   	(804, 740)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9832,7 +9819,7 @@
 				    height     	300

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$76" @422

-				    location   	(908, 197)

+				    location   	(908, 289)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -9847,7 +9834,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "precondition" @423

 					    Parent_View 	@422

-					    location   	(-616, -85)

+					    location   	(-616, 7)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -9859,7 +9846,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @424

 						Parent_View 	@423

-						location   	(1178, 156)

+						location   	(1178, 248)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9883,11 +9870,11 @@
 					    client     	@422

 					    supplier   	@420

 					    line_style 	3

-					    origin_attachment 	(908, 197)

-					    terminal_attachment 	(1349, 197)

+					    origin_attachment 	(908, 289)

+					    terminal_attachment 	(1349, 289)

 					    label      	(object SegLabel @425

 						Parent_View 	@423

-						location   	(1305, 251)

+						location   	(1305, 343)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9908,7 +9895,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @426

 						Parent_View 	@423

-						location   	(1082, 239)

+						location   	(1082, 331)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9929,7 +9916,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$77" @427

 					    Parent_View 	@422

-					    location   	(-616, -85)

+					    location   	(-616, 7)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -9944,11 +9931,11 @@
 					    client     	@422

 					    supplier   	@421

 					    line_style 	3

-					    origin_attachment 	(908, 197)

-					    terminal_attachment 	(467, 197)

+					    origin_attachment 	(908, 289)

+					    terminal_attachment 	(467, 289)

 					    label      	(object SegLabel @428

 						Parent_View 	@427

-						location   	(524, 250)

+						location   	(524, 342)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9969,7 +9956,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @429

 						Parent_View 	@427

-						location   	(650, 97)

+						location   	(650, 189)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -9989,7 +9976,7 @@
 						height     	100

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$78" @430

-				    location   	(908, 366)

+				    location   	(908, 289)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -10004,7 +9991,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "postcondition" @431

 					    Parent_View 	@430

-					    location   	(572, 66)

+					    location   	(572, -11)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -10016,7 +10003,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @432

 						Parent_View 	@431

-						location   	(1195, 325)

+						location   	(1195, 248)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -10040,11 +10027,11 @@
 					    client     	@430

 					    supplier   	@420

 					    line_style 	3

-					    origin_attachment 	(908, 366)

-					    terminal_attachment 	(1349, 366)

+					    origin_attachment 	(908, 289)

+					    terminal_attachment 	(1349, 289)

 					    label      	(object SegLabel @433

 						Parent_View 	@431

-						location   	(1305, 420)

+						location   	(1305, 343)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -10065,7 +10052,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @434

 						Parent_View 	@431

-						location   	(1082, 414)

+						location   	(1082, 337)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -10086,7 +10073,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$79" @435

 					    Parent_View 	@430

-					    location   	(572, 66)

+					    location   	(572, -11)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -10101,11 +10088,11 @@
 					    client     	@430

 					    supplier   	@421

 					    line_style 	3

-					    origin_attachment 	(908, 366)

-					    terminal_attachment 	(467, 366)

+					    origin_attachment 	(908, 289)

+					    terminal_attachment 	(467, 289)

 					    label      	(object SegLabel @436

 						Parent_View 	@435

-						location   	(523, 417)

+						location   	(523, 340)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -10126,7 +10113,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @437

 						Parent_View 	@435

-						location   	(654, 497)

+						location   	(654, 420)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -10157,6 +10144,7 @@
 		    logical_models 	(list unit_reference_list

 			(object Class "TimeExpression"

 			    quid       	"3DE4B43D032C"

+			    documentation 	"A TimeExpression defines a value specification that represent a time value. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3DE4B5650223"

@@ -10166,11 +10154,11 @@
 				(object ClassAttribute "firstTime"

 				    quid       	"3DFC7D420352"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"True"

 				    exportControl 	"Public")))

 			(object Class "Duration"

 			    quid       	"3DE4B589009E"

+			    documentation 	"A duration defines a value specification that specifies the temporal distance between two time expressions that specify time instants. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3DE4B5DF00E8"

@@ -10180,11 +10168,11 @@
 				(object ClassAttribute "firstTime"

 				    quid       	"3DFC7D7402FA"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"True"

 				    exportControl 	"Public")))

 			(object Class "TimeObservationAction"

 			    quid       	"3DFC7DB80077"

+			    documentation 	"A TimeObservationAction defines an action that observes the current point in time. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3DFC7DFA0252"

@@ -10192,6 +10180,7 @@
 				    quidu      	"380F43690262")))

 			(object Class "DurationInterval"

 			    quid       	"3DE4B5A00340"

+			    documentation 	"A DurationInterval defines the range between two Durations. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3DE4B5BB03DF"

@@ -10199,6 +10188,7 @@
 				    quidu      	"3DE4B3AC0189")))

 			(object Class "TimeConstraint"

 			    quid       	"3DE4B652035A"

+			    documentation 	"A TimeConstraint defines a Constraint that refers to a TimeInterval. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3DE4B6630264"

@@ -10206,6 +10196,7 @@
 				    quidu      	"3DE4B5F002CD")))

 			(object Class "TimeInterval"

 			    quid       	"3DE4B5320049"

+			    documentation 	"A TimeInterval defines the range between two TimeExpressions. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3DE4B5760200"

@@ -10213,6 +10204,7 @@
 				    quidu      	"3DE4B3AC0189")))

 			(object Class "DurationObservationAction"

 			    quid       	"3DFC7DDA0166"

+			    documentation 	"A DurationObservationAction defines an action that observes duration in time. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3DFC7E04018E"

@@ -10220,6 +10212,7 @@
 				    quidu      	"380F43690262")))

 			(object Class "DurationConstraint"

 			    quid       	"3DE4B68A0120"

+			    documentation 	"A DurationConstraint defines a Constraint that refers to a DurationInterval. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3DE4B6A7001D"

@@ -10227,6 +10220,7 @@
 				    quidu      	"3DE4B5F002CD")))

 			(object Class "IntervalConstraint"

 			    quid       	"3DE4B5F002CD"

+			    documentation 	"A IntervalConstraint defines a Constraint that refers to an Interval. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3DE4B61A00D9"

@@ -10234,6 +10228,7 @@
 				    quidu      	"3CAAED67023C")))

 			(object Class "Interval"

 			    quid       	"3DE4B3AC0189"

+			    documentation 	"An Interval defines the range between two value specifications. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3DE4B3C2023F"

@@ -10610,7 +10605,7 @@
 				    height     	175

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$100" @444

-				    location   	(2189, 622)

+				    location   	(2189, 587)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -10625,7 +10620,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "specification" @445

 					    Parent_View 	@444

-					    location   	(-461, 70)

+					    location   	(-461, 35)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -10637,7 +10632,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @446

 						Parent_View 	@445

-						location   	(2095, 668)

+						location   	(2095, 633)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -10662,11 +10657,11 @@
 					    client     	@444

 					    supplier   	@443

 					    line_style 	3

-					    origin_attachment 	(2189, 622)

-					    terminal_attachment 	(1984, 622)

+					    origin_attachment 	(2189, 587)

+					    terminal_attachment 	(1984, 587)

 					    label      	(object SegLabel @447

 						Parent_View 	@445

-						location   	(2008, 579)

+						location   	(2008, 544)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -10687,7 +10682,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @448

 						Parent_View 	@445

-						location   	(2178, 736)

+						location   	(2178, 701)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -10708,17 +10703,17 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$101" @449

 					    Parent_View 	@444

-					    location   	(-461, 70)

+					    location   	(-461, 35)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3DE4B63C01B6"

 					    client     	@444

 					    supplier   	@440

 					    line_style 	3

-					    origin_attachment 	(2189, 622)

-					    terminal_attachment 	(2395, 622))))

+					    origin_attachment 	(2189, 587)

+					    terminal_attachment 	(2395, 587))))

 				(object AssociationViewNew "$UNNAMED$98" @450

-				    location   	(1642, 315)

+				    location   	(1506, 536)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -10733,7 +10728,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "max" @451

 					    Parent_View 	@450

-					    location   	(340, -21)

+					    location   	(204, 200)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -10745,7 +10740,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @452

 						Parent_View 	@451

-						location   	(1401, 341)

+						location   	(1265, 562)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -10769,12 +10764,16 @@
 					    quidu      	"3DE4B3CE006F"

 					    client     	@450

 					    supplier   	@442

+					    vertices   	(list Points

+						(1506, 536)

+						(1272, 536)

+						(1272, 484))

 					    line_style 	3

-					    origin_attachment 	(1642, 315)

-					    terminal_attachment 	(1272, 315)

+					    origin_attachment 	(1506, 536)

+					    terminal_attachment 	(1272, 484)

 					    label      	(object SegLabel @453

 						Parent_View 	@451

-						location   	(1318, 263)

+						location   	(1182, 484)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -10795,21 +10794,21 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$99" @454

 					    Parent_View 	@450

-					    location   	(340, -21)

+					    location   	(204, 200)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3DE4B3CE00F1"

 					    client     	@450

 					    supplier   	@443

 					    vertices   	(list Points

-						(1642, 315)

-						(1791, 315)

+						(1506, 536)

+						(1791, 536)

 						(1791, 537))

 					    line_style 	3

-					    origin_attachment 	(1642, 315)

+					    origin_attachment 	(1506, 536)

 					    terminal_attachment 	(1791, 537))))

 				(object AssociationViewNew "$UNNAMED$96" @455

-				    location   	(1440, 451)

+				    location   	(1371, 536)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -10824,7 +10823,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "min" @456

 					    Parent_View 	@455

-					    location   	(132, 139)

+					    location   	(63, 224)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -10836,7 +10835,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @457

 						Parent_View 	@456

-						location   	(1424, 480)

+						location   	(1355, 565)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -10860,12 +10859,16 @@
 					    quidu      	"3DE4B4000338"

 					    client     	@455

 					    supplier   	@442

+					    vertices   	(list Points

+						(1371, 536)

+						(1272, 536)

+						(1272, 484))

 					    line_style 	3

-					    origin_attachment 	(1440, 451)

-					    terminal_attachment 	(1272, 451)

+					    origin_attachment 	(1371, 536)

+					    terminal_attachment 	(1272, 484)

 					    label      	(object SegLabel @458

 						Parent_View 	@456

-						location   	(1338, 418)

+						location   	(1269, 503)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -10886,18 +10889,18 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$97" @459

 					    Parent_View 	@455

-					    location   	(132, 139)

+					    location   	(63, 224)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3DE4B40003A6"

 					    client     	@455

 					    supplier   	@443

 					    vertices   	(list Points

-						(1440, 451)

-						(1522, 451)

+						(1371, 536)

+						(1522, 536)

 						(1522, 537))

 					    line_style 	3

-					    origin_attachment 	(1440, 451)

+					    origin_attachment 	(1371, 536)

 					    terminal_attachment 	(1522, 537))))

 				(object InheritView "" @460

 				    stereotype 	TRUE

@@ -11009,7 +11012,7 @@
 				    height     	162

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$94" @466

-				    location   	(2243, 1269)

+				    location   	(2243, 1276)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -11024,7 +11027,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "specification" @467

 					    Parent_View 	@466

-					    location   	(-481, -3)

+					    location   	(-481, 4)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -11036,7 +11039,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @468

 						Parent_View 	@467

-						location   	(2146, 1307)

+						location   	(2146, 1314)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -11061,11 +11064,11 @@
 					    client     	@466

 					    supplier   	@465

 					    line_style 	3

-					    origin_attachment 	(2243, 1269)

-					    terminal_attachment 	(2020, 1269)

+					    origin_attachment 	(2243, 1276)

+					    terminal_attachment 	(2020, 1276)

 					    label      	(object SegLabel @469

 						Parent_View 	@467

-						location   	(2067, 1226)

+						location   	(2067, 1233)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -11086,7 +11089,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @470

 						Parent_View 	@467

-						location   	(2213, 1348)

+						location   	(2213, 1355)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -11107,15 +11110,15 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$95" @471

 					    Parent_View 	@466

-					    location   	(-481, -3)

+					    location   	(-481, 4)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3DE4B6AE025A"

 					    client     	@466

 					    supplier   	@461

 					    line_style 	3

-					    origin_attachment 	(2243, 1269)

-					    terminal_attachment 	(2466, 1269))))

+					    origin_attachment 	(2243, 1276)

+					    terminal_attachment 	(2466, 1276))))

 				(object InheritView "" @472

 				    stereotype 	TRUE

 				    quidu      	"3DE4B5BB03DF"

@@ -11187,7 +11190,7 @@
 				    width      	588

 				    height     	144)

 				(object AssociationViewNew "$UNNAMED$104" @476

-				    location   	(1235, 1533)

+				    location   	(1092, 1533)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -11202,7 +11205,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "duration" @477

 					    Parent_View 	@476

-					    location   	(120, -247)

+					    location   	(-23, -247)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -11214,7 +11217,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @478

 						Parent_View 	@477

-						location   	(1134, 1397)

+						location   	(991, 1397)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -11239,11 +11242,11 @@
 					    client     	@476

 					    supplier   	@475

 					    line_style 	3

-					    origin_attachment 	(1235, 1533)

-					    terminal_attachment 	(1235, 1361)

+					    origin_attachment 	(1092, 1533)

+					    terminal_attachment 	(1092, 1361)

 					    label      	(object SegLabel @479

 						Parent_View 	@477

-						location   	(906, 1394)

+						location   	(763, 1394)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -11264,17 +11267,17 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$105" @480

 					    Parent_View 	@476

-					    location   	(120, -247)

+					    location   	(-23, -247)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3DFC7E820083"

 					    client     	@476

 					    supplier   	@463

 					    line_style 	3

-					    origin_attachment 	(1235, 1533)

-					    terminal_attachment 	(1235, 1705))))

+					    origin_attachment 	(1092, 1533)

+					    terminal_attachment 	(1092, 1705))))

 				(object AssociationViewNew "$UNNAMED$84" @481

-				    location   	(1514, 1241)

+				    location   	(1514, 1287)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -11289,7 +11292,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "min" @482

 					    Parent_View 	@481

-					    location   	(-331, -34)

+					    location   	(-331, 12)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -11301,7 +11304,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @483

 						Parent_View 	@482

-						location   	(1390, 1200)

+						location   	(1390, 1246)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -11326,11 +11329,11 @@
 					    client     	@481

 					    supplier   	@475

 					    line_style 	3

-					    origin_attachment 	(1514, 1241)

-					    terminal_attachment 	(1359, 1241)

+					    origin_attachment 	(1514, 1287)

+					    terminal_attachment 	(1359, 1287)

 					    label      	(object SegLabel @484

 						Parent_View 	@482

-						location   	(1466, 1156)

+						location   	(1466, 1202)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -11351,17 +11354,17 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$85" @485

 					    Parent_View 	@481

-					    location   	(-331, -34)

+					    location   	(-331, 12)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3DFC80590329"

 					    client     	@481

 					    supplier   	@465

 					    line_style 	3

-					    origin_attachment 	(1514, 1241)

-					    terminal_attachment 	(1670, 1241))))

+					    origin_attachment 	(1514, 1287)

+					    terminal_attachment 	(1670, 1287))))

 				(object AssociationViewNew "$UNNAMED$86" @486

-				    location   	(1514, 1335)

+				    location   	(1514, 1287)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -11376,7 +11379,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "max" @487

 					    Parent_View 	@486

-					    location   	(-331, 60)

+					    location   	(-331, 12)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -11388,7 +11391,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @488

 						Parent_View 	@487

-						location   	(1426, 1360)

+						location   	(1426, 1312)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -11413,11 +11416,11 @@
 					    client     	@486

 					    supplier   	@475

 					    line_style 	3

-					    origin_attachment 	(1514, 1335)

-					    terminal_attachment 	(1359, 1335)

+					    origin_attachment 	(1514, 1287)

+					    terminal_attachment 	(1359, 1287)

 					    label      	(object SegLabel @489

 						Parent_View 	@487

-						location   	(1507, 1393)

+						location   	(1507, 1345)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -11438,15 +11441,15 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$87" @490

 					    Parent_View 	@486

-					    location   	(-331, 60)

+					    location   	(-331, 12)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3DFC808703B2"

 					    client     	@486

 					    supplier   	@465

 					    line_style 	3

-					    origin_attachment 	(1514, 1335)

-					    terminal_attachment 	(1670, 1335))))

+					    origin_attachment 	(1514, 1287)

+					    terminal_attachment 	(1670, 1287))))

 				(object InheritView "" @491

 				    stereotype 	TRUE

 				    quidu      	"3DE4B5DF00E8"

@@ -11526,7 +11529,7 @@
 				    origin_attachment 	(1598, 843)

 				    terminal_attachment 	(1598, 710))

 				(object AssociationViewNew "$UNNAMED$92" @496

-				    location   	(2002, 908)

+				    location   	(2002, 912)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -11541,7 +11544,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "specification" @497

 					    Parent_View 	@496

-					    location   	(-434, 2)

+					    location   	(-434, 6)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -11553,7 +11556,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @498

 						Parent_View 	@497

-						location   	(1884, 957)

+						location   	(1884, 961)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -11578,11 +11581,11 @@
 					    client     	@496

 					    supplier   	@494

 					    line_style 	3

-					    origin_attachment 	(2002, 908)

-					    terminal_attachment 	(1762, 908)

+					    origin_attachment 	(2002, 912)

+					    terminal_attachment 	(1762, 912)

 					    label      	(object SegLabel @499

 						Parent_View 	@497

-						location   	(1792, 871)

+						location   	(1792, 875)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -11603,7 +11606,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @500

 						Parent_View 	@497

-						location   	(1955, 1006)

+						location   	(1955, 1010)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -11624,15 +11627,15 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$93" @501

 					    Parent_View 	@496

-					    location   	(-434, 2)

+					    location   	(-434, 6)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3DE4B674027D"

 					    client     	@496

 					    supplier   	@473

 					    line_style 	3

-					    origin_attachment 	(2002, 908)

-					    terminal_attachment 	(2243, 908))))

+					    origin_attachment 	(2002, 912)

+					    terminal_attachment 	(2243, 912))))

 				(object ClassView "Class" "Logical View::UML::Classes::Kernel::NamedElement" @502

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressAttribute 	TRUE

@@ -11662,7 +11665,7 @@
 				    height     	150

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$82" @503

-				    location   	(353, 1278)

+				    location   	(604, 2556)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -11677,7 +11680,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "event" @504

 					    Parent_View 	@503

-					    location   	(-535, -12)

+					    location   	(-284, 1266)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -11689,7 +11692,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @505

 						Parent_View 	@504

-						location   	(293, 1056)

+						location   	(544, 2334)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -11714,15 +11717,17 @@
 					    client     	@503

 					    supplier   	@502

 					    vertices   	(list Points

+						(604, 2556)

+						(353, 2556)

 						(353, 1278)

 						(197, 1278)

 						(197, 1017))

 					    line_style 	3

-					    origin_attachment 	(353, 1278)

+					    origin_attachment 	(604, 2556)

 					    terminal_attachment 	(197, 1017)

 					    label      	(object SegLabel @506

 						Parent_View 	@504

-						location   	(143, 1060)

+						location   	(394, 2338)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -11743,15 +11748,19 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$83" @507

 					    Parent_View 	@503

-					    location   	(-535, -12)

+					    location   	(-284, 1266)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3DE4B76D034D"

 					    client     	@503

 					    supplier   	@475

+					    vertices   	(list Points

+						(604, 2556)

+						(1357, 2556)

+						(1357, 1362))

 					    line_style 	3

-					    origin_attachment 	(353, 1278)

-					    terminal_attachment 	(771, 1278))))

+					    origin_attachment 	(604, 2556)

+					    terminal_attachment 	(1357, 1362))))

 				(object ClassView "Class" "Logical View::UML::CommonBehaviors::SimpleTime::TimeExpression" @508

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressOperation 	TRUE

@@ -11787,7 +11796,7 @@
 				    origin_attachment 	(897, 849)

 				    terminal_attachment 	(897, 483))

 				(object AssociationViewNew "$UNNAMED$102" @510

-				    location   	(594, 1367)

+				    location   	(670, 1367)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -11802,7 +11811,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "now" @511

 					    Parent_View 	@510

-					    location   	(-236, -148)

+					    location   	(-160, -148)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -11814,7 +11823,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @512

 						Parent_View 	@511

-						location   	(664, 1075)

+						location   	(740, 1075)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -11839,11 +11848,11 @@
 					    client     	@510

 					    supplier   	@508

 					    line_style 	3

-					    origin_attachment 	(594, 1367)

-					    terminal_attachment 	(594, 1030)

+					    origin_attachment 	(670, 1367)

+					    terminal_attachment 	(670, 1030)

 					    label      	(object SegLabel @513

 						Parent_View 	@511

-						location   	(763, 1119)

+						location   	(839, 1119)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -11864,17 +11873,17 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$103" @514

 					    Parent_View 	@510

-					    location   	(-236, -148)

+					    location   	(-160, -148)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3DFC7E1203B7"

 					    client     	@510

 					    supplier   	@492

 					    line_style 	3

-					    origin_attachment 	(594, 1367)

-					    terminal_attachment 	(594, 1705))))

+					    origin_attachment 	(670, 1367)

+					    terminal_attachment 	(670, 1704))))

 				(object AssociationViewNew "$UNNAMED$90" @515

-				    location   	(1266, 878)

+				    location   	(1266, 927)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -11889,7 +11898,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "min" @516

 					    Parent_View 	@515

-					    location   	(-324, -47)

+					    location   	(-324, 2)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -11901,7 +11910,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @517

 						Parent_View 	@516

-						location   	(1167, 838)

+						location   	(1167, 887)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -11926,11 +11935,11 @@
 					    client     	@515

 					    supplier   	@508

 					    line_style 	3

-					    origin_attachment 	(1266, 878)

-					    terminal_attachment 	(1114, 878)

+					    origin_attachment 	(1266, 927)

+					    terminal_attachment 	(1114, 927)

 					    label      	(object SegLabel @518

 						Parent_View 	@516

-						location   	(1099, 793)

+						location   	(1099, 842)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -11951,17 +11960,17 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$91" @519

 					    Parent_View 	@515

-					    location   	(-324, -47)

+					    location   	(-324, 2)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3DFC80050383"

 					    client     	@515

 					    supplier   	@494

 					    line_style 	3

-					    origin_attachment 	(1266, 878)

-					    terminal_attachment 	(1418, 878))))

+					    origin_attachment 	(1266, 927)

+					    terminal_attachment 	(1418, 927))))

 				(object AssociationViewNew "$UNNAMED$88" @520

-				    location   	(1266, 984)

+				    location   	(1266, 927)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -11976,7 +11985,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "max" @521

 					    Parent_View 	@520

-					    location   	(-324, 59)

+					    location   	(-324, 2)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -11988,7 +11997,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @522

 						Parent_View 	@521

-						location   	(1169, 1022)

+						location   	(1169, 965)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -12013,11 +12022,11 @@
 					    client     	@520

 					    supplier   	@508

 					    line_style 	3

-					    origin_attachment 	(1266, 984)

-					    terminal_attachment 	(1114, 984)

+					    origin_attachment 	(1266, 927)

+					    terminal_attachment 	(1114, 927)

 					    label      	(object SegLabel @523

 						Parent_View 	@521

-						location   	(1090, 1058)

+						location   	(1090, 1001)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -12038,17 +12047,17 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$89" @524

 					    Parent_View 	@520

-					    location   	(-324, 59)

+					    location   	(-324, 2)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3DFC802E02AD"

 					    client     	@520

 					    supplier   	@494

 					    line_style 	3

-					    origin_attachment 	(1266, 984)

-					    terminal_attachment 	(1418, 984))))

+					    origin_attachment 	(1266, 927)

+					    terminal_attachment 	(1418, 927))))

 				(object AssociationViewNew "$UNNAMED$80" @525

-				    location   	(454, 941)

+				    location   	(454, 942)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -12063,7 +12072,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "event" @526

 					    Parent_View 	@525

-					    location   	(-464, 5)

+					    location   	(-464, 6)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -12075,7 +12084,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @527

 						Parent_View 	@526

-						location   	(429, 901)

+						location   	(429, 902)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -12100,11 +12109,11 @@
 					    client     	@525

 					    supplier   	@502

 					    line_style 	3

-					    origin_attachment 	(454, 941)

-					    terminal_attachment 	(363, 941)

+					    origin_attachment 	(454, 942)

+					    terminal_attachment 	(363, 942)

 					    label      	(object SegLabel @528

 						Parent_View 	@526

-						location   	(399, 980)

+						location   	(399, 981)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -12125,15 +12134,15 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$81" @529

 					    Parent_View 	@525

-					    location   	(-464, 5)

+					    location   	(-464, 6)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3DE4B74D02CF"

 					    client     	@525

 					    supplier   	@508

 					    line_style 	3

-					    origin_attachment 	(454, 941)

-					    terminal_attachment 	(546, 941))))

+					    origin_attachment 	(454, 942)

+					    terminal_attachment 	(546, 942))))

 				(object ClassView "Class" "Logical View::UML::CommonBehaviors::SimpleTime::TimeTrigger" @530

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressOperation 	TRUE

@@ -12810,7 +12819,6 @@
 				(object ClassAttribute "effect"

 				    quid       	"3E00C69D03C6"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public")))

 			(object Class "Pin"

 			    quid       	"3DF3DB6F0383"

@@ -13341,7 +13349,7 @@
 				    height     	104

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$124" @560

-				    location   	(1309, 1390)

+				    location   	(1314, 1390)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -13357,7 +13365,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "parameter" @561

 					    Parent_View 	@560

-					    location   	(-96, -135)

+					    location   	(-91, -135)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -13369,7 +13377,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @562

 						Parent_View 	@561

-						location   	(1431, 1418)

+						location   	(1436, 1418)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -13394,11 +13402,11 @@
 					    client     	@560

 					    supplier   	@558

 					    line_style 	3

-					    origin_attachment 	(1309, 1390)

-					    terminal_attachment 	(1309, 1456)

+					    origin_attachment 	(1314, 1390)

+					    terminal_attachment 	(1314, 1456)

 					    label      	(object SegLabel @563

 						Parent_View 	@561

-						location   	(1265, 1418)

+						location   	(1270, 1418)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -13419,15 +13427,15 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$125" @564

 					    Parent_View 	@560

-					    location   	(-96, -135)

+					    location   	(-91, -135)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3DFE6D850148"

 					    client     	@560

 					    supplier   	@559

 					    line_style 	3

-					    origin_attachment 	(1309, 1390)

-					    terminal_attachment 	(1309, 1324))))

+					    origin_attachment 	(1314, 1390)

+					    terminal_attachment 	(1314, 1324))))

 				(object ClassView "Class" "Logical View::UML::CommonBehaviors::BasicBehaviors::Activity" @565

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressAttribute 	TRUE

@@ -13777,7 +13785,7 @@
 				    origin_attachment 	(284, 344)

 				    terminal_attachment 	(284, 188))

 				(object AssociationViewNew "$UNNAMED$117" @582

-				    location   	(755, 400)

+				    location   	(755, 396)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -13792,7 +13800,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "node" @583

 					    Parent_View 	@582

-					    location   	(330, -220)

+					    location   	(330, -224)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -13804,7 +13812,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @584

 						Parent_View 	@583

-						location   	(1062, 324)

+						location   	(1062, 320)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -13828,11 +13836,11 @@
 					    client     	@582

 					    supplier   	@569

 					    line_style 	3

-					    origin_attachment 	(755, 400)

-					    terminal_attachment 	(1165, 400)

+					    origin_attachment 	(755, 396)

+					    terminal_attachment 	(1165, 396)

 					    label      	(object SegLabel @585

 						Parent_View 	@583

-						location   	(1130, 436)

+						location   	(1130, 432)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -13853,7 +13861,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @586

 						Parent_View 	@583

-						location   	(899, 370)

+						location   	(899, 366)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -13874,7 +13882,7 @@
 						orientation 	0))

 					(object RoleView "activity" @587

 					    Parent_View 	@582

-					    location   	(330, -220)

+					    location   	(330, -224)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -13886,7 +13894,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @588

 						Parent_View 	@587

-						location   	(448, 444)

+						location   	(448, 440)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -13910,11 +13918,11 @@
 					    client     	@582

 					    supplier   	@580

 					    line_style 	3

-					    origin_attachment 	(755, 400)

-					    terminal_attachment 	(345, 400)

+					    origin_attachment 	(755, 396)

+					    terminal_attachment 	(345, 396)

 					    label      	(object SegLabel @589

 						Parent_View 	@587

-						location   	(412, 345)

+						location   	(412, 341)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -13935,7 +13943,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @590

 						Parent_View 	@587

-						location   	(516, 479)

+						location   	(516, 475)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -13983,7 +13991,7 @@
 				    height     	86

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$118" @592

-				    location   	(193, 963)

+				    location   	(342, 1698)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -13998,7 +14006,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "action" @593

 					    Parent_View 	@592

-					    location   	(-231, 342)

+					    location   	(-82, 1077)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -14010,7 +14018,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @594

 						Parent_View 	@593

-						location   	(294, 1314)

+						location   	(443, 2049)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14034,15 +14042,17 @@
 					    client     	@592

 					    supplier   	@591

 					    vertices   	(list Points

-						(193, 963)

+						(342, 1698)

+						(342, 1926)

+						(193, 1926)

 						(193, 1266)

 						(405, 1266))

 					    line_style 	3

-					    origin_attachment 	(193, 963)

+					    origin_attachment 	(342, 1698)

 					    terminal_attachment 	(405, 1266)

 					    label      	(object SegLabel @595

 						Parent_View 	@593

-						location   	(338, 1230)

+						location   	(487, 1965)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14063,7 +14073,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @596

 						Parent_View 	@593

-						location   	(297, 1381)

+						location   	(446, 2116)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14084,7 +14094,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$119" @597

 					    Parent_View 	@592

-					    location   	(-231, 342)

+					    location   	(-82, 1077)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -14099,11 +14109,11 @@
 					    client     	@592

 					    supplier   	@580

 					    line_style 	3

-					    origin_attachment 	(193, 963)

-					    terminal_attachment 	(193, 448)

+					    origin_attachment 	(342, 1698)

+					    terminal_attachment 	(342, 448)

 					    label      	(object SegLabel @598

 						Parent_View 	@597

-						location   	(247, 500)

+						location   	(396, 1235)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14160,13 +14170,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$126" @601

-				    location   	(506, 1385)

+				    location   	(510, 1385)

 				    stereotype 	TRUE

 				    quidu      	"3DF3D8E703BF"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$127" @602

 					    Parent_View 	@601

-					    location   	(-114, -311)

+					    location   	(-110, -311)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -14178,7 +14188,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @603

 						Parent_View 	@602

-						location   	(465, 1329)

+						location   	(469, 1329)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -14203,11 +14213,11 @@
 					    client     	@601

 					    supplier   	@591

 					    line_style 	3

-					    origin_attachment 	(506, 1385)

-					    terminal_attachment 	(506, 1315))

+					    origin_attachment 	(510, 1385)

+					    terminal_attachment 	(510, 1315))

 					(object RoleView "/context" @604

 					    Parent_View 	@601

-					    location   	(-114, -311)

+					    location   	(-110, -311)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -14219,7 +14229,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @605

 						Parent_View 	@604

-						location   	(593, 1392)

+						location   	(597, 1392)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14243,11 +14253,11 @@
 					    client     	@601

 					    supplier   	@600

 					    line_style 	3

-					    origin_attachment 	(506, 1385)

-					    terminal_attachment 	(506, 1455)

+					    origin_attachment 	(510, 1385)

+					    terminal_attachment 	(510, 1455)

 					    label      	(object SegLabel @606

 						Parent_View 	@604

-						location   	(557, 1427)

+						location   	(561, 1427)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14571,7 +14581,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$109" @621

-				    location   	(747, 634)

+				    location   	(747, 558)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -14586,7 +14596,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "outgoing" @622

 					    Parent_View 	@621

-					    location   	(-428, -188)

+					    location   	(-428, -264)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -14598,7 +14608,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @623

 						Parent_View 	@622

-						location   	(890, 605)

+						location   	(890, 529)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14622,11 +14632,11 @@
 					    client     	@621

 					    supplier   	@620

 					    line_style 	3

-					    origin_attachment 	(747, 634)

-					    terminal_attachment 	(1005, 634)

+					    origin_attachment 	(747, 558)

+					    terminal_attachment 	(1005, 558)

 					    label      	(object SegLabel @624

 						Parent_View 	@622

-						location   	(988, 667)

+						location   	(988, 591)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14647,7 +14657,7 @@
 						orientation 	1))

 					(object RoleView "source" @625

 					    Parent_View 	@621

-					    location   	(-428, -188)

+					    location   	(-428, -264)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -14659,7 +14669,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @626

 						Parent_View 	@625

-						location   	(624, 604)

+						location   	(624, 528)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14683,11 +14693,11 @@
 					    client     	@621

 					    supplier   	@617

 					    line_style 	3

-					    origin_attachment 	(747, 634)

-					    terminal_attachment 	(490, 634)

+					    origin_attachment 	(747, 558)

+					    terminal_attachment 	(490, 558)

 					    label      	(object SegLabel @627

 						Parent_View 	@625

-						location   	(518, 596)

+						location   	(518, 520)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14707,7 +14717,7 @@
 						height     	39

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$110" @628

-				    location   	(747, 497)

+				    location   	(747, 558)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -14722,7 +14732,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "target" @629

 					    Parent_View 	@628

-					    location   	(-1283, -318)

+					    location   	(-1283, -257)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -14734,7 +14744,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @630

 						Parent_View 	@629

-						location   	(613, 474)

+						location   	(613, 535)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14758,11 +14768,11 @@
 					    client     	@628

 					    supplier   	@617

 					    line_style 	3

-					    origin_attachment 	(747, 497)

-					    terminal_attachment 	(490, 497)

+					    origin_attachment 	(747, 558)

+					    terminal_attachment 	(490, 558)

 					    label      	(object SegLabel @631

 						Parent_View 	@629

-						location   	(518, 471)

+						location   	(518, 532)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14783,7 +14793,7 @@
 						orientation 	1))

 					(object RoleView "incoming" @632

 					    Parent_View 	@628

-					    location   	(-1283, -318)

+					    location   	(-1283, -257)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -14795,7 +14805,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @633

 						Parent_View 	@632

-						location   	(894, 471)

+						location   	(894, 532)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14819,11 +14829,11 @@
 					    client     	@628

 					    supplier   	@620

 					    line_style 	3

-					    origin_attachment 	(747, 497)

-					    terminal_attachment 	(1005, 497)

+					    origin_attachment 	(747, 558)

+					    terminal_attachment 	(1005, 558)

 					    label      	(object SegLabel @634

 						Parent_View 	@632

-						location   	(984, 533)

+						location   	(984, 594)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14843,13 +14853,13 @@
 						height     	36

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$108" @635

-				    location   	(1587, 447)

+				    location   	(1587, 452)

 				    stereotype 	TRUE

 				    quidu      	"3DF283D70203"

 				    roleview_list 	(list RoleViews

 					(object RoleView "edge" @636

 					    Parent_View 	@635

-					    location   	(-106, 233)

+					    location   	(-106, 238)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -14861,7 +14871,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @637

 						Parent_View 	@636

-						location   	(1405, 377)

+						location   	(1405, 382)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14885,11 +14895,11 @@
 					    client     	@635

 					    supplier   	@620

 					    line_style 	3

-					    origin_attachment 	(1587, 447)

-					    terminal_attachment 	(1335, 447)

+					    origin_attachment 	(1587, 452)

+					    terminal_attachment 	(1335, 452)

 					    label      	(object SegLabel @638

 						Parent_View 	@636

-						location   	(1371, 486)

+						location   	(1371, 491)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14910,7 +14920,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @639

 						Parent_View 	@636

-						location   	(1524, 412)

+						location   	(1524, 417)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14931,7 +14941,7 @@
 						orientation 	1))

 					(object RoleView "activity" @640

 					    Parent_View 	@635

-					    location   	(-106, 233)

+					    location   	(-106, 238)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -14943,7 +14953,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @641

 						Parent_View 	@640

-						location   	(1740, 480)

+						location   	(1740, 485)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14967,11 +14977,11 @@
 					    client     	@635

 					    supplier   	@618

 					    line_style 	3

-					    origin_attachment 	(1587, 447)

-					    terminal_attachment 	(1839, 447)

+					    origin_attachment 	(1587, 452)

+					    terminal_attachment 	(1839, 452)

 					    label      	(object SegLabel @642

 						Parent_View 	@640

-						location   	(1780, 398)

+						location   	(1780, 403)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -14992,7 +15002,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @643

 						Parent_View 	@640

-						location   	(1720, 514)

+						location   	(1720, 519)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15012,7 +15022,7 @@
 						height     	67

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$128" @644

-				    location   	(750, 772)

+				    location   	(750, 774)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -15028,7 +15038,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "guard" @645

 					    Parent_View 	@644

-					    location   	(5, 122)

+					    location   	(5, 124)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -15040,7 +15050,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @646

 						Parent_View 	@645

-						location   	(572, 820)

+						location   	(572, 822)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15065,11 +15075,11 @@
 					    client     	@644

 					    supplier   	@619

 					    line_style 	3

-					    origin_attachment 	(750, 772)

-					    terminal_attachment 	(496, 772)

+					    origin_attachment 	(750, 774)

+					    terminal_attachment 	(496, 774)

 					    label      	(object SegLabel @647

 						Parent_View 	@645

-						location   	(547, 746)

+						location   	(547, 748)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15090,7 +15100,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @648

 						Parent_View 	@645

-						location   	(692, 852)

+						location   	(692, 854)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15111,7 +15121,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$129" @649

 					    Parent_View 	@644

-					    location   	(5, 122)

+					    location   	(5, 124)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -15123,7 +15133,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @650

 						Parent_View 	@649

-						location   	(864, 688)

+						location   	(864, 690)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15149,8 +15159,8 @@
 					    client     	@644

 					    supplier   	@620

 					    line_style 	3

-					    origin_attachment 	(750, 772)

-					    terminal_attachment 	(1005, 772))))

+					    origin_attachment 	(750, 774)

+					    terminal_attachment 	(1005, 774))))

 				(object InheritView "" @651

 				    stereotype 	TRUE

 				    quidu      	"3DF410030004"

@@ -15184,7 +15194,7 @@
 				    terminal_attachment 	(1322, 997)

 				    drawSupplier 	@652)

 				(object AssociationViewNew "$UNNAMED$134" @655

-				    location   	(1617, 687)

+				    location   	(1617, 686)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -15199,7 +15209,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "redefinedElement" @656

 					    Parent_View 	@655

-					    location   	(447, 51)

+					    location   	(447, 50)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -15211,7 +15221,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @657

 						Parent_View 	@656

-						location   	(1502, 801)

+						location   	(1502, 800)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15235,15 +15245,15 @@
 					    client     	@655

 					    supplier   	@620

 					    vertices   	(list Points

-						(1617, 687)

+						(1617, 686)

 						(1617, 759)

 						(1335, 759))

 					    line_style 	3

-					    origin_attachment 	(1617, 687)

+					    origin_attachment 	(1617, 686)

 					    terminal_attachment 	(1335, 759)

 					    label      	(object SegLabel @658

 						Parent_View 	@656

-						location   	(1358, 730)

+						location   	(1358, 729)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15264,7 +15274,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @659

 						Parent_View 	@656

-						location   	(1577, 840)

+						location   	(1577, 839)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15285,17 +15295,17 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$135" @660

 					    Parent_View 	@655

-					    location   	(447, 51)

+					    location   	(447, 50)

 					    stereotype 	TRUE

 					    quidu      	"3E5403C20115"

 					    client     	@655

 					    supplier   	@620

 					    vertices   	(list Points

-						(1617, 687)

+						(1617, 686)

 						(1617, 612)

 						(1335, 612))

 					    line_style 	3

-					    origin_attachment 	(1617, 687)

+					    origin_attachment 	(1617, 686)

 					    terminal_attachment 	(1335, 612))))))

 			(object ClassDiagram "Groups"

 			    quid       	"3DF12610031C"

@@ -15609,7 +15619,7 @@
 						height     	83

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$114" @674

-				    location   	(594, 792)

+				    location   	(756, 1584)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -15624,7 +15634,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "containedEdge" @675

 					    Parent_View 	@674

-					    location   	(66, 289)

+					    location   	(228, 1081)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -15636,7 +15646,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @676

 						Parent_View 	@675

-						location   	(534, 891)

+						location   	(696, 1683)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15660,15 +15670,16 @@
 					    client     	@674

 					    supplier   	@662

 					    vertices   	(list Points

-						(594, 792)

+						(756, 1584)

+						(594, 1584)

 						(594, 852)

 						(410, 852))

 					    line_style 	3

-					    origin_attachment 	(594, 792)

+					    origin_attachment 	(756, 1584)

 					    terminal_attachment 	(410, 852)

 					    label      	(object SegLabel @677

 						Parent_View 	@675

-						location   	(455, 819)

+						location   	(617, 1611)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15689,7 +15700,7 @@
 						orientation 	1))

 					(object RoleView "/inGroup" @678

 					    Parent_View 	@674

-					    location   	(66, 289)

+					    location   	(228, 1081)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -15701,7 +15712,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @679

 						Parent_View 	@678

-						location   	(676, 666)

+						location   	(838, 1458)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15724,12 +15735,16 @@
 					    quidu      	"3C7C242F00F0"

 					    client     	@674

 					    supplier   	@664

+					    vertices   	(list Points

+						(756, 1584)

+						(860, 1584)

+						(860, 610))

 					    line_style 	3

-					    origin_attachment 	(594, 792)

-					    terminal_attachment 	(594, 610)

+					    origin_attachment 	(756, 1584)

+					    terminal_attachment 	(860, 610)

 					    label      	(object SegLabel @680

 						Parent_View 	@678

-						location   	(630, 634)

+						location   	(792, 1426)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15750,7 +15765,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @681

 						Parent_View 	@678

-						location   	(673, 714)

+						location   	(835, 1506)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15770,7 +15785,7 @@
 						height     	79

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$115" @682

-				    location   	(891, 848)

+				    location   	(891, 743)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -15785,7 +15800,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "containedNode" @683

 					    Parent_View 	@682

-					    location   	(360, 340)

+					    location   	(360, 235)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -15797,7 +15812,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @684

 						Parent_View 	@683

-						location   	(921, 889)

+						location   	(921, 784)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15820,12 +15835,17 @@
 					    quidu      	"3C7C243400C5"

 					    client     	@682

 					    supplier   	@663

+					    vertices   	(list Points

+						(891, 743)

+						(891, 669)

+						(1070, 669)

+						(1070, 819))

 					    line_style 	3

-					    origin_attachment 	(891, 848)

-					    terminal_attachment 	(1070, 848)

+					    origin_attachment 	(891, 743)

+					    terminal_attachment 	(1070, 819)

 					    label      	(object SegLabel @685

 						Parent_View 	@683

-						location   	(1041, 807)

+						location   	(1041, 702)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15846,7 +15866,7 @@
 						orientation 	0))

 					(object RoleView "/inGroup" @686

 					    Parent_View 	@682

-					    location   	(360, 340)

+					    location   	(360, 235)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -15858,7 +15878,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @687

 						Parent_View 	@686

-						location   	(917, 674)

+						location   	(917, 569)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15882,15 +15902,16 @@
 					    client     	@682

 					    supplier   	@664

 					    vertices   	(list Points

+						(891, 743)

 						(891, 848)

 						(831, 848)

 						(831, 610))

 					    line_style 	3

-					    origin_attachment 	(891, 848)

+					    origin_attachment 	(891, 743)

 					    terminal_attachment 	(831, 610)

 					    label      	(object SegLabel @688

 						Parent_View 	@686

-						location   	(858, 642)

+						location   	(858, 537)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15911,7 +15932,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @689

 						Parent_View 	@686

-						location   	(768, 720)

+						location   	(768, 615)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -15969,7 +15990,7 @@
 				    height     	94

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$116" @692

-				    location   	(883, 282)

+				    location   	(974, 564)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -15984,7 +16005,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "group" @693

 					    Parent_View 	@692

-					    location   	(-388, -23)

+					    location   	(-297, 259)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -15996,7 +16017,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @694

 						Parent_View 	@693

-						location   	(874, 387)

+						location   	(965, 669)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16020,15 +16041,17 @@
 					    client     	@692

 					    supplier   	@664

 					    vertices   	(list Points

+						(974, 564)

+						(883, 564)

 						(883, 282)

 						(807, 282)

 						(807, 506))

 					    line_style 	3

-					    origin_attachment 	(883, 282)

+					    origin_attachment 	(974, 564)

 					    terminal_attachment 	(807, 506)

 					    label      	(object SegLabel @695

 						Parent_View 	@693

-						location   	(837, 485)

+						location   	(928, 767)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -16049,7 +16072,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @696

 						Parent_View 	@693

-						location   	(996, 435)

+						location   	(1087, 717)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16070,7 +16093,7 @@
 						orientation 	0))

 					(object RoleView "activity" @697

 					    Parent_View 	@692

-					    location   	(-388, -23)

+					    location   	(-297, 259)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -16082,7 +16105,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @698

 						Parent_View 	@697

-						location   	(1086, 196)

+						location   	(1177, 478)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16105,12 +16128,16 @@
 					    quidu      	"3DF28F44010A"

 					    client     	@692

 					    supplier   	@691

+					    vertices   	(list Points

+						(974, 564)

+						(1415, 564)

+						(1415, 332))

 					    line_style 	3

-					    origin_attachment 	(883, 282)

-					    terminal_attachment 	(1183, 282)

+					    origin_attachment 	(974, 564)

+					    terminal_attachment 	(1415, 332)

 					    label      	(object SegLabel @699

 						Parent_View 	@697

-						location   	(1100, 325)

+						location   	(1191, 607)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16131,7 +16158,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @700

 						Parent_View 	@697

-						location   	(1055, 237)

+						location   	(1146, 519)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16390,7 +16417,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$111" @712

-				    location   	(1347, 624)

+				    location   	(1353, 624)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -16405,7 +16432,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "decisionInput" @713

 					    Parent_View 	@712

-					    location   	(-411, -90)

+					    location   	(-405, -90)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -16417,7 +16444,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @714

 						Parent_View 	@713

-						location   	(1195, 645)

+						location   	(1201, 645)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16442,11 +16469,11 @@
 					    client     	@712

 					    supplier   	@710

 					    line_style 	3

-					    origin_attachment 	(1347, 624)

-					    terminal_attachment 	(1347, 699)

+					    origin_attachment 	(1353, 624)

+					    terminal_attachment 	(1353, 698)

 					    label      	(object SegLabel @715

 						Parent_View 	@713

-						location   	(1415, 666)

+						location   	(1421, 666)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16467,7 +16494,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$112" @716

 					    Parent_View 	@712

-					    location   	(-411, -90)

+					    location   	(-405, -90)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -16483,11 +16510,11 @@
 					    client     	@712

 					    supplier   	@711

 					    line_style 	3

-					    origin_attachment 	(1347, 624)

-					    terminal_attachment 	(1347, 550)

+					    origin_attachment 	(1353, 624)

+					    terminal_attachment 	(1353, 550)

 					    label      	(object SegLabel @717

 						Parent_View 	@716

-						location   	(1402, 583)

+						location   	(1408, 583)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16657,32 +16684,16 @@
 					label      	"Action")

 				    icon_style 	"Icon"

 				    quidu      	"3DF3DB6F036B"

-				    compartment 	(object Compartment

-					Parent_View 	@725

-					location   	(93, 875)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	1

-					max_width  	206)

 				    width      	781

 				    height     	150)

 				(object AssociationViewNew "$UNNAMED$120" @726

-				    location   	(153, 660)

+				    location   	(199, 660)

 				    stereotype 	TRUE

 				    quidu      	"3D716DC100E7"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$121" @727

 					    Parent_View 	@726

-					    location   	(-1208, -42)

+					    location   	(-1162, -42)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -16694,7 +16705,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @728

 						Parent_View 	@727

-						location   	(239, 730)

+						location   	(285, 730)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16719,11 +16730,11 @@
 					    client     	@726

 					    supplier   	@725

 					    line_style 	3

-					    origin_attachment 	(153, 660)

-					    terminal_attachment 	(153, 813)

+					    origin_attachment 	(199, 660)

+					    terminal_attachment 	(199, 812)

 					    label      	(object SegLabel @729

 						Parent_View 	@727

-						location   	(122, 743)

+						location   	(168, 743)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16744,7 +16755,7 @@
 						orientation 	1))

 					(object RoleView "/output" @730

 					    Parent_View 	@726

-					    location   	(-1208, -42)

+					    location   	(-1162, -42)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -16756,7 +16767,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @731

 						Parent_View 	@730

-						location   	(254, 537)

+						location   	(300, 537)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16780,11 +16791,11 @@
 					    client     	@726

 					    supplier   	@722

 					    line_style 	3

-					    origin_attachment 	(153, 660)

-					    terminal_attachment 	(153, 507)

+					    origin_attachment 	(199, 660)

+					    terminal_attachment 	(199, 508)

 					    label      	(object SegLabel @732

 						Parent_View 	@730

-						location   	(116, 532)

+						location   	(162, 532)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16805,7 +16816,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @733

 						Parent_View 	@730

-						location   	(303, 621)

+						location   	(349, 621)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16828,14 +16839,14 @@
 						height     	150

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$122" @734

-				    location   	(788, 657)

+				    location   	(760, 657)

 				    stereotype 	TRUE

 				    line_color 	4194368

 				    quidu      	"3D716DF5031C"

 				    roleview_list 	(list RoleViews

 					(object RoleView "/input" @735

 					    Parent_View 	@734

-					    location   	(52, -7)

+					    location   	(24, -7)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -16847,7 +16858,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @736

 						Parent_View 	@735

-						location   	(700, 524)

+						location   	(672, 524)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16872,11 +16883,11 @@
 					    client     	@734

 					    supplier   	@724

 					    line_style 	3

-					    origin_attachment 	(788, 657)

-					    terminal_attachment 	(788, 502)

+					    origin_attachment 	(760, 657)

+					    terminal_attachment 	(760, 502)

 					    label      	(object SegLabel @737

 						Parent_View 	@735

-						location   	(828, 531)

+						location   	(800, 531)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16897,7 +16908,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @738

 						Parent_View 	@735

-						location   	(643, 619)

+						location   	(615, 619)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16921,7 +16932,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$123" @739

 					    Parent_View 	@734

-					    location   	(52, -7)

+					    location   	(24, -7)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -16933,7 +16944,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @740

 						Parent_View 	@739

-						location   	(707, 715)

+						location   	(679, 715)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -16959,11 +16970,11 @@
 					    client     	@734

 					    supplier   	@725

 					    line_style 	3

-					    origin_attachment 	(788, 657)

-					    terminal_attachment 	(788, 812)

+					    origin_attachment 	(760, 657)

+					    terminal_attachment 	(760, 812)

 					    label      	(object SegLabel @741

 						Parent_View 	@739

-						location   	(841, 744)

+						location   	(813, 744)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -17058,7 +17069,7 @@
 				    origin_attachment 	(1111, 444)

 				    terminal_attachment 	(867, 444))

 				(object AssociationViewNew "$UNNAMED$130" @746

-				    location   	(1223, 588)

+				    location   	(1224, 588)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -17073,7 +17084,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "value" @747

 					    Parent_View 	@746

-					    location   	(-169, -96)

+					    location   	(-168, -96)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -17085,7 +17096,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @748

 						Parent_View 	@747

-						location   	(1149, 632)

+						location   	(1150, 632)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -17109,11 +17120,11 @@
 					    client     	@746

 					    supplier   	@743

 					    line_style 	3

-					    origin_attachment 	(1223, 588)

-					    terminal_attachment 	(1223, 681)

+					    origin_attachment 	(1224, 588)

+					    terminal_attachment 	(1224, 681)

 					    label      	(object SegLabel @749

 						Parent_View 	@747

-						location   	(1270, 636)

+						location   	(1271, 636)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -17134,7 +17145,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$131" @750

 					    Parent_View 	@746

-					    location   	(-169, -96)

+					    location   	(-168, -96)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -17149,11 +17160,11 @@
 					    client     	@746

 					    supplier   	@744

 					    line_style 	3

-					    origin_attachment 	(1223, 588)

-					    terminal_attachment 	(1223, 496)

+					    origin_attachment 	(1224, 588)

+					    terminal_attachment 	(1224, 496)

 					    label      	(object SegLabel @751

 						Parent_View 	@750

-						location   	(1287, 512)

+						location   	(1288, 512)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -17242,13 +17253,11 @@
 				(object ClassAttribute "isDimension"

 				    quid       	"3C7695190325"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")

 				(object ClassAttribute "isExternal"

 				    quid       	"3C7E9DDB02FB"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public"))

 			    language   	"none")

@@ -17754,7 +17763,7 @@
 				    height     	154

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$139" @770

-				    location   	(1272, 631)

+				    location   	(1272, 660)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -17769,7 +17778,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "represents" @771

 					    Parent_View 	@770

-					    location   	(-273, -562)

+					    location   	(-273, -533)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -17781,7 +17790,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @772

 						Parent_View 	@771

-						location   	(1307, 595)

+						location   	(1307, 624)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -17805,11 +17814,11 @@
 					    client     	@770

 					    supplier   	@766

 					    line_style 	3

-					    origin_attachment 	(1272, 631)

-					    terminal_attachment 	(1413, 631)

+					    origin_attachment 	(1272, 660)

+					    terminal_attachment 	(1413, 660)

 					    label      	(object SegLabel @773

 						Parent_View 	@771

-						location   	(1361, 667)

+						location   	(1361, 696)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -17830,7 +17839,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$140" @774

 					    Parent_View 	@770

-					    location   	(-273, -562)

+					    location   	(-273, -533)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -17845,11 +17854,11 @@
 					    client     	@770

 					    supplier   	@769

 					    line_style 	3

-					    origin_attachment 	(1272, 631)

-					    terminal_attachment 	(1132, 631)

+					    origin_attachment 	(1272, 660)

+					    terminal_attachment 	(1132, 660)

 					    label      	(object SegLabel @775

 						Parent_View 	@774

-						location   	(1164, 670)

+						location   	(1164, 699)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -18225,7 +18234,7 @@
 						height     	140

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$137" @794

-				    location   	(1042, 1021)

+				    location   	(1042, 833)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -18240,7 +18249,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "containedNode" @795

 					    Parent_View 	@794

-					    location   	(513, 518)

+					    location   	(513, 330)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -18252,7 +18261,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @796

 						Parent_View 	@795

-						location   	(1191, 1062)

+						location   	(1191, 874)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -18275,12 +18284,17 @@
 					    quidu      	"3CF19E6A02FE"

 					    client     	@794

 					    supplier   	@768

+					    vertices   	(list Points

+						(1042, 833)

+						(1042, 773)

+						(1333, 773)

+						(1333, 982))

 					    line_style 	3

-					    origin_attachment 	(1042, 1021)

-					    terminal_attachment 	(1333, 1021)

+					    origin_attachment 	(1042, 833)

+					    terminal_attachment 	(1333, 982)

 					    label      	(object SegLabel @797

 						Parent_View 	@795

-						location   	(1122, 1104)

+						location   	(1122, 916)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -18301,7 +18315,7 @@
 						orientation 	1))

 					(object RoleView "inPartition" @798

 					    Parent_View 	@794

-					    location   	(513, 518)

+					    location   	(513, 330)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -18313,7 +18327,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @799

 						Parent_View 	@798

-						location   	(1089, 793)

+						location   	(1089, 605)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -18337,15 +18351,16 @@
 					    client     	@794

 					    supplier   	@769

 					    vertices   	(list Points

+						(1042, 833)

 						(1042, 1021)

 						(982, 1021)

 						(982, 713))

 					    line_style 	3

-					    origin_attachment 	(1042, 1021)

+					    origin_attachment 	(1042, 833)

 					    terminal_attachment 	(982, 713)

 					    label      	(object SegLabel @800

 						Parent_View 	@798

-						location   	(1036, 751)

+						location   	(1036, 563)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -18366,7 +18381,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @801

 						Parent_View 	@798

-						location   	(1135, 836)

+						location   	(1135, 648)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -18456,7 +18471,6 @@
 				(object ClassAttribute "isCombineDuplicate"

 				    quid       	"4063FEFD030C"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"true"

 				    exportControl 	"Public"))

 			    language   	"ObjectSwitch")

@@ -18479,13 +18493,11 @@
 				(object ClassAttribute "isMulticast"

 				    quid       	"3D027D810140"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")

 				(object ClassAttribute "isMultireceive"

 				    quid       	"3D027D8A025C"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public"))

 			    language   	"ObjectSwitch")

@@ -18565,12 +18577,10 @@
 			    class_attributes 	(list class_attribute_list

 				(object ClassAttribute "isSingleExecution"

 				    quid       	"3DF291A30186"

-				    type       	"Boolean"

-				    quidu      	"3CA010AC0090")

+				    type       	"Boolean")

 				(object ClassAttribute "isReadOnly"

 				    quid       	"40119C6501ED"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")))

 			(object Class "Parameter"

@@ -18584,13 +18594,11 @@
 				(object ClassAttribute "isException"

 				    quid       	"3E00B9E900C7"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")

 				(object ClassAttribute "isStream"

 				    quid       	"3DFBA76B01F4"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")

 				(object ClassAttribute "effect"

@@ -18968,22 +18976,6 @@
 					label      	"JoinNode")

 				    icon_style 	"Label"

 				    quidu      	"3D0284BE018B"

-				    compartment 	(object Compartment

-					Parent_View 	@807

-					location   	(57, 402)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	1

-					max_width  	544)

 				    width      	660

 				    height     	112

 				    autoResize 	TRUE)

@@ -18996,7 +18988,7 @@
 				    origin_attachment 	(285, 339)

 				    terminal_attachment 	(285, 170))

 				(object AssociationViewNew "$UNNAMED$141" @809

-				    location   	(984, 388)

+				    location   	(984, 396)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -19011,7 +19003,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "joinSpec" @810

 					    Parent_View 	@809

-					    location   	(503, -81)

+					    location   	(503, -73)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -19023,7 +19015,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @811

 						Parent_View 	@810

-						location   	(1118, 430)

+						location   	(1118, 438)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -19047,11 +19039,11 @@
 					    client     	@809

 					    supplier   	@806

 					    line_style 	3

-					    origin_attachment 	(984, 388)

-					    terminal_attachment 	(1260, 388)

+					    origin_attachment 	(984, 396)

+					    terminal_attachment 	(1260, 396)

 					    label      	(object SegLabel @812

 						Parent_View 	@810

-						location   	(1174, 344)

+						location   	(1174, 352)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -19072,7 +19064,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @813

 						Parent_View 	@810

-						location   	(1023, 470)

+						location   	(1023, 478)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -19093,7 +19085,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$142" @814

 					    Parent_View 	@809

-					    location   	(503, -81)

+					    location   	(503, -73)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -19105,7 +19097,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @815

 						Parent_View 	@814

-						location   	(937, 296)

+						location   	(937, 304)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -19130,8 +19122,8 @@
 					    client     	@809

 					    supplier   	@807

 					    line_style 	3

-					    origin_attachment 	(984, 388)

-					    terminal_attachment 	(708, 388))))))

+					    origin_attachment 	(984, 396)

+					    terminal_attachment 	(708, 396))))))

 			(object ClassDiagram "ObjectNodes"

 			    quid       	"3DF126C902AF"

 			    title      	"ObjectNodes"

@@ -19336,13 +19328,13 @@
 				    height     	112

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$147" @823

-				    location   	(286, 567)

+				    location   	(228, 567)

 				    stereotype 	TRUE

 				    quidu      	"3B72E7D301FB"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$148" @824

 					    Parent_View 	@823

-					    location   	(-808, -326)

+					    location   	(-866, -326)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -19354,7 +19346,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @825

 						Parent_View 	@824

-						location   	(246, 485)

+						location   	(188, 485)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -19379,11 +19371,11 @@
 					    client     	@823

 					    supplier   	@822

 					    line_style 	3

-					    origin_attachment 	(286, 567)

-					    terminal_attachment 	(286, 464)

+					    origin_attachment 	(228, 567)

+					    terminal_attachment 	(228, 464)

 					    label      	(object SegLabel @826

 						Parent_View 	@824

-						location   	(319, 495)

+						location   	(261, 495)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -19404,7 +19396,7 @@
 						orientation 	1))

 					(object RoleView "inState" @827

 					    Parent_View 	@823

-					    location   	(-808, -326)

+					    location   	(-866, -326)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -19416,7 +19408,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @828

 						Parent_View 	@827

-						location   	(162, 624)

+						location   	(104, 624)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -19440,11 +19432,11 @@
 					    client     	@823

 					    supplier   	@819

 					    line_style 	3

-					    origin_attachment 	(286, 567)

-					    terminal_attachment 	(286, 670)

+					    origin_attachment 	(228, 567)

+					    terminal_attachment 	(228, 670)

 					    label      	(object SegLabel @829

 						Parent_View 	@827

-						location   	(323, 632)

+						location   	(265, 632)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -19630,7 +19622,7 @@
 				    origin_attachment 	(386, 352)

 				    terminal_attachment 	(386, 190))

 				(object AssociationViewNew "$UNNAMED$160" @839

-				    location   	(518, 569)

+				    location   	(600, 569)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -19645,7 +19637,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "selection" @840

 					    Parent_View 	@839

-					    location   	(110, -1)

+					    location   	(192, -1)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -19657,7 +19649,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @841

 						Parent_View 	@840

-						location   	(621, 606)

+						location   	(703, 606)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -19681,11 +19673,11 @@
 					    client     	@839

 					    supplier   	@821

 					    line_style 	3

-					    origin_attachment 	(518, 569)

-					    terminal_attachment 	(518, 674)

+					    origin_attachment 	(600, 569)

+					    terminal_attachment 	(600, 674)

 					    label      	(object SegLabel @842

 						Parent_View 	@840

-						location   	(584, 649)

+						location   	(666, 649)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -19706,7 +19698,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$161" @843

 					    Parent_View 	@839

-					    location   	(110, -1)

+					    location   	(192, -1)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -19721,11 +19713,11 @@
 					    client     	@839

 					    supplier   	@822

 					    line_style 	3

-					    origin_attachment 	(518, 569)

-					    terminal_attachment 	(518, 464)

+					    origin_attachment 	(600, 569)

+					    terminal_attachment 	(600, 464)

 					    label      	(object SegLabel @844

 						Parent_View 	@843

-						location   	(559, 501)

+						location   	(641, 501)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -19816,68 +19808,9 @@
 				    line_color 	3342489

 				    fill_color 	16777215

 				    quidu      	"3C7EB0F6009B"

-				    compartment 	(object Compartment

-					Parent_View 	@846

-					location   	(62, 671)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	4

-					max_width  	112)

 				    width      	494

 				    height     	312)

-				(object ClassView "Class" "Logical View::UML::Activities::CompleteActivities::Parameter" @847

-				    ShowCompartmentStereotypes 	TRUE

-				    SuppressOperation 	TRUE

-				    IncludeAttribute 	TRUE

-				    IncludeOperation 	TRUE

-				    location   	(312, 408)

-				    font       	(object Font

-					size       	8

-					face       	"Arial"

-					bold       	FALSE

-					italics    	FALSE

-					underline  	FALSE

-					strike     	FALSE

-					color      	0

-					default_color 	TRUE)

-				    label      	(object ItemLabel

-					Parent_View 	@847

-					location   	(59, 321)

-					nlines     	1

-					max_width  	506

-					justify    	0

-					label      	"Parameter")

-				    icon_style 	"Label"

-				    quidu      	"3DFBA74801F4"

-				    compartment 	(object Compartment

-					Parent_View 	@847

-					location   	(59, 373)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	3

-					max_width  	428)

-				    width      	524

-				    height     	194

-				    autoResize 	TRUE)

-				(object ClassView "Class" "Logical View::UML::CommonBehaviors::BasicBehaviors::Behavior" @848

+				(object ClassView "Class" "Logical View::UML::CommonBehaviors::BasicBehaviors::Behavior" @847

 				    ShowCompartmentStereotypes 	TRUE

 				    IncludeAttribute 	TRUE

 				    IncludeOperation 	TRUE

@@ -19892,7 +19825,7 @@
 					color      	0

 					default_color 	TRUE)

 				    label      	(object ItemLabel

-					Parent_View 	@848

+					Parent_View 	@847

 					location   	(1629, 71)

 					fill_color 	13434879

 					nlines     	1

@@ -19903,27 +19836,10 @@
 				    line_color 	3342489

 				    fill_color 	13434879

 				    quidu      	"3B9A6F4F0008"

-				    compartment 	(object Compartment

-					Parent_View 	@848

-					location   	(1629, 157)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					fill_color 	13434879

-					anchor     	2

-					nlines     	2

-					max_width  	378)

 				    width      	456

 				    height     	190

 				    annotation 	8)

-				(object ClassView "Class" "Logical View::UML::Classes::Kernel::Parameter" @849

+				(object ClassView "Class" "Logical View::UML::Classes::Kernel::Parameter" @848

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressAttribute 	TRUE

 				    SuppressOperation 	TRUE

@@ -19940,7 +19856,7 @@
 					color      	0

 					default_color 	TRUE)

 				    label      	(object ItemLabel

-					Parent_View 	@849

+					Parent_View 	@848

 					location   	(215, 86)

 					nlines     	1

 					max_width  	230

@@ -19952,11 +19868,38 @@
 				    height     	100

 				    annotation 	8

 				    autoResize 	TRUE)

+				(object ClassView "Class" "Logical View::UML::Activities::CompleteActivities::Parameter" @849

+				    ShowCompartmentStereotypes 	TRUE

+				    SuppressOperation 	TRUE

+				    IncludeAttribute 	TRUE

+				    IncludeOperation 	TRUE

+				    location   	(312, 408)

+				    font       	(object Font

+					size       	8

+					face       	"Arial"

+					bold       	FALSE

+					italics    	FALSE

+					underline  	FALSE

+					strike     	FALSE

+					color      	0

+					default_color 	TRUE)

+				    label      	(object ItemLabel

+					Parent_View 	@849

+					location   	(59, 321)

+					nlines     	1

+					max_width  	506

+					justify    	0

+					label      	"Parameter")

+				    icon_style 	"Label"

+				    quidu      	"3DFBA74801F4"

+				    width      	524

+				    height     	194

+				    autoResize 	TRUE)

 				(object InheritView "" @850

 				    stereotype 	TRUE

 				    quidu      	"3E00BC5000E9"

-				    client     	@847

-				    supplier   	@849

+				    client     	@849

+				    supplier   	@848

 				    line_style 	3

 				    origin_attachment 	(328, 311)

 				    terminal_attachment 	(328, 176))

@@ -19990,43 +19933,7 @@
 				    width      	300

 				    height     	125

 				    annotation 	8)

-				(object ClassView "Class" "Logical View::UML::Activities::CompleteActivities::Behavior" @852

-				    ShowCompartmentStereotypes 	TRUE

-				    IncludeAttribute 	TRUE

-				    IncludeOperation 	TRUE

-				    location   	(1854, 396)

-				    font       	(object Font

-					size       	8

-					face       	"Arial"

-					bold       	FALSE

-					italics    	TRUE

-					underline  	FALSE

-					strike     	FALSE

-					color      	0

-					default_color 	TRUE)

-				    label      	(object ItemLabel

-					Parent_View 	@852

-					location   	(1754, 354)

-					fill_color 	13434879

-					nlines     	1

-					max_width  	200

-					justify    	0

-					label      	"Behavior")

-				    icon_style 	"Icon"

-				    line_color 	3342489

-				    fill_color 	13434879

-				    quidu      	"40AB95AB02A5"

-				    width      	218

-				    height     	104

-				    annotation 	8)

-				(object InheritView "" @853

-				    stereotype 	TRUE

-				    line_color 	3342489

-				    quidu      	"40AB95BC0083"

-				    client     	@852

-				    supplier   	@848

-				    line_style 	0)

-				(object ClassView "Class" "Logical View::UML::Activities::CompleteActivities::ParameterSet" @854

+				(object ClassView "Class" "Logical View::UML::Activities::CompleteActivities::ParameterSet" @852

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressOperation 	TRUE

 				    IncludeAttribute 	TRUE

@@ -20042,7 +19949,7 @@
 					color      	0

 					default_color 	TRUE)

 				    label      	(object ItemLabel

-					Parent_View 	@854

+					Parent_View 	@852

 					location   	(1163, 354)

 					nlines     	1

 					max_width  	278

@@ -20054,16 +19961,16 @@
 				    height     	104

 				    annotation 	8

 				    autoResize 	TRUE)

-				(object InheritView "" @855

+				(object InheritView "" @853

 				    stereotype 	TRUE

 				    quidu      	"3C75EDDA026D"

-				    client     	@854

+				    client     	@852

 				    supplier   	@845

 				    line_style 	3

 				    origin_attachment 	(1283, 344)

 				    terminal_attachment 	(1283, 196))

-				(object AssociationViewNew "$UNNAMED$149" @856

-				    location   	(864, 403)

+				(object AssociationViewNew "$UNNAMED$149" @854

+				    location   	(864, 396)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -20076,9 +19983,9 @@
 				    stereotype 	TRUE

 				    quidu      	"3C75EDE701C2"

 				    roleview_list 	(list RoleViews

-					(object RoleView "parameterSet" @857

-					    Parent_View 	@856

-					    location   	(517, -84)

+					(object RoleView "parameterSet" @855

+					    Parent_View 	@854

+					    location   	(517, -91)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -20088,9 +19995,9 @@
 						strike     	FALSE

 						color      	0

 						default_color 	TRUE)

-					    label      	(object SegLabel @858

-						Parent_View 	@857

-						location   	(1034, 366)

+					    label      	(object SegLabel @856

+						Parent_View 	@855

+						location   	(1034, 359)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20112,14 +20019,14 @@
 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3C75EDE800E7"

-					    client     	@856

-					    supplier   	@854

+					    client     	@854

+					    supplier   	@852

 					    line_style 	3

-					    origin_attachment 	(864, 403)

-					    terminal_attachment 	(1154, 403)

-					    label      	(object SegLabel @859

-						Parent_View 	@857

-						location   	(1117, 446)

+					    origin_attachment 	(864, 396)

+					    terminal_attachment 	(1154, 396)

+					    label      	(object SegLabel @857

+						Parent_View 	@855

+						location   	(1117, 439)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20138,9 +20045,9 @@
 						pctDist    	0.873926

 						height     	43

 						orientation 	1))

-					(object RoleView "parameter" @860

-					    Parent_View 	@856

-					    location   	(517, -84)

+					(object RoleView "parameter" @858

+					    Parent_View 	@854

+					    location   	(517, -91)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -20150,9 +20057,9 @@
 						strike     	FALSE

 						color      	0

 						default_color 	TRUE)

-					    label      	(object SegLabel @861

-						Parent_View 	@860

-						location   	(696, 366)

+					    label      	(object SegLabel @859

+						Parent_View 	@858

+						location   	(696, 359)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20174,14 +20081,14 @@
 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3C75EDE800E9"

-					    client     	@856

-					    supplier   	@847

+					    client     	@854

+					    supplier   	@849

 					    line_style 	3

-					    origin_attachment 	(864, 403)

-					    terminal_attachment 	(574, 403)

-					    label      	(object SegLabel @862

-						Parent_View 	@860

-						location   	(634, 451)

+					    origin_attachment 	(864, 396)

+					    terminal_attachment 	(574, 396)

+					    label      	(object SegLabel @860

+						Parent_View 	@858

+						location   	(634, 444)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20200,8 +20107,8 @@
 						pctDist    	0.793696

 						height     	48

 						orientation 	0))))

-				(object AssociationViewNew "$UNNAMED$162" @863

-				    location   	(1206, 603)

+				(object AssociationViewNew "$UNNAMED$162" @861

+				    location   	(1302, 604)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -20215,9 +20122,9 @@
 				    line_color 	3342489

 				    quidu      	"4063FFD203B3"

 				    roleview_list 	(list RoleViews

-					(object RoleView "condition" @864

-					    Parent_View 	@863

-					    location   	(-96, 207)

+					(object RoleView "condition" @862

+					    Parent_View 	@861

+					    location   	(0, 208)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -20227,9 +20134,9 @@
 						strike     	FALSE

 						color      	0

 						default_color 	TRUE)

-					    label      	(object SegLabel @865

-						Parent_View 	@864

-						location   	(1098, 679)

+					    label      	(object SegLabel @863

+						Parent_View 	@862

+						location   	(1194, 680)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20251,14 +20158,14 @@
 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"4063FFD4010D"

-					    client     	@863

+					    client     	@861

 					    supplier   	@851

 					    line_style 	3

-					    origin_attachment 	(1206, 603)

-					    terminal_attachment 	(1206, 759)

-					    label      	(object SegLabel @866

-						Parent_View 	@864

-						location   	(1258, 704)

+					    origin_attachment 	(1302, 604)

+					    terminal_attachment 	(1302, 760)

+					    label      	(object SegLabel @864

+						Parent_View 	@862

+						location   	(1354, 705)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20277,9 +20184,9 @@
 						pctDist    	0.647436

 						height     	52

 						orientation 	0)

-					    label      	(object SegLabel @867

-						Parent_View 	@864

-						location   	(1000, 728)

+					    label      	(object SegLabel @865

+						Parent_View 	@862

+						location   	(1096, 729)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20298,17 +20205,53 @@
 						pctDist    	0.801282

 						height     	206

 						orientation 	1))

-					(object RoleView "$UNNAMED$163" @868

-					    Parent_View 	@863

-					    location   	(-96, 207)

+					(object RoleView "$UNNAMED$163" @866

+					    Parent_View 	@861

+					    location   	(0, 208)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"4063FFD40135"

-					    client     	@863

-					    supplier   	@854

+					    client     	@861

+					    supplier   	@852

 					    line_style 	3

-					    origin_attachment 	(1206, 603)

-					    terminal_attachment 	(1206, 447))))

+					    origin_attachment 	(1302, 604)

+					    terminal_attachment 	(1302, 448))))

+				(object ClassView "Class" "Logical View::UML::Activities::CompleteActivities::Behavior" @867

+				    ShowCompartmentStereotypes 	TRUE

+				    IncludeAttribute 	TRUE

+				    IncludeOperation 	TRUE

+				    location   	(1854, 396)

+				    font       	(object Font

+					size       	8

+					face       	"Arial"

+					bold       	FALSE

+					italics    	TRUE

+					underline  	FALSE

+					strike     	FALSE

+					color      	0

+					default_color 	TRUE)

+				    label      	(object ItemLabel

+					Parent_View 	@867

+					location   	(1754, 354)

+					fill_color 	13434879

+					nlines     	1

+					max_width  	200

+					justify    	0

+					label      	"Behavior")

+				    icon_style 	"Icon"

+				    line_color 	3342489

+				    fill_color 	13434879

+				    quidu      	"40AB95AB02A5"

+				    width      	218

+				    height     	104

+				    annotation 	8)

+				(object InheritView "" @868

+				    stereotype 	TRUE

+				    line_color 	3342489

+				    quidu      	"40AB95BC0083"

+				    client     	@867

+				    supplier   	@847

+				    line_style 	0)

 				(object AssociationViewNew "$UNNAMED$164" @869

 				    location   	(1597, 396)

 				    font       	(object Font

@@ -20361,7 +20304,7 @@
 					    line_color 	3342489

 					    quidu      	"40AB9639033E"

 					    client     	@869

-					    supplier   	@854

+					    supplier   	@852

 					    line_style 	0

 					    label      	(object SegLabel @872

 						Parent_View 	@870

@@ -20400,7 +20343,7 @@
 					    line_color 	3342489

 					    quidu      	"40AB96390340"

 					    client     	@869

-					    supplier   	@852

+					    supplier   	@867

 					    line_style 	0

 					    label      	(object SegLabel @874

 						Parent_View 	@873

@@ -20607,7 +20550,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$143" @882

-				    location   	(610, 863)

+				    location   	(610, 861)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -20622,7 +20565,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "weight" @883

 					    Parent_View 	@882

-					    location   	(208, -818)

+					    location   	(208, -820)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -20634,7 +20577,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @884

 						Parent_View 	@883

-						location   	(789, 774)

+						location   	(789, 772)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20658,11 +20601,11 @@
 					    client     	@882

 					    supplier   	@880

 					    line_style 	3

-					    origin_attachment 	(610, 863)

-					    terminal_attachment 	(858, 863)

+					    origin_attachment 	(610, 861)

+					    terminal_attachment 	(858, 861)

 					    label      	(object SegLabel @885

 						Parent_View 	@883

-						location   	(831, 917)

+						location   	(831, 915)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20683,7 +20626,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @886

 						Parent_View 	@883

-						location   	(672, 818)

+						location   	(672, 816)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20704,7 +20647,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$144" @887

 					    Parent_View 	@882

-					    location   	(208, -818)

+					    location   	(208, -820)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -20716,7 +20659,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @888

 						Parent_View 	@887

-						location   	(507, 908)

+						location   	(507, 906)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20741,8 +20684,8 @@
 					    client     	@882

 					    supplier   	@881

 					    line_style 	3

-					    origin_attachment 	(610, 863)

-					    terminal_attachment 	(362, 863))))

+					    origin_attachment 	(610, 861)

+					    terminal_attachment 	(362, 861))))

 				(object ClassView "Class" "Logical View::UML::CommonBehaviors::BasicBehaviors::Behavior" @889

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressAttribute 	TRUE

@@ -20799,7 +20742,7 @@
 				    height     	154

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$150" @891

-				    location   	(911, 294)

+				    location   	(911, 342)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -20814,7 +20757,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "transformation" @892

 					    Parent_View 	@891

-					    location   	(-409, -216)

+					    location   	(-409, -168)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -20826,7 +20769,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @893

 						Parent_View 	@892

-						location   	(1038, 326)

+						location   	(1038, 374)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20850,11 +20793,11 @@
 					    client     	@891

 					    supplier   	@889

 					    line_style 	3

-					    origin_attachment 	(911, 294)

-					    terminal_attachment 	(1174, 294)

+					    origin_attachment 	(911, 342)

+					    terminal_attachment 	(1174, 342)

 					    label      	(object SegLabel @894

 						Parent_View 	@892

-						location   	(1129, 241)

+						location   	(1129, 289)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20875,7 +20818,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$151" @895

 					    Parent_View 	@891

-					    location   	(-409, -216)

+					    location   	(-409, -168)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -20890,11 +20833,11 @@
 					    client     	@891

 					    supplier   	@890

 					    line_style 	3

-					    origin_attachment 	(911, 294)

-					    terminal_attachment 	(649, 294)

+					    origin_attachment 	(911, 342)

+					    terminal_attachment 	(649, 342)

 					    label      	(object SegLabel @896

 						Parent_View 	@895

-						location   	(672, 260)

+						location   	(672, 308)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20914,7 +20857,7 @@
 						height     	35

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$158" @897

-				    location   	(911, 413)

+				    location   	(911, 342)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -20929,7 +20872,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "selection" @898

 					    Parent_View 	@897

-					    location   	(-409, -97)

+					    location   	(-409, -168)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -20941,7 +20884,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @899

 						Parent_View 	@898

-						location   	(1060, 444)

+						location   	(1060, 373)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20965,11 +20908,11 @@
 					    client     	@897

 					    supplier   	@889

 					    line_style 	3

-					    origin_attachment 	(911, 413)

-					    terminal_attachment 	(1174, 413)

+					    origin_attachment 	(911, 342)

+					    terminal_attachment 	(1174, 342)

 					    label      	(object SegLabel @900

 						Parent_View 	@898

-						location   	(1132, 369)

+						location   	(1132, 298)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -20990,7 +20933,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$159" @901

 					    Parent_View 	@897

-					    location   	(-409, -97)

+					    location   	(-409, -168)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -21005,11 +20948,11 @@
 					    client     	@897

 					    supplier   	@890

 					    line_style 	3

-					    origin_attachment 	(911, 413)

-					    terminal_attachment 	(649, 413)

+					    origin_attachment 	(911, 342)

+					    terminal_attachment 	(649, 342)

 					    label      	(object SegLabel @902

 						Parent_View 	@901

-						location   	(677, 375)

+						location   	(677, 304)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21208,7 +21151,7 @@
 				    height     	113

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$154" @911

-				    location   	(507, 671)

+				    location   	(508, 671)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -21223,7 +21166,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "localPostcondition" @912

 					    Parent_View 	@911

-					    location   	(184, -229)

+					    location   	(185, -229)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -21235,7 +21178,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @913

 						Parent_View 	@912

-						location   	(634, 730)

+						location   	(635, 730)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21260,15 +21203,15 @@
 					    client     	@911

 					    supplier   	@909

 					    vertices   	(list Points

-						(507, 671)

+						(508, 671)

 						(781, 671)

 						(781, 530))

 					    line_style 	3

-					    origin_attachment 	(507, 671)

+					    origin_attachment 	(508, 671)

 					    terminal_attachment 	(781, 530)

 					    label      	(object SegLabel @914

 						Parent_View 	@912

-						location   	(742, 560)

+						location   	(743, 560)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21289,7 +21232,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @915

 						Parent_View 	@912

-						location   	(609, 777)

+						location   	(610, 777)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21310,7 +21253,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$155" @916

 					    Parent_View 	@911

-					    location   	(184, -229)

+					    location   	(185, -229)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -21322,7 +21265,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @917

 						Parent_View 	@916

-						location   	(306, 713)

+						location   	(307, 713)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21348,14 +21291,14 @@
 					    client     	@911

 					    supplier   	@910

 					    vertices   	(list Points

-						(507, 671)

+						(508, 671)

 						(228, 671)

 						(228, 536))

 					    line_style 	3

-					    origin_attachment 	(507, 671)

+					    origin_attachment 	(508, 671)

 					    terminal_attachment 	(228, 536))))

 				(object AssociationViewNew "$UNNAMED$152" @918

-				    location   	(552, 319)

+				    location   	(553, 319)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -21370,7 +21313,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "localPrecondition" @919

 					    Parent_View 	@918

-					    location   	(233, -620)

+					    location   	(234, -620)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -21382,7 +21325,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @920

 						Parent_View 	@919

-						location   	(681, 229)

+						location   	(682, 229)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21407,15 +21350,15 @@
 					    client     	@918

 					    supplier   	@909

 					    vertices   	(list Points

-						(552, 319)

+						(553, 319)

 						(794, 319)

 						(794, 430))

 					    line_style 	3

-					    origin_attachment 	(552, 319)

+					    origin_attachment 	(553, 319)

 					    terminal_attachment 	(794, 430)

 					    label      	(object SegLabel @921

 						Parent_View 	@919

-						location   	(830, 406)

+						location   	(831, 406)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21436,7 +21379,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @922

 						Parent_View 	@919

-						location   	(650, 276)

+						location   	(651, 276)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21457,7 +21400,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$153" @923

 					    Parent_View 	@918

-					    location   	(233, -620)

+					    location   	(234, -620)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -21469,7 +21412,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @924

 						Parent_View 	@923

-						location   	(378, 230)

+						location   	(379, 230)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21495,11 +21438,11 @@
 					    client     	@918

 					    supplier   	@910

 					    vertices   	(list Points

-						(552, 319)

+						(553, 319)

 						(305, 319)

 						(305, 424))

 					    line_style 	3

-					    origin_attachment 	(552, 319)

+					    origin_attachment 	(553, 319)

 					    terminal_attachment 	(305, 424))))

 				(object ClassView "Class" "Logical View::UML::Activities::BasicActivities::Action" @925

 				    ShowCompartmentStereotypes 	TRUE

@@ -21667,13 +21610,13 @@
 				    origin_attachment 	(710, 353)

 				    terminal_attachment 	(710, 189))

 				(object AssociationViewNew "$UNNAMED$157" @932

-				    location   	(836, 678)

+				    location   	(835, 678)

 				    stereotype 	TRUE

 				    quidu      	"3E00BC060147"

 				    roleview_list 	(list RoleViews

 					(object RoleView "inInterruptibleRegion" @933

 					    Parent_View 	@932

-					    location   	(-528, -172)

+					    location   	(-529, -172)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -21685,7 +21628,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @934

 						Parent_View 	@933

-						location   	(919, 475)

+						location   	(918, 475)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21709,15 +21652,15 @@
 					    client     	@932

 					    supplier   	@930

 					    vertices   	(list Points

-						(836, 678)

+						(835, 678)

 						(750, 678)

 						(750, 439))

 					    line_style 	3

-					    origin_attachment 	(836, 678)

+					    origin_attachment 	(835, 678)

 					    terminal_attachment 	(750, 439)

 					    label      	(object SegLabel @935

 						Parent_View 	@933

-						location   	(727, 488)

+						location   	(726, 488)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -21738,7 +21681,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @936

 						Parent_View 	@933

-						location   	(922, 515)

+						location   	(921, 515)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21759,7 +21702,7 @@
 						orientation 	1))

 					(object RoleView "containedNode" @937

 					    Parent_View 	@932

-					    location   	(-528, -172)

+					    location   	(-529, -172)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -21771,7 +21714,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @938

 						Parent_View 	@937

-						location   	(1033, 716)

+						location   	(1032, 716)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21795,11 +21738,11 @@
 					    client     	@932

 					    supplier   	@928

 					    line_style 	3

-					    origin_attachment 	(836, 678)

-					    terminal_attachment 	(1160, 678)

+					    origin_attachment 	(1670, 1356)

+					    terminal_attachment 	(2462, 1350)

 					    label      	(object SegLabel @939

 						Parent_View 	@937

-						location   	(982, 758)

+						location   	(981, 758)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21819,13 +21762,13 @@
 						height     	80

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$156" @940

-				    location   	(619, 538)

+				    location   	(559, 539)

 				    stereotype 	TRUE

 				    quidu      	"3E00BBD200A2"

 				    roleview_list 	(list RoleViews

 					(object RoleView "interruptingEdge" @941

 					    Parent_View 	@940

-					    location   	(-115, 94)

+					    location   	(-175, 95)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -21837,7 +21780,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @942

 						Parent_View 	@941

-						location   	(474, 600)

+						location   	(414, 601)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21861,11 +21804,11 @@
 					    client     	@940

 					    supplier   	@929

 					    line_style 	3

-					    origin_attachment 	(619, 538)

-					    terminal_attachment 	(619, 638)

+					    origin_attachment 	(559, 539)

+					    terminal_attachment 	(559, 639)

 					    label      	(object SegLabel @943

 						Parent_View 	@941

-						location   	(643, 602)

+						location   	(583, 603)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21886,7 +21829,7 @@
 						orientation 	0))

 					(object RoleView "interrupts" @944

 					    Parent_View 	@940

-					    location   	(-115, 94)

+					    location   	(-175, 95)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -21898,7 +21841,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @945

 						Parent_View 	@944

-						location   	(529, 476)

+						location   	(469, 477)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -21922,11 +21865,11 @@
 					    client     	@940

 					    supplier   	@930

 					    line_style 	3

-					    origin_attachment 	(619, 538)

-					    terminal_attachment 	(619, 438)

+					    origin_attachment 	(559, 539)

+					    terminal_attachment 	(559, 439)

 					    label      	(object SegLabel @946

 						Parent_View 	@944

-						location   	(668, 478)

+						location   	(608, 479)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -22026,12 +21969,10 @@
 			    class_attributes 	(list class_attribute_list

 				(object ClassAttribute "isDeterminate"

 				    quid       	"3DF298EB034B"

-				    type       	"Boolean"

-				    quidu      	"3CA010AC0090")

+				    type       	"Boolean")

 				(object ClassAttribute "isAssured"

 				    quid       	"3DF298E2035B"

-				    type       	"Boolean"

-				    quidu      	"3CA010AC0090")))

+				    type       	"Boolean")))

 			(object Class "LoopNode"

 			    quid       	"3DF298320128"

 			    superclasses 	(list inheritance_relationship_list

@@ -22043,7 +21984,6 @@
 				(object ClassAttribute "isTestedFirst"

 				    quid       	"3DF2995703A9"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    exportControl 	"Public")))

 			(object Class "Clause"

 			    quid       	"3DF29840035B"

@@ -22452,22 +22392,6 @@
 				    icon_style 	"Icon"

 				    line_color 	4194368

 				    quidu      	"3DF2982700FA"

-				    compartment 	(object Compartment

-					Parent_View 	@953

-					location   	(275, 1125)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	2

-					max_width  	356)

 				    width      	440

 				    height     	154

 				    autoResize 	TRUE)

@@ -22502,7 +22426,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$171" @955

-				    location   	(683, 1688)

+				    location   	(746, 1689)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -22518,7 +22442,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$172" @956

 					    Parent_View 	@955

-					    location   	(223, 348)

+					    location   	(286, 349)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -22534,11 +22458,11 @@
 					    client     	@955

 					    supplier   	@954

 					    line_style 	3

-					    origin_attachment 	(683, 1688)

-					    terminal_attachment 	(683, 1598)

+					    origin_attachment 	(746, 1689)

+					    terminal_attachment 	(746, 1599)

 					    label      	(object SegLabel @957

 						Parent_View 	@956

-						location   	(736, 1632)

+						location   	(799, 1633)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -22559,7 +22483,7 @@
 						orientation 	1))

 					(object RoleView "body" @958

 					    Parent_View 	@955

-					    location   	(223, 348)

+					    location   	(286, 349)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -22571,7 +22495,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @959

 						Parent_View 	@958

-						location   	(604, 1756)

+						location   	(667, 1757)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -22596,11 +22520,11 @@
 					    client     	@955

 					    supplier   	@952

 					    line_style 	3

-					    origin_attachment 	(683, 1688)

-					    terminal_attachment 	(683, 1779)

+					    origin_attachment 	(746, 1689)

+					    terminal_attachment 	(746, 1780)

 					    label      	(object SegLabel @960

 						Parent_View 	@958

-						location   	(724, 1756)

+						location   	(787, 1757)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -22758,7 +22682,7 @@
 						height     	76

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$169" @968

-				    location   	(858, 1689)

+				    location   	(746, 1689)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -22774,7 +22698,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$170" @969

 					    Parent_View 	@968

-					    location   	(78, 564)

+					    location   	(-34, 564)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -22786,7 +22710,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @970

 						Parent_View 	@969

-						location   	(770, 1623)

+						location   	(658, 1623)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -22812,11 +22736,11 @@
 					    client     	@968

 					    supplier   	@954

 					    line_style 	3

-					    origin_attachment 	(858, 1689)

-					    terminal_attachment 	(858, 1599)

+					    origin_attachment 	(746, 1689)

+					    terminal_attachment 	(746, 1599)

 					    label      	(object SegLabel @971

 						Parent_View 	@969

-						location   	(916, 1633)

+						location   	(804, 1633)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -22837,7 +22761,7 @@
 						orientation 	1))

 					(object RoleView "test" @972

 					    Parent_View 	@968

-					    location   	(78, 564)

+					    location   	(-34, 564)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -22849,7 +22773,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @973

 						Parent_View 	@972

-						location   	(786, 1757)

+						location   	(674, 1757)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -22874,11 +22798,11 @@
 					    client     	@968

 					    supplier   	@952

 					    line_style 	3

-					    origin_attachment 	(858, 1689)

-					    terminal_attachment 	(858, 1780)

+					    origin_attachment 	(746, 1689)

+					    terminal_attachment 	(746, 1780)

 					    label      	(object SegLabel @974

 						Parent_View 	@972

-						location   	(902, 1758)

+						location   	(790, 1758)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -22898,7 +22822,7 @@
 						height     	44

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$178" @975

-				    location   	(581, 1320)

+				    location   	(574, 1321)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -22913,7 +22837,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "clause" @976

 					    Parent_View 	@975

-					    location   	(111, 650)

+					    location   	(104, 651)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -22925,7 +22849,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @977

 						Parent_View 	@976

-						location   	(507, 1336)

+						location   	(500, 1337)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -22949,11 +22873,11 @@
 					    client     	@975

 					    supplier   	@954

 					    line_style 	3

-					    origin_attachment 	(581, 1320)

-					    terminal_attachment 	(581, 1424)

+					    origin_attachment 	(574, 1321)

+					    terminal_attachment 	(574, 1425)

 					    label      	(object SegLabel @978

 						Parent_View 	@976

-						location   	(636, 1382)

+						location   	(629, 1383)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -22974,7 +22898,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @979

 						Parent_View 	@976

-						location   	(390, 1377)

+						location   	(383, 1378)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -22995,7 +22919,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$179" @980

 					    Parent_View 	@975

-					    location   	(111, 650)

+					    location   	(104, 651)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -23007,7 +22931,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @981

 						Parent_View 	@980

-						location   	(416, 1248)

+						location   	(409, 1249)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -23032,11 +22956,11 @@
 					    client     	@975

 					    supplier   	@953

 					    line_style 	3

-					    origin_attachment 	(581, 1320)

-					    terminal_attachment 	(581, 1217)

+					    origin_attachment 	(574, 1321)

+					    terminal_attachment 	(574, 1217)

 					    label      	(object SegLabel @982

 						Parent_View 	@980

-						location   	(623, 1246)

+						location   	(616, 1247)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -23084,7 +23008,7 @@
 				    height     	125

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$180" @984

-				    location   	(1128, 1509)

+				    location   	(902, 1718)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -23099,7 +23023,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "decider" @985

 					    Parent_View 	@984

-					    location   	(423, 509)

+					    location   	(197, 718)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -23111,7 +23035,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @986

 						Parent_View 	@985

-						location   	(1046, 1725)

+						location   	(820, 1934)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -23134,12 +23058,16 @@
 					    quidu      	"3DF4262802C2"

 					    client     	@984

 					    supplier   	@983

+					    vertices   	(list Points

+						(902, 1718)

+						(902, 1778)

+						(1028, 1778))

 					    line_style 	3

-					    origin_attachment 	(1128, 1509)

-					    terminal_attachment 	(1128, 1779)

+					    origin_attachment 	(902, 1718)

+					    terminal_attachment 	(1028, 1778)

 					    label      	(object SegLabel @987

 						Parent_View 	@985

-						location   	(1155, 1725)

+						location   	(929, 1934)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -23160,7 +23088,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$181" @988

 					    Parent_View 	@984

-					    location   	(423, 509)

+					    location   	(197, 718)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -23174,16 +23102,12 @@
 					    quidu      	"3DF426280312"

 					    client     	@984

 					    supplier   	@954

-					    vertices   	(list Points

-						(1128, 1509)

-						(1128, 1449)

-						(902, 1449))

 					    line_style 	3

-					    origin_attachment 	(1128, 1509)

-					    terminal_attachment 	(902, 1449)

+					    origin_attachment 	(1804, 3436)

+					    terminal_attachment 	(1574, 3111)

 					    label      	(object SegLabel @989

 						Parent_View 	@988

-						location   	(958, 1405)

+						location   	(732, 1614)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -23256,27 +23180,11 @@
 				    icon_style 	"Icon"

 				    line_color 	4194368

 				    quidu      	"3DF298320128"

-				    compartment 	(object Compartment

-					Parent_View 	@991

-					location   	(1410, 1464)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	1

-					max_width  	334)

 				    width      	414

 				    height     	112

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$182" @992

-				    location   	(1239, 1538)

+				    location   	(1401, 1672)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -23291,7 +23199,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "decider" @993

 					    Parent_View 	@992

-					    location   	(-176, 633)

+					    location   	(-14, 767)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -23303,7 +23211,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @994

 						Parent_View 	@993

-						location   	(1324, 1736)

+						location   	(1486, 1870)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -23326,12 +23234,16 @@
 					    quidu      	"3DF42657007B"

 					    client     	@992

 					    supplier   	@983

+					    vertices   	(list Points

+						(1401, 1672)

+						(1401, 1777)

+						(1348, 1777))

 					    line_style 	3

-					    origin_attachment 	(1239, 1538)

-					    terminal_attachment 	(1239, 1780)

+					    origin_attachment 	(1401, 1672)

+					    terminal_attachment 	(1348, 1777)

 					    label      	(object SegLabel @995

 						Parent_View 	@993

-						location   	(1219, 1729)

+						location   	(1381, 1863)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -23352,7 +23264,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$183" @996

 					    Parent_View 	@992

-					    location   	(-176, 633)

+					    location   	(-14, 767)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -23366,16 +23278,12 @@
 					    quidu      	"3DF4265700CB"

 					    client     	@992

 					    supplier   	@991

-					    vertices   	(list Points

-						(1239, 1538)

-						(1239, 1458)

-						(1401, 1458))

 					    line_style 	3

-					    origin_attachment 	(1239, 1538)

-					    terminal_attachment 	(1401, 1458)

+					    origin_attachment 	(2802, 3344)

+					    terminal_attachment 	(3009, 2972)

 					    label      	(object SegLabel @997

 						Parent_View 	@996

-						location   	(1363, 1413)

+						location   	(1525, 1547)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -23395,7 +23303,7 @@
 						height     	46

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$176" @998

-				    location   	(1587, 1649)

+				    location   	(1632, 1650)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -23411,7 +23319,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$177" @999

 					    Parent_View 	@998

-					    location   	(237, 499)

+					    location   	(282, 500)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -23427,11 +23335,11 @@
 					    client     	@998

 					    supplier   	@991

 					    line_style 	3

-					    origin_attachment 	(1587, 1649)

-					    terminal_attachment 	(1587, 1513)

+					    origin_attachment 	(1632, 1650)

+					    terminal_attachment 	(1632, 1514)

 					    label      	(object SegLabel @1000

 						Parent_View 	@999

-						location   	(1637, 1547)

+						location   	(1682, 1548)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -23452,7 +23360,7 @@
 						orientation 	1))

 					(object RoleView "setupPart" @1001

 					    Parent_View 	@998

-					    location   	(237, 499)

+					    location   	(282, 500)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -23464,7 +23372,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1002

 						Parent_View 	@1001

-						location   	(1497, 1689)

+						location   	(1542, 1690)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -23489,11 +23397,11 @@
 					    client     	@998

 					    supplier   	@990

 					    line_style 	3

-					    origin_attachment 	(1587, 1649)

-					    terminal_attachment 	(1587, 1785)

+					    origin_attachment 	(1632, 1650)

+					    terminal_attachment 	(1632, 1786)

 					    label      	(object SegLabel @1003

 						Parent_View 	@1001

-						location   	(1548, 1735)

+						location   	(1593, 1736)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -23513,7 +23421,7 @@
 						height     	40

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$174" @1004

-				    location   	(1703, 1649)

+				    location   	(1632, 1650)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -23529,7 +23437,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$175" @1005

 					    Parent_View 	@1004

-					    location   	(353, 499)

+					    location   	(282, 500)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -23545,11 +23453,11 @@
 					    client     	@1004

 					    supplier   	@991

 					    line_style 	3

-					    origin_attachment 	(1703, 1649)

-					    terminal_attachment 	(1703, 1513)

+					    origin_attachment 	(1632, 1650)

+					    terminal_attachment 	(1632, 1514)

 					    label      	(object SegLabel @1006

 						Parent_View 	@1005

-						location   	(1756, 1553)

+						location   	(1685, 1554)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -23570,7 +23478,7 @@
 						orientation 	1))

 					(object RoleView "bodyPart" @1007

 					    Parent_View 	@1004

-					    location   	(353, 499)

+					    location   	(282, 500)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -23582,7 +23490,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1008

 						Parent_View 	@1007

-						location   	(1811, 1684)

+						location   	(1740, 1685)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -23607,11 +23515,11 @@
 					    client     	@1004

 					    supplier   	@990

 					    line_style 	3

-					    origin_attachment 	(1703, 1649)

-					    terminal_attachment 	(1703, 1785)

+					    origin_attachment 	(1632, 1650)

+					    terminal_attachment 	(1632, 1786)

 					    label      	(object SegLabel @1009

 						Parent_View 	@1007

-						location   	(1742, 1739)

+						location   	(1671, 1740)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -23959,7 +23867,7 @@
 				    height     	407

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$166" @1024

-				    location   	(672, 584)

+				    location   	(672, 582)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -23975,7 +23883,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "scope" @1025

 					    Parent_View 	@1024

-					    location   	(437, 229)

+					    location   	(437, 227)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -23987,7 +23895,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1026

 						Parent_View 	@1025

-						location   	(837, 620)

+						location   	(837, 618)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24012,11 +23920,11 @@
 					    client     	@1024

 					    supplier   	@1023

 					    line_style 	3

-					    origin_attachment 	(672, 584)

-					    terminal_attachment 	(919, 584)

+					    origin_attachment 	(672, 582)

+					    terminal_attachment 	(919, 582)

 					    label      	(object SegLabel @1027

 						Parent_View 	@1025

-						location   	(882, 516)

+						location   	(882, 514)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24037,7 +23945,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1028

 						Parent_View 	@1025

-						location   	(783, 657)

+						location   	(783, 655)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24058,7 +23966,7 @@
 						orientation 	1))

 					(object RoleView "variable" @1029

 					    Parent_View 	@1024

-					    location   	(437, 229)

+					    location   	(437, 227)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -24070,7 +23978,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1030

 						Parent_View 	@1029

-						location   	(512, 505)

+						location   	(512, 503)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24095,11 +24003,11 @@
 					    client     	@1024

 					    supplier   	@1019

 					    line_style 	3

-					    origin_attachment 	(672, 584)

-					    terminal_attachment 	(426, 584)

+					    origin_attachment 	(672, 582)

+					    terminal_attachment 	(426, 582)

 					    label      	(object SegLabel @1031

 						Parent_View 	@1029

-						location   	(475, 622)

+						location   	(475, 620)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24120,7 +24028,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1032

 						Parent_View 	@1029

-						location   	(620, 554)

+						location   	(620, 552)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24193,7 +24101,7 @@
 				    origin_attachment 	(1140, 529)

 				    terminal_attachment 	(1140, 278))

 				(object AssociationViewNew "$UNNAMED$186" @1039

-				    location   	(665, 843)

+				    location   	(665, 864)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -24208,7 +24116,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "activity" @1040

 					    Parent_View 	@1039

-					    location   	(-373, 405)

+					    location   	(-373, 426)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -24220,7 +24128,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1041

 						Parent_View 	@1040

-						location   	(492, 726)

+						location   	(492, 747)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24244,11 +24152,11 @@
 					    client     	@1039

 					    supplier   	@1020

 					    line_style 	3

-					    origin_attachment 	(665, 843)

-					    terminal_attachment 	(411, 843)

+					    origin_attachment 	(665, 864)

+					    terminal_attachment 	(411, 864)

 					    label      	(object SegLabel @1042

 						Parent_View 	@1040

-						location   	(465, 886)

+						location   	(465, 907)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24269,7 +24177,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1043

 						Parent_View 	@1040

-						location   	(567, 785)

+						location   	(567, 806)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24290,7 +24198,7 @@
 						orientation 	1))

 					(object RoleView "/structuredNode" @1044

 					    Parent_View 	@1039

-					    location   	(-373, 405)

+					    location   	(-373, 426)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -24302,7 +24210,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1045

 						Parent_View 	@1044

-						location   	(779, 875)

+						location   	(779, 896)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24326,11 +24234,11 @@
 					    client     	@1039

 					    supplier   	@1023

 					    line_style 	3

-					    origin_attachment 	(665, 843)

-					    terminal_attachment 	(919, 843)

+					    origin_attachment 	(665, 864)

+					    terminal_attachment 	(919, 864)

 					    label      	(object SegLabel @1046

 						Parent_View 	@1044

-						location   	(892, 809)

+						location   	(892, 830)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24351,7 +24259,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1047

 						Parent_View 	@1044

-						location   	(791, 935)

+						location   	(791, 956)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24371,7 +24279,7 @@
 						height     	92

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$167" @1048

-				    location   	(1602, 587)

+				    location   	(1602, 606)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -24383,7 +24291,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @1049

 					Parent_View 	@1048

-					location   	(1400, 554)

+					location   	(1400, 573)

 					font       	(object Font

 					    size       	8

 					    face       	"Arial"

@@ -24409,7 +24317,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "containedNode" @1050

 					    Parent_View 	@1048

-					    location   	(787, 227)

+					    location   	(787, 246)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -24421,7 +24329,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1051

 						Parent_View 	@1050

-						location   	(1686, 628)

+						location   	(1686, 647)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24446,11 +24354,11 @@
 					    client     	@1048

 					    supplier   	@1021

 					    line_style 	3

-					    origin_attachment 	(1602, 587)

-					    terminal_attachment 	(1855, 587)

+					    origin_attachment 	(1602, 606)

+					    terminal_attachment 	(1855, 606)

 					    label      	(object SegLabel @1052

 						Parent_View 	@1050

-						location   	(1769, 688)

+						location   	(1769, 707)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24471,7 +24379,7 @@
 						orientation 	1))

 					(object RoleView "inStructuredNode" @1053

 					    Parent_View 	@1048

-					    location   	(787, 227)

+					    location   	(787, 246)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -24483,7 +24391,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1054

 						Parent_View 	@1053

-						location   	(1561, 489)

+						location   	(1561, 508)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24508,11 +24416,11 @@
 					    client     	@1048

 					    supplier   	@1023

 					    line_style 	3

-					    origin_attachment 	(1602, 587)

-					    terminal_attachment 	(1349, 587)

+					    origin_attachment 	(1602, 606)

+					    terminal_attachment 	(1349, 606)

 					    label      	(object SegLabel @1055

 						Parent_View 	@1053

-						location   	(1431, 634)

+						location   	(1431, 653)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24533,7 +24441,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1056

 						Parent_View 	@1053

-						location   	(1549, 541)

+						location   	(1549, 560)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24553,14 +24461,14 @@
 						height     	47

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$168" @1057

-				    location   	(1605, 875)

+				    location   	(1605, 864)

 				    stereotype 	TRUE

 				    line_color 	4194368

 				    quidu      	"3DF296FF0271"

 				    roleview_list 	(list RoleViews

 					(object RoleView "containedEdge" @1058

 					    Parent_View 	@1057

-					    location   	(790, 515)

+					    location   	(790, 504)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -24572,7 +24480,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1059

 						Parent_View 	@1058

-						location   	(1716, 913)

+						location   	(1716, 902)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24597,11 +24505,11 @@
 					    client     	@1057

 					    supplier   	@1022

 					    line_style 	3

-					    origin_attachment 	(1605, 875)

-					    terminal_attachment 	(1861, 875)

+					    origin_attachment 	(1605, 864)

+					    terminal_attachment 	(1861, 864)

 					    label      	(object SegLabel @1060

 						Parent_View 	@1058

-						location   	(1805, 957)

+						location   	(1805, 946)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24622,7 +24530,7 @@
 						orientation 	1))

 					(object RoleView "inStructuredNode" @1061

 					    Parent_View 	@1057

-					    location   	(790, 515)

+					    location   	(790, 504)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -24634,7 +24542,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1062

 						Parent_View 	@1061

-						location   	(1534, 792)

+						location   	(1534, 781)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24659,11 +24567,11 @@
 					    client     	@1057

 					    supplier   	@1023

 					    line_style 	3

-					    origin_attachment 	(1605, 875)

-					    terminal_attachment 	(1349, 875)

+					    origin_attachment 	(1605, 864)

+					    terminal_attachment 	(1349, 864)

 					    label      	(object SegLabel @1063

 						Parent_View 	@1061

-						location   	(1428, 925)

+						location   	(1428, 914)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -24684,7 +24592,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1064

 						Parent_View 	@1061

-						location   	(1549, 828)

+						location   	(1549, 817)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25087,14 +24995,14 @@
 				    origin_attachment 	(313, 525)

 				    terminal_attachment 	(313, 236))

 				(object AssociationViewNew "$UNNAMED$188" @1075

-				    location   	(764, 462)

+				    location   	(765, 462)

 				    stereotype 	TRUE

 				    line_color 	4194368

 				    quidu      	"3DF29C69009C"

 				    roleview_list 	(list RoleViews

 					(object RoleView "inputElement" @1076

 					    Parent_View 	@1075

-					    location   	(234, -183)

+					    location   	(235, -183)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -25106,7 +25014,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1077

 						Parent_View 	@1076

-						location   	(989, 376)

+						location   	(990, 376)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25131,15 +25039,15 @@
 					    client     	@1075

 					    supplier   	@1071

 					    vertices   	(list Points

-						(764, 462)

+						(765, 462)

 						(1122, 462)

 						(1122, 518))

 					    line_style 	3

-					    origin_attachment 	(764, 462)

+					    origin_attachment 	(765, 462)

 					    terminal_attachment 	(1122, 518)

 					    label      	(object SegLabel @1078

 						Parent_View 	@1076

-						location   	(1056, 435)

+						location   	(1057, 435)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25160,7 +25068,7 @@
 						orientation 	0))

 					(object RoleView "regionAsInput" @1079

 					    Parent_View 	@1075

-					    location   	(234, -183)

+					    location   	(235, -183)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -25172,7 +25080,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1080

 						Parent_View 	@1079

-						location   	(535, 429)

+						location   	(536, 429)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25197,15 +25105,15 @@
 					    client     	@1075

 					    supplier   	@1073

 					    vertices   	(list Points

-						(764, 462)

+						(765, 462)

 						(415, 462)

 						(415, 526))

 					    line_style 	3

-					    origin_attachment 	(764, 462)

+					    origin_attachment 	(765, 462)

 					    terminal_attachment 	(415, 526)

 					    label      	(object SegLabel @1081

 						Parent_View 	@1079

-						location   	(495, 499)

+						location   	(496, 499)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25225,14 +25133,14 @@
 						height     	37

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$187" @1082

-				    location   	(771, 709)

+				    location   	(772, 709)

 				    stereotype 	TRUE

 				    line_color 	4194368

 				    quidu      	"3DF29C9601C5"

 				    roleview_list 	(list RoleViews

 					(object RoleView "outputElement" @1083

 					    Parent_View 	@1082

-					    location   	(241, 64)

+					    location   	(242, 64)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -25244,7 +25152,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1084

 						Parent_View 	@1083

-						location   	(1063, 750)

+						location   	(1064, 750)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25269,15 +25177,15 @@
 					    client     	@1082

 					    supplier   	@1071

 					    vertices   	(list Points

-						(771, 709)

+						(772, 709)

 						(1106, 709)

 						(1106, 622))

 					    line_style 	3

-					    origin_attachment 	(771, 709)

+					    origin_attachment 	(772, 709)

 					    terminal_attachment 	(1106, 622)

 					    label      	(object SegLabel @1085

 						Parent_View 	@1083

-						location   	(1160, 665)

+						location   	(1161, 665)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25298,7 +25206,7 @@
 						orientation 	1))

 					(object RoleView "regionAsOutput" @1086

 					    Parent_View 	@1082

-					    location   	(241, 64)

+					    location   	(242, 64)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -25310,7 +25218,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1087

 						Parent_View 	@1086

-						location   	(546, 763)

+						location   	(547, 763)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25335,15 +25243,15 @@
 					    client     	@1082

 					    supplier   	@1073

 					    vertices   	(list Points

-						(771, 709)

+						(772, 709)

 						(421, 709)

 						(421, 638))

 					    line_style 	3

-					    origin_attachment 	(771, 709)

+					    origin_attachment 	(772, 709)

 					    terminal_attachment 	(421, 638)

 					    label      	(object SegLabel @1088

 						Parent_View 	@1086

-						location   	(477, 679)

+						location   	(478, 679)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25522,7 +25430,7 @@
 				    height     	344

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$191" @1094

-				    location   	(1317, 391)

+				    location   	(1317, 398)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -25538,7 +25446,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "exceptionInput" @1095

 					    Parent_View 	@1094

-					    location   	(-158, -444)

+					    location   	(-158, -437)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -25550,7 +25458,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1096

 						Parent_View 	@1095

-						location   	(1337, 347)

+						location   	(1337, 354)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25575,11 +25483,11 @@
 					    client     	@1094

 					    supplier   	@1090

 					    line_style 	3

-					    origin_attachment 	(1317, 391)

-					    terminal_attachment 	(1483, 391)

+					    origin_attachment 	(1317, 398)

+					    terminal_attachment 	(1483, 398)

 					    label      	(object SegLabel @1097

 						Parent_View 	@1095

-						location   	(1444, 433)

+						location   	(1444, 440)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25600,17 +25508,17 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$192" @1098

 					    Parent_View 	@1094

-					    location   	(-158, -444)

+					    location   	(-158, -437)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3DFA7F6302BF"

 					    client     	@1094

 					    supplier   	@1093

 					    line_style 	3

-					    origin_attachment 	(1317, 391)

-					    terminal_attachment 	(1152, 391))))

+					    origin_attachment 	(1317, 398)

+					    terminal_attachment 	(1152, 398))))

 				(object AssociationViewNew "$UNNAMED$193" @1099

-				    location   	(1339, 616)

+				    location   	(1339, 630)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -25626,7 +25534,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "exceptionType" @1100

 					    Parent_View 	@1099

-					    location   	(-6, -204)

+					    location   	(-6, -190)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -25638,7 +25546,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1101

 						Parent_View 	@1100

-						location   	(1384, 573)

+						location   	(1384, 587)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25663,11 +25571,11 @@
 					    client     	@1099

 					    supplier   	@1091

 					    line_style 	3

-					    origin_attachment 	(1339, 616)

-					    terminal_attachment 	(1526, 616)

+					    origin_attachment 	(1339, 630)

+					    terminal_attachment 	(1526, 630)

 					    label      	(object SegLabel @1102

 						Parent_View 	@1100

-						location   	(1463, 670)

+						location   	(1463, 684)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25688,24 +25596,24 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$194" @1103

 					    Parent_View 	@1099

-					    location   	(-6, -204)

+					    location   	(-6, -190)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3DFA79A2007D"

 					    client     	@1099

 					    supplier   	@1093

 					    line_style 	3

-					    origin_attachment 	(1339, 616)

-					    terminal_attachment 	(1152, 616))))

+					    origin_attachment 	(1339, 630)

+					    terminal_attachment 	(1152, 630))))

 				(object AssociationViewNew "$UNNAMED$189" @1104

-				    location   	(609, 394)

+				    location   	(609, 528)

 				    stereotype 	TRUE

 				    line_color 	4194368

 				    quidu      	"3DFA7999002E"

 				    roleview_list 	(list RoleViews

 					(object RoleView "handler" @1105

 					    Parent_View 	@1104

-					    location   	(29, -411)

+					    location   	(29, -277)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -25717,7 +25625,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1106

 						Parent_View 	@1105

-						location   	(761, 319)

+						location   	(761, 453)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25742,11 +25650,11 @@
 					    client     	@1104

 					    supplier   	@1093

 					    line_style 	3

-					    origin_attachment 	(609, 394)

-					    terminal_attachment 	(852, 394)

+					    origin_attachment 	(609, 528)

+					    terminal_attachment 	(852, 528)

 					    label      	(object SegLabel @1107

 						Parent_View 	@1105

-						location   	(825, 436)

+						location   	(825, 570)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25767,7 +25675,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1108

 						Parent_View 	@1105

-						location   	(661, 359)

+						location   	(661, 493)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25788,7 +25696,7 @@
 						orientation 	0))

 					(object RoleView "protectedNode" @1109

 					    Parent_View 	@1104

-					    location   	(29, -411)

+					    location   	(29, -277)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -25800,7 +25708,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1110

 						Parent_View 	@1109

-						location   	(517, 426)

+						location   	(517, 560)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25825,11 +25733,11 @@
 					    client     	@1104

 					    supplier   	@1092

 					    line_style 	3

-					    origin_attachment 	(609, 394)

-					    terminal_attachment 	(366, 394)

+					    origin_attachment 	(609, 528)

+					    terminal_attachment 	(366, 528)

 					    label      	(object SegLabel @1111

 						Parent_View 	@1109

-						location   	(401, 340)

+						location   	(401, 474)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25850,7 +25758,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1112

 						Parent_View 	@1109

-						location   	(514, 471)

+						location   	(514, 605)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25870,7 +25778,7 @@
 						height     	77

 						orientation 	0))))

 				(object AssociationViewNew "n" @1113

-				    location   	(609, 648)

+				    location   	(609, 528)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -25886,7 +25794,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "handlerBody" @1114

 					    Parent_View 	@1113

-					    location   	(-736, -172)

+					    location   	(-736, -292)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -25898,7 +25806,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1115

 						Parent_View 	@1114

-						location   	(493, 692)

+						location   	(493, 572)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25923,11 +25831,11 @@
 					    client     	@1113

 					    supplier   	@1092

 					    line_style 	3

-					    origin_attachment 	(609, 648)

-					    terminal_attachment 	(366, 648)

+					    origin_attachment 	(609, 528)

+					    terminal_attachment 	(366, 528)

 					    label      	(object SegLabel @1116

 						Parent_View 	@1114

-						location   	(405, 595)

+						location   	(405, 475)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25948,7 +25856,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$190" @1117

 					    Parent_View 	@1113

-					    location   	(-736, -172)

+					    location   	(-736, -292)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -25960,7 +25868,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1118

 						Parent_View 	@1117

-						location   	(692, 570)

+						location   	(692, 450)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -25986,8 +25894,8 @@
 					    client     	@1113

 					    supplier   	@1093

 					    line_style 	3

-					    origin_attachment 	(609, 648)

-					    terminal_attachment 	(852, 648))))

+					    origin_attachment 	(609, 528)

+					    terminal_attachment 	(852, 528))))

 				(object InheritView "" @1119

 				    stereotype 	TRUE

 				    line_color 	4194368

@@ -26064,8 +25972,7 @@
 			    class_attributes 	(list class_attribute_list

 				(object ClassAttribute "mustIsolate"

 				    quid       	"3DF42BF00270"

-				    type       	"Boolean"

-				    quidu      	"3CA010AC0090")))

+				    type       	"Boolean")))

 			(object Class "LoopNode"

 			    quid       	"3DF42C0A0051"

 			    superclasses 	(list inheritance_relationship_list

@@ -26343,22 +26250,6 @@
 					label      	"StructuredActivityNode")

 				    icon_style 	"Icon"

 				    quidu      	"3DF42BDA0369"

-				    compartment 	(object Compartment

-					Parent_View 	@1126

-					location   	(697, 798)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	1

-					max_width  	328)

 				    width      	375

 				    height     	118)

 				(object ClassView "Class" "Logical View::UML::Activities::BasicActivities::Action" @1127

@@ -26676,7 +26567,7 @@
 				    height     	106

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$203" @1144

-				    location   	(2489, 1122)

+				    location   	(2573, 2244)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -26691,7 +26582,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "bodyOutput" @1145

 					    Parent_View 	@1144

-					    location   	(449, 342)

+					    location   	(533, 1464)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -26703,7 +26594,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1146

 						Parent_View 	@1145

-						location   	(2319, 1225)

+						location   	(2403, 2347)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -26727,15 +26618,16 @@
 					    client     	@1144

 					    supplier   	@1143

 					    vertices   	(list Points

-						(2489, 1122)

+						(2573, 2244)

+						(2489, 2244)

 						(2489, 1182)

 						(2209, 1182))

 					    line_style 	3

-					    origin_attachment 	(2489, 1122)

+					    origin_attachment 	(2573, 2244)

 					    terminal_attachment 	(2209, 1182)

 					    label      	(object SegLabel @1147

 						Parent_View 	@1145

-						location   	(2262, 1162)

+						location   	(2346, 2284)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -26756,7 +26648,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$204" @1148

 					    Parent_View 	@1144

-					    location   	(449, 342)

+					    location   	(533, 1464)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -26770,12 +26662,16 @@
 					    quidu      	"3DF42F0103C3"

 					    client     	@1144

 					    supplier   	@1133

+					    vertices   	(list Points

+						(2573, 2244)

+						(2633, 2244)

+						(2633, 847))

 					    line_style 	3

-					    origin_attachment 	(2489, 1122)

-					    terminal_attachment 	(2489, 847)

+					    origin_attachment 	(2573, 2244)

+					    terminal_attachment 	(2633, 847)

 					    label      	(object SegLabel @1149

 						Parent_View 	@1148

-						location   	(2523, 884)

+						location   	(2607, 2006)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -26851,7 +26747,7 @@
 				    width      	300

 				    height     	118)

 				(object AssociationViewNew "$UNNAMED$197" @1152

-				    location   	(1711, 981)

+				    location   	(1678, 980)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -26866,7 +26762,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "result" @1153

 					    Parent_View 	@1152

-					    location   	(326, 206)

+					    location   	(293, 205)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -26878,7 +26774,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1154

 						Parent_View 	@1153

-						location   	(1634, 1082)

+						location   	(1601, 1081)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -26902,11 +26798,11 @@
 					    client     	@1152

 					    supplier   	@1135

 					    line_style 	3

-					    origin_attachment 	(1711, 981)

-					    terminal_attachment 	(1711, 1114)

+					    origin_attachment 	(1678, 980)

+					    terminal_attachment 	(1678, 1113)

 					    label      	(object SegLabel @1155

 						Parent_View 	@1153

-						location   	(1748, 1084)

+						location   	(1715, 1083)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -26927,7 +26823,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1156

 						Parent_View 	@1153

-						location   	(1580, 980)

+						location   	(1547, 979)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -26951,7 +26847,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$198" @1157

 					    Parent_View 	@1152

-					    location   	(326, 206)

+					    location   	(293, 205)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -26966,11 +26862,11 @@
 					    client     	@1152

 					    supplier   	@1151

 					    line_style 	3

-					    origin_attachment 	(1711, 981)

-					    terminal_attachment 	(1711, 848)

+					    origin_attachment 	(1678, 980)

+					    terminal_attachment 	(1678, 848)

 					    label      	(object SegLabel @1158

 						Parent_View 	@1157

-						location   	(1778, 879)

+						location   	(1745, 878)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -26990,7 +26886,7 @@
 						height     	67

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$199" @1159

-				    location   	(1879, 982)

+				    location   	(1878, 982)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -27005,7 +26901,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "loopVariable" @1160

 					    Parent_View 	@1159

-					    location   	(494, 207)

+					    location   	(493, 207)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -27017,7 +26913,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1161

 						Parent_View 	@1160

-						location   	(2016, 1081)

+						location   	(2015, 1081)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -27041,11 +26937,11 @@
 					    client     	@1159

 					    supplier   	@1143

 					    line_style 	3

-					    origin_attachment 	(1879, 982)

-					    terminal_attachment 	(1879, 1116)

+					    origin_attachment 	(1878, 982)

+					    terminal_attachment 	(1878, 1116)

 					    label      	(object SegLabel @1162

 						Parent_View 	@1160

-						location   	(1843, 1093)

+						location   	(1842, 1093)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -27066,7 +26962,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1163

 						Parent_View 	@1160

-						location   	(2022, 1005)

+						location   	(2021, 1005)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -27090,7 +26986,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$200" @1164

 					    Parent_View 	@1159

-					    location   	(494, 207)

+					    location   	(493, 207)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -27105,11 +27001,11 @@
 					    client     	@1159

 					    supplier   	@1151

 					    line_style 	3

-					    origin_attachment 	(1879, 982)

-					    terminal_attachment 	(1879, 849)

+					    origin_attachment 	(1878, 982)

+					    terminal_attachment 	(1878, 849)

 					    label      	(object SegLabel @1165

 						Parent_View 	@1164

-						location   	(1939, 885)

+						location   	(1938, 885)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -27129,7 +27025,7 @@
 						height     	60

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$201" @1166

-				    location   	(2164, 880)

+				    location   	(2104, 982)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -27144,7 +27040,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "bodyOutput" @1167

 					    Parent_View 	@1166

-					    location   	(779, 105)

+					    location   	(719, 207)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -27156,7 +27052,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1168

 						Parent_View 	@1167

-						location   	(2289, 1009)

+						location   	(2229, 1111)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -27179,12 +27075,16 @@
 					    quidu      	"3DF42EB3000A"

 					    client     	@1166

 					    supplier   	@1143

+					    vertices   	(list Points

+						(2104, 982)

+						(1878, 982)

+						(1878, 1117))

 					    line_style 	3

-					    origin_attachment 	(2164, 880)

-					    terminal_attachment 	(2164, 1117)

+					    origin_attachment 	(2104, 982)

+					    terminal_attachment 	(1878, 1117)

 					    label      	(object SegLabel @1169

 						Parent_View 	@1167

-						location   	(2198, 1092)

+						location   	(2138, 1194)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -27205,7 +27105,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$202" @1170

 					    Parent_View 	@1166

-					    location   	(779, 105)

+					    location   	(719, 207)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -27220,15 +27120,16 @@
 					    client     	@1166

 					    supplier   	@1151

 					    vertices   	(list Points

-						(2164, 880)

+						(2104, 982)

+						(2164, 982)

 						(2164, 820)

 						(1915, 820))

 					    line_style 	3

-					    origin_attachment 	(2164, 880)

+					    origin_attachment 	(2104, 982)

 					    terminal_attachment 	(1915, 820)

 					    label      	(object SegLabel @1171

 						Parent_View 	@1170

-						location   	(1947, 810)

+						location   	(1887, 912)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -27256,7 +27157,7 @@
 				    origin_attachment 	(1772, 730)

 				    terminal_attachment 	(1772, 577))

 				(object AssociationViewNew "$UNNAMED$205" @1173

-				    location   	(2049, 741)

+				    location   	(2109, 681)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -27271,7 +27172,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "loopVariableInput" @1174

 					    Parent_View 	@1173

-					    location   	(664, -34)

+					    location   	(724, -94)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -27283,7 +27184,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1175

 						Parent_View 	@1174

-						location   	(2273, 611)

+						location   	(2333, 551)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -27306,16 +27207,12 @@
 					    quidu      	"3DF42F4A03B4"

 					    client     	@1173

 					    supplier   	@1150

-					    vertices   	(list Points

-						(2049, 741)

-						(2109, 741)

-						(2109, 548))

 					    line_style 	3

-					    origin_attachment 	(2049, 741)

+					    origin_attachment 	(2109, 681)

 					    terminal_attachment 	(2109, 548)

 					    label      	(object SegLabel @1176

 						Parent_View 	@1174

-						location   	(2063, 621)

+						location   	(2123, 561)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -27336,7 +27233,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1177

 						Parent_View 	@1174

-						location   	(2223, 676)

+						location   	(2283, 616)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -27360,7 +27257,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$206" @1178

 					    Parent_View 	@1173

-					    location   	(664, -34)

+					    location   	(724, -94)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -27374,12 +27271,16 @@
 					    quidu      	"3DF42F4B006D"

 					    client     	@1173

 					    supplier   	@1151

+					    vertices   	(list Points

+						(2109, 681)

+						(2109, 741)

+						(1915, 741))

 					    line_style 	3

-					    origin_attachment 	(2049, 741)

+					    origin_attachment 	(2109, 681)

 					    terminal_attachment 	(1915, 741)

 					    label      	(object SegLabel @1179

 						Parent_View 	@1178

-						location   	(1942, 697)

+						location   	(2002, 637)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -28630,7 +28531,7 @@
 				    height     	125

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$227" @1212

-				    location   	(2989, 1297)

+				    location   	(3006, 1297)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -28646,7 +28547,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "invariant" @1213

 					    Parent_View 	@1212

-					    location   	(-533, 169)

+					    location   	(-516, 169)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -28658,7 +28559,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1214

 						Parent_View 	@1213

-						location   	(2876, 1340)

+						location   	(2893, 1340)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -28683,11 +28584,11 @@
 					    client     	@1212

 					    supplier   	@1210

 					    line_style 	3

-					    origin_attachment 	(2989, 1297)

-					    terminal_attachment 	(2989, 1411)

+					    origin_attachment 	(3006, 1297)

+					    terminal_attachment 	(3006, 1411)

 					    label      	(object SegLabel @1215

 						Parent_View 	@1213

-						location   	(3061, 1364)

+						location   	(3078, 1364)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -28708,7 +28609,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1216

 						Parent_View 	@1213

-						location   	(2737, 1379)

+						location   	(2754, 1379)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -28729,15 +28630,15 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$228" @1217

 					    Parent_View 	@1212

-					    location   	(-533, 169)

+					    location   	(-516, 169)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3D256CF00260"

 					    client     	@1212

 					    supplier   	@1211

 					    line_style 	3

-					    origin_attachment 	(2989, 1297)

-					    terminal_attachment 	(2989, 1184))))

+					    origin_attachment 	(3006, 1297)

+					    terminal_attachment 	(3006, 1183))))

 				(object ClassView "Class" "Logical View::UML::Interactions::BasicInteractions::InteractionFragment" @1218

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressAttribute 	TRUE

@@ -28830,7 +28731,7 @@
 				    height     	162

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$232" @1224

-				    location   	(1222, 470)

+				    location   	(1222, 922)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -28845,7 +28746,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "fragment" @1225

 					    Parent_View 	@1224

-					    location   	(839, -773)

+					    location   	(839, -321)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -28857,7 +28758,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1226

 						Parent_View 	@1225

-						location   	(1707, 388)

+						location   	(1707, 840)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -28881,12 +28782,17 @@
 					    quidu      	"3DC8F1740087"

 					    client     	@1224

 					    supplier   	@1218

+					    vertices   	(list Points

+						(1222, 922)

+						(1222, 1005)

+						(1830, 1005)

+						(1830, 589))

 					    line_style 	3

-					    origin_attachment 	(1222, 470)

-					    terminal_attachment 	(1831, 470)

+					    origin_attachment 	(1222, 922)

+					    terminal_attachment 	(1830, 589)

 					    label      	(object SegLabel @1227

 						Parent_View 	@1225

-						location   	(1789, 521)

+						location   	(1789, 973)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -28907,7 +28813,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1228

 						Parent_View 	@1225

-						location   	(1553, 524)

+						location   	(1553, 976)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -28931,7 +28837,7 @@
 						orientation 	1))

 					(object RoleView "enclosingInteraction" @1229

 					    Parent_View 	@1224

-					    location   	(839, -773)

+					    location   	(839, -321)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -28943,7 +28849,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1230

 						Parent_View 	@1229

-						location   	(1371, 910)

+						location   	(1371, 1362)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -28968,15 +28874,16 @@
 					    client     	@1224

 					    supplier   	@1223

 					    vertices   	(list Points

+						(1222, 922)

 						(1222, 470)

 						(1162, 470)

 						(1162, 1065))

 					    line_style 	3

-					    origin_attachment 	(1222, 470)

+					    origin_attachment 	(1222, 922)

 					    terminal_attachment 	(1162, 1065)

 					    label      	(object SegLabel @1231

 						Parent_View 	@1229

-						location   	(1212, 1017)

+						location   	(1212, 1469)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29415,7 +29322,7 @@
 				    width      	692

 				    height     	267)

 				(object AssociationViewNew "$UNNAMED$218" @1250

-				    location   	(1038, 1358)

+				    location   	(1019, 1358)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -29430,7 +29337,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "connector" @1251

 					    Parent_View 	@1250

-					    location   	(-72, 206)

+					    location   	(-91, 206)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -29442,7 +29349,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1252

 						Parent_View 	@1251

-						location   	(897, 1488)

+						location   	(878, 1488)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29466,11 +29373,11 @@
 					    client     	@1250

 					    supplier   	@1243

 					    line_style 	3

-					    origin_attachment 	(1038, 1358)

-					    terminal_attachment 	(1038, 1528)

+					    origin_attachment 	(1019, 1358)

+					    terminal_attachment 	(1019, 1528)

 					    label      	(object SegLabel @1253

 						Parent_View 	@1251

-						location   	(1101, 1494)

+						location   	(1082, 1494)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29491,7 +29398,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$219" @1254

 					    Parent_View 	@1250

-					    location   	(-72, 206)

+					    location   	(-91, 206)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -29506,11 +29413,11 @@
 					    client     	@1250

 					    supplier   	@1249

 					    line_style 	3

-					    origin_attachment 	(1038, 1358)

-					    terminal_attachment 	(1038, 1189)

+					    origin_attachment 	(1019, 1358)

+					    terminal_attachment 	(1019, 1188)

 					    label      	(object SegLabel @1255

 						Parent_View 	@1254

-						location   	(1085, 1228)

+						location   	(1066, 1228)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29530,7 +29437,7 @@
 						height     	47

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$214" @1256

-				    location   	(1842, 1008)

+				    location   	(1842, 1074)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -29542,7 +29449,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @1257

 					Parent_View 	@1256

-					location   	(1876, 1043)

+					location   	(1876, 1109)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -29567,7 +29474,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "sendMessage" @1258

 					    Parent_View 	@1256

-					    location   	(-913, -407)

+					    location   	(-913, -341)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -29579,7 +29486,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1259

 						Parent_View 	@1258

-						location   	(1674, 983)

+						location   	(1674, 1049)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29604,11 +29511,11 @@
 					    client     	@1256

 					    supplier   	@1249

 					    line_style 	3

-					    origin_attachment 	(1842, 1008)

-					    terminal_attachment 	(1534, 1008)

+					    origin_attachment 	(1842, 1074)

+					    terminal_attachment 	(1534, 1074)

 					    label      	(object SegLabel @1260

 						Parent_View 	@1258

-						location   	(1574, 1044)

+						location   	(1574, 1110)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29629,7 +29536,7 @@
 						orientation 	0))

 					(object RoleView "sendEvent" @1261

 					    Parent_View 	@1256

-					    location   	(-913, -407)

+					    location   	(-913, -341)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -29641,7 +29548,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1262

 						Parent_View 	@1261

-						location   	(2045, 968)

+						location   	(2045, 1034)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29666,11 +29573,11 @@
 					    client     	@1256

 					    supplier   	@1244

 					    line_style 	3

-					    origin_attachment 	(1842, 1008)

-					    terminal_attachment 	(2150, 1008)

+					    origin_attachment 	(1842, 1074)

+					    terminal_attachment 	(2150, 1074)

 					    label      	(object SegLabel @1263

 						Parent_View 	@1261

-						location   	(2095, 1037)

+						location   	(2095, 1103)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29690,7 +29597,7 @@
 						height     	29

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$213" @1264

-				    location   	(1842, 1126)

+				    location   	(1842, 1074)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -29702,7 +29609,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @1265

 					Parent_View 	@1264

-					location   	(1868, 1162)

+					location   	(1868, 1110)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -29727,7 +29634,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "receiveMessage" @1266

 					    Parent_View 	@1264

-					    location   	(-913, -289)

+					    location   	(-913, -341)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -29739,7 +29646,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1267

 						Parent_View 	@1266

-						location   	(1708, 1100)

+						location   	(1708, 1048)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29764,11 +29671,11 @@
 					    client     	@1264

 					    supplier   	@1249

 					    line_style 	3

-					    origin_attachment 	(1842, 1126)

-					    terminal_attachment 	(1534, 1126)

+					    origin_attachment 	(1842, 1074)

+					    terminal_attachment 	(1534, 1074)

 					    label      	(object SegLabel @1268

 						Parent_View 	@1266

-						location   	(1584, 1171)

+						location   	(1584, 1119)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29789,7 +29696,7 @@
 						orientation 	0))

 					(object RoleView "receiveEvent" @1269

 					    Parent_View 	@1264

-					    location   	(-913, -289)

+					    location   	(-913, -341)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -29801,7 +29708,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1270

 						Parent_View 	@1269

-						location   	(2031, 1087)

+						location   	(2031, 1035)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29826,11 +29733,11 @@
 					    client     	@1264

 					    supplier   	@1244

 					    line_style 	3

-					    origin_attachment 	(1842, 1126)

-					    terminal_attachment 	(2150, 1126)

+					    origin_attachment 	(1842, 1074)

+					    terminal_attachment 	(2150, 1074)

 					    label      	(object SegLabel @1271

 						Parent_View 	@1269

-						location   	(2100, 1174)

+						location   	(2100, 1122)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29850,7 +29757,7 @@
 						height     	48

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$220" @1272

-				    location   	(1413, 736)

+				    location   	(1411, 737)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -29865,7 +29772,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "message" @1273

 					    Parent_View 	@1272

-					    location   	(141, 112)

+					    location   	(139, 113)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -29877,7 +29784,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1274

 						Parent_View 	@1273

-						location   	(1518, 823)

+						location   	(1516, 824)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29901,11 +29808,11 @@
 					    client     	@1272

 					    supplier   	@1249

 					    line_style 	3

-					    origin_attachment 	(1413, 736)

-					    terminal_attachment 	(1413, 922)

+					    origin_attachment 	(1411, 737)

+					    terminal_attachment 	(1411, 922)

 					    label      	(object SegLabel @1275

 						Parent_View 	@1273

-						location   	(1376, 883)

+						location   	(1374, 884)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29926,7 +29833,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1276

 						Parent_View 	@1273

-						location   	(1652, 874)

+						location   	(1650, 875)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29947,7 +29854,7 @@
 						orientation 	0))

 					(object RoleView "interaction" @1277

 					    Parent_View 	@1272

-					    location   	(141, 112)

+					    location   	(139, 113)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -29959,7 +29866,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1278

 						Parent_View 	@1277

-						location   	(1553, 579)

+						location   	(1551, 580)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -29983,11 +29890,11 @@
 					    client     	@1272

 					    supplier   	@1246

 					    line_style 	3

-					    origin_attachment 	(1413, 736)

-					    terminal_attachment 	(1413, 551)

+					    origin_attachment 	(1411, 737)

+					    terminal_attachment 	(1411, 552)

 					    label      	(object SegLabel @1279

 						Parent_View 	@1277

-						location   	(1368, 588)

+						location   	(1366, 589)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30008,7 +29915,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1280

 						Parent_View 	@1277

-						location   	(1628, 637)

+						location   	(1626, 638)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30036,7 +29943,7 @@
 				    origin_attachment 	(1065, 923)

 				    terminal_attachment 	(1065, 373))

 				(object AssociationViewNew "$UNNAMED$223" @1282

-				    location   	(1426, 1351)

+				    location   	(1391, 1351)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -30051,7 +29958,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "signature" @1283

 					    Parent_View 	@1282

-					    location   	(286, 187)

+					    location   	(251, 187)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -30063,7 +29970,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1284

 						Parent_View 	@1283

-						location   	(1320, 1480)

+						location   	(1285, 1480)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30087,11 +29994,11 @@
 					    client     	@1282

 					    supplier   	@1247

 					    line_style 	3

-					    origin_attachment 	(1426, 1351)

-					    terminal_attachment 	(1426, 1515)

+					    origin_attachment 	(1391, 1351)

+					    terminal_attachment 	(1391, 1514)

 					    label      	(object SegLabel @1285

 						Parent_View 	@1283

-						location   	(1499, 1484)

+						location   	(1464, 1484)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30112,16 +30019,16 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$224" @1286

 					    Parent_View 	@1282

-					    location   	(286, 187)

+					    location   	(251, 187)

 					    stereotype 	TRUE

 					    quidu      	"3C63983E02C2"

 					    client     	@1282

 					    supplier   	@1249

 					    line_style 	3

-					    origin_attachment 	(1426, 1351)

-					    terminal_attachment 	(1426, 1188))))

+					    origin_attachment 	(1391, 1351)

+					    terminal_attachment 	(1391, 1189))))

 				(object AssociationViewNew "$UNNAMED$225" @1287

-				    location   	(635, 1101)

+				    location   	(635, 1124)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -30136,7 +30043,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "argument" @1288

 					    Parent_View 	@1287

-					    location   	(-601, 9)

+					    location   	(-601, 32)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -30148,7 +30055,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1289

 						Parent_View 	@1288

-						location   	(517, 1014)

+						location   	(517, 1037)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30172,11 +30079,11 @@
 					    client     	@1287

 					    supplier   	@1248

 					    line_style 	3

-					    origin_attachment 	(635, 1101)

-					    terminal_attachment 	(428, 1101)

+					    origin_attachment 	(635, 1124)

+					    terminal_attachment 	(428, 1124)

 					    label      	(object SegLabel @1290

 						Parent_View 	@1288

-						location   	(449, 1155)

+						location   	(449, 1178)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30197,7 +30104,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1291

 						Parent_View 	@1288

-						location   	(628, 1058)

+						location   	(628, 1081)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30218,7 +30125,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$226" @1292

 					    Parent_View 	@1287

-					    location   	(-601, 9)

+					    location   	(-601, 32)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -30230,7 +30137,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1293

 						Parent_View 	@1292

-						location   	(801, 1060)

+						location   	(801, 1083)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30255,11 +30162,11 @@
 					    client     	@1287

 					    supplier   	@1249

 					    line_style 	3

-					    origin_attachment 	(635, 1101)

-					    terminal_attachment 	(842, 1101)

+					    origin_attachment 	(635, 1124)

+					    terminal_attachment 	(842, 1124)

 					    label      	(object SegLabel @1294

 						Parent_View 	@1292

-						location   	(801, 1155)

+						location   	(801, 1178)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30345,7 +30252,7 @@
 				    origin_attachment 	(3696, 990)

 				    terminal_attachment 	(3696, 743))

 				(object AssociationViewNew "$UNNAMED$230" @1298

-				    location   	(3944, 427)

+				    location   	(3360, 869)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -30361,7 +30268,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "generalOrdering" @1299

 					    Parent_View 	@1298

-					    location   	(890, 67)

+					    location   	(306, 509)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -30373,7 +30280,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1300

 						Parent_View 	@1299

-						location   	(3888, 955)

+						location   	(3304, 1397)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30397,12 +30304,16 @@
 					    quidu      	"3DBE53BE0173"

 					    client     	@1298

 					    supplier   	@1296

+					    vertices   	(list Points

+						(3360, 869)

+						(3360, 989)

+						(3674, 989))

 					    line_style 	3

-					    origin_attachment 	(3944, 427)

-					    terminal_attachment 	(3944, 989)

+					    origin_attachment 	(3360, 869)

+					    terminal_attachment 	(3674, 989)

 					    label      	(object SegLabel @1301

 						Parent_View 	@1299

-						location   	(4085, 948)

+						location   	(3501, 1390)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30423,7 +30334,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1302

 						Parent_View 	@1299

-						location   	(3943, 910)

+						location   	(3359, 1352)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30444,19 +30355,15 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$231" @1303

 					    Parent_View 	@1298

-					    location   	(890, 67)

+					    location   	(306, 509)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3DBE53BE0175"

 					    client     	@1298

 					    supplier   	@1295

-					    vertices   	(list Points

-						(3944, 427)

-						(3944, 367)

-						(3360, 367))

 					    line_style 	3

-					    origin_attachment 	(3944, 427)

-					    terminal_attachment 	(3360, 367))))

+					    origin_attachment 	(6720, 1738)

+					    terminal_attachment 	(6414, 795))))

 				(object ClassView "Class" "Logical View::UML::Interactions::BasicInteractions::EventOccurrence" @1304

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressAttribute 	TRUE

@@ -30508,13 +30415,13 @@
 				    origin_attachment 	(2801, 1071)

 				    terminal_attachment 	(2494, 1071))

 				(object AssociationViewNew "$UNNAMED$221" @1307

-				    location   	(3490, 1007)

+				    location   	(3490, 1074)

 				    stereotype 	TRUE

 				    quidu      	"3C472194024A"

 				    roleview_list 	(list RoleViews

 					(object RoleView "before" @1308

 					    Parent_View 	@1307

-					    location   	(358, -139)

+					    location   	(358, -72)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -30526,7 +30433,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1309

 						Parent_View 	@1308

-						location   	(3378, 974)

+						location   	(3378, 1041)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30551,11 +30458,11 @@
 					    client     	@1307

 					    supplier   	@1304

 					    line_style 	3

-					    origin_attachment 	(3490, 1007)

-					    terminal_attachment 	(3307, 1007)

+					    origin_attachment 	(3490, 1074)

+					    terminal_attachment 	(3307, 1074)

 					    label      	(object SegLabel @1310

 						Parent_View 	@1308

-						location   	(3326, 1039)

+						location   	(3326, 1106)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30576,7 +30483,7 @@
 						orientation 	0))

 					(object RoleView "toAfter" @1311

 					    Parent_View 	@1307

-					    location   	(358, -139)

+					    location   	(358, -72)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -30588,7 +30495,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1312

 						Parent_View 	@1311

-						location   	(3585, 974)

+						location   	(3585, 1041)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30613,11 +30520,11 @@
 					    client     	@1307

 					    supplier   	@1296

 					    line_style 	3

-					    origin_attachment 	(3490, 1007)

-					    terminal_attachment 	(3674, 1007)

+					    origin_attachment 	(3490, 1074)

+					    terminal_attachment 	(3674, 1074)

 					    label      	(object SegLabel @1313

 						Parent_View 	@1311

-						location   	(3656, 1061)

+						location   	(3656, 1128)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30637,13 +30544,13 @@
 						height     	54

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$222" @1314

-				    location   	(3490, 1129)

+				    location   	(3490, 1074)

 				    stereotype 	TRUE

 				    quidu      	"3C4721FE0102"

 				    roleview_list 	(list RoleViews

 					(object RoleView "toBefore" @1315

 					    Parent_View 	@1314

-					    location   	(1096, -29)

+					    location   	(1096, -84)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -30655,7 +30562,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1316

 						Parent_View 	@1315

-						location   	(3576, 1158)

+						location   	(3576, 1103)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30680,11 +30587,11 @@
 					    client     	@1314

 					    supplier   	@1296

 					    line_style 	3

-					    origin_attachment 	(3490, 1129)

-					    terminal_attachment 	(3674, 1129)

+					    origin_attachment 	(3490, 1074)

+					    terminal_attachment 	(3674, 1074)

 					    label      	(object SegLabel @1317

 						Parent_View 	@1315

-						location   	(3654, 1106)

+						location   	(3654, 1051)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30705,7 +30612,7 @@
 						orientation 	0))

 					(object RoleView "after" @1318

 					    Parent_View 	@1314

-					    location   	(1096, -29)

+					    location   	(1096, -84)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -30717,7 +30624,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1319

 						Parent_View 	@1318

-						location   	(3358, 1158)

+						location   	(3358, 1103)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30742,11 +30649,11 @@
 					    client     	@1314

 					    supplier   	@1304

 					    line_style 	3

-					    origin_attachment 	(3490, 1129)

-					    terminal_attachment 	(3307, 1129)

+					    origin_attachment 	(3490, 1074)

+					    terminal_attachment 	(3307, 1074)

 					    label      	(object SegLabel @1320

 						Parent_View 	@1318

-						location   	(3332, 1100)

+						location   	(3332, 1045)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30834,13 +30741,13 @@
 				    height     	156

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$208" @1324

-				    location   	(3264, 1350)

+				    location   	(3054, 1350)

 				    stereotype 	TRUE

 				    quidu      	"3B4BC10B03D4"

 				    roleview_list 	(list RoleViews

 					(object RoleView "startExec" @1325

 					    Parent_View 	@1324

-					    location   	(506, -212)

+					    location   	(296, -212)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -30852,7 +30759,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1326

 						Parent_View 	@1325

-						location   	(3373, 1462)

+						location   	(3163, 1462)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30877,11 +30784,11 @@
 					    client     	@1324

 					    supplier   	@1323

 					    line_style 	3

-					    origin_attachment 	(3264, 1350)

-					    terminal_attachment 	(3264, 1505)

+					    origin_attachment 	(3054, 1350)

+					    terminal_attachment 	(3054, 1505)

 					    label      	(object SegLabel @1327

 						Parent_View 	@1325

-						location   	(3238, 1465)

+						location   	(3028, 1465)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30902,7 +30809,7 @@
 						orientation 	1))

 					(object RoleView "start" @1328

 					    Parent_View 	@1324

-					    location   	(506, -212)

+					    location   	(296, -212)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -30914,7 +30821,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1329

 						Parent_View 	@1328

-						location   	(3326, 1225)

+						location   	(3116, 1225)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30939,11 +30846,11 @@
 					    client     	@1324

 					    supplier   	@1304

 					    line_style 	3

-					    origin_attachment 	(3264, 1350)

-					    terminal_attachment 	(3264, 1195)

+					    origin_attachment 	(3054, 1350)

+					    terminal_attachment 	(3054, 1195)

 					    label      	(object SegLabel @1330

 						Parent_View 	@1328

-						location   	(3216, 1227)

+						location   	(3006, 1227)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -30963,13 +30870,13 @@
 						height     	49

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$209" @1331

-				    location   	(2920, 1350)

+				    location   	(3054, 1350)

 				    stereotype 	TRUE

 				    quidu      	"3B4BC1510082"

 				    roleview_list 	(list RoleViews

 					(object RoleView "finishExec" @1332

 					    Parent_View 	@1331

-					    location   	(162, -212)

+					    location   	(296, -212)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -30981,7 +30888,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1333

 						Parent_View 	@1332

-						location   	(3042, 1470)

+						location   	(3176, 1470)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31006,11 +30913,11 @@
 					    client     	@1331

 					    supplier   	@1323

 					    line_style 	3

-					    origin_attachment 	(2920, 1350)

-					    terminal_attachment 	(2920, 1506)

+					    origin_attachment 	(3054, 1350)

+					    terminal_attachment 	(3054, 1505)

 					    label      	(object SegLabel @1334

 						Parent_View 	@1332

-						location   	(2895, 1469)

+						location   	(3029, 1469)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31031,7 +30938,7 @@
 						orientation 	1))

 					(object RoleView "finish" @1335

 					    Parent_View 	@1331

-					    location   	(162, -212)

+					    location   	(296, -212)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -31043,7 +30950,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1336

 						Parent_View 	@1335

-						location   	(3002, 1233)

+						location   	(3136, 1233)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31068,11 +30975,11 @@
 					    client     	@1331

 					    supplier   	@1304

 					    line_style 	3

-					    origin_attachment 	(2920, 1350)

-					    terminal_attachment 	(2920, 1195)

+					    origin_attachment 	(3054, 1350)

+					    terminal_attachment 	(3054, 1195)

 					    label      	(object SegLabel @1337

 						Parent_View 	@1335

-						location   	(2882, 1231)

+						location   	(3016, 1231)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31372,7 +31279,7 @@
 				    width      	899

 				    height     	170)

 				(object AssociationViewNew "$UNNAMED$207" @1349

-				    location   	(1920, 738)

+				    location   	(1944, 738)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -31384,7 +31291,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @1350

 					Parent_View 	@1349

-					location   	(1920, 679)

+					location   	(1944, 679)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -31409,7 +31316,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "covered" @1351

 					    Parent_View 	@1349

-					    location   	(311, -188)

+					    location   	(335, -188)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -31421,7 +31328,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1352

 						Parent_View 	@1351

-						location   	(1765, 986)

+						location   	(1789, 986)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31446,11 +31353,11 @@
 					    client     	@1349

 					    supplier   	@1348

 					    line_style 	3

-					    origin_attachment 	(1920, 738)

-					    terminal_attachment 	(1920, 1036)

+					    origin_attachment 	(1944, 738)

+					    terminal_attachment 	(1944, 1037)

 					    label      	(object SegLabel @1353

 						Parent_View 	@1351

-						location   	(1890, 1001)

+						location   	(1914, 1001)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31471,7 +31378,7 @@
 						orientation 	1))

 					(object RoleView "coveredBy" @1354

 					    Parent_View 	@1349

-					    location   	(311, -188)

+					    location   	(335, -188)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -31483,7 +31390,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1355

 						Parent_View 	@1354

-						location   	(1797, 480)

+						location   	(1821, 480)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31508,11 +31415,11 @@
 					    client     	@1349

 					    supplier   	@1343

 					    line_style 	3

-					    origin_attachment 	(1920, 738)

-					    terminal_attachment 	(1920, 440)

+					    origin_attachment 	(1944, 738)

+					    terminal_attachment 	(1944, 440)

 					    label      	(object SegLabel @1356

 						Parent_View 	@1354

-						location   	(1958, 487)

+						location   	(1982, 487)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31532,13 +31439,13 @@
 						height     	38

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$210" @1357

-				    location   	(1762, 1398)

+				    location   	(1656, 1398)

 				    stereotype 	TRUE

 				    quidu      	"3B4DDD1B005A"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$211" @1358

 					    Parent_View 	@1357

-					    location   	(-662, -923)

+					    location   	(-768, -923)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -31550,7 +31457,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1359

 						Parent_View 	@1358

-						location   	(1834, 1257)

+						location   	(1728, 1257)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31576,11 +31483,11 @@
 					    client     	@1357

 					    supplier   	@1348

 					    line_style 	3

-					    origin_attachment 	(1762, 1398)

-					    terminal_attachment 	(1762, 1206)

+					    origin_attachment 	(1656, 1398)

+					    terminal_attachment 	(1656, 1206)

 					    label      	(object SegLabel @1360

 						Parent_View 	@1358

-						location   	(1727, 1275)

+						location   	(1621, 1275)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31601,7 +31508,7 @@
 						orientation 	0))

 					(object RoleView "represents" @1361

 					    Parent_View 	@1357

-					    location   	(-662, -923)

+					    location   	(-768, -923)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -31613,7 +31520,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1362

 						Parent_View 	@1361

-						location   	(1626, 1505)

+						location   	(1520, 1505)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31638,11 +31545,11 @@
 					    client     	@1357

 					    supplier   	@1344

 					    line_style 	3

-					    origin_attachment 	(1762, 1398)

-					    terminal_attachment 	(1762, 1590)

+					    origin_attachment 	(1656, 1398)

+					    terminal_attachment 	(1656, 1590)

 					    label      	(object SegLabel @1363

 						Parent_View 	@1361

-						location   	(1730, 1551)

+						location   	(1624, 1551)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31662,7 +31569,7 @@
 						height     	33

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$216" @1364

-				    location   	(2192, 1400)

+				    location   	(2142, 1401)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -31677,7 +31584,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "selector" @1365

 					    Parent_View 	@1364

-					    location   	(152, 476)

+					    location   	(102, 477)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -31689,7 +31596,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1366

 						Parent_View 	@1365

-						location   	(2306, 1498)

+						location   	(2256, 1499)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31713,11 +31620,11 @@
 					    client     	@1364

 					    supplier   	@1345

 					    line_style 	3

-					    origin_attachment 	(2192, 1400)

-					    terminal_attachment 	(2192, 1594)

+					    origin_attachment 	(2142, 1401)

+					    terminal_attachment 	(2142, 1595)

 					    label      	(object SegLabel @1367

 						Parent_View 	@1365

-						location   	(2145, 1537)

+						location   	(2095, 1538)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31738,7 +31645,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1368

 						Parent_View 	@1365

-						location   	(2431, 1550)

+						location   	(2381, 1551)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31759,7 +31666,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$217" @1369

 					    Parent_View 	@1364

-					    location   	(152, 476)

+					    location   	(102, 477)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -31771,7 +31678,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1370

 						Parent_View 	@1369

-						location   	(2099, 1266)

+						location   	(2049, 1267)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -31796,11 +31703,11 @@
 					    client     	@1364

 					    supplier   	@1348

 					    line_style 	3

-					    origin_attachment 	(2192, 1400)

-					    terminal_attachment 	(2192, 1207)

+					    origin_attachment 	(2142, 1401)

+					    terminal_attachment 	(2142, 1207)

 					    label      	(object SegLabel @1371

 						Parent_View 	@1369

-						location   	(2237, 1309)

+						location   	(2187, 1310)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -32106,7 +32013,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$212" @1387

-				    location   	(1540, 878)

+				    location   	(1532, 878)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -32121,7 +32028,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "lifeline" @1388

 					    Parent_View 	@1387

-					    location   	(-1426, -1533)

+					    location   	(-1434, -1533)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -32133,7 +32040,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1389

 						Parent_View 	@1388

-						location   	(1462, 935)

+						location   	(1454, 935)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -32158,11 +32065,11 @@
 					    client     	@1387

 					    supplier   	@1348

 					    line_style 	3

-					    origin_attachment 	(1540, 878)

-					    terminal_attachment 	(1540, 1037)

+					    origin_attachment 	(1532, 878)

+					    terminal_attachment 	(1532, 1037)

 					    label      	(object SegLabel @1390

 						Parent_View 	@1388

-						location   	(1566, 1010)

+						location   	(1558, 1010)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -32183,7 +32090,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1391

 						Parent_View 	@1388

-						location   	(1302, 978)

+						location   	(1294, 978)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -32204,7 +32111,7 @@
 						orientation 	1))

 					(object RoleView "interaction" @1392

 					    Parent_View 	@1387

-					    location   	(-1426, -1533)

+					    location   	(-1434, -1533)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -32216,7 +32123,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1393

 						Parent_View 	@1392

-						location   	(1659, 769)

+						location   	(1651, 769)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -32241,11 +32148,11 @@
 					    client     	@1387

 					    supplier   	@1386

 					    line_style 	3

-					    origin_attachment 	(1540, 878)

-					    terminal_attachment 	(1540, 719)

+					    origin_attachment 	(1532, 878)

+					    terminal_attachment 	(1532, 719)

 					    label      	(object SegLabel @1394

 						Parent_View 	@1392

-						location   	(1489, 746)

+						location   	(1481, 746)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -32266,7 +32173,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1395

 						Parent_View 	@1392

-						location   	(1750, 813)

+						location   	(1742, 813)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -32340,7 +32247,7 @@
 		    logical_models 	(list unit_reference_list

 			(object Class "InteractionOccurrence"

 			    quid       	"38A3FDEF012C"

-			    documentation 	"A reference to an interaction with actual values. The interpretation is that the sequence diagram replaces the reference (with actual parameters substituted)"

+			    documentation 	"InteractionOccurrence is a specialization of InteractionFragment. An InteractionOccurrence has a set of actual gates that must match the formal gates of the referenced Interaction. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3B975A3B0162"

@@ -32471,7 +32378,6 @@
 				(object ClassAttribute "setting"

 				    quid       	"3DFC90410098"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"True"

 				    exportControl 	"Public")))

 			(object Class "InteractionFragment"

@@ -32801,7 +32707,7 @@
 				    width      	725

 				    height     	690)

 				(object AssociationViewNew "$UNNAMED$243" @1403

-				    location   	(751, 975)

+				    location   	(751, 978)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -32816,7 +32722,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "cfragmentGate" @1404

 					    Parent_View 	@1403

-					    location   	(-65, -207)

+					    location   	(-65, -204)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -32828,7 +32734,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1405

 						Parent_View 	@1404

-						location   	(824, 887)

+						location   	(824, 890)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -32852,11 +32758,11 @@
 					    client     	@1403

 					    supplier   	@1402

 					    line_style 	3

-					    origin_attachment 	(751, 975)

-					    terminal_attachment 	(988, 975)

+					    origin_attachment 	(751, 978)

+					    terminal_attachment 	(988, 978)

 					    label      	(object SegLabel @1406

 						Parent_View 	@1404

-						location   	(958, 1011)

+						location   	(958, 1014)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -32877,7 +32783,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1407

 						Parent_View 	@1404

-						location   	(764, 942)

+						location   	(764, 945)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -32898,7 +32804,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$244" @1408

 					    Parent_View 	@1403

-					    location   	(-65, -207)

+					    location   	(-65, -204)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -32913,11 +32819,11 @@
 					    client     	@1403

 					    supplier   	@1400

 					    line_style 	3

-					    origin_attachment 	(751, 975)

-					    terminal_attachment 	(514, 975)

+					    origin_attachment 	(751, 978)

+					    terminal_attachment 	(514, 978)

 					    label      	(object SegLabel @1409

 						Parent_View 	@1408

-						location   	(558, 1028)

+						location   	(558, 1031)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -32937,7 +32843,7 @@
 						height     	53

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$245" @1410

-				    location   	(741, 716)

+				    location   	(741, 702)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -32952,7 +32858,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$246" @1411

 					    Parent_View 	@1410

-					    location   	(-1119, -466)

+					    location   	(-1119, -480)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -32964,7 +32870,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1412

 						Parent_View 	@1411

-						location   	(925, 866)

+						location   	(925, 852)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -32989,11 +32895,11 @@
 					    client     	@1410

 					    supplier   	@1401

 					    line_style 	3

-					    origin_attachment 	(741, 716)

-					    terminal_attachment 	(494, 716)

+					    origin_attachment 	(741, 702)

+					    terminal_attachment 	(494, 702)

 					    label      	(object SegLabel @1413

 						Parent_View 	@1411

-						location   	(548, 783)

+						location   	(548, 769)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33014,7 +32920,7 @@
 						orientation 	0))

 					(object RoleView "actualGate" @1414

 					    Parent_View 	@1410

-					    location   	(-1119, -466)

+					    location   	(-1119, -480)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -33026,7 +32932,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1415

 						Parent_View 	@1414

-						location   	(851, 628)

+						location   	(851, 614)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33050,11 +32956,11 @@
 					    client     	@1410

 					    supplier   	@1402

 					    line_style 	3

-					    origin_attachment 	(741, 716)

-					    terminal_attachment 	(988, 716)

+					    origin_attachment 	(741, 702)

+					    terminal_attachment 	(988, 702)

 					    label      	(object SegLabel @1416

 						Parent_View 	@1414

-						location   	(956, 759)

+						location   	(956, 745)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33075,7 +32981,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1417

 						Parent_View 	@1414

-						location   	(747, 681)

+						location   	(747, 667)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33134,7 +33040,7 @@
 				    height     	150

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$247" @1420

-				    location   	(713, 1191)

+				    location   	(713, 1203)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -33149,7 +33055,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "formalGate" @1421

 					    Parent_View 	@1420

-					    location   	(-1141, 465)

+					    location   	(-1141, 477)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -33161,7 +33067,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1422

 						Parent_View 	@1421

-						location   	(870, 1112)

+						location   	(870, 1124)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33185,11 +33091,11 @@
 					    client     	@1420

 					    supplier   	@1402

 					    line_style 	3

-					    origin_attachment 	(713, 1191)

-					    terminal_attachment 	(988, 1191)

+					    origin_attachment 	(713, 1203)

+					    terminal_attachment 	(988, 1203)

 					    label      	(object SegLabel @1423

 						Parent_View 	@1421

-						location   	(919, 1214)

+						location   	(919, 1226)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33210,7 +33116,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1424

 						Parent_View 	@1421

-						location   	(734, 1154)

+						location   	(734, 1166)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33231,7 +33137,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$248" @1425

 					    Parent_View 	@1420

-					    location   	(-1141, 465)

+					    location   	(-1141, 477)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -33246,11 +33152,11 @@
 					    client     	@1420

 					    supplier   	@1419

 					    line_style 	3

-					    origin_attachment 	(713, 1191)

-					    terminal_attachment 	(439, 1191)

+					    origin_attachment 	(713, 1203)

+					    terminal_attachment 	(439, 1203)

 					    label      	(object SegLabel @1426

 						Parent_View 	@1425

-						location   	(493, 1239)

+						location   	(493, 1251)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33368,7 +33274,7 @@
 				    width      	462

 				    height     	138)

 				(object AssociationViewNew "$UNNAMED$253" @1430

-				    location   	(592, 708)

+				    location   	(592, 709)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -33383,7 +33289,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "argument" @1431

 					    Parent_View 	@1430

-					    location   	(-380, -6)

+					    location   	(-380, -5)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -33395,7 +33301,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1432

 						Parent_View 	@1431

-						location   	(542, 671)

+						location   	(542, 672)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33420,11 +33326,11 @@
 					    client     	@1430

 					    supplier   	@1427

 					    line_style 	3

-					    origin_attachment 	(592, 708)

-					    terminal_attachment 	(435, 708)

+					    origin_attachment 	(592, 709)

+					    terminal_attachment 	(435, 709)

 					    label      	(object SegLabel @1433

 						Parent_View 	@1431

-						location   	(452, 762)

+						location   	(452, 763)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33445,7 +33351,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$254" @1434

 					    Parent_View 	@1430

-					    location   	(-380, -6)

+					    location   	(-380, -5)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -33461,11 +33367,11 @@
 					    client     	@1430

 					    supplier   	@1429

 					    line_style 	3

-					    origin_attachment 	(592, 708)

-					    terminal_attachment 	(749, 708)

+					    origin_attachment 	(592, 709)

+					    terminal_attachment 	(749, 709)

 					    label      	(object SegLabel @1435

 						Parent_View 	@1434

-						location   	(713, 756)

+						location   	(713, 757)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -33485,7 +33391,7 @@
 						height     	48

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$241" @1436

-				    location   	(1427, 684)

+				    location   	(1427, 696)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -33500,7 +33406,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "refersTo" @1437

 					    Parent_View 	@1436

-					    location   	(905, -168)

+					    location   	(905, -156)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -33512,7 +33418,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1438

 						Parent_View 	@1437

-						location   	(1524, 645)

+						location   	(1524, 657)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33536,11 +33442,11 @@
 					    client     	@1436

 					    supplier   	@1428

 					    line_style 	3

-					    origin_attachment 	(1427, 684)

-					    terminal_attachment 	(1644, 684)

+					    origin_attachment 	(1427, 696)

+					    terminal_attachment 	(1644, 696)

 					    label      	(object SegLabel @1439

 						Parent_View 	@1437

-						location   	(1594, 730)

+						location   	(1594, 742)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33561,7 +33467,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$242" @1440

 					    Parent_View 	@1436

-					    location   	(905, -168)

+					    location   	(905, -156)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -33576,11 +33482,11 @@
 					    client     	@1436

 					    supplier   	@1429

 					    line_style 	3

-					    origin_attachment 	(1427, 684)

-					    terminal_attachment 	(1211, 684)

+					    origin_attachment 	(1427, 696)

+					    terminal_attachment 	(1211, 696)

 					    label      	(object SegLabel @1441

 						Parent_View 	@1440

-						location   	(1241, 653)

+						location   	(1241, 665)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33665,7 +33571,7 @@
 				    height     	126

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$235" @1445

-				    location   	(1439, 1070)

+				    location   	(1439, 1068)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -33677,7 +33583,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @1446

 					Parent_View 	@1445

-					location   	(1439, 1011)

+					location   	(1439, 1009)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -33702,7 +33608,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "decomposedAs" @1447

 					    Parent_View 	@1445

-					    location   	(-492, -851)

+					    location   	(-492, -853)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -33714,7 +33620,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1448

 						Parent_View 	@1447

-						location   	(1417, 1111)

+						location   	(1417, 1109)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33739,11 +33645,11 @@
 					    client     	@1445

 					    supplier   	@1442

 					    line_style 	3

-					    origin_attachment 	(1439, 1070)

-					    terminal_attachment 	(1234, 1070)

+					    origin_attachment 	(1439, 1068)

+					    terminal_attachment 	(1234, 1068)

 					    label      	(object SegLabel @1449

 						Parent_View 	@1447

-						location   	(1291, 1026)

+						location   	(1291, 1024)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33764,7 +33670,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$236" @1450

 					    Parent_View 	@1445

-					    location   	(-492, -851)

+					    location   	(-492, -853)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -33776,7 +33682,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1451

 						Parent_View 	@1450

-						location   	(1450, 1176)

+						location   	(1450, 1174)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -33802,8 +33708,8 @@
 					    client     	@1445

 					    supplier   	@1444

 					    line_style 	3

-					    origin_attachment 	(1439, 1070)

-					    terminal_attachment 	(1644, 1070))))

+					    origin_attachment 	(1439, 1068)

+					    terminal_attachment 	(1644, 1068))))

 				(object ClassView "Class" "Logical View::UML::Interactions::Fragments::InteractionFragment" @1452

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressAttribute 	TRUE

@@ -33898,14 +33804,14 @@
 					default_color 	TRUE)

 				    label      	(object ItemLabel

 					Parent_View 	@1455

-					location   	(1911, 1195)

+					location   	(1911, 1190)

 					nlines     	1

 					max_width  	451

 					justify    	0

 					label      	"InteractionOperator")

 				    stereotype 	(object ItemLabel

 					Parent_View 	@1455

-					location   	(1911, 1141)

+					location   	(1911, 1140)

 					anchor     	10

 					nlines     	1

 					max_width  	451

@@ -33914,22 +33820,6 @@
 				    icon_style 	"Icon"

 				    fill_color 	16777215

 				    quidu      	"3B7A272600B4"

-				    compartment 	(object Compartment

-					Parent_View 	@1455

-					location   	(1911, 1260)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	12

-					max_width  	162)

 				    width      	469

 				    height     	781)

 				(object ClassView "Class" "Logical View::UML::Interactions::Fragments::Continuation" @1456

@@ -33957,22 +33847,6 @@
 				    icon_style 	"Icon"

 				    fill_color 	16777215

 				    quidu      	"3DFC87C303E5"

-				    compartment 	(object Compartment

-					Parent_View 	@1456

-					location   	(2085, 982)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	1

-					max_width  	443)

 				    width      	517

 				    height     	136)

 				(object ClassView "Class" "Logical View::UML::Classes::Kernel::ValueSpecification" @1457

@@ -34035,7 +33909,7 @@
 				    height     	173

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$249" @1459

-				    location   	(1021, 1528)

+				    location   	(1021, 1484)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -34051,7 +33925,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "minint" @1460

 					    Parent_View 	@1459

-					    location   	(745, -110)

+					    location   	(745, -154)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -34063,7 +33937,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1461

 						Parent_View 	@1460

-						location   	(1113, 1559)

+						location   	(1113, 1515)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34088,11 +33962,11 @@
 					    client     	@1459

 					    supplier   	@1457

 					    line_style 	3

-					    origin_attachment 	(1021, 1528)

-					    terminal_attachment 	(1267, 1528)

+					    origin_attachment 	(1021, 1484)

+					    terminal_attachment 	(1267, 1484)

 					    label      	(object SegLabel @1462

 						Parent_View 	@1460

-						location   	(1227, 1563)

+						location   	(1227, 1519)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34113,7 +33987,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1463

 						Parent_View 	@1460

-						location   	(1042, 1614)

+						location   	(1042, 1570)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34134,17 +34008,17 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$250" @1464

 					    Parent_View 	@1459

-					    location   	(745, -110)

+					    location   	(745, -154)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3C46E99E0087"

 					    client     	@1459

 					    supplier   	@1458

 					    line_style 	3

-					    origin_attachment 	(1021, 1528)

-					    terminal_attachment 	(775, 1528))))

+					    origin_attachment 	(1021, 1484)

+					    terminal_attachment 	(775, 1484))))

 				(object AssociationViewNew "$UNNAMED$251" @1465

-				    location   	(1021, 1469)

+				    location   	(1021, 1484)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -34160,7 +34034,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "maxint" @1466

 					    Parent_View 	@1465

-					    location   	(745, -169)

+					    location   	(745, -154)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -34172,7 +34046,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1467

 						Parent_View 	@1466

-						location   	(1090, 1443)

+						location   	(1090, 1458)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34197,11 +34071,11 @@
 					    client     	@1465

 					    supplier   	@1457

 					    line_style 	3

-					    origin_attachment 	(1021, 1469)

-					    terminal_attachment 	(1267, 1469)

+					    origin_attachment 	(1021, 1484)

+					    terminal_attachment 	(1267, 1484)

 					    label      	(object SegLabel @1468

 						Parent_View 	@1466

-						location   	(1222, 1438)

+						location   	(1222, 1453)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34222,7 +34096,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1469

 						Parent_View 	@1466

-						location   	(1040, 1405)

+						location   	(1040, 1420)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34243,15 +34117,15 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$252" @1470

 					    Parent_View 	@1465

-					    location   	(745, -169)

+					    location   	(745, -154)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3C46E9B70386"

 					    client     	@1465

 					    supplier   	@1458

 					    line_style 	3

-					    origin_attachment 	(1021, 1469)

-					    terminal_attachment 	(775, 1469))))

+					    origin_attachment 	(1021, 1484)

+					    terminal_attachment 	(775, 1484))))

 				(object ClassView "Class" "Logical View::UML::Interactions::Fragments::CombinedFragment" @1471

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressOperation 	TRUE

@@ -34278,22 +34152,6 @@
 				    icon_style 	"Icon"

 				    fill_color 	16777215

 				    quidu      	"38A3FF2003C0"

-				    compartment 	(object Compartment

-					Parent_View 	@1471

-					location   	(1122, 980)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	1

-					max_width  	796)

 				    width      	954

 				    height     	140

 				    autoResize 	TRUE)

@@ -34391,7 +34249,7 @@
 				    width      	469

 				    height     	156)

 				(object AssociationViewNew "$UNNAMED$237" @1478

-				    location   	(421, 1226)

+				    location   	(533, 1225)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -34406,7 +34264,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "guard" @1479

 					    Parent_View 	@1478

-					    location   	(55, -148)

+					    location   	(167, -149)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -34418,7 +34276,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1480

 						Parent_View 	@1479

-						location   	(503, 1378)

+						location   	(615, 1377)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34442,11 +34300,11 @@
 					    client     	@1478

 					    supplier   	@1458

 					    line_style 	3

-					    origin_attachment 	(421, 1226)

-					    terminal_attachment 	(421, 1414)

+					    origin_attachment 	(533, 1225)

+					    terminal_attachment 	(533, 1414)

 					    label      	(object SegLabel @1481

 						Parent_View 	@1479

-						location   	(360, 1353)

+						location   	(472, 1352)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34467,7 +34325,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1482

 						Parent_View 	@1479

-						location   	(658, 1333)

+						location   	(770, 1332)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34488,7 +34346,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$238" @1483

 					    Parent_View 	@1478

-					    location   	(55, -148)

+					    location   	(167, -149)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -34503,11 +34361,11 @@
 					    client     	@1478

 					    supplier   	@1477

 					    line_style 	3

-					    origin_attachment 	(421, 1226)

-					    terminal_attachment 	(421, 1038)

+					    origin_attachment 	(533, 1225)

+					    terminal_attachment 	(533, 1037)

 					    label      	(object SegLabel @1484

 						Parent_View 	@1483

-						location   	(351, 1089)

+						location   	(463, 1088)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -34527,7 +34385,7 @@
 						height     	71

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$239" @1485

-				    location   	(925, 969)

+				    location   	(925, 970)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -34542,7 +34400,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "operand" @1486

 					    Parent_View 	@1485

-					    location   	(-227, -399)

+					    location   	(-227, -398)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -34554,7 +34412,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1487

 						Parent_View 	@1486

-						location   	(829, 888)

+						location   	(829, 889)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34578,11 +34436,11 @@
 					    client     	@1485

 					    supplier   	@1477

 					    line_style 	3

-					    origin_attachment 	(925, 969)

-					    terminal_attachment 	(738, 969)

+					    origin_attachment 	(925, 970)

+					    terminal_attachment 	(738, 970)

 					    label      	(object SegLabel @1488

 						Parent_View 	@1486

-						location   	(782, 1008)

+						location   	(782, 1009)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34603,7 +34461,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1489

 						Parent_View 	@1486

-						location   	(917, 928)

+						location   	(917, 929)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34624,7 +34482,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$240" @1490

 					    Parent_View 	@1485

-					    location   	(-227, -399)

+					    location   	(-227, -398)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -34639,11 +34497,11 @@
 					    client     	@1485

 					    supplier   	@1471

 					    line_style 	3

-					    origin_attachment 	(925, 969)

-					    terminal_attachment 	(1113, 969)

+					    origin_attachment 	(925, 970)

+					    terminal_attachment 	(1113, 970)

 					    label      	(object SegLabel @1491

 						Parent_View 	@1490

-						location   	(1071, 1015)

+						location   	(1071, 1016)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34672,7 +34530,7 @@
 				    terminal_attachment 	(686, 724)

 				    drawSupplier 	@1473)

 				(object AssociationViewNew "$UNNAMED$255" @1493

-				    location   	(713, 477)

+				    location   	(1072, 880)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -34686,7 +34544,7 @@
 				    quidu      	"3B8B9A5702D0"

 				    label      	(object SegLabel @1494

 					Parent_View 	@1493

-					location   	(1125, 450)

+					location   	(1484, 853)

 					font       	(object Font

 					    size       	8

 					    face       	"Arial"

@@ -34708,7 +34566,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "fragment" @1495

 					    Parent_View 	@1493

-					    location   	(330, -766)

+					    location   	(689, -363)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -34720,7 +34578,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1496

 						Parent_View 	@1495

-						location   	(1134, 409)

+						location   	(1493, 812)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34744,12 +34602,16 @@
 					    quidu      	"3B8B9A5902FB"

 					    client     	@1493

 					    supplier   	@1472

+					    vertices   	(list Points

+						(1072, 880)

+						(1258, 880)

+						(1258, 565))

 					    line_style 	3

-					    origin_attachment 	(713, 477)

-					    terminal_attachment 	(1258, 477)

+					    origin_attachment 	(1072, 880)

+					    terminal_attachment 	(1258, 565)

 					    label      	(object SegLabel @1497

 						Parent_View 	@1495

-						location   	(1221, 528)

+						location   	(1580, 931)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -34770,7 +34632,7 @@
 						orientation 	1))

 					(object RoleView "enclosingOperand" @1498

 					    Parent_View 	@1493

-					    location   	(330, -766)

+					    location   	(689, -363)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -34782,7 +34644,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1499

 						Parent_View 	@1498

-						location   	(403, 775)

+						location   	(762, 1178)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34807,15 +34669,15 @@
 					    client     	@1493

 					    supplier   	@1477

 					    vertices   	(list Points

-						(713, 477)

-						(573, 477)

+						(1072, 880)

+						(573, 880)

 						(573, 882))

 					    line_style 	3

-					    origin_attachment 	(713, 477)

+					    origin_attachment 	(1072, 880)

 					    terminal_attachment 	(573, 882)

 					    label      	(object SegLabel @1500

 						Parent_View 	@1498

-						location   	(623, 841)

+						location   	(982, 1244)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -34836,7 +34698,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1501

 						Parent_View 	@1498

-						location   	(361, 828)

+						location   	(720, 1231)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -35310,6 +35172,7 @@
 		    logical_models 	(list unit_reference_list

 			(object Class "Element"

 			    quid       	"3CAAEC0D0176"

+			    documentation 	"Element is an abstract metaclass with no superclass. It is used as the common superclass for all metaclasses in the infrastructure library. Element has a derived composition association to itself to support the general capability for elements to own other elements. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E0241E001D0"

@@ -35318,6 +35181,7 @@
 			    abstract   	TRUE)

 			(object Class "Comment"

 			    quid       	"3CAC07C901D9"

+			    documentation 	"A comment gives the ability to attach various remarks to elements. A comment carries no semantic force, but may contain information that is useful to a modeler. A comment can be owned by any element. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CB1F2690142"

@@ -35331,10 +35195,10 @@
 				(object ClassAttribute "body"

 				    quid       	"3CAC07D800D7"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public")))

 			(object Class "DirectedRelationship"

 			    quid       	"3CAAEC1902BE"

+			    documentation 	"A directed relationship references one or more source elements and one or more target elements. Directed relationship is an abstract metaclass. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3D514F5D0134"

@@ -35347,6 +35211,7 @@
 			    abstract   	TRUE)

 			(object Class "NamedElement"

 			    quid       	"3CAAECB901B0"

+			    documentation 	"A named element represents elements that may have a name. The name is used for identification of the named element within the namespace in which it is defined. A named element also has a qualified name that allows it to be unambiguously identified within a hierarchy of nested namespaces. NamedElement is an abstract metaclass. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CAAEFE5033E"

@@ -35361,7 +35226,6 @@
 				    quid       	"3CAAF00E0351"

 				    stereotype 	"0..1"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public")

 				(object ClassAttribute "visibility"

 				    quid       	"3CAAF02203B4"

@@ -35373,12 +35237,12 @@
 				    quid       	"3CAAF0300219"

 				    stereotype 	"0..1"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public"

 				    derived    	TRUE))

 			    abstract   	TRUE)

 			(object Class "PackageableElement"

 			    quid       	"3CB1F3A0024D"

+			    documentation 	"A packageable element indicates a named element that may be owned directly by a package. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CB1F3C003D0"

@@ -35397,6 +35261,7 @@
 			    abstract   	TRUE)

 			(object Class "VisibilityKind"

 			    quid       	"3CAAF25600F8"

+			    documentation 	"VisibilityKind is an enumeration of the following literal values: • public • private • protected • package "

 			    stereotype 	"enumeration"

 			    class_attributes 	(list class_attribute_list

 				(object ClassAttribute "public"

@@ -35413,6 +35278,7 @@
 				    exportControl 	"Public")))

 			(object Class "OpaqueExpression"

 			    quid       	"3CAAF87D0107"

+			    documentation 	"An expression contains a language-specific text string used to describe a value or values, and an optional specification of the language. One predefined language for specifying expressions is OCL. Natural language or programming languages may also be used. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3D0254F702D3"

@@ -35426,16 +35292,15 @@
 				(object ClassAttribute "body"

 				    quid       	"3CAAF8BC0374"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public")

 				(object ClassAttribute "language"

 				    quid       	"3CAAF8C101FF"

 				    stereotype 	"0..1"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public")))

 			(object Class "LiteralSpecification"

 			    quid       	"3CB5DE0E024E"

+			    documentation 	"A literal specification is an abstract specialization of ValueSpecification that identifies a literal constant being modeled. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3D0254FB0116"

@@ -35448,6 +35313,7 @@
 			    abstract   	TRUE)

 			(object Class "LiteralInteger"

 			    quid       	"3CB5DE2F0198"

+			    documentation 	"A literal integer contains an Integer-valued attribute. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CB5DED001CB"

@@ -35461,10 +35327,10 @@
 				(object ClassAttribute "value"

 				    quid       	"3CB5DE860048"

 				    type       	"Integer"

-				    quidu      	"3CA010A4007B"

 				    exportControl 	"Public")))

 			(object Class "LiteralString"

 			    quid       	"3CB5DE47039B"

+			    documentation 	"A literal string contains a String-valued attribute. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CB5DED60242"

@@ -35478,10 +35344,10 @@
 				(object ClassAttribute "value"

 				    quid       	"3CB5DEA0029E"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public")))

 			(object Class "LiteralBoolean"

 			    quid       	"3CB5DE390142"

+			    documentation 	"A literal boolean contains a Boolean-valued attribute. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CB5DEDD029C"

@@ -35495,10 +35361,10 @@
 				(object ClassAttribute "value"

 				    quid       	"3CB5DEB10375"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    exportControl 	"Public")))

 			(object Class "LiteralNull"

 			    quid       	"3CB5DE520102"

+			    documentation 	"A literal null is used to represent null, i.e., the absence of a value. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CB5DEE402D8"

@@ -35510,6 +35376,7 @@
 				    quidu      	"3CB5A29200D2")))

 			(object Class "Constraint"

 			    quid       	"3CAAED67023C"

+			    documentation 	"Constraint contains a ValueSpecification that specifies additional semantics for one or more elements. Certain kinds of constraints (such as an association “xor” constraint) are predefined in UML, others may be user-defined. A user-defined Constraint is described using a specified language, whose syntax and interpretation is a tool responsibility. One predefined language for writing constraints is OCL. In some situations, a programming language such as Java may be appropriate for expressing a constraint. In other situations natural language may be used. Constraint is a condition (a Boolean expression) that restricts the extension of the associated element beyond what is imposed by the other language constructs applied to that element. Constraint contains an optional name, although they are commonly unnamed. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CB20D4A0345"

@@ -35521,6 +35388,7 @@
 				    quidu      	"3DE766450007")))

 			(object Class "ElementImport"

 			    quid       	"3CB5E15901BA"

+			    documentation 	"An element import is defined as a directed relationship between an importing namespace and a packageable element. The name of the packageable element or its alias is to be added to the namespace of the importing namespace. It is also possible to control whether the imported element can be further imported. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CB5E2F40374"

@@ -35540,10 +35408,10 @@
 				    quid       	"3CBBE2E9024C"

 				    stereotype 	"0..1"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public")))

 			(object Class "MultiplicityElement"

 			    quid       	"3CAAFD5202DC"

+			    documentation 	"A MultiplicityElement is an abstract metaclass which includes optional attributes for defining the bounds of a multiplicity. A MultiplicityElement also includes specifications of whether the values in an instantiation of this element must be unique or ordered. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CAAFEE802C2"

@@ -35561,32 +35429,29 @@
 				(object ClassAttribute "isOrdered"

 				    quid       	"3CAD9D1D004C"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")

 				(object ClassAttribute "isUnique"

 				    quid       	"3DFFB22D03D6"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"true"

 				    exportControl 	"Public")

 				(object ClassAttribute "upper"

 				    quid       	"3DFFB238029B"

 				    stereotype 	"0..1"

 				    type       	"UnlimitedNatural"

-				    quidu      	"3DE6A93C0003"

 				    exportControl 	"Public"

 				    derived    	TRUE)

 				(object ClassAttribute "lower"

 				    quid       	"3DFFB2640028"

 				    stereotype 	"0..1"

 				    type       	"Integer"

-				    quidu      	"3CA010A4007B"

 				    exportControl 	"Public"

 				    derived    	TRUE))

 			    abstract   	TRUE)

 			(object Class "TypedElement"

 			    quid       	"3CAAFD3A006B"

+			    documentation 	"A typed element is an element that has a type that serves as a constraint on the range of values the element can represent. Typed element is an abstract metaclass. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3DFFB8E5034D"

@@ -35603,6 +35468,7 @@
 			    abstract   	TRUE)

 			(object Class "Classifier"

 			    quid       	"3CAAECE80199"

+			    documentation 	"A classifier is a namespace whose members can include features. Classifier is an abstract metaclass. A classifier is a type and can own generalizations, thereby making it possible to define generalization relationships to other classifiers. A classifier can specify a generalization hierarchy by referencing its general classifiers. A classifier is a redefinable element, meaning that it is possible to redefine nested classifiers. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CB1986F03D0"

@@ -35628,12 +35494,12 @@
 				(object ClassAttribute "isAbstract"

 				    quid       	"3CAB025C02CD"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public"))

 			    abstract   	TRUE)

 			(object Class "Feature"

 			    quid       	"3CAAFD220337"

+			    documentation 	"A feature declares a behavioral or structural characteristic of instances of classifiers. Feature is an abstract metaclass. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CAB043E0063"

@@ -35647,12 +35513,12 @@
 				(object ClassAttribute "isStatic"

 				    quid       	"3CB17B760027"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public"))

 			    abstract   	TRUE)

 			(object Class "RedefinableElement"

 			    quid       	"3CAB007101D7"

+			    documentation 	"A redefinable element is a named element that can be redefined in the context of a generalization. RedefinableElement is an abstract metaclass. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CAB0423024F"

@@ -35666,12 +35532,12 @@
 				(object ClassAttribute "isLeaf"

 				    quid       	"3CAB044C0208"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public"))

 			    abstract   	TRUE)

 			(object Class "Generalization"

 			    quid       	"3CAAECEF0149"

+			    documentation 	"A generalization relates a specific classifier to a more general classifier, and is owned by the specific classifier. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CAB01D20012"

@@ -35685,10 +35551,10 @@
 				(object ClassAttribute "isSubstitutable"

 				    quid       	"3DF4FA43024F"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    exportControl 	"Public")))

 			(object Class "BehavioralFeature"

 			    quid       	"3CAAFD470326"

+			    documentation 	"A behavioral feature specifies that an instance of a classifier will respond to a designated request by invoking a behavior. BehavioralFeature is an abstract metaclass specializing Feature and Namespace. Kinds of behavioral aspects are modeled by subclasses of BehavioralFeature. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CAB09740397"

@@ -35705,6 +35571,7 @@
 			    abstract   	TRUE)

 			(object Class "Parameter"

 			    quid       	"3CAB0B3D0362"

+			    documentation 	"A parameter is a specification of an argument used to pass information into or out of an invocation of a behavioral feature. It has a type, and may have a multiplicity and an optional default value. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CAB0DEE0204"

@@ -35729,11 +35596,11 @@
 				    quid       	"3DFFCC4902FB"

 				    stereotype 	"0..1"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public"

 				    derived    	TRUE)))

 			(object Class "StructuralFeature"

 			    quid       	"3CAB08ED000D"

+			    documentation 	"A structural feature is a typed feature of a classifier that specify the structure of instances of the classifier. Structural feature is an abstract metaclass. By specializing multiplicity element, it supports a multiplicity that specifies valid cardinalities for the set of values associated with an instantiation of the structural feature. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CAB0948000E"

@@ -35755,12 +35622,12 @@
 				(object ClassAttribute "isReadOnly"

 				    quid       	"3E0272B40257"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public"))

 			    abstract   	TRUE)

 			(object Class "InstanceSpecification"

 			    quid       	"3CAB11A7010A"

+			    documentation 	"In the metamodel, InstanceSpecification is a specialization of DeploymentTarget and DeployedArtifact. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CE167ED0006"

@@ -35772,6 +35639,7 @@
 				    quidu      	"3CA0320C02DB")))

 			(object Class "Slot"

 			    quid       	"3CAB11B20214"

+			    documentation 	"A slot is owned by an instance specification. It specifies the value or values for its defining feature, which must be a structural feature of a classifier of the instance specification owning the slot. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CAB131E0312"

@@ -35783,6 +35651,7 @@
 				    quidu      	"3CA032120334")))

 			(object Class "Package"

 			    quid       	"3CAB1D7E0162"

+			    documentation 	"A package is a namespace for its members, and may contain other packages. Only packageable elements can be owned members of a package. By virtue of being a namespace, a package can import either individual members of other packages, or all the members of other packages. In addition a package can be merged with other packages. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CB2142F00C2"

@@ -35798,6 +35667,7 @@
 				    quidu      	"3DE6D5DA0183")))

 			(object Class "PackageImport"

 			    quid       	"3CAB1D8F02A7"

+			    documentation 	"A package import is defined as a directed relationship that identifies a package whose members are to be imported by a namespace. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3DDD03280141"

@@ -35815,6 +35685,7 @@
 				    exportControl 	"Public")))

 			(object Class "Class"

 			    quid       	"3CAB1D6D00A0"

+			    documentation 	"Class is a kind of classifier whose features are attributes and operations. Attributes of a class are represented by instances of Property that are owned by the class. Some of these attributes may represent the navigable ends of binary associations. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CAB214001FC"

@@ -35828,11 +35699,11 @@
 				(object ClassAttribute "isAbstract"

 				    quid       	"3E1BFA62009C"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")))

 			(object Class "Property"

 			    quid       	"3CAB1D790101"

+			    documentation 	"Property represents a declared state of one or more instances in terms of a named relationship to a value or values. When a property is an attribute of a classifier, the value or values are related to the instance of the classifier by being held in slots of the instance. When a property is an association end, the value or values are related to the instance or instances at the other end(s) of the association (see semantics of Association). Property is indirectly a subclass of Constructs::TypedElement. The range of valid values represented by the property can be controlled by setting the property’s type. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CAB219E01F7"

@@ -35846,26 +35717,22 @@
 				(object ClassAttribute "isDerived"

 				    quid       	"3CAB218E0045"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")

 				(object ClassAttribute "isReadOnly"

 				    quid       	"3DFFC059038D"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")

 				(object ClassAttribute "isDerivedUnion"

 				    quid       	"3DFFC06103CA"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")

 				(object ClassAttribute "default"

 				    quid       	"3DFFC10401EE"

 				    stereotype 	"0..1"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public"

 				    derived    	TRUE)

 				(object ClassAttribute "aggregation"

@@ -35877,11 +35744,11 @@
 				(object ClassAttribute "isComposite"

 				    quid       	"3DFFC66A0368"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    exportControl 	"Public"

 				    derived    	TRUE)))

 			(object Class "Operation"

 			    quid       	"3CAB1D710164"

+			    documentation 	"An operation is a behavioral feature of a classifier that specifies the name, type, parameters, and constraints for invoking an associated behavior. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CAB234B0136"

@@ -35895,37 +35762,33 @@
 				(object ClassAttribute "isQuery"

 				    quid       	"3E02805002BB"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")

 				(object ClassAttribute "isOrdered"

 				    quid       	"3E04B1B500F0"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    exportControl 	"Public"

 				    derived    	TRUE)

 				(object ClassAttribute "isUnique"

 				    quid       	"3E04B1BD0137"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    exportControl 	"Public"

 				    derived    	TRUE)

 				(object ClassAttribute "lower"

 				    quid       	"3E04B1CF009D"

 				    stereotype 	"0..1"

 				    type       	"Integer"

-				    quidu      	"3CA010A4007B"

 				    exportControl 	"Public"

 				    derived    	TRUE)

 				(object ClassAttribute "upper"

 				    quid       	"3E04B1C20171"

 				    stereotype 	"0..1"

 				    type       	"UnlimitedNatural"

-				    quidu      	"3DE6A93C0003"

 				    exportControl 	"Public"

 				    derived    	TRUE)))

 			(object Class "DataType"

 			    quid       	"3CAB1D9C03C8"

+			    documentation 	"DataType defines a kind of classifier in which operations are all pure functions (i.e., they can return data values but they cannot change data values, because they have no identity). For example, an “add” operation on a number with another number as an argument yields a third number as a result; the target and argument are unchanged. A DataType may also contain attributes to support the modeling of structured data types. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CBC61120274"

@@ -35937,6 +35800,7 @@
 				    quidu      	"3DE6D25202A6")))

 			(object Class "Enumeration"

 			    quid       	"3CAB1DC0026C"

+			    documentation 	"Enumeration is a kind of data type, whose instances may be any of a number of user-defined enumeration literals. It is possible to extend the set of applicable enumeration literals in other packages or profiles. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CAB576C02FA"

@@ -35948,6 +35812,7 @@
 				    quidu      	"3DE6D2750152")))

 			(object Class "EnumerationLiteral"

 			    quid       	"3CAB1DC601C0"

+			    documentation 	"An enumeration literal is a user-defined data value for an enumeration. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CEE3ABE00AB"

@@ -35959,6 +35824,7 @@
 				    quidu      	"3DE6D2910397")))

 			(object Class "PrimitiveType"

 			    quid       	"3CAB1DCD00B2"

+			    documentation 	"The instances of primitive type used in UML itself include Boolean, Integer, UnlimitedNatural, and String. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CAB576803A8"

@@ -35970,6 +35836,7 @@
 				    quidu      	"3DE6D2570393")))

 			(object Class "Association"

 			    quid       	"3CAB1DD70016"

+			    documentation 	"An association specifies a semantic relationship that can occur between typed instances. It has at least two ends represented by properties, each of which is connected to the type of the end. More than one end of the association may have the same type. When a property is owned by an association it represents a non-navigable end of the association. In this case the property does not appear in the namespace of any of the associated classifiers. When a property at an end of an association is owned by one of the associated classifiers it represents a navigable end of the association. In this case the property is also an attribute of the associated classifier. Only binary associations may have navigable ends. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CBC615101E9"

@@ -35987,11 +35854,11 @@
 				(object ClassAttribute "isDerived"

 				    quid       	"3CAB3F980274"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")))

 			(object Class "Namespace"

 			    quid       	"3CAAECC502DA"

+			    documentation 	"A namespace is a named element that can own other named elements. Each named element may be owned by at most one namespace. A namespace provides a means for identifying named elements by name. Named elements can be identified by name in a namespace either by being directly owned by the namespace or by being introduced into the namespace by other means e.g. importing or inheriting. Namespace is an abstract metaclass. A namespace can own constraints. The constraint does not necessarily apply to the namespace itself, but may also apply to elements in the namespace. A namespace has the ability to import either individial members or all members of a package, thereby making it possible to refer to those named elements without qualification in the importing namespace. In the case of conflicts, it is necessary to use qualified names or aliases to disambiguate the referenced elements. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CAAF0700320"

@@ -36004,6 +35871,7 @@
 			    abstract   	TRUE)

 			(object Class "ParameterDirectionKind"

 			    quid       	"3CEE419F03B0"

+			    documentation 	"ParameterDirectionKind is an enumeration of the following literal values: • in Indicates that parameter values are passed into the behavioral element by the caller. • inout Indicates that parameter values are passed into a behavioral element by the caller and then back out to the caller from the behavioral element. • out Indicates that parameter values are passed from a behavioral element out to the caller. • return Indicates that parameter values are passed as return values from a behavioral element back to the caller. "

 			    stereotype 	"enumeration"

 			    class_attributes 	(list class_attribute_list

 				(object ClassAttribute "in"

@@ -36020,6 +35888,7 @@
 				    exportControl 	"Public")))

 			(object Class "ValueSpecification"

 			    quid       	"3D0254AB023D"

+			    documentation 	"ValueSpecification is an abstract metaclass used to identify a value or values in a model. It may reference an instance or it may be an expression denoting an instance or instances when evaluated. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E025C770305"

@@ -36032,6 +35901,7 @@
 			    abstract   	TRUE)

 			(object Class "Relationship"

 			    quid       	"3D514EBA0111"

+			    documentation 	"A relationship references one or more related elements. Relationship is an abstract metaclass. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3D514EDB02F9"

@@ -36044,6 +35914,7 @@
 			    abstract   	TRUE)

 			(object Class "PackageMerge"

 			    quid       	"3D623A8601AB"

+			    documentation 	"A package merge is a relationship between two packages, where the contents of the target package (the one pointed at) is merged with the contents of the source package through specialization and redefinition, where applicable. This is a mechanism that should be used when elements of the same name are intended to represent the same concept, regardless of the package in which they are defined. A merging package will take elements of the same kind with the same name from one or more packages and merge them together into a single element using generalization and redefinitions. It should be noted that a package merge can be viewed as a short-hand way of explicitly defining those generalizations and redefinitions. The merged packages are still available, and the elements in those packages can be separately qualified. From an XMI point of view, it is either possible to exchange a model with all PackageMerges retained or a model where all PackageMerges have been transformed away (in which case package imports, generalizations, and redefinitions are used instead). "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3D623AB503A7"

@@ -36055,6 +35926,7 @@
 				    quidu      	"3DEE8DFE0290")))

 			(object Class "InstanceValue"

 			    quid       	"3D78AD4B0374"

+			    documentation 	"An instance value specifies the value modeled by an instance specification. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3D78ADDB0014"

@@ -36066,6 +35938,7 @@
 				    quidu      	"3D1115A7028B")))

 			(object Class "AggregationKind"

 			    quid       	"3DFFC6AB0253"

+			    documentation 	"AggregationKind is an enumeration of the following literal values: • none Indicates that the property has no aggregation. • shared Indicates that the property has a shared aggregation. • composite Indicates that the property is aggregated compositely, i.e., the composite object has responsibility for the existence and storage of the composed objects (parts). "

 			    stereotype 	"enumeration"

 			    class_attributes 	(list class_attribute_list

 				(object ClassAttribute "none"

@@ -36079,6 +35952,7 @@
 				    exportControl 	"Public")))

 			(object Class "LiteralUnlimitedNatural"

 			    quid       	"3E025DA001CB"

+			    documentation 	"A literal unlimited natural contains a UnlimitedNatural-valued attribute. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E025DD10258"

@@ -36092,10 +35966,10 @@
 				(object ClassAttribute "value"

 				    quid       	"3E025DC40047"

 				    type       	"UnlimitedNatural"

-				    quidu      	"3DE6A93C0003"

 				    exportControl 	"Public")))

 			(object Class "Type"

 			    quid       	"3E5920C2014E"

+			    documentation 	"A type serves as a constraint on the range of values represented by a typed element. Type is an abstract metaclass. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E59212102C7"

@@ -36108,6 +35982,7 @@
 			    abstract   	TRUE)

 			(object Class "Expression"

 			    quid       	"3E5921EE010A"

+			    documentation 	"An expression represents a node in an expression tree, which may be non-terminal or terminal. It defines a symbol, and has a possibly empty sequence of operands which are value specifications. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E59221302BB"

@@ -36121,7 +35996,6 @@
 				(object ClassAttribute "symbol"

 				    quid       	"3E5921F9017E"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public")))

 			(object Association "$UNNAMED$256"

 			    quid       	"3CAAEEA4038D"

@@ -37523,7 +37397,7 @@
 				    width      	650

 				    height     	356)

 				(object AssociationViewNew "$UNNAMED$320" @1525

-				    location   	(2443, 522)

+				    location   	(2443, 594)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -37538,7 +37412,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "upperValue" @1526

 					    Parent_View 	@1525

-					    location   	(1585, -522)

+					    location   	(1585, -450)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -37550,7 +37424,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1527

 						Parent_View 	@1526

-						location   	(2752, 472)

+						location   	(2752, 544)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -37574,11 +37448,11 @@
 					    client     	@1525

 					    supplier   	@1523

 					    line_style 	3

-					    origin_attachment 	(2443, 522)

-					    terminal_attachment 	(2930, 522)

+					    origin_attachment 	(2443, 594)

+					    terminal_attachment 	(2930, 594)

 					    label      	(object SegLabel @1528

 						Parent_View 	@1526

-						location   	(2880, 576)

+						location   	(2880, 648)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -37599,7 +37473,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1529

 						Parent_View 	@1526

-						location   	(2561, 566)

+						location   	(2561, 638)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -37620,7 +37494,7 @@
 						orientation 	1))

 					(object RoleView "ownerUpper" @1530

 					    Parent_View 	@1525

-					    location   	(1585, -522)

+					    location   	(1585, -450)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -37632,7 +37506,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1531

 						Parent_View 	@1530

-						location   	(2114, 440)

+						location   	(2114, 512)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -37656,11 +37530,11 @@
 					    client     	@1525

 					    supplier   	@1524

 					    line_style 	3

-					    origin_attachment 	(2443, 522)

-					    terminal_attachment 	(1957, 522)

+					    origin_attachment 	(2443, 594)

+					    terminal_attachment 	(1957, 594)

 					    label      	(object SegLabel @1532

 						Parent_View 	@1530

-						location   	(2006, 576)

+						location   	(2006, 648)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -37681,7 +37555,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1533

 						Parent_View 	@1530

-						location   	(2157, 484)

+						location   	(2157, 556)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -37701,7 +37575,7 @@
 						height     	38

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$321" @1534

-				    location   	(2443, 687)

+				    location   	(2443, 594)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -37716,7 +37590,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "lowerValue" @1535

 					    Parent_View 	@1534

-					    location   	(1585, -357)

+					    location   	(1585, -450)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -37728,7 +37602,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1536

 						Parent_View 	@1535

-						location   	(2744, 642)

+						location   	(2744, 549)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -37752,11 +37626,11 @@
 					    client     	@1534

 					    supplier   	@1523

 					    line_style 	3

-					    origin_attachment 	(2443, 687)

-					    terminal_attachment 	(2930, 687)

+					    origin_attachment 	(2443, 594)

+					    terminal_attachment 	(2930, 594)

 					    label      	(object SegLabel @1537

 						Parent_View 	@1535

-						location   	(2880, 741)

+						location   	(2880, 648)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -37777,7 +37651,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1538

 						Parent_View 	@1535

-						location   	(2571, 726)

+						location   	(2571, 633)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -37798,7 +37672,7 @@
 						orientation 	1))

 					(object RoleView "ownerLower" @1539

 					    Parent_View 	@1534

-					    location   	(1585, -357)

+					    location   	(1585, -450)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -37810,7 +37684,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1540

 						Parent_View 	@1539

-						location   	(2132, 620)

+						location   	(2132, 527)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -37834,11 +37708,11 @@
 					    client     	@1534

 					    supplier   	@1524

 					    line_style 	3

-					    origin_attachment 	(2443, 687)

-					    terminal_attachment 	(1957, 687)

+					    origin_attachment 	(2443, 594)

+					    terminal_attachment 	(1957, 594)

 					    label      	(object SegLabel @1541

 						Parent_View 	@1539

-						location   	(2006, 741)

+						location   	(2006, 648)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -37859,7 +37733,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1542

 						Parent_View 	@1539

-						location   	(2173, 657)

+						location   	(2173, 564)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -38003,7 +37877,7 @@
 				    origin_attachment 	(1660, 1136)

 				    terminal_attachment 	(1660, 1000))

 				(object AssociationViewNew "$UNNAMED$263" @1550

-				    location   	(2122, 1184)

+				    location   	(2122, 1224)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -38018,7 +37892,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "type" @1551

 					    Parent_View 	@1550

-					    location   	(622, 548)

+					    location   	(622, 588)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -38030,7 +37904,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1552

 						Parent_View 	@1551

-						location   	(2259, 1144)

+						location   	(2259, 1184)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -38054,11 +37928,11 @@
 					    client     	@1550

 					    supplier   	@1547

 					    line_style 	3

-					    origin_attachment 	(2122, 1184)

-					    terminal_attachment 	(2380, 1184)

+					    origin_attachment 	(2122, 1224)

+					    terminal_attachment 	(2380, 1224)

 					    label      	(object SegLabel @1553

 						Parent_View 	@1551

-						location   	(2270, 1226)

+						location   	(2270, 1266)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -38079,7 +37953,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$264" @1554

 					    Parent_View 	@1550

-					    location   	(622, 548)

+					    location   	(622, 588)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -38094,8 +37968,8 @@
 					    client     	@1550

 					    supplier   	@1548

 					    line_style 	3

-					    origin_attachment 	(2122, 1184)

-					    terminal_attachment 	(1864, 1184))))

+					    origin_attachment 	(2122, 1224)

+					    terminal_attachment 	(1864, 1224))))

 				(object ClassView "Class" "Logical View::UML::Classes::Kernel::PackageableElement" @1555

 				    SuppressAttribute 	TRUE

 				    SuppressOperation 	TRUE

@@ -38735,13 +38609,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$280" @1584

-				    location   	(1222, 406)

+				    location   	(1222, 404)

 				    stereotype 	TRUE

 				    quidu      	"3CB1F21F024A"

 				    roleview_list 	(list RoleViews

 					(object RoleView "owningElement" @1585

 					    Parent_View 	@1584

-					    location   	(-536, -374)

+					    location   	(-536, -376)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -38753,7 +38627,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1586

 						Parent_View 	@1585

-						location   	(1039, 382)

+						location   	(1039, 380)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -38777,11 +38651,11 @@
 					    client     	@1584

 					    supplier   	@1573

 					    line_style 	3

-					    origin_attachment 	(1222, 406)

-					    terminal_attachment 	(875, 406)

+					    origin_attachment 	(1222, 404)

+					    terminal_attachment 	(875, 404)

 					    label      	(object SegLabel @1587

 						Parent_View 	@1585

-						location   	(910, 460)

+						location   	(910, 458)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -38802,7 +38676,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1588

 						Parent_View 	@1585

-						location   	(1048, 451)

+						location   	(1048, 449)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -38823,7 +38697,7 @@
 						orientation 	0))

 					(object RoleView "ownedComment" @1589

 					    Parent_View 	@1584

-					    location   	(-536, -374)

+					    location   	(-536, -376)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -38835,7 +38709,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1590

 						Parent_View 	@1589

-						location   	(1411, 366)

+						location   	(1411, 364)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -38859,11 +38733,11 @@
 					    client     	@1584

 					    supplier   	@1583

 					    line_style 	3

-					    origin_attachment 	(1222, 406)

-					    terminal_attachment 	(1570, 406)

+					    origin_attachment 	(1222, 404)

+					    terminal_attachment 	(1570, 404)

 					    label      	(object SegLabel @1591

 						Parent_View 	@1589

-						location   	(1534, 460)

+						location   	(1534, 458)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -38884,7 +38758,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1592

 						Parent_View 	@1589

-						location   	(1342, 451)

+						location   	(1342, 449)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39035,13 +38909,13 @@
 				    height     	625

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$259" @1600

-				    location   	(1134, 1112)

+				    location   	(1134, 1176)

 				    stereotype 	TRUE

 				    quidu      	"3CAAEF46037B"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$260" @1601

 					    Parent_View 	@1600

-					    location   	(-210, 344)

+					    location   	(-210, 408)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -39053,7 +38927,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1602

 						Parent_View 	@1601

-						location   	(945, 1071)

+						location   	(945, 1135)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39078,11 +38952,11 @@
 					    client     	@1600

 					    supplier   	@1594

 					    line_style 	3

-					    origin_attachment 	(1134, 1112)

-					    terminal_attachment 	(898, 1112))

+					    origin_attachment 	(1134, 1176)

+					    terminal_attachment 	(898, 1176))

 					(object RoleView "/target" @1603

 					    Parent_View 	@1600

-					    location   	(-210, 344)

+					    location   	(-210, 408)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -39094,7 +38968,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1604

 						Parent_View 	@1603

-						location   	(1294, 1077)

+						location   	(1294, 1141)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39118,11 +38992,11 @@
 					    client     	@1600

 					    supplier   	@1599

 					    line_style 	3

-					    origin_attachment 	(1134, 1112)

-					    terminal_attachment 	(1371, 1112)

+					    origin_attachment 	(1134, 1176)

+					    terminal_attachment 	(1371, 1176)

 					    label      	(object SegLabel @1605

 						Parent_View 	@1603

-						location   	(1340, 1160)

+						location   	(1340, 1224)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39143,7 +39017,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1606

 						Parent_View 	@1603

-						location   	(1137, 1179)

+						location   	(1137, 1243)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39166,13 +39040,13 @@
 						height     	67

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$257" @1607

-				    location   	(1134, 1272)

+				    location   	(1134, 1176)

 				    stereotype 	TRUE

 				    quidu      	"3CAAEEF60308"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$258" @1608

 					    Parent_View 	@1607

-					    location   	(408, 954)

+					    location   	(408, 858)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -39184,7 +39058,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1609

 						Parent_View 	@1608

-						location   	(945, 1231)

+						location   	(945, 1135)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39209,11 +39083,11 @@
 					    client     	@1607

 					    supplier   	@1594

 					    line_style 	3

-					    origin_attachment 	(1134, 1272)

-					    terminal_attachment 	(898, 1272))

+					    origin_attachment 	(1134, 1176)

+					    terminal_attachment 	(898, 1176))

 					(object RoleView "/source" @1610

 					    Parent_View 	@1607

-					    location   	(408, 954)

+					    location   	(408, 858)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -39225,7 +39099,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1611

 						Parent_View 	@1610

-						location   	(1294, 1245)

+						location   	(1294, 1149)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39249,11 +39123,11 @@
 					    client     	@1607

 					    supplier   	@1599

 					    line_style 	3

-					    origin_attachment 	(1134, 1272)

-					    terminal_attachment 	(1371, 1272)

+					    origin_attachment 	(1134, 1176)

+					    terminal_attachment 	(1371, 1176)

 					    label      	(object SegLabel @1612

 						Parent_View 	@1610

-						location   	(1346, 1326)

+						location   	(1346, 1230)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39274,7 +39148,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1613

 						Parent_View 	@1610

-						location   	(1186, 1344)

+						location   	(1186, 1248)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39297,13 +39171,13 @@
 						height     	72

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$278" @1614

-				    location   	(1894, 766)

+				    location   	(1894, 774)

 				    stereotype 	TRUE

 				    quidu      	"3CAC0CBA00DE"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$279" @1615

 					    Parent_View 	@1614

-					    location   	(1168, 448)

+					    location   	(1168, 456)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -39315,7 +39189,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1616

 						Parent_View 	@1615

-						location   	(2047, 725)

+						location   	(2047, 733)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39340,11 +39214,11 @@
 					    client     	@1614

 					    supplier   	@1595

 					    line_style 	3

-					    origin_attachment 	(1894, 766)

-					    terminal_attachment 	(2087, 766))

+					    origin_attachment 	(1894, 774)

+					    terminal_attachment 	(2087, 774))

 					(object RoleView "annotatedElement" @1617

 					    Parent_View 	@1614

-					    location   	(1168, 448)

+					    location   	(1168, 456)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -39356,7 +39230,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1618

 						Parent_View 	@1617

-						location   	(1866, 737)

+						location   	(1866, 745)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39380,11 +39254,11 @@
 					    client     	@1614

 					    supplier   	@1599

 					    line_style 	3

-					    origin_attachment 	(1894, 766)

-					    terminal_attachment 	(1701, 766)

+					    origin_attachment 	(1894, 774)

+					    terminal_attachment 	(1701, 774)

 					    label      	(object SegLabel @1619

 						Parent_View 	@1617

-						location   	(1727, 810)

+						location   	(1727, 818)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39404,13 +39278,13 @@
 						height     	44

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$316" @1620

-				    location   	(1122, 753)

+				    location   	(1122, 774)

 				    stereotype 	TRUE

 				    quidu      	"3D514F6D0227"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$317" @1621

 					    Parent_View 	@1620

-					    location   	(396, 435)

+					    location   	(396, 456)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -39422,7 +39296,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1622

 						Parent_View 	@1621

-						location   	(924, 712)

+						location   	(924, 733)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39447,11 +39321,11 @@
 					    client     	@1620

 					    supplier   	@1596

 					    line_style 	3

-					    origin_attachment 	(1122, 753)

-					    terminal_attachment 	(873, 753))

+					    origin_attachment 	(1122, 774)

+					    terminal_attachment 	(873, 774))

 					(object RoleView "/relatedElement" @1623

 					    Parent_View 	@1620

-					    location   	(396, 435)

+					    location   	(396, 456)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -39463,7 +39337,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1624

 						Parent_View 	@1623

-						location   	(1151, 715)

+						location   	(1151, 736)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39487,11 +39361,11 @@
 					    client     	@1620

 					    supplier   	@1599

 					    line_style 	3

-					    origin_attachment 	(1122, 753)

-					    terminal_attachment 	(1371, 753)

+					    origin_attachment 	(1122, 774)

+					    terminal_attachment 	(1371, 774)

 					    label      	(object SegLabel @1625

 						Parent_View 	@1623

-						location   	(1299, 795)

+						location   	(1299, 816)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39512,7 +39386,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1626

 						Parent_View 	@1623

-						location   	(1185, 795)

+						location   	(1185, 816)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39854,13 +39728,13 @@
 				    origin_attachment 	(3002, 1273)

 				    terminal_attachment 	(3002, 1154))

 				(object AssociationViewNew "$UNNAMED$281" @1643

-				    location   	(3305, 1325)

+				    location   	(3305, 1338)

 				    stereotype 	TRUE

 				    quidu      	"3CB5E39A0084"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$282" @1644

 					    Parent_View 	@1643

-					    location   	(2429, 407)

+					    location   	(2429, 420)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -39872,7 +39746,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1645

 						Parent_View 	@1644

-						location   	(3149, 1367)

+						location   	(3149, 1380)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39897,11 +39771,11 @@
 					    client     	@1643

 					    supplier   	@1641

 					    line_style 	3

-					    origin_attachment 	(3305, 1325)

-					    terminal_attachment 	(3109, 1325))

+					    origin_attachment 	(3305, 1338)

+					    terminal_attachment 	(3109, 1338))

 					(object RoleView "importedElement" @1646

 					    Parent_View 	@1643

-					    location   	(2429, 407)

+					    location   	(2429, 420)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -39913,7 +39787,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1647

 						Parent_View 	@1646

-						location   	(3357, 1281)

+						location   	(3357, 1294)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39937,11 +39811,11 @@
 					    client     	@1643

 					    supplier   	@1639

 					    line_style 	3

-					    origin_attachment 	(3305, 1325)

-					    terminal_attachment 	(3502, 1325)

+					    origin_attachment 	(3305, 1338)

+					    terminal_attachment 	(3502, 1338)

 					    label      	(object SegLabel @1648

 						Parent_View 	@1646

-						location   	(3470, 1367)

+						location   	(3470, 1380)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -39962,7 +39836,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1649

 						Parent_View 	@1646

-						location   	(3344, 1358)

+						location   	(3344, 1371)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40042,13 +39916,13 @@
 				    height     	943

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$313" @1653

-				    location   	(2197, 1069)

+				    location   	(2197, 976)

 				    stereotype 	TRUE

 				    quidu      	"3CAAF0AF00E6"

 				    roleview_list 	(list RoleViews

 					(object RoleView "/namespace" @1654

 					    Parent_View 	@1653

-					    location   	(1429, 787)

+					    location   	(1429, 694)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -40060,7 +39934,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1655

 						Parent_View 	@1654

-						location   	(2002, 1029)

+						location   	(2002, 936)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40084,11 +39958,11 @@
 					    client     	@1653

 					    supplier   	@1652

 					    line_style 	3

-					    origin_attachment 	(2197, 1069)

-					    terminal_attachment 	(1856, 1069)

+					    origin_attachment 	(2197, 976)

+					    terminal_attachment 	(1856, 976)

 					    label      	(object SegLabel @1656

 						Parent_View 	@1654

-						location   	(1903, 1117)

+						location   	(1903, 1024)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40109,7 +39983,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1657

 						Parent_View 	@1654

-						location   	(2022, 1142)

+						location   	(2022, 1049)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40133,7 +40007,7 @@
 						orientation 	0))

 					(object RoleView "/ownedMember" @1658

 					    Parent_View 	@1653

-					    location   	(1429, 787)

+					    location   	(1429, 694)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -40145,7 +40019,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1659

 						Parent_View 	@1658

-						location   	(2378, 1032)

+						location   	(2378, 939)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40169,11 +40043,11 @@
 					    client     	@1653

 					    supplier   	@1640

 					    line_style 	3

-					    origin_attachment 	(2197, 1069)

-					    terminal_attachment 	(2539, 1069)

+					    origin_attachment 	(2197, 976)

+					    terminal_attachment 	(2539, 976)

 					    label      	(object SegLabel @1660

 						Parent_View 	@1658

-						location   	(2505, 1123)

+						location   	(2505, 1030)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40194,7 +40068,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1661

 						Parent_View 	@1658

-						location   	(2389, 1150)

+						location   	(2389, 1057)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40218,13 +40092,13 @@
 						height     	81

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$314" @1662

-				    location   	(2197, 894)

+				    location   	(2197, 976)

 				    stereotype 	TRUE

 				    quidu      	"3CAAF1D0011D"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$315" @1663

 					    Parent_View 	@1662

-					    location   	(1429, 612)

+					    location   	(1429, 694)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -40236,7 +40110,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1664

 						Parent_View 	@1663

-						location   	(1924, 853)

+						location   	(1924, 935)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40261,11 +40135,11 @@
 					    client     	@1662

 					    supplier   	@1652

 					    line_style 	3

-					    origin_attachment 	(2197, 894)

-					    terminal_attachment 	(1856, 894))

+					    origin_attachment 	(2197, 976)

+					    terminal_attachment 	(1856, 976))

 					(object RoleView "/member" @1665

 					    Parent_View 	@1662

-					    location   	(1429, 612)

+					    location   	(1429, 694)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -40277,7 +40151,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1666

 						Parent_View 	@1665

-						location   	(2415, 860)

+						location   	(2415, 942)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40301,11 +40175,11 @@
 					    client     	@1662

 					    supplier   	@1640

 					    line_style 	3

-					    origin_attachment 	(2197, 894)

-					    terminal_attachment 	(2539, 894)

+					    origin_attachment 	(2197, 976)

+					    terminal_attachment 	(2539, 976)

 					    label      	(object SegLabel @1667

 						Parent_View 	@1665

-						location   	(2485, 942)

+						location   	(2485, 1024)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40326,7 +40200,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1668

 						Parent_View 	@1665

-						location   	(2375, 929)

+						location   	(2375, 1011)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40355,13 +40229,13 @@
 				    terminal_attachment 	(1647, 766)

 				    drawSupplier 	@1633)

 				(object AssociationViewNew "$UNNAMED$299" @1670

-				    location   	(2271, 1340)

+				    location   	(2271, 1350)

 				    stereotype 	TRUE

 				    quidu      	"3CAB5C7500C2"

 				    roleview_list 	(list RoleViews

 					(object RoleView "importingNamespace" @1671

 					    Parent_View 	@1670

-					    location   	(-273, -70)

+					    location   	(-273, -60)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -40373,7 +40247,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1672

 						Parent_View 	@1671

-						location   	(2050, 1300)

+						location   	(2050, 1310)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40397,11 +40271,11 @@
 					    client     	@1670

 					    supplier   	@1652

 					    line_style 	3

-					    origin_attachment 	(2271, 1340)

-					    terminal_attachment 	(1856, 1340)

+					    origin_attachment 	(2271, 1350)

+					    terminal_attachment 	(1856, 1350)

 					    label      	(object SegLabel @1673

 						Parent_View 	@1671

-						location   	(1898, 1394)

+						location   	(1898, 1404)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40422,7 +40296,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1674

 						Parent_View 	@1671

-						location   	(2057, 1394)

+						location   	(2057, 1404)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40446,7 +40320,7 @@
 						orientation 	0))

 					(object RoleView "elementImport" @1675

 					    Parent_View 	@1670

-					    location   	(-273, -70)

+					    location   	(-273, -60)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -40458,7 +40332,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1676

 						Parent_View 	@1675

-						location   	(2548, 1300)

+						location   	(2548, 1310)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40482,11 +40356,11 @@
 					    client     	@1670

 					    supplier   	@1641

 					    line_style 	3

-					    origin_attachment 	(2271, 1340)

-					    terminal_attachment 	(2687, 1340)

+					    origin_attachment 	(2271, 1350)

+					    terminal_attachment 	(2687, 1350)

 					    label      	(object SegLabel @1677

 						Parent_View 	@1675

-						location   	(2644, 1394)

+						location   	(2644, 1404)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40507,7 +40381,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1678

 						Parent_View 	@1675

-						location   	(2438, 1375)

+						location   	(2438, 1385)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40527,7 +40401,7 @@
 						height     	35

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$330" @1679

-				    location   	(1235, 938)

+				    location   	(1235, 948)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -40539,7 +40413,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @1680

 					Parent_View 	@1679

-					location   	(1235, 879)

+					location   	(1235, 889)

 					font       	(object Font

 					    size       	8

 					    face       	"Arial"

@@ -40564,7 +40438,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$331" @1681

 					    Parent_View 	@1679

-					    location   	(-655, 326)

+					    location   	(-655, 336)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -40576,7 +40450,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1682

 						Parent_View 	@1681

-						location   	(1383, 980)

+						location   	(1383, 990)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40601,11 +40475,11 @@
 					    client     	@1679

 					    supplier   	@1652

 					    line_style 	3

-					    origin_attachment 	(1235, 938)

-					    terminal_attachment 	(1420, 938))

+					    origin_attachment 	(1235, 948)

+					    terminal_attachment 	(1420, 948))

 					(object RoleView "/importedMember" @1683

 					    Parent_View 	@1679

-					    location   	(-655, 326)

+					    location   	(-655, 336)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -40617,7 +40491,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1684

 						Parent_View 	@1683

-						location   	(1217, 907)

+						location   	(1217, 917)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40641,11 +40515,11 @@
 					    client     	@1679

 					    supplier   	@1650

 					    line_style 	3

-					    origin_attachment 	(1235, 938)

-					    terminal_attachment 	(1051, 938)

+					    origin_attachment 	(1235, 948)

+					    terminal_attachment 	(1051, 948)

 					    label      	(object SegLabel @1685

 						Parent_View 	@1683

-						location   	(1078, 978)

+						location   	(1078, 988)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40666,7 +40540,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1686

 						Parent_View 	@1683

-						location   	(1258, 975)

+						location   	(1258, 985)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40712,13 +40586,13 @@
 				    height     	112

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$300" @1688

-				    location   	(2265, 1697)

+				    location   	(2265, 1704)

 				    stereotype 	TRUE

 				    quidu      	"3CAB5CE7026B"

 				    roleview_list 	(list RoleViews

 					(object RoleView "importingNamespace" @1689

 					    Parent_View 	@1688

-					    location   	(-621, -67)

+					    location   	(-621, -60)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -40730,7 +40604,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1690

 						Parent_View 	@1689

-						location   	(2037, 1658)

+						location   	(2037, 1665)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40754,11 +40628,11 @@
 					    client     	@1688

 					    supplier   	@1652

 					    line_style 	3

-					    origin_attachment 	(2265, 1697)

-					    terminal_attachment 	(1856, 1697)

+					    origin_attachment 	(2265, 1704)

+					    terminal_attachment 	(1856, 1704)

 					    label      	(object SegLabel @1691

 						Parent_View 	@1689

-						location   	(1898, 1751)

+						location   	(1898, 1758)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40779,7 +40653,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1692

 						Parent_View 	@1689

-						location   	(2067, 1771)

+						location   	(2067, 1778)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40803,7 +40677,7 @@
 						orientation 	0))

 					(object RoleView "packageImport" @1693

 					    Parent_View 	@1688

-					    location   	(-621, -67)

+					    location   	(-621, -60)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -40815,7 +40689,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1694

 						Parent_View 	@1693

-						location   	(2540, 1662)

+						location   	(2540, 1669)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40839,11 +40713,11 @@
 					    client     	@1688

 					    supplier   	@1687

 					    line_style 	3

-					    origin_attachment 	(2265, 1697)

-					    terminal_attachment 	(2675, 1697)

+					    origin_attachment 	(2265, 1704)

+					    terminal_attachment 	(2675, 1704)

 					    label      	(object SegLabel @1695

 						Parent_View 	@1693

-						location   	(2620, 1753)

+						location   	(2620, 1760)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40864,7 +40738,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1696

 						Parent_View 	@1693

-						location   	(2407, 1745)

+						location   	(2407, 1752)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40920,13 +40794,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$301" @1699

-				    location   	(3297, 1710)

+				    location   	(3297, 1716)

 				    stereotype 	TRUE

 				    quidu      	"3CAB5D4302E5"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$302" @1700

 					    Parent_View 	@1699

-					    location   	(-393, -12)

+					    location   	(-393, -6)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -40938,7 +40812,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1701

 						Parent_View 	@1700

-						location   	(3137, 1669)

+						location   	(3137, 1675)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -40963,11 +40837,11 @@
 					    client     	@1699

 					    supplier   	@1687

 					    line_style 	3

-					    origin_attachment 	(3297, 1710)

-					    terminal_attachment 	(3097, 1710))

+					    origin_attachment 	(3297, 1716)

+					    terminal_attachment 	(3097, 1716))

 					(object RoleView "importedPackage" @1702

 					    Parent_View 	@1699

-					    location   	(-393, -12)

+					    location   	(-393, -6)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -40979,7 +40853,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1703

 						Parent_View 	@1702

-						location   	(3322, 1665)

+						location   	(3322, 1671)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -41003,11 +40877,11 @@
 					    client     	@1699

 					    supplier   	@1698

 					    line_style 	3

-					    origin_attachment 	(3297, 1710)

-					    terminal_attachment 	(3497, 1710)

+					    origin_attachment 	(3297, 1716)

+					    terminal_attachment 	(3497, 1716)

 					    label      	(object SegLabel @1704

 						Parent_View 	@1702

-						location   	(3476, 1764)

+						location   	(3476, 1770)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -41028,7 +40902,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1705

 						Parent_View 	@1702

-						location   	(3334, 1760)

+						location   	(3334, 1766)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -41349,22 +41223,6 @@
 				    icon_style 	"Icon"

 				    fill_color 	16777215

 				    quidu      	"3CAAECE80199"

-				    compartment 	(object Compartment

-					Parent_View 	@1719

-					location   	(948, 577)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	TRUE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	1

-					max_width  	0)

 				    width      	463

 				    height     	662)

 				(object AssociationViewNew "$UNNAMED$303" @1720

@@ -41504,7 +41362,7 @@
 					    origin_attachment 	(1751, 1002)

 					    terminal_attachment 	(1401, 952))))

 				(object AssociationViewNew "$UNNAMED$341" @1727

-				    location   	(701, 662)

+				    location   	(701, 792)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -41519,7 +41377,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "/redefinitionContext" @1728

 					    Parent_View 	@1727

-					    location   	(425, -22)

+					    location   	(425, 108)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -41531,7 +41389,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1729

 						Parent_View 	@1728

-						location   	(739, 622)

+						location   	(739, 752)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -41555,11 +41413,11 @@
 					    client     	@1727

 					    supplier   	@1719

 					    line_style 	3

-					    origin_attachment 	(701, 662)

-					    terminal_attachment 	(939, 662)

+					    origin_attachment 	(701, 792)

+					    terminal_attachment 	(939, 792)

 					    label      	(object SegLabel @1730

 						Parent_View 	@1728

-						location   	(915, 716)

+						location   	(915, 846)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -41580,7 +41438,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1731

 						Parent_View 	@1728

-						location   	(807, 708)

+						location   	(807, 838)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -41601,22 +41459,22 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$342" @1732

 					    Parent_View 	@1727

-					    location   	(425, -22)

+					    location   	(425, 108)

 					    stereotype 	TRUE

 					    quidu      	"3E026E2C017C"

 					    client     	@1727

 					    supplier   	@1710

 					    line_style 	3

-					    origin_attachment 	(701, 662)

-					    terminal_attachment 	(463, 662))))

+					    origin_attachment 	(701, 792)

+					    terminal_attachment 	(463, 792))))

 				(object AssociationViewNew "$UNNAMED$265" @1733

-				    location   	(1836, 716)

+				    location   	(1836, 648)

 				    stereotype 	TRUE

 				    quidu      	"3CAB01E40162"

 				    roleview_list 	(list RoleViews

 					(object RoleView "specific" @1734

 					    Parent_View 	@1733

-					    location   	(-144, 80)

+					    location   	(-144, 12)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -41628,7 +41486,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1735

 						Parent_View 	@1734

-						location   	(1488, 675)

+						location   	(1488, 607)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -41652,11 +41510,11 @@
 					    client     	@1733

 					    supplier   	@1719

 					    line_style 	3

-					    origin_attachment 	(1836, 716)

-					    terminal_attachment 	(1401, 716)

+					    origin_attachment 	(1836, 648)

+					    terminal_attachment 	(1401, 648)

 					    label      	(object SegLabel @1736

 						Parent_View 	@1734

-						location   	(1446, 770)

+						location   	(1446, 702)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -41677,7 +41535,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1737

 						Parent_View 	@1734

-						location   	(1622, 764)

+						location   	(1622, 696)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -41701,7 +41559,7 @@
 						orientation 	0))

 					(object RoleView "generalization" @1738

 					    Parent_View 	@1733

-					    location   	(-144, 80)

+					    location   	(-144, 12)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -41713,7 +41571,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1739

 						Parent_View 	@1738

-						location   	(2097, 692)

+						location   	(2097, 624)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -41737,11 +41595,11 @@
 					    client     	@1733

 					    supplier   	@1717

 					    line_style 	3

-					    origin_attachment 	(1836, 716)

-					    terminal_attachment 	(2272, 716)

+					    origin_attachment 	(1836, 648)

+					    terminal_attachment 	(2272, 648)

 					    label      	(object SegLabel @1740

 						Parent_View 	@1738

-						location   	(2227, 770)

+						location   	(2227, 702)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -41762,7 +41620,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1741

 						Parent_View 	@1738

-						location   	(2005, 764)

+						location   	(2005, 696)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -41782,13 +41640,13 @@
 						height     	48

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$266" @1742

-				    location   	(1836, 603)

+				    location   	(1836, 648)

 				    stereotype 	TRUE

 				    quidu      	"3CAB021A0119"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$267" @1743

 					    Parent_View 	@1742

-					    location   	(654, -99)

+					    location   	(654, -54)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -41800,7 +41658,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1744

 						Parent_View 	@1743

-						location   	(2118, 569)

+						location   	(2118, 614)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -41825,11 +41683,11 @@
 					    client     	@1742

 					    supplier   	@1717

 					    line_style 	3

-					    origin_attachment 	(1836, 603)

-					    terminal_attachment 	(2272, 603))

+					    origin_attachment 	(1836, 648)

+					    terminal_attachment 	(2272, 648))

 					(object RoleView "general" @1745

 					    Parent_View 	@1742

-					    location   	(654, -99)

+					    location   	(654, -54)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -41841,7 +41699,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1746

 						Parent_View 	@1745

-						location   	(1488, 570)

+						location   	(1488, 615)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -41865,11 +41723,11 @@
 					    client     	@1742

 					    supplier   	@1719

 					    line_style 	3

-					    origin_attachment 	(1836, 603)

-					    terminal_attachment 	(1401, 603)

+					    origin_attachment 	(1836, 648)

+					    terminal_attachment 	(1401, 648)

 					    label      	(object SegLabel @1747

 						Parent_View 	@1745

-						location   	(1453, 642)

+						location   	(1453, 687)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -41890,7 +41748,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1748

 						Parent_View 	@1745

-						location   	(1603, 639)

+						location   	(1603, 684)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -42032,7 +41890,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$283" @1755

-				    location   	(1819, 866)

+				    location   	(1819, 858)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -42044,7 +41902,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @1756

 					Parent_View 	@1755

-					location   	(1819, 807)

+					location   	(1819, 799)

 					font       	(object Font

 					    size       	8

 					    face       	"Arial"

@@ -42069,7 +41927,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$284" @1757

 					    Parent_View 	@1755

-					    location   	(1333, 584)

+					    location   	(1333, 576)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -42081,7 +41939,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1758

 						Parent_View 	@1757

-						location   	(1486, 908)

+						location   	(1486, 900)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -42106,11 +41964,11 @@
 					    client     	@1755

 					    supplier   	@1719

 					    line_style 	3

-					    origin_attachment 	(1819, 866)

-					    terminal_attachment 	(1401, 866))

+					    origin_attachment 	(1819, 858)

+					    terminal_attachment 	(1401, 858))

 					(object RoleView "/inheritedMember" @1759

 					    Parent_View 	@1755

-					    location   	(1333, 584)

+					    location   	(1333, 576)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -42122,7 +41980,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1760

 						Parent_View 	@1759

-						location   	(2067, 820)

+						location   	(2067, 812)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -42146,11 +42004,11 @@
 					    client     	@1755

 					    supplier   	@1754

 					    line_style 	3

-					    origin_attachment 	(1819, 866)

-					    terminal_attachment 	(2238, 866)

+					    origin_attachment 	(1819, 858)

+					    terminal_attachment 	(2238, 858)

 					    label      	(object SegLabel @1761

 						Parent_View 	@1759

-						location   	(2195, 920)

+						location   	(2195, 912)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -42171,7 +42029,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1762

 						Parent_View 	@1759

-						location   	(2022, 901)

+						location   	(2022, 893)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -42589,13 +42447,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$325" @1785

-				    location   	(2168, 754)

+				    location   	(2168, 766)

 				    stereotype 	TRUE

 				    quidu      	"3D78AD610091"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$326" @1786

 					    Parent_View 	@1785

-					    location   	(362, 184)

+					    location   	(362, 196)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -42607,7 +42465,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1787

 						Parent_View 	@1786

-						location   	(2019, 713)

+						location   	(2019, 725)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -42632,11 +42490,11 @@
 					    client     	@1785

 					    supplier   	@1783

 					    line_style 	3

-					    origin_attachment 	(2168, 754)

-					    terminal_attachment 	(1982, 754))

+					    origin_attachment 	(2168, 766)

+					    terminal_attachment 	(1982, 766))

 					(object RoleView "instance" @1788

 					    Parent_View 	@1785

-					    location   	(362, 184)

+					    location   	(362, 196)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -42648,7 +42506,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1789

 						Parent_View 	@1788

-						location   	(2239, 721)

+						location   	(2239, 733)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -42672,11 +42530,11 @@
 					    client     	@1785

 					    supplier   	@1784

 					    line_style 	3

-					    origin_attachment 	(2168, 754)

-					    terminal_attachment 	(2355, 754)

+					    origin_attachment 	(2168, 766)

+					    terminal_attachment 	(2355, 766)

 					    label      	(object SegLabel @1790

 						Parent_View 	@1788

-						location   	(2315, 799)

+						location   	(2315, 811)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -42782,7 +42640,7 @@
 				    width      	350

 				    height     	137)

 				(object AssociationViewNew "$UNNAMED$351" @1797

-				    location   	(365, 429)

+				    location   	(1030, 766)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -42797,7 +42655,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "operand" @1798

 					    Parent_View 	@1797

-					    location   	(-247, -351)

+					    location   	(418, -14)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -42809,7 +42667,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1799

 						Parent_View 	@1798

-						location   	(945, 388)

+						location   	(1610, 725)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -42832,12 +42690,16 @@
 					    quidu      	"3E59221E027B"

 					    client     	@1797

 					    supplier   	@1791

+					    vertices   	(list Points

+						(1030, 766)

+						(1090, 766)

+						(1090, 488))

 					    line_style 	3

-					    origin_attachment 	(365, 429)

-					    terminal_attachment 	(1090, 429)

+					    origin_attachment 	(1030, 766)

+					    terminal_attachment 	(1090, 488)

 					    label      	(object SegLabel @1800

 						Parent_View 	@1798

-						location   	(1017, 483)

+						location   	(1682, 820)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -42858,7 +42720,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1801

 						Parent_View 	@1798

-						location   	(736, 477)

+						location   	(1401, 814)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -42879,7 +42741,7 @@
 						orientation 	1))

 					(object RoleView "expression" @1802

 					    Parent_View 	@1797

-					    location   	(-247, -351)

+					    location   	(418, -14)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -42891,7 +42753,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1803

 						Parent_View 	@1802

-						location   	(338, 729)

+						location   	(1003, 1066)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -42914,17 +42776,12 @@
 					    quidu      	"3E59221E02FD"

 					    client     	@1797

 					    supplier   	@1796

-					    vertices   	(list Points

-						(365, 429)

-						(209, 429)

-						(209, 769)

-						(437, 769))

 					    line_style 	3

-					    origin_attachment 	(365, 429)

-					    terminal_attachment 	(437, 769)

+					    origin_attachment 	(2060, 1532)

+					    terminal_attachment 	(1399, 1546)

 					    label      	(object SegLabel @1804

 						Parent_View 	@1802

-						location   	(365, 823)

+						location   	(1030, 1160)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -42945,7 +42802,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1805

 						Parent_View 	@1802

-						location   	(365, 877)

+						location   	(1030, 1214)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43133,13 +42990,13 @@
 				    origin_attachment 	(1310, 488)

 				    terminal_attachment 	(1310, 368))

 				(object AssociationViewNew "$UNNAMED$310" @1814

-				    location   	(677, 594)

+				    location   	(677, 672)

 				    stereotype 	TRUE

 				    quidu      	"3CAC71C1037C"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$311" @1815

 					    Parent_View 	@1814

-					    location   	(509, 30)

+					    location   	(509, 108)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -43151,7 +43008,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1816

 						Parent_View 	@1815

-						location   	(1001, 553)

+						location   	(1001, 631)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43176,11 +43033,11 @@
 					    client     	@1814

 					    supplier   	@1812

 					    line_style 	3

-					    origin_attachment 	(677, 594)

-					    terminal_attachment 	(1083, 594)

+					    origin_attachment 	(677, 672)

+					    terminal_attachment 	(1083, 672)

 					    label      	(object SegLabel @1817

 						Parent_View 	@1815

-						location   	(1041, 648)

+						location   	(1041, 726)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43201,7 +43058,7 @@
 						orientation 	1))

 					(object RoleView "/context" @1818

 					    Parent_View 	@1814

-					    location   	(509, 30)

+					    location   	(509, 108)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -43213,7 +43070,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1819

 						Parent_View 	@1818

-						location   	(403, 567)

+						location   	(403, 645)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43237,11 +43094,11 @@
 					    client     	@1814

 					    supplier   	@1810

 					    line_style 	3

-					    origin_attachment 	(677, 594)

-					    terminal_attachment 	(271, 594)

+					    origin_attachment 	(677, 672)

+					    terminal_attachment 	(271, 672)

 					    label      	(object SegLabel @1820

 						Parent_View 	@1818

-						location   	(313, 648)

+						location   	(313, 726)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43262,7 +43119,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1821

 						Parent_View 	@1818

-						location   	(450, 651)

+						location   	(450, 729)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43282,13 +43139,13 @@
 						height     	57

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$312" @1822

-				    location   	(677, 759)

+				    location   	(677, 672)

 				    stereotype 	TRUE

 				    quidu      	"3CAAF5A80000"

 				    roleview_list 	(list RoleViews

 					(object RoleView "namespace" @1823

 					    Parent_View 	@1822

-					    location   	(-439, 99)

+					    location   	(-439, 12)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -43300,7 +43157,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1824

 						Parent_View 	@1823

-						location   	(432, 720)

+						location   	(432, 633)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43324,11 +43181,11 @@
 					    client     	@1822

 					    supplier   	@1810

 					    line_style 	3

-					    origin_attachment 	(677, 759)

-					    terminal_attachment 	(271, 759)

+					    origin_attachment 	(677, 672)

+					    terminal_attachment 	(271, 672)

 					    label      	(object SegLabel @1825

 						Parent_View 	@1823

-						location   	(318, 812)

+						location   	(318, 725)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43349,7 +43206,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1826

 						Parent_View 	@1823

-						location   	(506, 808)

+						location   	(506, 721)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43370,7 +43227,7 @@
 						orientation 	0))

 					(object RoleView "ownedRule" @1827

 					    Parent_View 	@1822

-					    location   	(-439, 99)

+					    location   	(-439, 12)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -43382,7 +43239,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1828

 						Parent_View 	@1827

-						location   	(907, 720)

+						location   	(907, 633)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43406,11 +43263,11 @@
 					    client     	@1822

 					    supplier   	@1812

 					    line_style 	3

-					    origin_attachment 	(677, 759)

-					    terminal_attachment 	(1083, 759)

+					    origin_attachment 	(677, 672)

+					    terminal_attachment 	(1083, 672)

 					    label      	(object SegLabel @1829

 						Parent_View 	@1827

-						location   	(1058, 806)

+						location   	(1058, 719)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43431,7 +43288,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1830

 						Parent_View 	@1827

-						location   	(849, 804)

+						location   	(849, 717)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43451,13 +43308,13 @@
 						height     	45

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$305" @1831

-				    location   	(1904, 744)

+				    location   	(1904, 750)

 				    stereotype 	TRUE

 				    quidu      	"3CECFC010132"

 				    roleview_list 	(list RoleViews

 					(object RoleView "owningConstraint" @1832

 					    Parent_View 	@1831

-					    location   	(-130, -54)

+					    location   	(-130, -48)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -43469,7 +43326,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1833

 						Parent_View 	@1832

-						location   	(1718, 781)

+						location   	(1718, 787)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43493,11 +43350,11 @@
 					    client     	@1831

 					    supplier   	@1812

 					    line_style 	3

-					    origin_attachment 	(1904, 744)

-					    terminal_attachment 	(1545, 744)

+					    origin_attachment 	(1904, 750)

+					    terminal_attachment 	(1545, 750)

 					    label      	(object SegLabel @1834

 						Parent_View 	@1832

-						location   	(1614, 695)

+						location   	(1614, 701)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43518,7 +43375,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1835

 						Parent_View 	@1832

-						location   	(1706, 820)

+						location   	(1706, 826)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43539,7 +43396,7 @@
 						orientation 	0))

 					(object RoleView "specification" @1836

 					    Parent_View 	@1831

-					    location   	(-130, -54)

+					    location   	(-130, -48)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -43551,7 +43408,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1837

 						Parent_View 	@1836

-						location   	(2119, 679)

+						location   	(2119, 685)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43575,11 +43432,11 @@
 					    client     	@1831

 					    supplier   	@1811

 					    line_style 	3

-					    origin_attachment 	(1904, 744)

-					    terminal_attachment 	(2264, 744)

+					    origin_attachment 	(1904, 750)

+					    terminal_attachment 	(2264, 750)

 					    label      	(object SegLabel @1838

 						Parent_View 	@1836

-						location   	(2227, 798)

+						location   	(2227, 804)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43600,7 +43457,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1839

 						Parent_View 	@1836

-						location   	(2063, 716)

+						location   	(2063, 722)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43647,13 +43504,13 @@
 				    height     	113

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$261" @1841

-				    location   	(1908, 544)

+				    location   	(1908, 542)

 				    stereotype 	TRUE

 				    quidu      	"3CAAF6910344"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$262" @1842

 					    Parent_View 	@1841

-					    location   	(-294, 16)

+					    location   	(-294, 14)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -43665,7 +43522,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1843

 						Parent_View 	@1842

-						location   	(1618, 503)

+						location   	(1618, 501)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43690,11 +43547,11 @@
 					    client     	@1841

 					    supplier   	@1812

 					    line_style 	3

-					    origin_attachment 	(1908, 544)

-					    terminal_attachment 	(1545, 544))

+					    origin_attachment 	(1908, 542)

+					    terminal_attachment 	(1545, 542))

 					(object RoleView "constrainedElement" @1844

 					    Parent_View 	@1841

-					    location   	(-294, 16)

+					    location   	(-294, 14)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -43706,7 +43563,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1845

 						Parent_View 	@1844

-						location   	(2014, 505)

+						location   	(2014, 503)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43730,11 +43587,11 @@
 					    client     	@1841

 					    supplier   	@1840

 					    line_style 	3

-					    origin_attachment 	(1908, 544)

-					    terminal_attachment 	(2271, 544)

+					    origin_attachment 	(1908, 542)

+					    terminal_attachment 	(2271, 542)

 					    label      	(object SegLabel @1846

 						Parent_View 	@1844

-						location   	(2235, 598)

+						location   	(2235, 596)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43755,7 +43612,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1847

 						Parent_View 	@1844

-						location   	(2102, 586)

+						location   	(2102, 584)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43929,13 +43786,13 @@
 				    origin_attachment 	(316, 467)

 				    terminal_attachment 	(316, 357))

 				(object AssociationViewNew "$UNNAMED$328" @1854

-				    location   	(862, 741)

+				    location   	(862, 768)

 				    stereotype 	TRUE

 				    quidu      	"3D78AE93004B"

 				    roleview_list 	(list RoleViews

 					(object RoleView "owningInstanceSpec" @1855

 					    Parent_View 	@1854

-					    location   	(-182, -51)

+					    location   	(-182, -24)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -43947,7 +43804,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1856

 						Parent_View 	@1855

-						location   	(708, 667)

+						location   	(708, 694)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43971,11 +43828,11 @@
 					    client     	@1854

 					    supplier   	@1852

 					    line_style 	3

-					    origin_attachment 	(862, 741)

-					    terminal_attachment 	(490, 741)

+					    origin_attachment 	(862, 768)

+					    terminal_attachment 	(490, 768)

 					    label      	(object SegLabel @1857

 						Parent_View 	@1855

-						location   	(578, 784)

+						location   	(578, 811)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -43996,7 +43853,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1858

 						Parent_View 	@1855

-						location   	(669, 711)

+						location   	(669, 738)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44017,7 +43874,7 @@
 						orientation 	1))

 					(object RoleView "specification" @1859

 					    Parent_View 	@1854

-					    location   	(-182, -51)

+					    location   	(-182, -24)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -44029,7 +43886,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1860

 						Parent_View 	@1859

-						location   	(1089, 698)

+						location   	(1089, 725)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44053,11 +43910,11 @@
 					    client     	@1854

 					    supplier   	@1850

 					    line_style 	3

-					    origin_attachment 	(862, 741)

-					    terminal_attachment 	(1234, 741)

+					    origin_attachment 	(862, 768)

+					    terminal_attachment 	(1234, 768)

 					    label      	(object SegLabel @1861

 						Parent_View 	@1859

-						location   	(1164, 772)

+						location   	(1164, 799)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44078,7 +43935,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1862

 						Parent_View 	@1859

-						location   	(932, 777)

+						location   	(932, 804)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44098,13 +43955,13 @@
 						height     	36

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$273" @1863

-				    location   	(863, 881)

+				    location   	(863, 900)

 				    stereotype 	TRUE

 				    quidu      	"3CAB13870327"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$274" @1864

 					    Parent_View 	@1863

-					    location   	(-241, -91)

+					    location   	(-241, -72)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -44116,7 +43973,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1865

 						Parent_View 	@1864

-						location   	(566, 840)

+						location   	(566, 859)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44141,11 +43998,11 @@
 					    client     	@1863

 					    supplier   	@1852

 					    line_style 	3

-					    origin_attachment 	(863, 881)

-					    terminal_attachment 	(490, 881))

+					    origin_attachment 	(863, 900)

+					    terminal_attachment 	(490, 900))

 					(object RoleView "classifier" @1866

 					    Parent_View 	@1863

-					    location   	(-241, -91)

+					    location   	(-241, -72)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -44157,7 +44014,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1867

 						Parent_View 	@1866

-						location   	(1106, 841)

+						location   	(1106, 860)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44181,11 +44038,11 @@
 					    client     	@1863

 					    supplier   	@1851

 					    line_style 	3

-					    origin_attachment 	(863, 881)

-					    terminal_attachment 	(1236, 881)

+					    origin_attachment 	(863, 900)

+					    terminal_attachment 	(1236, 900)

 					    label      	(object SegLabel @1868

 						Parent_View 	@1866

-						location   	(1142, 923)

+						location   	(1142, 942)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44260,13 +44117,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$275" @1871

-				    location   	(860, 516)

+				    location   	(860, 573)

 				    stereotype 	TRUE

 				    quidu      	"3CAB13B503B9"

 				    roleview_list 	(list RoleViews

 					(object RoleView "owningInstance" @1872

 					    Parent_View 	@1871

-					    location   	(-382, 12)

+					    location   	(-382, 69)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -44278,7 +44135,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1873

 						Parent_View 	@1872

-						location   	(637, 479)

+						location   	(637, 536)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44302,11 +44159,11 @@
 					    client     	@1871

 					    supplier   	@1852

 					    line_style 	3

-					    origin_attachment 	(860, 516)

-					    terminal_attachment 	(490, 516)

+					    origin_attachment 	(860, 573)

+					    terminal_attachment 	(490, 573)

 					    label      	(object SegLabel @1874

 						Parent_View 	@1872

-						location   	(522, 570)

+						location   	(522, 627)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44327,7 +44184,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1875

 						Parent_View 	@1872

-						location   	(660, 565)

+						location   	(660, 622)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44348,7 +44205,7 @@
 						orientation 	0))

 					(object RoleView "slot" @1876

 					    Parent_View 	@1871

-					    location   	(-382, 12)

+					    location   	(-382, 69)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -44360,7 +44217,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1877

 						Parent_View 	@1876

-						location   	(1156, 475)

+						location   	(1156, 532)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44384,11 +44241,11 @@
 					    client     	@1871

 					    supplier   	@1870

 					    line_style 	3

-					    origin_attachment 	(860, 516)

-					    terminal_attachment 	(1230, 516)

+					    origin_attachment 	(860, 573)

+					    terminal_attachment 	(1230, 573)

 					    label      	(object SegLabel @1878

 						Parent_View 	@1876

-						location   	(1192, 570)

+						location   	(1192, 627)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44409,7 +44266,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1879

 						Parent_View 	@1876

-						location   	(979, 565)

+						location   	(979, 622)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44437,13 +44294,13 @@
 				    origin_attachment 	(1373, 449)

 				    terminal_attachment 	(1373, 339))

 				(object AssociationViewNew "$UNNAMED$327" @1881

-				    location   	(1880, 472)

+				    location   	(1880, 490)

 				    stereotype 	TRUE

 				    quidu      	"3D78AE0600C0"

 				    roleview_list 	(list RoleViews

 					(object RoleView "owningSlot" @1882

 					    Parent_View 	@1881

-					    location   	(836, -320)

+					    location   	(836, -302)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -44455,7 +44312,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1883

 						Parent_View 	@1882

-						location   	(1645, 405)

+						location   	(1645, 423)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44479,11 +44336,11 @@
 					    client     	@1881

 					    supplier   	@1870

 					    line_style 	3

-					    origin_attachment 	(1880, 472)

-					    terminal_attachment 	(1518, 472)

+					    origin_attachment 	(1880, 490)

+					    terminal_attachment 	(1518, 490)

 					    label      	(object SegLabel @1884

 						Parent_View 	@1882

-						location   	(1631, 512)

+						location   	(1631, 530)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44504,7 +44361,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1885

 						Parent_View 	@1882

-						location   	(1673, 442)

+						location   	(1673, 460)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44525,7 +44382,7 @@
 						orientation 	1))

 					(object RoleView "value" @1886

 					    Parent_View 	@1881

-					    location   	(836, -320)

+					    location   	(836, -302)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -44537,7 +44394,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1887

 						Parent_View 	@1886

-						location   	(2135, 437)

+						location   	(2135, 455)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44561,11 +44418,11 @@
 					    client     	@1881

 					    supplier   	@1869

 					    line_style 	3

-					    origin_attachment 	(1880, 472)

-					    terminal_attachment 	(2242, 472)

+					    origin_attachment 	(1880, 490)

+					    terminal_attachment 	(2242, 490)

 					    label      	(object SegLabel @1888

 						Parent_View 	@1886

-						location   	(2215, 538)

+						location   	(2215, 556)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44586,7 +44443,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1889

 						Parent_View 	@1886

-						location   	(2014, 517)

+						location   	(2014, 535)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44637,13 +44494,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$276" @1891

-				    location   	(1881, 610)

+				    location   	(1881, 624)

 				    stereotype 	TRUE

 				    quidu      	"3CAB144F008F"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$277" @1892

 					    Parent_View 	@1891

-					    location   	(-633, -98)

+					    location   	(-633, -84)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -44655,7 +44512,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1893

 						Parent_View 	@1892

-						location   	(1591, 569)

+						location   	(1591, 583)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44680,11 +44537,11 @@
 					    client     	@1891

 					    supplier   	@1870

 					    line_style 	3

-					    origin_attachment 	(1881, 610)

-					    terminal_attachment 	(1518, 610))

+					    origin_attachment 	(1881, 624)

+					    terminal_attachment 	(1518, 624))

 					(object RoleView "definingFeature" @1894

 					    Parent_View 	@1891

-					    location   	(-633, -98)

+					    location   	(-633, -84)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -44696,7 +44553,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1895

 						Parent_View 	@1894

-						location   	(2020, 583)

+						location   	(2020, 597)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44720,11 +44577,11 @@
 					    client     	@1891

 					    supplier   	@1890

 					    line_style 	3

-					    origin_attachment 	(1881, 610)

-					    terminal_attachment 	(2244, 610)

+					    origin_attachment 	(1881, 624)

+					    terminal_attachment 	(2244, 624)

 					    label      	(object SegLabel @1896

 						Parent_View 	@1894

-						location   	(2208, 664)

+						location   	(2208, 678)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44951,13 +44808,13 @@
 				    height     	862

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$329" @1905

-				    location   	(1018, 515)

+				    location   	(1018, 522)

 				    stereotype 	TRUE

 				    quidu      	"3DDD058B026C"

 				    roleview_list 	(list RoleViews

 					(object RoleView "owningPackage" @1906

 					    Parent_View 	@1905

-					    location   	(4, 95)

+					    location   	(4, 102)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -44969,7 +44826,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1907

 						Parent_View 	@1906

-						location   	(732, 446)

+						location   	(732, 453)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -44993,11 +44850,11 @@
 					    client     	@1905

 					    supplier   	@1904

 					    line_style 	3

-					    origin_attachment 	(1018, 515)

-					    terminal_attachment 	(562, 515)

+					    origin_attachment 	(1018, 522)

+					    terminal_attachment 	(562, 522)

 					    label      	(object SegLabel @1908

 						Parent_View 	@1906

-						location   	(651, 563)

+						location   	(651, 570)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45018,7 +44875,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1909

 						Parent_View 	@1906

-						location   	(771, 480)

+						location   	(771, 487)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45039,7 +44896,7 @@
 						orientation 	1))

 					(object RoleView "ownedMember" @1910

 					    Parent_View 	@1905

-					    location   	(4, 95)

+					    location   	(4, 102)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -45051,7 +44908,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1911

 						Parent_View 	@1910

-						location   	(1262, 489)

+						location   	(1262, 496)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45075,11 +44932,11 @@
 					    client     	@1905

 					    supplier   	@1900

 					    line_style 	3

-					    origin_attachment 	(1018, 515)

-					    terminal_attachment 	(1474, 515)

+					    origin_attachment 	(1018, 522)

+					    terminal_attachment 	(1474, 522)

 					    label      	(object SegLabel @1912

 						Parent_View 	@1910

-						location   	(1428, 569)

+						location   	(1428, 576)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45100,7 +44957,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1913

 						Parent_View 	@1910

-						location   	(1220, 557)

+						location   	(1220, 564)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45136,13 +44993,13 @@
 				    origin_attachment 	(316, 474)

 				    terminal_attachment 	(316, 363))

 				(object AssociationViewNew "$UNNAMED$322" @1916

-				    location   	(1036, 947)

+				    location   	(1036, 1038)

 				    stereotype 	TRUE

 				    quidu      	"3D623ABA00DD"

 				    roleview_list 	(list RoleViews

 					(object RoleView "mergingPackage" @1917

 					    Parent_View 	@1916

-					    location   	(-440, -49)

+					    location   	(-440, 42)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -45154,7 +45011,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1918

 						Parent_View 	@1917

-						location   	(717, 907)

+						location   	(717, 998)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45178,11 +45035,11 @@
 					    client     	@1916

 					    supplier   	@1904

 					    line_style 	3

-					    origin_attachment 	(1036, 947)

-					    terminal_attachment 	(562, 947)

+					    origin_attachment 	(1036, 1038)

+					    terminal_attachment 	(562, 1038)

 					    label      	(object SegLabel @1919

 						Parent_View 	@1917

-						location   	(610, 1001)

+						location   	(610, 1092)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45203,7 +45060,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1920

 						Parent_View 	@1917

-						location   	(784, 999)

+						location   	(784, 1090)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45227,7 +45084,7 @@
 						orientation 	0))

 					(object RoleView "packageExtension" @1921

 					    Parent_View 	@1916

-					    location   	(-440, -49)

+					    location   	(-440, 42)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -45239,7 +45096,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1922

 						Parent_View 	@1921

-						location   	(1345, 907)

+						location   	(1345, 998)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45263,11 +45120,11 @@
 					    client     	@1916

 					    supplier   	@1901

 					    line_style 	3

-					    origin_attachment 	(1036, 947)

-					    terminal_attachment 	(1510, 947)

+					    origin_attachment 	(1036, 1038)

+					    terminal_attachment 	(1510, 1038)

 					    label      	(object SegLabel @1923

 						Parent_View 	@1921

-						location   	(1462, 1001)

+						location   	(1462, 1092)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45288,7 +45145,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1924

 						Parent_View 	@1921

-						location   	(1247, 998)

+						location   	(1247, 1089)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45308,13 +45165,13 @@
 						height     	51

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$323" @1925

-				    location   	(1036, 1113)

+				    location   	(1036, 1038)

 				    stereotype 	TRUE

 				    quidu      	"3D623AF30284"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$324" @1926

 					    Parent_View 	@1925

-					    location   	(646, 357)

+					    location   	(646, 282)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -45326,7 +45183,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1927

 						Parent_View 	@1926

-						location   	(1415, 1072)

+						location   	(1415, 997)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45351,11 +45208,11 @@
 					    client     	@1925

 					    supplier   	@1901

 					    line_style 	3

-					    origin_attachment 	(1036, 1113)

-					    terminal_attachment 	(1510, 1113))

+					    origin_attachment 	(1036, 1038)

+					    terminal_attachment 	(1510, 1038))

 					(object RoleView "mergedPackage" @1928

 					    Parent_View 	@1925

-					    location   	(646, 357)

+					    location   	(646, 282)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -45367,7 +45224,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1929

 						Parent_View 	@1928

-						location   	(734, 1080)

+						location   	(734, 1005)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45391,11 +45248,11 @@
 					    client     	@1925

 					    supplier   	@1904

 					    line_style 	3

-					    origin_attachment 	(1036, 1113)

-					    terminal_attachment 	(562, 1113)

+					    origin_attachment 	(1036, 1038)

+					    terminal_attachment 	(562, 1038)

 					    label      	(object SegLabel @1930

 						Parent_View 	@1928

-						location   	(616, 1148)

+						location   	(616, 1073)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45416,7 +45273,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1931

 						Parent_View 	@1928

-						location   	(769, 1149)

+						location   	(769, 1074)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45436,7 +45293,7 @@
 						height     	36

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$338" @1932

-				    location   	(998, 1410)

+				    location   	(938, 1470)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -45451,7 +45308,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "/nestedPackage" @1933

 					    Parent_View 	@1932

-					    location   	(608, 504)

+					    location   	(548, 564)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -45463,7 +45320,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1934

 						Parent_View 	@1933

-						location   	(318, 1407)

+						location   	(258, 1467)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45487,16 +45344,15 @@
 					    client     	@1932

 					    supplier   	@1904

 					    vertices   	(list Points

-						(998, 1410)

-						(998, 1470)

+						(938, 1470)

 						(473, 1470)

 						(473, 1337))

 					    line_style 	3

-					    origin_attachment 	(998, 1410)

+					    origin_attachment 	(938, 1470)

 					    terminal_attachment 	(473, 1337)

 					    label      	(object SegLabel @1935

 						Parent_View 	@1933

-						location   	(512, 1396)

+						location   	(452, 1456)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45517,7 +45373,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1936

 						Parent_View 	@1933

-						location   	(680, 1429)

+						location   	(620, 1489)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45538,7 +45394,7 @@
 						orientation 	1))

 					(object RoleView "nestingPackage" @1937

 					    Parent_View 	@1932

-					    location   	(608, 504)

+					    location   	(548, 564)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -45550,7 +45406,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1938

 						Parent_View 	@1937

-						location   	(743, 1226)

+						location   	(683, 1286)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45574,15 +45430,16 @@
 					    client     	@1932

 					    supplier   	@1904

 					    vertices   	(list Points

-						(998, 1410)

+						(938, 1470)

+						(998, 1470)

 						(998, 1268)

 						(562, 1268))

 					    line_style 	3

-					    origin_attachment 	(998, 1410)

+					    origin_attachment 	(938, 1470)

 					    terminal_attachment 	(562, 1268)

 					    label      	(object SegLabel @1939

 						Parent_View 	@1937

-						location   	(620, 1322)

+						location   	(560, 1382)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45603,7 +45460,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1940

 						Parent_View 	@1937

-						location   	(809, 1320)

+						location   	(749, 1380)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45623,7 +45480,7 @@
 						height     	52

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$337" @1941

-				    location   	(1034, 687)

+				    location   	(1034, 660)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -45638,7 +45495,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "/ownedType" @1942

 					    Parent_View 	@1941

-					    location   	(644, -69)

+					    location   	(644, -96)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -45650,7 +45507,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1943

 						Parent_View 	@1942

-						location   	(1334, 654)

+						location   	(1334, 627)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45674,11 +45531,11 @@
 					    client     	@1941

 					    supplier   	@1903

 					    line_style 	3

-					    origin_attachment 	(1034, 687)

-					    terminal_attachment 	(1506, 687)

+					    origin_attachment 	(1034, 660)

+					    terminal_attachment 	(1506, 660)

 					    label      	(object SegLabel @1944

 						Parent_View 	@1942

-						location   	(1458, 741)

+						location   	(1458, 714)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45699,7 +45556,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1945

 						Parent_View 	@1942

-						location   	(1247, 730)

+						location   	(1247, 703)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45720,7 +45577,7 @@
 						orientation 	1))

 					(object RoleView "package" @1946

 					    Parent_View 	@1941

-					    location   	(644, -69)

+					    location   	(644, -96)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -45732,7 +45589,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1947

 						Parent_View 	@1946

-						location   	(656, 646)

+						location   	(656, 619)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45756,11 +45613,11 @@
 					    client     	@1941

 					    supplier   	@1904

 					    line_style 	3

-					    origin_attachment 	(1034, 687)

-					    terminal_attachment 	(562, 687)

+					    origin_attachment 	(1034, 660)

+					    terminal_attachment 	(562, 660)

 					    label      	(object SegLabel @1948

 						Parent_View 	@1946

-						location   	(610, 741)

+						location   	(610, 714)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45781,7 +45638,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1949

 						Parent_View 	@1946

-						location   	(813, 741)

+						location   	(813, 714)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45864,13 +45721,13 @@
 				    height     	369

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$296" @1952

-				    location   	(1338, 551)

+				    location   	(1338, 559)

 				    stereotype 	TRUE

 				    quidu      	"3CAB56E102C8"

 				    roleview_list 	(list RoleViews

 					(object RoleView "datatype" @1953

 					    Parent_View 	@1952

-					    location   	(-216, -43)

+					    location   	(-216, -35)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -45882,7 +45739,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1954

 						Parent_View 	@1953

-						location   	(1010, 524)

+						location   	(1010, 532)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45906,11 +45763,11 @@
 					    client     	@1952

 					    supplier   	@1951

 					    line_style 	3

-					    origin_attachment 	(1338, 551)

-					    terminal_attachment 	(886, 551)

+					    origin_attachment 	(1338, 559)

+					    terminal_attachment 	(886, 559)

 					    label      	(object SegLabel @1955

 						Parent_View 	@1953

-						location   	(931, 605)

+						location   	(931, 613)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45931,7 +45788,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1956

 						Parent_View 	@1953

-						location   	(1147, 633)

+						location   	(1147, 641)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45956,7 +45813,7 @@
 						orientation 	0))

 					(object RoleView "ownedAttribute" @1957

 					    Parent_View 	@1952

-					    location   	(-216, -43)

+					    location   	(-216, -35)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -45968,7 +45825,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1958

 						Parent_View 	@1957

-						location   	(1605, 512)

+						location   	(1605, 520)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -45992,11 +45849,11 @@
 					    client     	@1952

 					    supplier   	@1950

 					    line_style 	3

-					    origin_attachment 	(1338, 551)

-					    terminal_attachment 	(1791, 551)

+					    origin_attachment 	(1338, 559)

+					    terminal_attachment 	(1791, 559)

 					    label      	(object SegLabel @1959

 						Parent_View 	@1957

-						location   	(1745, 605)

+						location   	(1745, 613)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -46017,7 +45874,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1960

 						Parent_View 	@1957

-						location   	(1591, 640)

+						location   	(1591, 648)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -46343,13 +46200,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$298" @1976

-				    location   	(1398, 1254)

+				    location   	(1398, 1266)

 				    stereotype 	TRUE

 				    quidu      	"3CAB58340315"

 				    roleview_list 	(list RoleViews

 					(object RoleView "enumeration" @1977

 					    Parent_View 	@1976

-					    location   	(-180, 12)

+					    location   	(-180, 24)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -46361,7 +46218,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1978

 						Parent_View 	@1977

-						location   	(1165, 1214)

+						location   	(1165, 1226)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -46385,11 +46242,11 @@
 					    client     	@1976

 					    supplier   	@1973

 					    line_style 	3

-					    origin_attachment 	(1398, 1254)

-					    terminal_attachment 	(1021, 1254)

+					    origin_attachment 	(1398, 1266)

+					    terminal_attachment 	(1021, 1266)

 					    label      	(object SegLabel @1979

 						Parent_View 	@1977

-						location   	(1059, 1308)

+						location   	(1059, 1320)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -46410,7 +46267,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @1980

 						Parent_View 	@1977

-						location   	(1239, 1305)

+						location   	(1239, 1317)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -46431,7 +46288,7 @@
 						orientation 	0))

 					(object RoleView "ownedLiteral" @1981

 					    Parent_View 	@1976

-					    location   	(-180, 12)

+					    location   	(-180, 24)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -46443,7 +46300,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1982

 						Parent_View 	@1981

-						location   	(1661, 1206)

+						location   	(1661, 1218)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -46467,11 +46324,11 @@
 					    client     	@1976

 					    supplier   	@1975

 					    line_style 	3

-					    origin_attachment 	(1398, 1254)

-					    terminal_attachment 	(1776, 1254)

+					    origin_attachment 	(1398, 1266)

+					    terminal_attachment 	(1776, 1266)

 					    label      	(object SegLabel @1983

 						Parent_View 	@1981

-						location   	(1738, 1308)

+						location   	(1738, 1320)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -46492,7 +46349,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @1984

 						Parent_View 	@1981

-						location   	(1594, 1316)

+						location   	(1594, 1328)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -46645,22 +46502,6 @@
 				    icon_style 	"Icon"

 				    fill_color 	16777215

 				    quidu      	"3CAB08ED000D"

-				    compartment 	(object Compartment

-					Parent_View 	@1990

-					location   	(649, 1086)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	TRUE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	1

-					max_width  	434)

 				    width      	532

 				    height     	112

 				    autoResize 	TRUE)

@@ -46723,22 +46564,6 @@
 				    icon_style 	"Icon"

 				    fill_color 	16777215

 				    quidu      	"3CEE419F03B0"

-				    compartment 	(object Compartment

-					Parent_View 	@1992

-					location   	(1975, 580)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	4

-					max_width  	93)

 				    width      	400

 				    height     	282

 				    autoResize 	TRUE)

@@ -46765,22 +46590,6 @@
 				    icon_style 	"Icon"

 				    fill_color 	16777215

 				    quidu      	"3CAAFD220337"

-				    compartment 	(object Compartment

-					Parent_View 	@1993

-					location   	(1112, 654)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	TRUE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	1

-					max_width  	372)

 				    width      	458

 				    height     	112

 				    autoResize 	TRUE)

@@ -46827,13 +46636,13 @@
 				    height     	106

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$268" @1997

-				    location   	(849, 637)

+				    location   	(849, 655)

 				    stereotype 	TRUE

 				    quidu      	"3CAB04790108"

 				    roleview_list 	(list RoleViews

 					(object RoleView "/feature" @1998

 					    Parent_View 	@1997

-					    location   	(-195, -5)

+					    location   	(-195, 13)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -46845,7 +46654,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @1999

 						Parent_View 	@1998

-						location   	(1027, 608)

+						location   	(1027, 626)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -46869,11 +46678,11 @@
 					    client     	@1997

 					    supplier   	@1993

 					    line_style 	3

-					    origin_attachment 	(849, 637)

-					    terminal_attachment 	(1103, 637)

+					    origin_attachment 	(849, 655)

+					    terminal_attachment 	(1103, 655)

 					    label      	(object SegLabel @2000

 						Parent_View 	@1998

-						location   	(1056, 675)

+						location   	(1056, 693)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -46894,7 +46703,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2001

 						Parent_View 	@1998

-						location   	(984, 666)

+						location   	(984, 684)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -46915,7 +46724,7 @@
 						orientation 	1))

 					(object RoleView "/featuringClassifier" @2002

 					    Parent_View 	@1997

-					    location   	(-195, -5)

+					    location   	(-195, 13)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -46927,7 +46736,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2003

 						Parent_View 	@2002

-						location   	(757, 599)

+						location   	(757, 617)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -46951,11 +46760,11 @@
 					    client     	@1997

 					    supplier   	@1996

 					    line_style 	3

-					    origin_attachment 	(849, 637)

-					    terminal_attachment 	(596, 637)

+					    origin_attachment 	(849, 655)

+					    terminal_attachment 	(596, 655)

 					    label      	(object SegLabel @2004

 						Parent_View 	@2002

-						location   	(644, 679)

+						location   	(644, 697)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -46976,7 +46785,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2005

 						Parent_View 	@2002

-						location   	(742, 684)

+						location   	(742, 702)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47195,22 +47004,6 @@
 				    icon_style 	"Icon"

 				    fill_color 	16777215

 				    quidu      	"3CAB0B3D0362"

-				    compartment 	(object Compartment

-					Parent_View 	@2015

-					location   	(2392, 1104)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	2

-					max_width  	584)

 				    width      	682

 				    height     	532)

 				(object InheritView "" @2016

@@ -47222,13 +47015,13 @@
 				    origin_attachment 	(2593, 1042)

 				    terminal_attachment 	(2593, 926))

 				(object AssociationViewNew "$UNNAMED$306" @2017

-				    location   	(3470, 1097)

+				    location   	(3470, 1104)

 				    stereotype 	TRUE

 				    quidu      	"3CECFCD501BA"

 				    roleview_list 	(list RoleViews

 					(object RoleView "owningParameter" @2018

 					    Parent_View 	@2017

-					    location   	(296, 401)

+					    location   	(296, 408)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -47240,7 +47033,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2019

 						Parent_View 	@2018

-						location   	(3247, 1057)

+						location   	(3247, 1064)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47264,11 +47057,11 @@
 					    client     	@2017

 					    supplier   	@2015

 					    line_style 	3

-					    origin_attachment 	(3470, 1097)

-					    terminal_attachment 	(3065, 1097)

+					    origin_attachment 	(3470, 1104)

+					    terminal_attachment 	(3065, 1104)

 					    label      	(object SegLabel @2020

 						Parent_View 	@2018

-						location   	(3118, 1144)

+						location   	(3118, 1151)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47289,7 +47082,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2021

 						Parent_View 	@2018

-						location   	(3270, 1139)

+						location   	(3270, 1146)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47310,7 +47103,7 @@
 						orientation 	0))

 					(object RoleView "defaultValue" @2022

 					    Parent_View 	@2017

-					    location   	(296, 401)

+					    location   	(296, 408)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -47322,7 +47115,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2023

 						Parent_View 	@2022

-						location   	(3695, 1060)

+						location   	(3695, 1067)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47346,11 +47139,11 @@
 					    client     	@2017

 					    supplier   	@2014

 					    line_style 	3

-					    origin_attachment 	(3470, 1097)

-					    terminal_attachment 	(3876, 1097)

+					    origin_attachment 	(3470, 1104)

+					    terminal_attachment 	(3876, 1104)

 					    label      	(object SegLabel @2024

 						Parent_View 	@2022

-						location   	(3824, 1137)

+						location   	(3824, 1144)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47371,7 +47164,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2025

 						Parent_View 	@2022

-						location   	(3589, 1141)

+						location   	(3589, 1148)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47425,13 +47218,13 @@
 				    height     	731

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$269" @2028

-				    location   	(2031, 1065)

+				    location   	(2031, 1308)

 				    stereotype 	TRUE

 				    quidu      	"3CAB0E2402CA"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$270" @2029

 					    Parent_View 	@2028

-					    location   	(-177, 57)

+					    location   	(-177, 300)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -47443,7 +47236,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2030

 						Parent_View 	@2029

-						location   	(1751, 1024)

+						location   	(1751, 1267)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47468,11 +47261,11 @@
 					    client     	@2028

 					    supplier   	@2027

 					    line_style 	3

-					    origin_attachment 	(2031, 1065)

-					    terminal_attachment 	(1680, 1065)

+					    origin_attachment 	(2031, 1308)

+					    terminal_attachment 	(1680, 1308)

 					    label      	(object SegLabel @2031

 						Parent_View 	@2029

-						location   	(1716, 1119)

+						location   	(1716, 1362)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47493,7 +47286,7 @@
 						orientation 	0))

 					(object RoleView "/parameter" @2032

 					    Parent_View 	@2028

-					    location   	(-177, 57)

+					    location   	(-177, 300)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -47505,7 +47298,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2033

 						Parent_View 	@2032

-						location   	(2282, 1024)

+						location   	(2282, 1267)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47529,11 +47322,11 @@
 					    client     	@2028

 					    supplier   	@2015

 					    line_style 	3

-					    origin_attachment 	(2031, 1065)

-					    terminal_attachment 	(2383, 1065)

+					    origin_attachment 	(2031, 1308)

+					    terminal_attachment 	(2383, 1308)

 					    label      	(object SegLabel @2034

 						Parent_View 	@2032

-						location   	(2348, 1119)

+						location   	(2348, 1362)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47554,7 +47347,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2035

 						Parent_View 	@2032

-						location   	(2195, 1137)

+						location   	(2195, 1380)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47578,13 +47371,13 @@
 						height     	72

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$271" @2036

-				    location   	(2031, 1522)

+				    location   	(2031, 1308)

 				    stereotype 	TRUE

 				    quidu      	"3CAB0E7A020F"

 				    roleview_list 	(list RoleViews

 					(object RoleView "ownerReturnParam" @2037

 					    Parent_View 	@2036

-					    location   	(-177, 514)

+					    location   	(-177, 300)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -47596,7 +47389,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2038

 						Parent_View 	@2037

-						location   	(1850, 1462)

+						location   	(1850, 1248)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47620,11 +47413,11 @@
 					    client     	@2036

 					    supplier   	@2027

 					    line_style 	3

-					    origin_attachment 	(2031, 1522)

-					    terminal_attachment 	(1680, 1522)

+					    origin_attachment 	(2031, 1308)

+					    terminal_attachment 	(1680, 1308)

 					    label      	(object SegLabel @2039

 						Parent_View 	@2037

-						location   	(1716, 1576)

+						location   	(1716, 1362)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47645,7 +47438,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2040

 						Parent_View 	@2037

-						location   	(1852, 1492)

+						location   	(1852, 1278)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47666,7 +47459,7 @@
 						orientation 	1))

 					(object RoleView "returnResult" @2041

 					    Parent_View 	@2036

-					    location   	(-177, 514)

+					    location   	(-177, 300)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -47678,7 +47471,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2042

 						Parent_View 	@2041

-						location   	(2254, 1488)

+						location   	(2254, 1274)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47702,11 +47495,11 @@
 					    client     	@2036

 					    supplier   	@2015

 					    line_style 	3

-					    origin_attachment 	(2031, 1522)

-					    terminal_attachment 	(2383, 1522)

+					    origin_attachment 	(2031, 1308)

+					    terminal_attachment 	(2383, 1308)

 					    label      	(object SegLabel @2043

 						Parent_View 	@2041

-						location   	(2348, 1576)

+						location   	(2348, 1362)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47727,7 +47520,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2044

 						Parent_View 	@2041

-						location   	(2171, 1626)

+						location   	(2171, 1412)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47751,13 +47544,13 @@
 						height     	104

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$272" @2045

-				    location   	(2031, 1318)

+				    location   	(2031, 1308)

 				    stereotype 	TRUE

 				    quidu      	"3CAB0F2A0321"

 				    roleview_list 	(list RoleViews

 					(object RoleView "ownerFormalParam" @2046

 					    Parent_View 	@2045

-					    location   	(-177, 310)

+					    location   	(-177, 300)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -47769,7 +47562,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2047

 						Parent_View 	@2046

-						location   	(1847, 1245)

+						location   	(1847, 1235)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47793,11 +47586,11 @@
 					    client     	@2045

 					    supplier   	@2027

 					    line_style 	3

-					    origin_attachment 	(2031, 1318)

-					    terminal_attachment 	(1680, 1318)

+					    origin_attachment 	(2031, 1308)

+					    terminal_attachment 	(1680, 1308)

 					    label      	(object SegLabel @2048

 						Parent_View 	@2046

-						location   	(1716, 1372)

+						location   	(1716, 1362)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47818,7 +47611,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2049

 						Parent_View 	@2046

-						location   	(1865, 1283)

+						location   	(1865, 1273)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47839,7 +47632,7 @@
 						orientation 	1))

 					(object RoleView "formalParameter" @2050

 					    Parent_View 	@2045

-					    location   	(-177, 310)

+					    location   	(-177, 300)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -47851,7 +47644,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2051

 						Parent_View 	@2050

-						location   	(2234, 1289)

+						location   	(2234, 1279)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47875,11 +47668,11 @@
 					    client     	@2045

 					    supplier   	@2015

 					    line_style 	3

-					    origin_attachment 	(2031, 1318)

-					    terminal_attachment 	(2383, 1318)

+					    origin_attachment 	(2031, 1308)

+					    terminal_attachment 	(2383, 1308)

 					    label      	(object SegLabel @2052

 						Parent_View 	@2050

-						location   	(2348, 1372)

+						location   	(2348, 1362)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47900,7 +47693,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2053

 						Parent_View 	@2050

-						location   	(2183, 1390)

+						location   	(2183, 1380)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -47967,13 +47760,13 @@
 				    height     	104

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$308" @2057

-				    location   	(2034, 1722)

+				    location   	(2034, 1713)

 				    stereotype 	TRUE

 				    quidu      	"3CEE3778016E"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$309" @2058

 					    Parent_View 	@2057

-					    location   	(1764, 1074)

+					    location   	(1764, 1065)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -47985,7 +47778,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2059

 						Parent_View 	@2058

-						location   	(1752, 1681)

+						location   	(1752, 1672)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48010,11 +47803,11 @@
 					    client     	@2057

 					    supplier   	@2027

 					    line_style 	3

-					    origin_attachment 	(2034, 1722)

-					    terminal_attachment 	(1680, 1722))

+					    origin_attachment 	(2034, 1713)

+					    terminal_attachment 	(1680, 1713))

 					(object RoleView "raisedException" @2060

 					    Parent_View 	@2057

-					    location   	(1764, 1074)

+					    location   	(1764, 1065)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -48026,7 +47819,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2061

 						Parent_View 	@2060

-						location   	(2163, 1766)

+						location   	(2163, 1757)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48050,11 +47843,11 @@
 					    client     	@2057

 					    supplier   	@2056

 					    line_style 	3

-					    origin_attachment 	(2034, 1722)

-					    terminal_attachment 	(2388, 1722)

+					    origin_attachment 	(2034, 1713)

+					    terminal_attachment 	(2388, 1713)

 					    label      	(object SegLabel @2062

 						Parent_View 	@2060

-						location   	(2346, 1776)

+						location   	(2346, 1767)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48241,22 +48034,6 @@
 				    icon_style 	"Icon"

 				    fill_color 	16777215

 				    quidu      	"3CAB1D710164"

-				    compartment 	(object Compartment

-					Parent_View 	@2069

-					location   	(201, 610)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	5

-					max_width  	390)

 				    width      	481

 				    height     	1100)

 				(object AssociationViewNew "$UNNAMED$291" @2070

@@ -48404,13 +48181,13 @@
 				    origin_attachment 	(384, 547)

 				    terminal_attachment 	(384, 440))

 				(object AssociationViewNew "$UNNAMED$289" @2078

-				    location   	(1089, 737)

+				    location   	(1089, 918)

 				    stereotype 	TRUE

 				    quidu      	"3CAB241802AD"

 				    roleview_list 	(list RoleViews

 					(object RoleView "preContext" @2079

 					    Parent_View 	@2078

-					    location   	(-303, 131)

+					    location   	(-303, 312)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -48422,7 +48199,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2080

 						Parent_View 	@2079

-						location   	(796, 696)

+						location   	(796, 877)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48446,11 +48223,11 @@
 					    client     	@2078

 					    supplier   	@2069

 					    line_style 	3

-					    origin_attachment 	(1089, 737)

-					    terminal_attachment 	(672, 737)

+					    origin_attachment 	(1089, 918)

+					    terminal_attachment 	(672, 918)

 					    label      	(object SegLabel @2081

 						Parent_View 	@2079

-						location   	(715, 791)

+						location   	(715, 972)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48471,7 +48248,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2082

 						Parent_View 	@2079

-						location   	(888, 786)

+						location   	(888, 967)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48495,7 +48272,7 @@
 						orientation 	0))

 					(object RoleView "precondition" @2083

 					    Parent_View 	@2078

-					    location   	(-303, 131)

+					    location   	(-303, 312)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -48507,7 +48284,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2084

 						Parent_View 	@2083

-						location   	(1361, 706)

+						location   	(1361, 887)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48531,11 +48308,11 @@
 					    client     	@2078

 					    supplier   	@2066

 					    line_style 	3

-					    origin_attachment 	(1089, 737)

-					    terminal_attachment 	(1507, 737)

+					    origin_attachment 	(1089, 918)

+					    terminal_attachment 	(1507, 918)

 					    label      	(object SegLabel @2085

 						Parent_View 	@2083

-						location   	(1464, 791)

+						location   	(1464, 972)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48556,7 +48333,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2086

 						Parent_View 	@2083

-						location   	(1254, 776)

+						location   	(1254, 957)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48576,13 +48353,13 @@
 						height     	39

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$290" @2087

-				    location   	(1089, 919)

+				    location   	(1089, 918)

 				    stereotype 	TRUE

 				    quidu      	"3CAB2431012C"

 				    roleview_list 	(list RoleViews

 					(object RoleView "postContext" @2088

 					    Parent_View 	@2087

-					    location   	(-303, 313)

+					    location   	(-303, 312)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -48594,7 +48371,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2089

 						Parent_View 	@2088

-						location   	(814, 873)

+						location   	(814, 872)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48618,11 +48395,11 @@
 					    client     	@2087

 					    supplier   	@2069

 					    line_style 	3

-					    origin_attachment 	(1089, 919)

-					    terminal_attachment 	(672, 919)

+					    origin_attachment 	(1089, 918)

+					    terminal_attachment 	(672, 918)

 					    label      	(object SegLabel @2090

 						Parent_View 	@2088

-						location   	(715, 973)

+						location   	(715, 972)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48643,7 +48420,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2091

 						Parent_View 	@2088

-						location   	(892, 961)

+						location   	(892, 960)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48667,7 +48444,7 @@
 						orientation 	0))

 					(object RoleView "postcondition" @2092

 					    Parent_View 	@2087

-					    location   	(-303, 313)

+					    location   	(-303, 312)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -48679,7 +48456,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2093

 						Parent_View 	@2092

-						location   	(1343, 887)

+						location   	(1343, 886)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48703,11 +48480,11 @@
 					    client     	@2087

 					    supplier   	@2066

 					    line_style 	3

-					    origin_attachment 	(1089, 919)

-					    terminal_attachment 	(1507, 919)

+					    origin_attachment 	(1089, 918)

+					    terminal_attachment 	(1507, 918)

 					    label      	(object SegLabel @2094

 						Parent_View 	@2092

-						location   	(1464, 973)

+						location   	(1464, 972)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48728,7 +48505,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2095

 						Parent_View 	@2092

-						location   	(1254, 967)

+						location   	(1254, 966)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48748,7 +48525,7 @@
 						height     	48

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$347" @2096

-				    location   	(1089, 1075)

+				    location   	(1089, 918)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -48763,7 +48540,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "bodyCondition" @2097

 					    Parent_View 	@2096

-					    location   	(633, 181)

+					    location   	(633, 24)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -48775,7 +48552,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2098

 						Parent_View 	@2097

-						location   	(1320, 1050)

+						location   	(1320, 893)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48799,11 +48576,11 @@
 					    client     	@2096

 					    supplier   	@2066

 					    line_style 	3

-					    origin_attachment 	(1089, 1075)

-					    terminal_attachment 	(1507, 1075)

+					    origin_attachment 	(1089, 918)

+					    terminal_attachment 	(1507, 918)

 					    label      	(object SegLabel @2099

 						Parent_View 	@2097

-						location   	(1464, 1129)

+						location   	(1464, 972)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48824,7 +48601,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2100

 						Parent_View 	@2097

-						location   	(1228, 1120)

+						location   	(1228, 963)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48845,7 +48622,7 @@
 						orientation 	1))

 					(object RoleView "bodyContext" @2101

 					    Parent_View 	@2096

-					    location   	(633, 181)

+					    location   	(633, 24)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -48857,7 +48634,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2102

 						Parent_View 	@2101

-						location   	(832, 1041)

+						location   	(832, 884)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48881,11 +48658,11 @@
 					    client     	@2096

 					    supplier   	@2069

 					    line_style 	3

-					    origin_attachment 	(1089, 1075)

-					    terminal_attachment 	(672, 1075)

+					    origin_attachment 	(1089, 918)

+					    terminal_attachment 	(672, 918)

 					    label      	(object SegLabel @2103

 						Parent_View 	@2101

-						location   	(715, 1129)

+						location   	(715, 972)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48906,7 +48683,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2104

 						Parent_View 	@2101

-						location   	(881, 1129)

+						location   	(881, 972)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48929,7 +48706,7 @@
 						height     	54

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$350" @2105

-				    location   	(1088, 584)

+				    location   	(1088, 609)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -48944,7 +48721,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "formalParameter" @2106

 					    Parent_View 	@2105

-					    location   	(632, -448)

+					    location   	(632, -423)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -48956,7 +48733,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2107

 						Parent_View 	@2106

-						location   	(1329, 549)

+						location   	(1329, 574)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -48980,11 +48757,11 @@
 					    client     	@2105

 					    supplier   	@2067

 					    line_style 	3

-					    origin_attachment 	(1088, 584)

-					    terminal_attachment 	(1505, 584)

+					    origin_attachment 	(1088, 609)

+					    terminal_attachment 	(1505, 609)

 					    label      	(object SegLabel @2108

 						Parent_View 	@2106

-						location   	(1484, 622)

+						location   	(1484, 647)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49005,7 +48782,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2109

 						Parent_View 	@2106

-						location   	(1259, 619)

+						location   	(1259, 644)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49026,7 +48803,7 @@
 						orientation 	1))

 					(object RoleView "operation" @2110

 					    Parent_View 	@2105

-					    location   	(632, -448)

+					    location   	(632, -423)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -49038,7 +48815,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2111

 						Parent_View 	@2110

-						location   	(802, 543)

+						location   	(802, 568)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49062,11 +48839,11 @@
 					    client     	@2105

 					    supplier   	@2069

 					    line_style 	3

-					    origin_attachment 	(1088, 584)

-					    terminal_attachment 	(672, 584)

+					    origin_attachment 	(1088, 609)

+					    terminal_attachment 	(672, 609)

 					    label      	(object SegLabel @2112

 						Parent_View 	@2110

-						location   	(715, 638)

+						location   	(715, 663)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49087,7 +48864,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2113

 						Parent_View 	@2110

-						location   	(896, 619)

+						location   	(896, 644)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49107,7 +48884,7 @@
 						height     	35

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$348" @2114

-				    location   	(1088, 1241)

+				    location   	(1088, 1314)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -49122,7 +48899,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "/type" @2115

 					    Parent_View 	@2114

-					    location   	(632, 209)

+					    location   	(632, 282)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -49134,7 +48911,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2116

 						Parent_View 	@2115

-						location   	(1401, 1215)

+						location   	(1401, 1288)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49158,11 +48935,11 @@
 					    client     	@2114

 					    supplier   	@2068

 					    line_style 	3

-					    origin_attachment 	(1088, 1241)

-					    terminal_attachment 	(1505, 1241)

+					    origin_attachment 	(1088, 1314)

+					    terminal_attachment 	(1505, 1314)

 					    label      	(object SegLabel @2117

 						Parent_View 	@2115

-						location   	(1429, 1273)

+						location   	(1429, 1346)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49183,16 +48960,16 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$349" @2118

 					    Parent_View 	@2114

-					    location   	(632, 209)

+					    location   	(632, 282)

 					    stereotype 	TRUE

 					    quidu      	"3E02824700D3"

 					    client     	@2114

 					    supplier   	@2069

 					    line_style 	3

-					    origin_attachment 	(1088, 1241)

-					    terminal_attachment 	(672, 1241))))

+					    origin_attachment 	(1088, 1314)

+					    terminal_attachment 	(672, 1314))))

 				(object AssociationViewNew "$UNNAMED$352" @2119

-				    location   	(1088, 1366)

+				    location   	(1088, 1314)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -49207,7 +48984,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "raisedException" @2120

 					    Parent_View 	@2119

-					    location   	(656, 268)

+					    location   	(656, 216)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -49219,7 +48996,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2121

 						Parent_View 	@2120

-						location   	(1356, 1338)

+						location   	(1356, 1286)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49243,11 +49020,11 @@
 					    client     	@2119

 					    supplier   	@2068

 					    line_style 	3

-					    origin_attachment 	(1088, 1366)

-					    terminal_attachment 	(1505, 1366)

+					    origin_attachment 	(1088, 1314)

+					    terminal_attachment 	(1505, 1314)

 					    label      	(object SegLabel @2122

 						Parent_View 	@2120

-						location   	(1462, 1420)

+						location   	(1462, 1368)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49268,14 +49045,14 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$353" @2123

 					    Parent_View 	@2119

-					    location   	(656, 268)

+					    location   	(656, 216)

 					    stereotype 	TRUE

 					    quidu      	"3E592411003E"

 					    client     	@2119

 					    supplier   	@2069

 					    line_style 	3

-					    origin_attachment 	(1088, 1366)

-					    terminal_attachment 	(672, 1366))))))

+					    origin_attachment 	(1088, 1314)

+					    terminal_attachment 	(672, 1314))))))

 			(object ClassDiagram "Classes"

 			    quid       	"3E0277E403B5"

 			    title      	"Classes"

@@ -49386,22 +49163,6 @@
 				    icon_style 	"Icon"

 				    fill_color 	16777215

 				    quidu      	"3DFFC6AB0253"

-				    compartment 	(object Compartment

-					Parent_View 	@2127

-					location   	(2841, 1374)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	3

-					max_width  	159)

 				    width      	300

 				    height     	242

 				    autoResize 	TRUE)

@@ -49584,13 +49345,13 @@
 				    height     	956

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$285" @2135

-				    location   	(1017, 1416)

+				    location   	(1017, 1446)

 				    stereotype 	TRUE

 				    quidu      	"3CBC39310094"

 				    roleview_list 	(list RoleViews

 					(object RoleView "class" @2136

 					    Parent_View 	@2135

-					    location   	(153, 990)

+					    location   	(153, 1020)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -49602,7 +49363,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2137

 						Parent_View 	@2136

-						location   	(654, 1375)

+						location   	(654, 1405)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49626,11 +49387,11 @@
 					    client     	@2135

 					    supplier   	@2134

 					    line_style 	3

-					    origin_attachment 	(1017, 1416)

-					    terminal_attachment 	(563, 1416)

+					    origin_attachment 	(1017, 1446)

+					    terminal_attachment 	(563, 1446)

 					    label      	(object SegLabel @2138

 						Parent_View 	@2136

-						location   	(639, 1461)

+						location   	(639, 1491)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49651,7 +49412,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2139

 						Parent_View 	@2136

-						location   	(890, 1479)

+						location   	(890, 1509)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49675,7 +49436,7 @@
 						orientation 	0))

 					(object RoleView "nestedClassifier" @2140

 					    Parent_View 	@2135

-					    location   	(153, 990)

+					    location   	(153, 1020)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -49687,7 +49448,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2141

 						Parent_View 	@2140

-						location   	(1245, 1381)

+						location   	(1245, 1411)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49711,11 +49472,11 @@
 					    client     	@2135

 					    supplier   	@2130

 					    line_style 	3

-					    origin_attachment 	(1017, 1416)

-					    terminal_attachment 	(1472, 1416)

+					    origin_attachment 	(1017, 1446)

+					    terminal_attachment 	(1472, 1446)

 					    label      	(object SegLabel @2142

 						Parent_View 	@2140

-						location   	(1433, 1467)

+						location   	(1433, 1497)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49736,7 +49497,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2143

 						Parent_View 	@2140

-						location   	(1299, 1477)

+						location   	(1299, 1507)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49759,7 +49520,7 @@
 						height     	61

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$345" @2144

-				    location   	(811, 1057)

+				    location   	(811, 1056)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -49774,7 +49535,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "/superClass" @2145

 					    Parent_View 	@2144

-					    location   	(-5, 109)

+					    location   	(-5, 108)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -49786,7 +49547,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2146

 						Parent_View 	@2145

-						location   	(694, 1084)

+						location   	(694, 1083)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49810,15 +49571,15 @@
 					    client     	@2144

 					    supplier   	@2134

 					    vertices   	(list Points

-						(811, 1057)

+						(811, 1056)

 						(811, 1119)

 						(563, 1119))

 					    line_style 	3

-					    origin_attachment 	(811, 1057)

+					    origin_attachment 	(811, 1056)

 					    terminal_attachment 	(563, 1119)

 					    label      	(object SegLabel @2147

 						Parent_View 	@2145

-						location   	(579, 1163)

+						location   	(579, 1162)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49839,7 +49600,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2148

 						Parent_View 	@2145

-						location   	(717, 1155)

+						location   	(717, 1154)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49860,17 +49621,17 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$346" @2149

 					    Parent_View 	@2144

-					    location   	(-5, 109)

+					    location   	(-5, 108)

 					    stereotype 	TRUE

 					    quidu      	"3E027BEB00F0"

 					    client     	@2144

 					    supplier   	@2134

 					    vertices   	(list Points

-						(811, 1057)

+						(811, 1056)

 						(811, 993)

 						(563, 993))

 					    line_style 	3

-					    origin_attachment 	(811, 1057)

+					    origin_attachment 	(811, 1056)

 					    terminal_attachment 	(563, 993))))

 				(object InheritView "" @2150

 				    stereotype 	TRUE

@@ -49881,13 +49642,13 @@
 				    origin_attachment 	(406, 692)

 				    terminal_attachment 	(406, 555))

 				(object AssociationViewNew "$UNNAMED$288" @2151

-				    location   	(1013, 1638)

+				    location   	(1013, 1636)

 				    stereotype 	TRUE

 				    quidu      	"3CAB22E000E2"

 				    roleview_list 	(list RoleViews

 					(object RoleView "class" @2152

 					    Parent_View 	@2151

-					    location   	(-901, -84)

+					    location   	(-901, -86)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -49899,7 +49660,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2153

 						Parent_View 	@2152

-						location   	(653, 1597)

+						location   	(653, 1595)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49923,11 +49684,11 @@
 					    client     	@2151

 					    supplier   	@2134

 					    line_style 	3

-					    origin_attachment 	(1013, 1638)

-					    terminal_attachment 	(563, 1638)

+					    origin_attachment 	(1013, 1636)

+					    terminal_attachment 	(563, 1636)

 					    label      	(object SegLabel @2154

 						Parent_View 	@2152

-						location   	(609, 1692)

+						location   	(609, 1690)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49948,7 +49709,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2155

 						Parent_View 	@2152

-						location   	(863, 1723)

+						location   	(863, 1721)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -49973,7 +49734,7 @@
 						orientation 	0))

 					(object RoleView "ownedOperation" @2156

 					    Parent_View 	@2151

-					    location   	(-901, -84)

+					    location   	(-901, -86)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -49985,7 +49746,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2157

 						Parent_View 	@2156

-						location   	(1304, 1598)

+						location   	(1304, 1596)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50009,11 +49770,11 @@
 					    client     	@2151

 					    supplier   	@2131

 					    line_style 	3

-					    origin_attachment 	(1013, 1638)

-					    terminal_attachment 	(1464, 1638)

+					    origin_attachment 	(1013, 1636)

+					    terminal_attachment 	(1464, 1636)

 					    label      	(object SegLabel @2158

 						Parent_View 	@2156

-						location   	(1418, 1692)

+						location   	(1418, 1690)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50034,7 +49795,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2159

 						Parent_View 	@2156

-						location   	(1298, 1738)

+						location   	(1298, 1736)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50080,22 +49841,6 @@
 				    icon_style 	"Icon"

 				    fill_color 	16777215

 				    quidu      	"3CAB1D790101"

-				    compartment 	(object Compartment

-					Parent_View 	@2160

-					location   	(1491, 543)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	6

-					max_width  	578)

 				    width      	637

 				    height     	875)

 				(object AssociationViewNew "$UNNAMED$293" @2161

@@ -50473,13 +50218,13 @@
 				    origin_attachment 	(1806, 481)

 				    terminal_attachment 	(1806, 321))

 				(object AssociationViewNew "$UNNAMED$286" @2181

-				    location   	(998, 521)

+				    location   	(998, 518)

 				    stereotype 	TRUE

 				    quidu      	"3CAB21AF016F"

 				    roleview_list 	(list RoleViews

 					(object RoleView "classifier" @2182

 					    Parent_View 	@2181

-					    location   	(-1234, -229)

+					    location   	(-1234, -232)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -50491,7 +50236,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2183

 						Parent_View 	@2182

-						location   	(612, 480)

+						location   	(612, 477)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50515,11 +50260,11 @@
 					    client     	@2181

 					    supplier   	@2132

 					    line_style 	3

-					    origin_attachment 	(998, 521)

-					    terminal_attachment 	(514, 521)

+					    origin_attachment 	(998, 518)

+					    terminal_attachment 	(514, 518)

 					    label      	(object SegLabel @2184

 						Parent_View 	@2182

-						location   	(562, 575)

+						location   	(562, 572)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50540,7 +50285,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2185

 						Parent_View 	@2182

-						location   	(825, 573)

+						location   	(825, 570)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50561,7 +50306,7 @@
 						orientation 	0))

 					(object RoleView "/attribute" @2186

 					    Parent_View 	@2181

-					    location   	(-1234, -229)

+					    location   	(-1234, -232)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -50573,7 +50318,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2187

 						Parent_View 	@2186

-						location   	(1384, 480)

+						location   	(1384, 477)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50597,11 +50342,11 @@
 					    client     	@2181

 					    supplier   	@2160

 					    line_style 	3

-					    origin_attachment 	(998, 521)

-					    terminal_attachment 	(1482, 521)

+					    origin_attachment 	(998, 518)

+					    terminal_attachment 	(1482, 518)

 					    label      	(object SegLabel @2188

 						Parent_View 	@2186

-						location   	(1429, 558)

+						location   	(1429, 555)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50622,7 +50367,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2189

 						Parent_View 	@2186

-						location   	(1329, 576)

+						location   	(1329, 573)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50645,13 +50390,13 @@
 						height     	55

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$307" @2190

-				    location   	(2586, 1066)

+				    location   	(2586, 1098)

 				    stereotype 	TRUE

 				    quidu      	"3CED007D0378"

 				    roleview_list 	(list RoleViews

 					(object RoleView "owningProperty" @2191

 					    Parent_View 	@2190

-					    location   	(-282, 730)

+					    location   	(-282, 762)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -50663,7 +50408,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2192

 						Parent_View 	@2191

-						location   	(2293, 1033)

+						location   	(2293, 1065)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50687,11 +50432,11 @@
 					    client     	@2190

 					    supplier   	@2160

 					    line_style 	3

-					    origin_attachment 	(2586, 1066)

-					    terminal_attachment 	(2118, 1066)

+					    origin_attachment 	(2586, 1098)

+					    terminal_attachment 	(2118, 1098)

 					    label      	(object SegLabel @2193

 						Parent_View 	@2191

-						location   	(2192, 1107)

+						location   	(2192, 1139)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50712,7 +50457,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2194

 						Parent_View 	@2191

-						location   	(2341, 1102)

+						location   	(2341, 1134)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50733,7 +50478,7 @@
 						orientation 	0))

 					(object RoleView "defaultValue" @2195

 					    Parent_View 	@2190

-					    location   	(-282, 730)

+					    location   	(-282, 762)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -50745,7 +50490,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2196

 						Parent_View 	@2195

-						location   	(2808, 1028)

+						location   	(2808, 1060)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50769,11 +50514,11 @@
 					    client     	@2190

 					    supplier   	@2133

 					    line_style 	3

-					    origin_attachment 	(2586, 1066)

-					    terminal_attachment 	(3054, 1066)

+					    origin_attachment 	(2586, 1098)

+					    terminal_attachment 	(3054, 1098)

 					    label      	(object SegLabel @2197

 						Parent_View 	@2195

-						location   	(3003, 1105)

+						location   	(3003, 1137)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50794,7 +50539,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2198

 						Parent_View 	@2195

-						location   	(2770, 1108)

+						location   	(2770, 1140)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50814,13 +50559,13 @@
 						height     	42

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$287" @2199

-				    location   	(1022, 706)

+				    location   	(1022, 1023)

 				    stereotype 	TRUE

 				    quidu      	"3CAB22490044"

 				    roleview_list 	(list RoleViews

 					(object RoleView "class" @2200

 					    Parent_View 	@2199

-					    location   	(-124, 70)

+					    location   	(-124, 387)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -50832,7 +50577,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2201

 						Parent_View 	@2200

-						location   	(656, 665)

+						location   	(656, 982)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50856,11 +50601,11 @@
 					    client     	@2199

 					    supplier   	@2134

 					    line_style 	3

-					    origin_attachment 	(1022, 706)

-					    terminal_attachment 	(563, 706)

+					    origin_attachment 	(1022, 1023)

+					    terminal_attachment 	(563, 1023)

 					    label      	(object SegLabel @2202

 						Parent_View 	@2200

-						location   	(613, 749)

+						location   	(613, 1066)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50881,7 +50626,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2203

 						Parent_View 	@2200

-						location   	(857, 816)

+						location   	(857, 1133)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50906,7 +50651,7 @@
 						orientation 	0))

 					(object RoleView "ownedAttribute" @2204

 					    Parent_View 	@2199

-					    location   	(-124, 70)

+					    location   	(-124, 387)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -50918,7 +50663,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2205

 						Parent_View 	@2204

-						location   	(1304, 666)

+						location   	(1304, 983)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50942,11 +50687,11 @@
 					    client     	@2199

 					    supplier   	@2160

 					    line_style 	3

-					    origin_attachment 	(1022, 706)

-					    terminal_attachment 	(1482, 706)

+					    origin_attachment 	(1022, 1023)

+					    terminal_attachment 	(1482, 1023)

 					    label      	(object SegLabel @2206

 						Parent_View 	@2204

-						location   	(1428, 756)

+						location   	(1428, 1073)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -50967,7 +50712,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2207

 						Parent_View 	@2204

-						location   	(1272, 801)

+						location   	(1272, 1118)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -51013,32 +50758,16 @@
 				    icon_style 	"Icon"

 				    fill_color 	16777215

 				    quidu      	"3CAB1DD70016"

-				    compartment 	(object Compartment

-					Parent_View 	@2208

-					location   	(3084, 612)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	1

-					max_width  	403)

 				    width      	462

 				    height     	256)

 				(object AssociationViewNew "$UNNAMED$295" @2209

-				    location   	(2596, 769)

+				    location   	(2596, 678)

 				    stereotype 	TRUE

 				    quidu      	"3CAB3EBC02BE"

 				    roleview_list 	(list RoleViews

 					(object RoleView "owningAssociation" @2210

 					    Parent_View 	@2209

-					    location   	(364, -185)

+					    location   	(364, -276)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -51050,7 +50779,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2211

 						Parent_View 	@2210

-						location   	(2840, 733)

+						location   	(2840, 642)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -51074,11 +50803,11 @@
 					    client     	@2209

 					    supplier   	@2208

 					    line_style 	3

-					    origin_attachment 	(2596, 769)

-					    terminal_attachment 	(3075, 769)

+					    origin_attachment 	(2596, 678)

+					    terminal_attachment 	(3075, 678)

 					    label      	(object SegLabel @2212

 						Parent_View 	@2210

-						location   	(3043, 819)

+						location   	(3043, 728)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -51099,7 +50828,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2213

 						Parent_View 	@2210

-						location   	(2805, 856)

+						location   	(2805, 765)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -51124,7 +50853,7 @@
 						orientation 	1))

 					(object RoleView "ownedEnd" @2214

 					    Parent_View 	@2209

-					    location   	(364, -185)

+					    location   	(364, -276)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -51136,7 +50865,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2215

 						Parent_View 	@2214

-						location   	(2235, 740)

+						location   	(2235, 649)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -51160,11 +50889,11 @@
 					    client     	@2209

 					    supplier   	@2160

 					    line_style 	3

-					    origin_attachment 	(2596, 769)

-					    terminal_attachment 	(2118, 769)

+					    origin_attachment 	(2596, 678)

+					    terminal_attachment 	(2118, 678)

 					    label      	(object SegLabel @2216

 						Parent_View 	@2214

-						location   	(2153, 808)

+						location   	(2153, 717)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -51185,7 +50914,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2217

 						Parent_View 	@2214

-						location   	(2347, 890)

+						location   	(2347, 799)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -51210,13 +50939,13 @@
 						height     	121

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$336" @2218

-				    location   	(2596, 624)

+				    location   	(2596, 678)

 				    stereotype 	TRUE

 				    quidu      	"3DFFC74E02D9"

 				    roleview_list 	(list RoleViews

 					(object RoleView "association" @2219

 					    Parent_View 	@2218

-					    location   	(364, -330)

+					    location   	(364, -276)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -51228,7 +50957,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2220

 						Parent_View 	@2219

-						location   	(2904, 589)

+						location   	(2904, 643)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -51252,11 +50981,11 @@
 					    client     	@2218

 					    supplier   	@2208

 					    line_style 	3

-					    origin_attachment 	(2596, 624)

-					    terminal_attachment 	(3075, 624)

+					    origin_attachment 	(2596, 678)

+					    terminal_attachment 	(3075, 678)

 					    label      	(object SegLabel @2221

 						Parent_View 	@2219

-						location   	(3041, 665)

+						location   	(3041, 719)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -51277,7 +51006,7 @@
 						orientation 	1))

 					(object RoleView "memberEnd" @2222

 					    Parent_View 	@2218

-					    location   	(364, -330)

+					    location   	(364, -276)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -51289,7 +51018,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2223

 						Parent_View 	@2222

-						location   	(2237, 579)

+						location   	(2237, 633)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -51313,11 +51042,11 @@
 					    client     	@2218

 					    supplier   	@2160

 					    line_style 	3

-					    origin_attachment 	(2596, 624)

-					    terminal_attachment 	(2118, 624)

+					    origin_attachment 	(2596, 678)

+					    terminal_attachment 	(2118, 678)

 					    label      	(object SegLabel @2224

 						Parent_View 	@2222

-						location   	(2172, 661)

+						location   	(2172, 715)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -51338,7 +51067,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2225

 						Parent_View 	@2222

-						location   	(2493, 691)

+						location   	(2493, 745)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -51402,7 +51131,7 @@
 				    height     	104

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$318" @2229

-				    location   	(3706, 738)

+				    location   	(3706, 758)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -51414,7 +51143,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @2230

 					Parent_View 	@2229

-					location   	(3706, 679)

+					location   	(3706, 699)

 					font       	(object Font

 					    size       	8

 					    face       	"Arial"

@@ -51439,7 +51168,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$319" @2231

 					    Parent_View 	@2229

-					    location   	(2878, 240)

+					    location   	(2878, 260)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -51451,7 +51180,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2232

 						Parent_View 	@2231

-						location   	(3572, 697)

+						location   	(3572, 717)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -51476,11 +51205,11 @@
 					    client     	@2229

 					    supplier   	@2208

 					    line_style 	3

-					    origin_attachment 	(3706, 738)

-					    terminal_attachment 	(3537, 738))

+					    origin_attachment 	(3706, 758)

+					    terminal_attachment 	(3537, 758))

 					(object RoleView "/endType" @2233

 					    Parent_View 	@2229

-					    location   	(2878, 240)

+					    location   	(2878, 260)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -51492,7 +51221,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2234

 						Parent_View 	@2233

-						location   	(3774, 703)

+						location   	(3774, 723)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -51516,11 +51245,11 @@
 					    client     	@2229

 					    supplier   	@2228

 					    line_style 	3

-					    origin_attachment 	(3706, 738)

-					    terminal_attachment 	(3876, 738)

+					    origin_attachment 	(3706, 758)

+					    terminal_attachment 	(3876, 758)

 					    label      	(object SegLabel @2235

 						Parent_View 	@2233

-						location   	(3808, 792)

+						location   	(3808, 812)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -51556,6 +51285,7 @@
 		    logical_models 	(list unit_reference_list

 			(object Class "Interface"

 			    quid       	"3342A195014D"

+			    documentation 	"An interface is a kind of classifier that represents a declaration of a set of coherent public features and obligations. In a sense, "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3342A19C01ED"

@@ -51564,6 +51294,7 @@
 			    language   	"none")

 			(object Class "Implementation"

 			    quid       	"3B6D70E00032"

+			    documentation 	"An Implementation is a specialized Realization relationship between a Classifier and an Interface. The implementation relationship signifies that the realizing classifier conforms to the contract specified by the interface. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3B6D70F3010E"

@@ -51571,6 +51302,7 @@
 				    quidu      	"3B71F6410244")))

 			(object Class "BehavioredClassifier"

 			    quid       	"3D0B41210023"

+			    documentation 	"A BehavioredClassifier may have implementations. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E11EE2D020F"

@@ -51739,7 +51471,33 @@
 				    width      	444

 				    height     	131

 				    annotation 	8)

-				(object ClassView "Class" "Logical View::UML::Classes::Kernel::Property" @2237

+				(object ClassView "Class" "Logical View::UML::Classes::Interfaces::BehavioredClassifier" @2237

+				    ShowCompartmentStereotypes 	TRUE

+				    SuppressOperation 	TRUE

+				    IncludeAttribute 	TRUE

+				    IncludeOperation 	TRUE

+				    location   	(675, 1230)

+				    font       	(object Font

+					size       	10

+					face       	"Arial"

+					bold       	FALSE

+					italics    	TRUE

+					underline  	FALSE

+					strike     	FALSE

+					color      	0

+					default_color 	TRUE)

+				    label      	(object ItemLabel

+					Parent_View 	@2237

+					location   	(459, 1164)

+					nlines     	1

+					max_width  	432

+					justify    	0

+					label      	"BehavioredClassifier")

+				    icon_style 	"Icon"

+				    quidu      	"3D0B41210023"

+				    width      	450

+				    height     	157)

+				(object ClassView "Class" "Logical View::UML::Classes::Kernel::Property" @2238

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressAttribute 	TRUE

 				    SuppressOperation 	TRUE

@@ -51756,7 +51514,7 @@
 					color      	0

 					default_color 	TRUE)

 				    label      	(object ItemLabel

-					Parent_View 	@2237

+					Parent_View 	@2238

 					location   	(248, 403)

 					nlines     	1

 					max_width  	364

@@ -51767,7 +51525,7 @@
 				    width      	382

 				    height     	138

 				    annotation 	8)

-				(object ClassView "Class" "Logical View::UML::Classes::Kernel::Operation" @2238

+				(object ClassView "Class" "Logical View::UML::Classes::Kernel::Operation" @2239

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressAttribute 	TRUE

 				    SuppressOperation 	TRUE

@@ -51784,7 +51542,7 @@
 					color      	0

 					default_color 	TRUE)

 				    label      	(object ItemLabel

-					Parent_View 	@2238

+					Parent_View 	@2239

 					location   	(227, 733)

 					nlines     	1

 					max_width  	363

@@ -51795,7 +51553,7 @@
 				    width      	381

 				    height     	131

 				    annotation 	8)

-				(object ClassView "Class" "Logical View::UML::Classes::Interfaces::Implementation" @2239

+				(object ClassView "Class" "Logical View::UML::Classes::Interfaces::Implementation" @2240

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressOperation 	TRUE

 				    IncludeAttribute 	TRUE

@@ -51811,7 +51569,7 @@
 					color      	0

 					default_color 	TRUE)

 				    label      	(object ItemLabel

-					Parent_View 	@2239

+					Parent_View 	@2240

 					location   	(1522, 1164)

 					nlines     	1

 					max_width  	426

@@ -51822,42 +51580,16 @@
 				    width      	444

 				    height     	157

 				    annotation 	8)

-				(object InheritView "" @2240

+				(object InheritView "" @2241

 				    stereotype 	TRUE

 				    quidu      	"3B6D70F3010E"

-				    client     	@2239

+				    client     	@2240

 				    supplier   	@2236

 				    line_style 	3

 				    origin_attachment 	(1724, 1308)

 				    terminal_attachment 	(1724, 1495))

-				(object ClassView "Class" "Logical View::UML::Classes::Interfaces::BehavioredClassifier" @2241

-				    ShowCompartmentStereotypes 	TRUE

-				    SuppressOperation 	TRUE

-				    IncludeAttribute 	TRUE

-				    IncludeOperation 	TRUE

-				    location   	(675, 1230)

-				    font       	(object Font

-					size       	10

-					face       	"Arial"

-					bold       	FALSE

-					italics    	TRUE

-					underline  	FALSE

-					strike     	FALSE

-					color      	0

-					default_color 	TRUE)

-				    label      	(object ItemLabel

-					Parent_View 	@2241

-					location   	(459, 1164)

-					nlines     	1

-					max_width  	432

-					justify    	0

-					label      	"BehavioredClassifier")

-				    icon_style 	"Icon"

-				    quidu      	"3D0B41210023"

-				    width      	450

-				    height     	157)

 				(object AssociationViewNew "$UNNAMED$360" @2242

-				    location   	(1206, 1225)

+				    location   	(1206, 1230)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -51872,7 +51604,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "implementation" @2243

 					    Parent_View 	@2242

-					    location   	(-324, -389)

+					    location   	(-324, -384)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -51884,7 +51616,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2244

 						Parent_View 	@2243

-						location   	(1350, 1174)

+						location   	(1350, 1179)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -51907,13 +51639,13 @@
 					    line_color 	3342489

 					    quidu      	"3BD88B4C03BB"

 					    client     	@2242

-					    supplier   	@2239

+					    supplier   	@2240

 					    line_style 	3

-					    origin_attachment 	(1206, 1225)

-					    terminal_attachment 	(1513, 1225)

+					    origin_attachment 	(1206, 1230)

+					    terminal_attachment 	(1513, 1230)

 					    label      	(object SegLabel @2245

 						Parent_View 	@2243

-						location   	(1476, 1273)

+						location   	(1476, 1278)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -51934,7 +51666,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2246

 						Parent_View 	@2243

-						location   	(1259, 1099)

+						location   	(1259, 1104)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -51958,7 +51690,7 @@
 						orientation 	0))

 					(object RoleView "implementingClassifier" @2247

 					    Parent_View 	@2242

-					    location   	(-324, -389)

+					    location   	(-324, -384)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -51970,7 +51702,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2248

 						Parent_View 	@2247

-						location   	(1148, 1280)

+						location   	(1148, 1285)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -51993,13 +51725,13 @@
 					    line_color 	3342489

 					    quidu      	"3BD88B4C03C5"

 					    client     	@2242

-					    supplier   	@2241

+					    supplier   	@2237

 					    line_style 	3

-					    origin_attachment 	(1206, 1225)

-					    terminal_attachment 	(900, 1225)

+					    origin_attachment 	(1206, 1230)

+					    terminal_attachment 	(900, 1230)

 					    label      	(object SegLabel @2249

 						Parent_View 	@2247

-						location   	(950, 1180)

+						location   	(950, 1185)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52020,7 +51752,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2250

 						Parent_View 	@2247

-						location   	(1089, 1333)

+						location   	(1089, 1338)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52039,7 +51771,35 @@
 						pctDist    	0.382353

 						height     	108

 						orientation 	0))))

-				(object ClassView "Class" "Logical View::UML::Classes::Interfaces::Interface" @2251

+				(object ClassView "Class" "Logical View::UML::Classes::Kernel::Classifier" @2251

+				    ShowCompartmentStereotypes 	TRUE

+				    SuppressAttribute 	TRUE

+				    SuppressOperation 	TRUE

+				    IncludeAttribute 	TRUE

+				    IncludeOperation 	TRUE

+				    location   	(1770, 190)

+				    font       	(object Font

+					size       	10

+					face       	"Arial"

+					bold       	FALSE

+					italics    	TRUE

+					underline  	FALSE

+					strike     	FALSE

+					color      	0

+					default_color 	TRUE)

+				    label      	(object ItemLabel

+					Parent_View 	@2251

+					location   	(1564, 124)

+					nlines     	1

+					max_width  	413

+					justify    	0

+					label      	"Classifier")

+				    icon_style 	"Icon"

+				    quidu      	"3CAAECE80199"

+				    width      	431

+				    height     	156

+				    annotation 	8)

+				(object ClassView "Class" "Logical View::UML::Classes::Interfaces::Interface" @2252

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressOperation 	TRUE

 				    IncludeAttribute 	TRUE

@@ -52055,7 +51815,7 @@
 					color      	0

 					default_color 	TRUE)

 				    label      	(object ItemLabel

-					Parent_View 	@2251

+					Parent_View 	@2252

 					location   	(1558, 420)

 					nlines     	1

 					max_width  	414

@@ -52066,7 +51826,7 @@
 				    width      	432

 				    height     	444

 				    annotation 	8)

-				(object AssociationViewNew "$UNNAMED$361" @2252

+				(object AssociationViewNew "$UNNAMED$361" @2253

 				    location   	(2331, 775)

 				    font       	(object Font

 					size       	10

@@ -52080,8 +51840,8 @@
 				    stereotype 	TRUE

 				    quidu      	"3CC4DF29039E"

 				    roleview_list 	(list RoleViews

-					(object RoleView "$UNNAMED$362" @2253

-					    Parent_View 	@2252

+					(object RoleView "$UNNAMED$362" @2254

+					    Parent_View 	@2253

 					    location   	(351, 103)

 					    font       	(object Font

 						size       	10

@@ -52094,8 +51854,8 @@
 						default_color 	TRUE)

 					    stereotype 	TRUE

 					    quidu      	"3CC4DF2B03D3"

-					    client     	@2252

-					    supplier   	@2251

+					    client     	@2253

+					    supplier   	@2252

 					    vertices   	(list Points

 						(2331, 775)

 						(2331, 731)

@@ -52103,8 +51863,8 @@
 					    line_style 	3

 					    origin_attachment 	(2331, 775)

 					    terminal_attachment 	(1981, 731)

-					    label      	(object SegLabel @2254

-						Parent_View 	@2253

+					    label      	(object SegLabel @2255

+						Parent_View 	@2254

 						location   	(2020, 785)

 						font       	(object Font

 						    size       	10

@@ -52124,8 +51884,8 @@
 						pctDist    	0.900000

 						height     	54

 						orientation 	0))

-					(object RoleView "redefinedInterface" @2255

-					    Parent_View 	@2252

+					(object RoleView "redefinedInterface" @2256

+					    Parent_View 	@2253

 					    location   	(351, 103)

 					    font       	(object Font

 						size       	10

@@ -52136,8 +51896,8 @@
 						strike     	FALSE

 						color      	0

 						default_color 	TRUE)

-					    label      	(object SegLabel @2256

-						Parent_View 	@2255

+					    label      	(object SegLabel @2257

+						Parent_View 	@2256

 						location   	(2232, 863)

 						font       	(object Font

 						    size       	10

@@ -52159,8 +51919,8 @@
 						orientation 	0)

 					    stereotype 	TRUE

 					    quidu      	"3CC4DF2C0009"

-					    client     	@2252

-					    supplier   	@2251

+					    client     	@2253

+					    supplier   	@2252

 					    vertices   	(list Points

 						(2331, 775)

 						(2331, 819)

@@ -52168,8 +51928,8 @@
 					    line_style 	3

 					    origin_attachment 	(2331, 775)

 					    terminal_attachment 	(1981, 819)

-					    label      	(object SegLabel @2257

-						Parent_View 	@2255

+					    label      	(object SegLabel @2258

+						Parent_View 	@2256

 						location   	(2020, 873)

 						font       	(object Font

 						    size       	10

@@ -52189,8 +51949,8 @@
 						pctDist    	0.900000

 						height     	54

 						orientation 	0)

-					    label      	(object SegLabel @2258

-						Parent_View 	@2255

+					    label      	(object SegLabel @2259

+						Parent_View 	@2256

 						location   	(2300, 905)

 						font       	(object Font

 						    size       	10

@@ -52210,8 +51970,8 @@
 						pctDist    	0.190355

 						height     	86

 						orientation 	0))))

-				(object AssociationViewNew "$UNNAMED$354" @2259

-				    location   	(1085, 443)

+				(object AssociationViewNew "$UNNAMED$354" @2260

+				    location   	(1085, 468)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -52221,9 +51981,9 @@
 					strike     	FALSE

 					color      	0

 					default_color 	TRUE)

-				    label      	(object SegLabel @2260

-					Parent_View 	@2259

-					location   	(1085, 384)

+				    label      	(object SegLabel @2261

+					Parent_View 	@2260

+					location   	(1085, 409)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -52246,9 +52006,9 @@
 				    stereotype 	TRUE

 				    quidu      	"3B71EABF00A0"

 				    roleview_list 	(list RoleViews

-					(object RoleView "ownedAttribute" @2261

-					    Parent_View 	@2259

-					    location   	(589, -2053)

+					(object RoleView "ownedAttribute" @2262

+					    Parent_View 	@2260

+					    location   	(589, -2028)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -52258,9 +52018,9 @@
 						strike     	FALSE

 						color      	0

 						default_color 	TRUE)

-					    label      	(object SegLabel @2262

-						Parent_View 	@2261

-						location   	(807, 403)

+					    label      	(object SegLabel @2263

+						Parent_View 	@2262

+						location   	(807, 428)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52282,14 +52042,14 @@
 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3B71EABF00A2"

-					    client     	@2259

-					    supplier   	@2237

+					    client     	@2260

+					    supplier   	@2238

 					    line_style 	3

-					    origin_attachment 	(1085, 443)

-					    terminal_attachment 	(621, 443)

-					    label      	(object SegLabel @2263

-						Parent_View 	@2261

-						location   	(681, 502)

+					    origin_attachment 	(1085, 468)

+					    terminal_attachment 	(621, 468)

+					    label      	(object SegLabel @2264

+						Parent_View 	@2262

+						location   	(681, 527)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52308,9 +52068,9 @@
 						pctDist    	0.872845

 						height     	59

 						orientation 	0)

-					    label      	(object SegLabel @2264

-						Parent_View 	@2261

-						location   	(882, 353)

+					    label      	(object SegLabel @2265

+						Parent_View 	@2262

+						location   	(882, 378)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52329,9 +52089,9 @@
 						pctDist    	0.437500

 						height     	91

 						orientation 	1))

-					(object RoleView "$UNNAMED$355" @2265

-					    Parent_View 	@2259

-					    location   	(589, -2053)

+					(object RoleView "$UNNAMED$355" @2266

+					    Parent_View 	@2260

+					    location   	(589, -2028)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -52341,9 +52101,9 @@
 						strike     	FALSE

 						color      	0

 						default_color 	TRUE)

-					    label      	(object SegLabel @2266

-						Parent_View 	@2265

-						location   	(1455, 402)

+					    label      	(object SegLabel @2267

+						Parent_View 	@2266

+						location   	(1455, 427)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52366,14 +52126,14 @@
 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3B71EABF00A1"

-					    client     	@2259

-					    supplier   	@2251

+					    client     	@2260

+					    supplier   	@2252

 					    line_style 	3

-					    origin_attachment 	(1085, 443)

-					    terminal_attachment 	(1549, 443)

-					    label      	(object SegLabel @2267

-						Parent_View 	@2265

-						location   	(1450, 409)

+					    origin_attachment 	(1085, 468)

+					    terminal_attachment 	(1549, 468)

+					    label      	(object SegLabel @2268

+						Parent_View 	@2266

+						location   	(1450, 434)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52392,9 +52152,9 @@
 						pctDist    	0.788793

 						height     	35

 						orientation 	0)

-					    label      	(object SegLabel @2268

-						Parent_View 	@2265

-						location   	(1177, 517)

+					    label      	(object SegLabel @2269

+						Parent_View 	@2266

+						location   	(1177, 542)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52416,8 +52176,8 @@
 						pctDist    	0.200431

 						height     	74

 						orientation 	1))))

-				(object AssociationViewNew "$UNNAMED$356" @2269

-				    location   	(1073, 766)

+				(object AssociationViewNew "$UNNAMED$356" @2270

+				    location   	(1073, 786)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -52427,9 +52187,9 @@
 					strike     	FALSE

 					color      	0

 					default_color 	TRUE)

-				    label      	(object SegLabel @2270

-					Parent_View 	@2269

-					location   	(1073, 707)

+				    label      	(object SegLabel @2271

+					Parent_View 	@2270

+					location   	(1073, 727)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -52452,9 +52212,9 @@
 				    stereotype 	TRUE

 				    quidu      	"3B71EAE7005A"

 				    roleview_list 	(list RoleViews

-					(object RoleView "$UNNAMED$357" @2271

-					    Parent_View 	@2269

-					    location   	(-1934, -970)

+					(object RoleView "$UNNAMED$357" @2272

+					    Parent_View 	@2270

+					    location   	(-1934, -950)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -52464,9 +52224,9 @@
 						strike     	FALSE

 						color      	0

 						default_color 	TRUE)

-					    label      	(object SegLabel @2272

-						Parent_View 	@2271

-						location   	(1453, 725)

+					    label      	(object SegLabel @2273

+						Parent_View 	@2272

+						location   	(1453, 745)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52488,14 +52248,14 @@
 						orientation 	0)

 					    stereotype 	TRUE

 					    quidu      	"3B71EAE7005B"

-					    client     	@2269

-					    supplier   	@2251

+					    client     	@2270

+					    supplier   	@2252

 					    line_style 	3

-					    origin_attachment 	(1073, 766)

-					    terminal_attachment 	(1549, 766)

-					    label      	(object SegLabel @2273

-						Parent_View 	@2271

-						location   	(1440, 734)

+					    origin_attachment 	(1073, 786)

+					    terminal_attachment 	(1549, 786)

+					    label      	(object SegLabel @2274

+						Parent_View 	@2272

+						location   	(1440, 754)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52514,9 +52274,9 @@
 						pctDist    	0.771008

 						height     	33

 						orientation 	0)

-					    label      	(object SegLabel @2274

-						Parent_View 	@2271

-						location   	(1241, 808)

+					    label      	(object SegLabel @2275

+						Parent_View 	@2272

+						location   	(1241, 828)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52535,9 +52295,9 @@
 						pctDist    	0.355042

 						height     	42

 						orientation 	1))

-					(object RoleView "ownedOperation" @2275

-					    Parent_View 	@2269

-					    location   	(-1934, -970)

+					(object RoleView "ownedOperation" @2276

+					    Parent_View 	@2270

+					    location   	(-1934, -950)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -52547,9 +52307,9 @@
 						strike     	FALSE

 						color      	0

 						default_color 	TRUE)

-					    label      	(object SegLabel @2276

-						Parent_View 	@2275

-						location   	(814, 724)

+					    label      	(object SegLabel @2277

+						Parent_View 	@2276

+						location   	(814, 744)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52570,14 +52330,14 @@
 						orientation 	1)

 					    stereotype 	TRUE

 					    quidu      	"3B71EAE7005C"

-					    client     	@2269

-					    supplier   	@2238

+					    client     	@2270

+					    supplier   	@2239

 					    line_style 	3

-					    origin_attachment 	(1073, 766)

-					    terminal_attachment 	(598, 766)

-					    label      	(object SegLabel @2277

-						Parent_View 	@2275

-						location   	(662, 807)

+					    origin_attachment 	(1073, 786)

+					    terminal_attachment 	(598, 786)

+					    label      	(object SegLabel @2278

+						Parent_View 	@2276

+						location   	(662, 827)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52596,9 +52356,9 @@
 						pctDist    	0.867368

 						height     	41

 						orientation 	0)

-					    label      	(object SegLabel @2278

-						Parent_View 	@2275

-						location   	(812, 671)

+					    label      	(object SegLabel @2279

+						Parent_View 	@2276

+						location   	(812, 691)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52617,8 +52377,8 @@
 						pctDist    	0.549474

 						height     	96

 						orientation 	1))))

-				(object AssociationViewNew "$UNNAMED$358" @2279

-				    location   	(1761, 1002)

+				(object AssociationViewNew "$UNNAMED$358" @2280

+				    location   	(1753, 1001)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -52631,9 +52391,9 @@
 				    stereotype 	TRUE

 				    quidu      	"3BD88A4A0251"

 				    roleview_list 	(list RoleViews

-					(object RoleView "contract" @2280

-					    Parent_View 	@2279

-					    location   	(213, -246)

+					(object RoleView "contract" @2281

+					    Parent_View 	@2280

+					    location   	(205, -247)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -52643,9 +52403,9 @@
 						strike     	FALSE

 						color      	0

 						default_color 	TRUE)

-					    label      	(object SegLabel @2281

-						Parent_View 	@2280

-						location   	(1655, 901)

+					    label      	(object SegLabel @2282

+						Parent_View 	@2281

+						location   	(1647, 900)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52667,14 +52427,14 @@
 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3BD88A54022D"

-					    client     	@2279

-					    supplier   	@2251

+					    client     	@2280

+					    supplier   	@2252

 					    line_style 	3

-					    origin_attachment 	(1761, 1002)

-					    terminal_attachment 	(1761, 852)

-					    label      	(object SegLabel @2282

-						Parent_View 	@2280

-						location   	(1815, 906)

+					    origin_attachment 	(1753, 1001)

+					    terminal_attachment 	(1753, 852)

+					    label      	(object SegLabel @2283

+						Parent_View 	@2281

+						location   	(1807, 905)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52693,9 +52453,9 @@
 						pctDist    	0.645455

 						height     	54

 						orientation 	1)

-					    label      	(object SegLabel @2283

-						Parent_View 	@2280

-						location   	(1438, 946)

+					    label      	(object SegLabel @2284

+						Parent_View 	@2281

+						location   	(1430, 945)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52714,9 +52474,9 @@
 						pctDist    	0.380000

 						height     	324

 						orientation 	0))

-					(object RoleView "$UNNAMED$359" @2284

-					    Parent_View 	@2279

-					    location   	(213, -246)

+					(object RoleView "$UNNAMED$359" @2285

+					    Parent_View 	@2280

+					    location   	(205, -247)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -52729,14 +52489,14 @@
 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3BD88A55006C"

-					    client     	@2279

-					    supplier   	@2239

+					    client     	@2280

+					    supplier   	@2240

 					    line_style 	3

-					    origin_attachment 	(1761, 1002)

-					    terminal_attachment 	(1761, 1152)

-					    label      	(object SegLabel @2285

-						Parent_View 	@2284

-						location   	(1809, 1110)

+					    origin_attachment 	(1753, 1001)

+					    terminal_attachment 	(1753, 1151)

+					    label      	(object SegLabel @2286

+						Parent_View 	@2285

+						location   	(1801, 1109)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -52755,39 +52515,11 @@
 						pctDist    	0.718182

 						height     	48

 						orientation 	0))))

-				(object ClassView "Class" "Logical View::UML::Classes::Kernel::Classifier" @2286

-				    ShowCompartmentStereotypes 	TRUE

-				    SuppressAttribute 	TRUE

-				    SuppressOperation 	TRUE

-				    IncludeAttribute 	TRUE

-				    IncludeOperation 	TRUE

-				    location   	(1770, 190)

-				    font       	(object Font

-					size       	10

-					face       	"Arial"

-					bold       	FALSE

-					italics    	TRUE

-					underline  	FALSE

-					strike     	FALSE

-					color      	0

-					default_color 	TRUE)

-				    label      	(object ItemLabel

-					Parent_View 	@2286

-					location   	(1564, 124)

-					nlines     	1

-					max_width  	413

-					justify    	0

-					label      	"Classifier")

-				    icon_style 	"Icon"

-				    quidu      	"3CAAECE80199"

-				    width      	431

-				    height     	156

-				    annotation 	8)

 				(object InheritView "" @2287

 				    stereotype 	TRUE

 				    quidu      	"3342A19C01ED"

-				    client     	@2251

-				    supplier   	@2286

+				    client     	@2252

+				    supplier   	@2251

 				    line_style 	3

 				    origin_attachment 	(1759, 408)

 				    terminal_attachment 	(1759, 268))

@@ -52843,7 +52575,7 @@
 					    line_color 	3342489

 					    quidu      	"40AB74F6012B"

 					    client     	@2288

-					    supplier   	@2286

+					    supplier   	@2251

 					    vertices   	(list Points

 						(2306, 411)

 						(2306, 191)

@@ -52931,7 +52663,7 @@
 					    line_color 	3342489

 					    quidu      	"40AB74F60154"

 					    client     	@2288

-					    supplier   	@2251

+					    supplier   	@2252

 					    vertices   	(list Points

 						(2306, 411)

 						(2306, 628)

@@ -52970,6 +52702,7 @@
 		    logical_models 	(list unit_reference_list

 			(object Class "Permission"

 			    quid       	"33F5A6AA03CA"

+			    documentation 	"A Permission signifies granting of access rights from the supplier model element to a client model element. Or to put it another way, it signifies that the client requires access to some or all of the constituent elements of the supplier. The supplier element gives the client permission to access some or all of its constituents elements. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"33F5A6BB00DC"

@@ -52978,6 +52711,7 @@
 			    language   	"none")

 			(object Class "Usage"

 			    quid       	"33E8FEF701E0"

+			    documentation 	"A usage is a relationship in which one element requires another element (or set of elements) for its full implementation or operation. In the metamodel, a Usage is a Dependency in which the client requires the presence of the supplier. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"33E8FF070082"

@@ -52986,6 +52720,7 @@
 			    language   	"none")

 			(object Class "Abstraction"

 			    quid       	"3388FE7D006E"

+			    documentation 	"An abstraction is a relationship that relates two elements or sets of elements that represent the same concept at different levels of abstraction or from different viewpoints. (See also, the definition of abstration in the Glossary.) In the metamodel, an Abstraction is a Dependency in which there is a mapping between the supplier and the client. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3388FE87006E"

@@ -52994,6 +52729,7 @@
 			    language   	"none")

 			(object Class "Dependency"

 			    quid       	"327A646F00E6"

+			    documentation 	"A dependency is a relationship that signifies that a single or a set of model elements requires other model elements for their specification or implementation. This means that the complete semantics of the depending elements is either semantically or structurally dependent on the definition of the supplier element(s). "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3388FB030096"

@@ -53006,6 +52742,7 @@
 			    language   	"none")

 			(object Class "Realization"

 			    quid       	"3B71F6410244"

+			    documentation 	"In the metamodel, a Realization is a subtype of Dependencies::Realization. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3B71F662024E"

@@ -53013,6 +52750,7 @@
 				    quidu      	"3388FE7D006E")))

 			(object Class "Substitution"

 			    quid       	"3CC0E11001C4"

+			    documentation 	"A substitution is a relationship between two classifiers signifies that the substitutingClassifier complies with the contract specified by the contract classifier. This implies that instances of the substitutingClassifier are runtime substitutable where instances of the contract classifier are expected. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3CC0E11001C5"

@@ -53269,7 +53007,7 @@
 				    height     	300

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$367" @2301

-				    location   	(1856, 1747)

+				    location   	(1856, 1851)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -53284,7 +53022,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "contract" @2302

 					    Parent_View 	@2301

-					    location   	(824, -683)

+					    location   	(824, -579)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -53296,7 +53034,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2303

 						Parent_View 	@2302

-						location   	(2171, 1657)

+						location   	(2171, 1761)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53320,11 +53058,11 @@
 					    client     	@2301

 					    supplier   	@2300

 					    line_style 	3

-					    origin_attachment 	(1856, 1747)

-					    terminal_attachment 	(2302, 1747)

+					    origin_attachment 	(1856, 1851)

+					    terminal_attachment 	(2302, 1851)

 					    label      	(object SegLabel @2304

 						Parent_View 	@2302

-						location   	(2260, 1782)

+						location   	(2260, 1886)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53345,7 +53083,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2305

 						Parent_View 	@2302

-						location   	(1976, 1705)

+						location   	(1976, 1809)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53366,7 +53104,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$368" @2306

 					    Parent_View 	@2301

-					    location   	(824, -683)

+					    location   	(824, -579)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -53381,11 +53119,11 @@
 					    client     	@2301

 					    supplier   	@2299

 					    line_style 	3

-					    origin_attachment 	(1856, 1747)

-					    terminal_attachment 	(1410, 1747)

+					    origin_attachment 	(1856, 1851)

+					    terminal_attachment 	(1410, 1851)

 					    label      	(object SegLabel @2307

 						Parent_View 	@2306

-						location   	(1454, 1789)

+						location   	(1454, 1893)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53405,7 +53143,7 @@
 						height     	42

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$369" @2308

-				    location   	(1856, 1962)

+				    location   	(1856, 1851)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -53420,7 +53158,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "substitution" @2309

 					    Parent_View 	@2308

-					    location   	(-814, -492)

+					    location   	(-814, -603)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -53432,7 +53170,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2310

 						Parent_View 	@2309

-						location   	(1532, 2012)

+						location   	(1532, 1901)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53456,11 +53194,11 @@
 					    client     	@2308

 					    supplier   	@2299

 					    line_style 	3

-					    origin_attachment 	(1856, 1962)

-					    terminal_attachment 	(1410, 1962)

+					    origin_attachment 	(1856, 1851)

+					    terminal_attachment 	(1410, 1851)

 					    label      	(object SegLabel @2311

 						Parent_View 	@2309

-						location   	(1455, 1945)

+						location   	(1455, 1834)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53481,7 +53219,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2312

 						Parent_View 	@2309

-						location   	(1910, 2057)

+						location   	(1910, 1946)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53502,7 +53240,7 @@
 						orientation 	0))

 					(object RoleView "substitutingClassifier" @2313

 					    Parent_View 	@2308

-					    location   	(-814, -492)

+					    location   	(-814, -603)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -53514,7 +53252,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2314

 						Parent_View 	@2313

-						location   	(2057, 1873)

+						location   	(2057, 1762)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53538,11 +53276,11 @@
 					    client     	@2308

 					    supplier   	@2300

 					    line_style 	3

-					    origin_attachment 	(1856, 1962)

-					    terminal_attachment 	(2302, 1962)

+					    origin_attachment 	(1856, 1851)

+					    terminal_attachment 	(2302, 1851)

 					    label      	(object SegLabel @2315

 						Parent_View 	@2313

-						location   	(2257, 2016)

+						location   	(2257, 1905)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53563,7 +53301,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2316

 						Parent_View 	@2313

-						location   	(1975, 1921)

+						location   	(1975, 1810)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53682,7 +53420,7 @@
 				    origin_attachment 	(1134, 1363)

 				    terminal_attachment 	(1134, 1206))

 				(object AssociationViewNew "$UNNAMED$365" @2322

-				    location   	(734, 1109)

+				    location   	(734, 1116)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -53697,7 +53435,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "mapping" @2323

 					    Parent_View 	@2322

-					    location   	(-700, -373)

+					    location   	(-700, -366)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -53709,7 +53447,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2324

 						Parent_View 	@2323

-						location   	(661, 1167)

+						location   	(661, 1174)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53733,11 +53471,11 @@
 					    client     	@2322

 					    supplier   	@2319

 					    line_style 	3

-					    origin_attachment 	(734, 1109)

-					    terminal_attachment 	(561, 1109)

+					    origin_attachment 	(734, 1116)

+					    terminal_attachment 	(561, 1116)

 					    label      	(object SegLabel @2325

 						Parent_View 	@2323

-						location   	(603, 1057)

+						location   	(603, 1064)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53758,7 +53496,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2326

 						Parent_View 	@2323

-						location   	(544, 1223)

+						location   	(544, 1230)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53779,7 +53517,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$366" @2327

 					    Parent_View 	@2322

-					    location   	(-700, -373)

+					    location   	(-700, -366)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -53794,11 +53532,11 @@
 					    client     	@2322

 					    supplier   	@2320

 					    line_style 	3

-					    origin_attachment 	(734, 1109)

-					    terminal_attachment 	(908, 1109)

+					    origin_attachment 	(734, 1116)

+					    terminal_attachment 	(908, 1116)

 					    label      	(object SegLabel @2328

 						Parent_View 	@2327

-						location   	(873, 1056)

+						location   	(873, 1063)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53911,7 +53649,7 @@
 				    height     	231

 				    annotation 	8)

 				(object AssociationViewNew "L" @2336

-				    location   	(1066, 716)

+				    location   	(1066, 648)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -53927,7 +53665,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "clientDependency" @2337

 					    Parent_View 	@2336

-					    location   	(694, 158)

+					    location   	(694, 90)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -53939,7 +53677,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2338

 						Parent_View 	@2337

-						location   	(1232, 683)

+						location   	(1232, 615)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53964,11 +53702,11 @@
 					    client     	@2336

 					    supplier   	@2330

 					    line_style 	3

-					    origin_attachment 	(1066, 716)

-					    terminal_attachment 	(1440, 716)

+					    origin_attachment 	(1066, 648)

+					    terminal_attachment 	(1440, 648)

 					    label      	(object SegLabel @2339

 						Parent_View 	@2337

-						location   	(1403, 770)

+						location   	(1403, 702)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -53989,7 +53727,7 @@
 						orientation 	1))

 					(object RoleView "client" @2340

 					    Parent_View 	@2336

-					    location   	(694, 158)

+					    location   	(694, 90)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -54001,7 +53739,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2341

 						Parent_View 	@2340

-						location   	(769, 677)

+						location   	(769, 609)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -54026,11 +53764,11 @@
 					    client     	@2336

 					    supplier   	@2335

 					    line_style 	3

-					    origin_attachment 	(1066, 716)

-					    terminal_attachment 	(692, 716)

+					    origin_attachment 	(1066, 648)

+					    terminal_attachment 	(692, 648)

 					    label      	(object SegLabel @2342

 						Parent_View 	@2340

-						location   	(762, 770)

+						location   	(762, 702)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -54050,14 +53788,14 @@
 						height     	54

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$364" @2343

-				    location   	(1066, 566)

+				    location   	(1066, 648)

 				    stereotype 	TRUE

 				    line_color 	3342489

 				    quidu      	"3AFF021B0000"

 				    roleview_list 	(list RoleViews

 					(object RoleView "supplierDependency" @2344

 					    Parent_View 	@2343

-					    location   	(694, 8)

+					    location   	(694, 90)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -54069,7 +53807,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2345

 						Parent_View 	@2344

-						location   	(1207, 528)

+						location   	(1207, 610)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -54094,11 +53832,11 @@
 					    client     	@2343

 					    supplier   	@2330

 					    line_style 	3

-					    origin_attachment 	(1066, 566)

-					    terminal_attachment 	(1440, 566)

+					    origin_attachment 	(1066, 648)

+					    terminal_attachment 	(1440, 648)

 					    label      	(object SegLabel @2346

 						Parent_View 	@2344

-						location   	(1391, 611)

+						location   	(1391, 693)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -54119,7 +53857,7 @@
 						orientation 	1))

 					(object RoleView "supplier" @2347

 					    Parent_View 	@2343

-					    location   	(694, 8)

+					    location   	(694, 90)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -54131,7 +53869,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2348

 						Parent_View 	@2347

-						location   	(800, 526)

+						location   	(800, 608)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -54156,11 +53894,11 @@
 					    client     	@2343

 					    supplier   	@2335

 					    line_style 	3

-					    origin_attachment 	(1066, 566)

-					    terminal_attachment 	(692, 566)

+					    origin_attachment 	(1066, 648)

+					    terminal_attachment 	(692, 648)

 					    label      	(object SegLabel @2349

 						Parent_View 	@2347

-						location   	(762, 590)

+						location   	(762, 672)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -54299,6 +54037,7 @@
 		    logical_models 	(list unit_reference_list

 			(object Class "GeneralizationSet"

 			    quid       	"3D7655AD029F"

+			    documentation 	"Each Generalization is a binary relationship that relates a specific Classifier to a more general Classifier (i.e., a subclass). Each GeneralizationSet defines a particular set of Generalization relationships that describe the way in which a specific Classifier "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3D76566502E1"

@@ -54307,12 +54046,10 @@
 			    class_attributes 	(list class_attribute_list

 				(object ClassAttribute "isCovering"

 				    quid       	"3D7656240161"

-				    type       	"Boolean"

-				    quidu      	"3CA010AC0090")

+				    type       	"Boolean")

 				(object ClassAttribute "isDisjoint"

 				    quid       	"3D7656340222"

-				    type       	"Boolean"

-				    quidu      	"3CA010AC0090")))

+				    type       	"Boolean")))

 			(object Class "Classifier"

 			    quid       	"3D7655C4007B"

 			    superclasses 	(list inheritance_relationship_list

@@ -54423,22 +54160,6 @@
 					label      	"GeneralizationSet")

 				    icon_style 	"Icon"

 				    quidu      	"3D7655AD029F"

-				    compartment 	(object Compartment

-					Parent_View 	@2357

-					location   	(881, 1245)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	2

-					max_width  	315)

 				    width      	406

 				    height     	224)

 				(object AssociationViewNew "$UNNAMED$370" @2358

@@ -54798,7 +54519,7 @@
 				    height     	440

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$265" @2375

-				    location   	(1205, 215)

+				    location   	(1205, 330)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -54813,7 +54534,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "generalization" @2376

 					    Parent_View 	@2375

-					    location   	(-1055, -473)

+					    location   	(-1055, -358)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -54825,7 +54546,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2377

 						Parent_View 	@2376

-						location   	(1414, 157)

+						location   	(1414, 272)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -54849,11 +54570,11 @@
 					    client     	@2375

 					    supplier   	@2374

 					    line_style 	3

-					    origin_attachment 	(1205, 215)

-					    terminal_attachment 	(1602, 215)

+					    origin_attachment 	(1205, 330)

+					    terminal_attachment 	(1602, 330)

 					    label      	(object SegLabel @2378

 						Parent_View 	@2376

-						location   	(1565, 166)

+						location   	(1565, 281)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -54874,7 +54595,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2379

 						Parent_View 	@2376

-						location   	(1410, 269)

+						location   	(1410, 384)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -54895,7 +54616,7 @@
 						orientation 	1))

 					(object RoleView "specific" @2380

 					    Parent_View 	@2375

-					    location   	(-1055, -473)

+					    location   	(-1055, -358)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -54907,7 +54628,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2381

 						Parent_View 	@2380

-						location   	(985, 161)

+						location   	(985, 276)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -54931,11 +54652,11 @@
 					    client     	@2375

 					    supplier   	@2373

 					    line_style 	3

-					    origin_attachment 	(1205, 215)

-					    terminal_attachment 	(809, 215)

+					    origin_attachment 	(1205, 330)

+					    terminal_attachment 	(809, 330)

 					    label      	(object SegLabel @2382

 						Parent_View 	@2380

-						location   	(883, 158)

+						location   	(883, 273)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -54956,7 +54677,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2383

 						Parent_View 	@2380

-						location   	(996, 291)

+						location   	(996, 406)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -54979,7 +54700,7 @@
 						height     	76

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$266" @2384

-				    location   	(1205, 480)

+				    location   	(1205, 330)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -54994,7 +54715,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "general" @2385

 					    Parent_View 	@2384

-					    location   	(-2195, -208)

+					    location   	(-2195, -358)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -55006,7 +54727,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2386

 						Parent_View 	@2385

-						location   	(992, 431)

+						location   	(992, 281)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -55030,11 +54751,11 @@
 					    client     	@2384

 					    supplier   	@2373

 					    line_style 	3

-					    origin_attachment 	(1205, 480)

-					    terminal_attachment 	(809, 480)

+					    origin_attachment 	(1205, 330)

+					    terminal_attachment 	(809, 330)

 					    label      	(object SegLabel @2387

 						Parent_View 	@2385

-						location   	(885, 434)

+						location   	(885, 284)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -55055,7 +54776,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2388

 						Parent_View 	@2385

-						location   	(990, 519)

+						location   	(990, 369)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -55076,7 +54797,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$267" @2389

 					    Parent_View 	@2384

-					    location   	(-2195, -208)

+					    location   	(-2195, -358)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -55088,7 +54809,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2390

 						Parent_View 	@2389

-						location   	(1418, 442)

+						location   	(1418, 292)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -55113,8 +54834,8 @@
 					    client     	@2384

 					    supplier   	@2374

 					    line_style 	3

-					    origin_attachment 	(1205, 480)

-					    terminal_attachment 	(1602, 480))))

+					    origin_attachment 	(1205, 330)

+					    terminal_attachment 	(1602, 330))))

 				(object InheritView "" @2391

 				    stereotype 	TRUE

 				    quidu      	"3D765A4201E8"

@@ -55177,6 +54898,7 @@
 		    logical_models 	(list unit_reference_list

 			(object Class "AssociationClass"

 			    quid       	"33657990026C"

+			    documentation 	"In the metamodel, an AssociationClass is a declaration of a semantic relationship between Classifiers, which has a set of features of its own. AssociationClass is both an Association and a Class. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"33FF559B008C"

@@ -55377,13 +55099,13 @@
 				    height     	131

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$372" @2402

-				    location   	(966, 459)

+				    location   	(966, 471)

 				    stereotype 	TRUE

 				    quidu      	"33DBE5050028"

 				    roleview_list 	(list RoleViews

 					(object RoleView "associationEnd" @2403

 					    Parent_View 	@2402

-					    location   	(-894, -688)

+					    location   	(-894, -676)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -55395,7 +55117,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2404

 						Parent_View 	@2403

-						location   	(1224, 409)

+						location   	(1224, 421)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -55419,11 +55141,11 @@
 					    client     	@2402

 					    supplier   	@2400

 					    line_style 	3

-					    origin_attachment 	(966, 459)

-					    terminal_attachment 	(1449, 459)

+					    origin_attachment 	(966, 471)

+					    terminal_attachment 	(1449, 471)

 					    label      	(object SegLabel @2405

 						Parent_View 	@2403

-						location   	(1375, 519)

+						location   	(1375, 531)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -55444,7 +55166,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2406

 						Parent_View 	@2403

-						location   	(1282, 566)

+						location   	(1282, 578)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -55465,7 +55187,7 @@
 						orientation 	1))

 					(object RoleView "qualifier" @2407

 					    Parent_View 	@2402

-					    location   	(-894, -688)

+					    location   	(-894, -676)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -55477,7 +55199,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2408

 						Parent_View 	@2407

-						location   	(623, 395)

+						location   	(623, 407)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -55501,11 +55223,11 @@
 					    client     	@2402

 					    supplier   	@2401

 					    line_style 	3

-					    origin_attachment 	(966, 459)

-					    terminal_attachment 	(483, 459)

+					    origin_attachment 	(966, 471)

+					    terminal_attachment 	(483, 471)

 					    label      	(object SegLabel @2409

 						Parent_View 	@2407

-						location   	(541, 514)

+						location   	(541, 526)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -55526,7 +55248,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2410

 						Parent_View 	@2407

-						location   	(737, 570)

+						location   	(737, 582)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -56102,13 +55824,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$373" @2433

-				    location   	(1009, 784)

+				    location   	(1009, 786)

 				    stereotype 	TRUE

 				    quidu      	"3E0252E500C7"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$374" @2434

 					    Parent_View 	@2433

-					    location   	(-233, 28)

+					    location   	(-233, 30)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -56120,7 +55842,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2435

 						Parent_View 	@2434

-						location   	(756, 743)

+						location   	(756, 745)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56145,11 +55867,11 @@
 					    client     	@2433

 					    supplier   	@2431

 					    line_style 	3

-					    origin_attachment 	(1009, 784)

-					    terminal_attachment 	(691, 784)

+					    origin_attachment 	(1009, 786)

+					    terminal_attachment 	(691, 786)

 					    label      	(object SegLabel @2436

 						Parent_View 	@2434

-						location   	(723, 838)

+						location   	(723, 840)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56170,7 +55892,7 @@
 						orientation 	0))

 					(object RoleView "ownedMember" @2437

 					    Parent_View 	@2433

-					    location   	(-233, 28)

+					    location   	(-233, 30)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -56182,7 +55904,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2438

 						Parent_View 	@2437

-						location   	(1108, 742)

+						location   	(1108, 744)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56206,11 +55928,11 @@
 					    client     	@2433

 					    supplier   	@2432

 					    line_style 	3

-					    origin_attachment 	(1009, 784)

-					    terminal_attachment 	(1327, 784)

+					    origin_attachment 	(1009, 786)

+					    terminal_attachment 	(1327, 786)

 					    label      	(object SegLabel @2439

 						Parent_View 	@2437

-						location   	(1288, 834)

+						location   	(1288, 836)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56231,7 +55953,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2440

 						Parent_View 	@2437

-						location   	(1061, 827)

+						location   	(1061, 829)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56281,7 +56003,6 @@
 				(object ClassAttribute "isIndirectlyInstantiated"

 				    quid       	"3E02573803AE"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    exportControl 	"Public")))

 			(object Class "Realization"

 			    quid       	"3E02572A001E"

@@ -56504,7 +56225,7 @@
 				    origin_attachment 	(353, 738)

 				    terminal_attachment 	(353, 524))

 				(object AssociationViewNew "$UNNAMED$375" @2446

-				    location   	(287, 1273)

+				    location   	(336, 1273)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -56519,7 +56240,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "/required" @2447

 					    Parent_View 	@2446

-					    location   	(-79, 595)

+					    location   	(-30, 595)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -56531,7 +56252,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2448

 						Parent_View 	@2447

-						location   	(194, 1382)

+						location   	(243, 1382)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56555,11 +56276,11 @@
 					    client     	@2446

 					    supplier   	@2443

 					    line_style 	3

-					    origin_attachment 	(287, 1273)

-					    terminal_attachment 	(287, 1473)

+					    origin_attachment 	(336, 1273)

+					    terminal_attachment 	(336, 1473)

 					    label      	(object SegLabel @2449

 						Parent_View 	@2447

-						location   	(234, 1452)

+						location   	(283, 1452)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56580,16 +56301,16 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$376" @2450

 					    Parent_View 	@2446

-					    location   	(-79, 595)

+					    location   	(-30, 595)

 					    stereotype 	TRUE

 					    quidu      	"3E0257890089"

 					    client     	@2446

 					    supplier   	@2444

 					    line_style 	3

-					    origin_attachment 	(287, 1273)

-					    terminal_attachment 	(287, 1074))))

+					    origin_attachment 	(336, 1273)

+					    terminal_attachment 	(336, 1074))))

 				(object AssociationViewNew "$UNNAMED$377" @2451

-				    location   	(384, 1273)

+				    location   	(336, 1273)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -56604,7 +56325,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "/provided" @2452

 					    Parent_View 	@2451

-					    location   	(18, 595)

+					    location   	(-30, 595)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -56616,7 +56337,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2453

 						Parent_View 	@2452

-						location   	(563, 1410)

+						location   	(515, 1410)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56640,11 +56361,11 @@
 					    client     	@2451

 					    supplier   	@2443

 					    line_style 	3

-					    origin_attachment 	(384, 1273)

-					    terminal_attachment 	(384, 1473)

+					    origin_attachment 	(336, 1273)

+					    terminal_attachment 	(336, 1473)

 					    label      	(object SegLabel @2454

 						Parent_View 	@2452

-						location   	(331, 1452)

+						location   	(283, 1452)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56665,14 +56386,14 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$378" @2455

 					    Parent_View 	@2451

-					    location   	(18, 595)

+					    location   	(-30, 595)

 					    stereotype 	TRUE

 					    quidu      	"3E0257B902D7"

 					    client     	@2451

 					    supplier   	@2444

 					    line_style 	3

-					    origin_attachment 	(384, 1273)

-					    terminal_attachment 	(384, 1074))))

+					    origin_attachment 	(336, 1273)

+					    terminal_attachment 	(336, 1074))))

 				(object ClassView "Class" "Logical View::UML::Classes::Kernel::Classifier" @2456

 				    SuppressAttribute 	TRUE

 				    SuppressOperation 	TRUE

@@ -56730,7 +56451,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$379" @2458

-				    location   	(1024, 956)

+				    location   	(1024, 966)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -56745,7 +56466,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "realization" @2459

 					    Parent_View 	@2458

-					    location   	(658, 200)

+					    location   	(658, 210)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -56757,7 +56478,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2460

 						Parent_View 	@2459

-						location   	(1278, 910)

+						location   	(1278, 920)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56781,11 +56502,11 @@
 					    client     	@2458

 					    supplier   	@2457

 					    line_style 	3

-					    origin_attachment 	(1024, 956)

-					    terminal_attachment 	(1423, 956)

+					    origin_attachment 	(1024, 966)

+					    terminal_attachment 	(1423, 966)

 					    label      	(object SegLabel @2461

 						Parent_View 	@2459

-						location   	(1383, 1010)

+						location   	(1383, 1020)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56806,7 +56527,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2462

 						Parent_View 	@2459

-						location   	(1182, 1032)

+						location   	(1182, 1042)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56830,7 +56551,7 @@
 						orientation 	1))

 					(object RoleView "abstraction" @2463

 					    Parent_View 	@2458

-					    location   	(658, 200)

+					    location   	(658, 210)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -56842,7 +56563,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2464

 						Parent_View 	@2463

-						location   	(754, 916)

+						location   	(754, 926)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56866,11 +56587,11 @@
 					    client     	@2458

 					    supplier   	@2444

 					    line_style 	3

-					    origin_attachment 	(1024, 956)

-					    terminal_attachment 	(625, 956)

+					    origin_attachment 	(1024, 966)

+					    terminal_attachment 	(625, 966)

 					    label      	(object SegLabel @2465

 						Parent_View 	@2463

-						location   	(665, 1010)

+						location   	(665, 1020)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56891,7 +56612,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2466

 						Parent_View 	@2463

-						location   	(812, 1052)

+						location   	(812, 1062)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56915,7 +56636,7 @@
 						height     	96

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$380" @2467

-				    location   	(1877, 950)

+				    location   	(1877, 964)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -56930,7 +56651,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "realizingClassifier" @2468

 					    Parent_View 	@2467

-					    location   	(359, 68)

+					    location   	(359, 82)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -56942,7 +56663,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2469

 						Parent_View 	@2468

-						location   	(1910, 920)

+						location   	(1910, 934)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56966,11 +56687,11 @@
 					    client     	@2467

 					    supplier   	@2456

 					    line_style 	3

-					    origin_attachment 	(1877, 950)

-					    terminal_attachment 	(2106, 950)

+					    origin_attachment 	(1877, 964)

+					    terminal_attachment 	(2106, 964)

 					    label      	(object SegLabel @2470

 						Parent_View 	@2468

-						location   	(2082, 1004)

+						location   	(2082, 1018)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -56991,7 +56712,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2471

 						Parent_View 	@2468

-						location   	(1934, 1005)

+						location   	(1934, 1019)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -57015,14 +56736,14 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$381" @2472

 					    Parent_View 	@2467

-					    location   	(359, 68)

+					    location   	(359, 82)

 					    stereotype 	TRUE

 					    quidu      	"3E02589F00F7"

 					    client     	@2467

 					    supplier   	@2457

 					    line_style 	3

-					    origin_attachment 	(1877, 950)

-					    terminal_attachment 	(1649, 950))))))

+					    origin_attachment 	(1877, 964)

+					    terminal_attachment 	(1649, 964))))))

 			(object ClassDiagram "Connectors"

 			    quid       	"3E025955004F"

 			    title      	"Connectors"

@@ -57121,7 +56842,7 @@
 				    height     	112

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$382" @2476

-				    location   	(888, 606)

+				    location   	(888, 617)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -57136,7 +56857,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "contract" @2477

 					    Parent_View 	@2476

-					    location   	(390, -24)

+					    location   	(390, -13)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -57148,7 +56869,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2478

 						Parent_View 	@2477

-						location   	(1020, 567)

+						location   	(1020, 578)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -57172,11 +56893,11 @@
 					    client     	@2476

 					    supplier   	@2474

 					    line_style 	3

-					    origin_attachment 	(888, 606)

-					    terminal_attachment 	(1116, 606)

+					    origin_attachment 	(888, 617)

+					    terminal_attachment 	(1116, 617)

 					    label      	(object SegLabel @2479

 						Parent_View 	@2477

-						location   	(1093, 660)

+						location   	(1093, 671)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -57197,7 +56918,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$383" @2480

 					    Parent_View 	@2476

-					    location   	(390, -24)

+					    location   	(390, -13)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -57212,11 +56933,11 @@
 					    client     	@2476

 					    supplier   	@2475

 					    line_style 	3

-					    origin_attachment 	(888, 606)

-					    terminal_attachment 	(661, 606)

+					    origin_attachment 	(888, 617)

+					    terminal_attachment 	(661, 617)

 					    label      	(object SegLabel @2481

 						Parent_View 	@2480

-						location   	(707, 552)

+						location   	(707, 563)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -57487,12 +57208,10 @@
 				(object ClassAttribute "deploymentLocation"

 				    quid       	"3E023C610263"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public")

 				(object ClassAttribute "executionLocation"

 				    quid       	"3E023C6802FA"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public")))

 			(object Association "$UNNAMED$384"

 			    quid       	"3E023CB5000B"

@@ -57641,7 +57360,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$384" @2496

-				    location   	(1205, 675)

+				    location   	(1205, 682)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -57656,7 +57375,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "configuration" @2497

 					    Parent_View 	@2496

-					    location   	(455, -3)

+					    location   	(455, 4)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -57668,7 +57387,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2498

 						Parent_View 	@2497

-						location   	(1375, 641)

+						location   	(1375, 648)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -57692,11 +57411,11 @@
 					    client     	@2496

 					    supplier   	@2493

 					    line_style 	3

-					    origin_attachment 	(1205, 675)

-					    terminal_attachment 	(1549, 675)

+					    origin_attachment 	(1205, 682)

+					    terminal_attachment 	(1549, 682)

 					    label      	(object SegLabel @2499

 						Parent_View 	@2497

-						location   	(1515, 729)

+						location   	(1515, 736)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -57717,7 +57436,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2500

 						Parent_View 	@2497

-						location   	(1270, 717)

+						location   	(1270, 724)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -57738,7 +57457,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$385" @2501

 					    Parent_View 	@2496

-					    location   	(455, -3)

+					    location   	(455, 4)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -57753,11 +57472,11 @@
 					    client     	@2496

 					    supplier   	@2495

 					    line_style 	3

-					    origin_attachment 	(1205, 675)

-					    terminal_attachment 	(862, 675)

+					    origin_attachment 	(1205, 682)

+					    terminal_attachment 	(862, 682)

 					    label      	(object SegLabel @2502

 						Parent_View 	@2501

-						location   	(912, 729)

+						location   	(912, 736)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -58527,7 +58246,7 @@
 				    origin_attachment 	(2004, 442)

 				    terminal_attachment 	(2004, 306))

 				(object AssociationViewNew "$UNNAMED$386" @2531

-				    location   	(2287, 476)

+				    location   	(2287, 481)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -58542,7 +58261,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "deployedArtifact" @2532

 					    Parent_View 	@2531

-					    location   	(1111, -514)

+					    location   	(1111, -509)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -58554,7 +58273,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2533

 						Parent_View 	@2532

-						location   	(2307, 426)

+						location   	(2307, 431)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -58578,11 +58297,11 @@
 					    client     	@2531

 					    supplier   	@2528

 					    line_style 	3

-					    origin_attachment 	(2287, 476)

-					    terminal_attachment 	(2429, 476)

+					    origin_attachment 	(2287, 481)

+					    terminal_attachment 	(2429, 481)

 					    label      	(object SegLabel @2534

 						Parent_View 	@2532

-						location   	(2414, 530)

+						location   	(2414, 535)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -58603,7 +58322,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2535

 						Parent_View 	@2532

-						location   	(2322, 360)

+						location   	(2322, 365)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -58627,7 +58346,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$387" @2536

 					    Parent_View 	@2531

-					    location   	(1111, -514)

+					    location   	(1111, -509)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -58642,11 +58361,11 @@
 					    client     	@2531

 					    supplier   	@2529

 					    line_style 	3

-					    origin_attachment 	(2287, 476)

-					    terminal_attachment 	(2146, 476)

+					    origin_attachment 	(2287, 481)

+					    terminal_attachment 	(2146, 481)

 					    label      	(object SegLabel @2537

 						Parent_View 	@2536

-						location   	(2173, 515)

+						location   	(2173, 520)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -58724,7 +58443,7 @@
 				    supplier   	@2525

 				    line_style 	0)

 				(object AssociationViewNew "$UNNAMED$388" @2541

-				    location   	(1542, 469)

+				    location   	(1542, 481)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -58739,7 +58458,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "deployment" @2542

 					    Parent_View 	@2541

-					    location   	(666, 19)

+					    location   	(666, 31)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -58751,7 +58470,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2543

 						Parent_View 	@2542

-						location   	(1756, 429)

+						location   	(1756, 441)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -58775,11 +58494,11 @@
 					    client     	@2541

 					    supplier   	@2529

 					    line_style 	3

-					    origin_attachment 	(1542, 469)

-					    terminal_attachment 	(1874, 469)

+					    origin_attachment 	(1542, 481)

+					    terminal_attachment 	(1874, 481)

 					    label      	(object SegLabel @2544

 						Parent_View 	@2542

-						location   	(1853, 511)

+						location   	(1853, 523)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -58800,7 +58519,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2545

 						Parent_View 	@2542

-						location   	(1653, 367)

+						location   	(1653, 379)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -58824,7 +58543,7 @@
 						orientation 	0))

 					(object RoleView "location" @2546

 					    Parent_View 	@2541

-					    location   	(666, 19)

+					    location   	(666, 31)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -58836,7 +58555,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2547

 						Parent_View 	@2546

-						location   	(1271, 428)

+						location   	(1271, 440)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -58860,11 +58579,11 @@
 					    client     	@2541

 					    supplier   	@2539

 					    line_style 	3

-					    origin_attachment 	(1542, 469)

-					    terminal_attachment 	(1211, 469)

+					    origin_attachment 	(1542, 481)

+					    terminal_attachment 	(1211, 481)

 					    label      	(object SegLabel @2548

 						Parent_View 	@2546

-						location   	(1245, 523)

+						location   	(1245, 535)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -58885,7 +58604,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2549

 						Parent_View 	@2546

-						location   	(1412, 539)

+						location   	(1412, 551)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -59180,8 +58899,7 @@
 			    class_attributes 	(list class_attribute_list

 				(object ClassAttribute "fileName"

 				    quid       	"3E0330D40211"

-				    type       	"String"

-				    quidu      	"3CA010B103C3")))

+				    type       	"String")))

 			(object Class "Manifestation"

 			    quid       	"3E04533F02DA"

 			    superclasses 	(list inheritance_relationship_list

@@ -59771,7 +59489,7 @@
 					    origin_attachment 	(480, 880)

 					    terminal_attachment 	(778, 1002))))

 				(object AssociationViewNew "$UNNAMED$397" @2589

-				    location   	(1287, 1027)

+				    location   	(1287, 1020)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -59786,7 +59504,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "manifestation" @2590

 					    Parent_View 	@2589

-					    location   	(741, 263)

+					    location   	(741, 256)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -59798,7 +59516,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2591

 						Parent_View 	@2590

-						location   	(1336, 990)

+						location   	(1336, 983)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -59822,11 +59540,11 @@
 					    client     	@2589

 					    supplier   	@2571

 					    line_style 	3

-					    origin_attachment 	(1287, 1027)

-					    terminal_attachment 	(1481, 1027)

+					    origin_attachment 	(1287, 1020)

+					    terminal_attachment 	(1481, 1020)

 					    label      	(object SegLabel @2592

 						Parent_View 	@2590

-						location   	(1460, 1063)

+						location   	(1460, 1056)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -59847,7 +59565,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2593

 						Parent_View 	@2590

-						location   	(1321, 912)

+						location   	(1321, 905)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -59871,7 +59589,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$398" @2594

 					    Parent_View 	@2589

-					    location   	(741, 263)

+					    location   	(741, 256)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -59883,7 +59601,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2595

 						Parent_View 	@2594

-						location   	(1134, 986)

+						location   	(1134, 979)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -59908,11 +59626,11 @@
 					    client     	@2589

 					    supplier   	@2582

 					    line_style 	3

-					    origin_attachment 	(1287, 1027)

-					    terminal_attachment 	(1094, 1027)

+					    origin_attachment 	(1287, 1020)

+					    terminal_attachment 	(1094, 1020)

 					    label      	(object SegLabel @2596

 						Parent_View 	@2594

-						location   	(1162, 1075)

+						location   	(1162, 1068)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -59932,7 +59650,7 @@
 						height     	48

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$401" @2597

-				    location   	(1034, 1197)

+				    location   	(1019, 1197)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -59944,7 +59662,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @2598

 					Parent_View 	@2597

-					location   	(1034, 1138)

+					location   	(1019, 1138)

 					font       	(object Font

 					    size       	8

 					    face       	"Arial"

@@ -59969,7 +59687,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "ownedAttribute" @2599

 					    Parent_View 	@2597

-					    location   	(488, 435)

+					    location   	(473, 435)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -59981,7 +59699,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2600

 						Parent_View 	@2599

-						location   	(1179, 1278)

+						location   	(1164, 1278)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -60005,11 +59723,11 @@
 					    client     	@2597

 					    supplier   	@2580

 					    line_style 	3

-					    origin_attachment 	(1034, 1197)

-					    terminal_attachment 	(1034, 1337)

+					    origin_attachment 	(1019, 1197)

+					    terminal_attachment 	(1019, 1337)

 					    label      	(object SegLabel @2601

 						Parent_View 	@2599

-						location   	(999, 1297)

+						location   	(984, 1297)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -60030,7 +59748,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2602

 						Parent_View 	@2599

-						location   	(1494, 1317)

+						location   	(1479, 1317)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -60051,7 +59769,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$402" @2603

 					    Parent_View 	@2597

-					    location   	(488, 435)

+					    location   	(473, 435)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -60063,7 +59781,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2604

 						Parent_View 	@2603

-						location   	(1143, 1085)

+						location   	(1128, 1085)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -60088,11 +59806,11 @@
 					    client     	@2597

 					    supplier   	@2582

 					    line_style 	3

-					    origin_attachment 	(1034, 1197)

-					    terminal_attachment 	(1034, 1057)

+					    origin_attachment 	(1019, 1197)

+					    terminal_attachment 	(1019, 1058)

 					    label      	(object SegLabel @2605

 						Parent_View 	@2603

-						location   	(970, 1092)

+						location   	(955, 1092)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -60113,7 +59831,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2606

 						Parent_View 	@2603

-						location   	(1229, 1174)

+						location   	(1214, 1174)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -60137,7 +59855,7 @@
 						height     	195

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$399" @2607

-				    location   	(818, 1197)

+				    location   	(836, 1197)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -60152,7 +59870,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "ownedOperation" @2608

 					    Parent_View 	@2607

-					    location   	(272, 435)

+					    location   	(290, 435)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -60164,7 +59882,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2609

 						Parent_View 	@2608

-						location   	(660, 1298)

+						location   	(678, 1298)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -60188,11 +59906,11 @@
 					    client     	@2607

 					    supplier   	@2581

 					    line_style 	3

-					    origin_attachment 	(818, 1197)

-					    terminal_attachment 	(818, 1337)

+					    origin_attachment 	(836, 1197)

+					    terminal_attachment 	(836, 1337)

 					    label      	(object SegLabel @2610

 						Parent_View 	@2608

-						location   	(862, 1310)

+						location   	(880, 1310)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -60213,7 +59931,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2611

 						Parent_View 	@2608

-						location   	(428, 1247)

+						location   	(446, 1247)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -60234,7 +59952,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$400" @2612

 					    Parent_View 	@2607

-					    location   	(272, 435)

+					    location   	(290, 435)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -60246,7 +59964,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2613

 						Parent_View 	@2612

-						location   	(456, 1040)

+						location   	(474, 1040)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -60271,11 +59989,11 @@
 					    client     	@2607

 					    supplier   	@2582

 					    line_style 	3

-					    origin_attachment 	(818, 1197)

-					    terminal_attachment 	(818, 1058)

+					    origin_attachment 	(836, 1197)

+					    terminal_attachment 	(836, 1057)

 					    label      	(object SegLabel @2614

 						Parent_View 	@2612

-						location   	(877, 1094)

+						location   	(895, 1094)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -60296,7 +60014,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2615

 						Parent_View 	@2612

-						location   	(574, 1119)

+						location   	(592, 1119)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -60666,6 +60384,7 @@
 	    logical_models 	(list unit_reference_list

 		(object Class "Actor"

 		    quid       	"33656C0B017C"

+		    documentation 	"An Actor models a type of role played by an entity that interacts with the subject (e.g., by exchanging signals and data), "

 		    superclasses 	(list inheritance_relationship_list

 			(object Inheritance_Relationship

 			    quid       	"3D289995018F"

@@ -60711,6 +60430,7 @@
 			    name       	"ConstructorIs"

 			    value      	("Ctor_Set" 62)))

 		    quid       	"35FDD683021C"

+		    documentation 	"This relationship specifies that the behavior of a use case may be extended by the behavior of another (usually supplementary) use case. The extension takes place at one or more specific extension points defined in the extended use case. Note, however, that the extended use case is defined independently of the extending use case and is meaningful independently of the extending use case. On the other hand, the extending use case typically defines behavior that may not necessarily be meaningful by itself. Instead, the extending use case defines a set of modular behavior increments that augment an execution of the extended use case under specific conditions. Note that the same extending use case can extend more than one use case. Furthermore, an extending use case may itself be extended. "

 		    superclasses 	(list inheritance_relationship_list

 			(object Inheritance_Relationship

 			    attributes 	(list Attribute_Set)

@@ -60736,6 +60456,7 @@
 		    language   	"Java")

 		(object Class "UseCase"

 		    quid       	"3C1F02440042"

+		    documentation 	"A UseCase is a kind of behaviored classifier that represents a declaration of an offered behavior. Each use case specifies some behavior, possibly including variants, that the subject can perform in collaboration with one or more actors. Use cases define the offered behavior of the subject without reference to its internal structure. These behaviors, involving interactions between the actor and the subject, may result in changes to the state of the subject and communications with its environment. A use case can include possible variations of its basic behavior, including exceptional behavior and error handling. The subject of a use case could be a physical system or any other element that may have behavior, such as a component, subsystem or class. Each use case specifies a unit of useful functionality that the subject provides to its users, i.e., a specific way of interacting with the subject. This functionality, which is initiated by an actor, must always be completed for the use case to complete. It is deemed complete if, after its execution, the subject will be in a state in which no further inputs or actions are expected and the use case can be initiated again or in an error state. Use cases can be used both for specification of the (external) requirements on a subject and for the specification of the functionality offered by a subject. Moreover, the use cases also state the requirements the specified subject poses on its environment by defining how they should interact with the subject so that it will be able to perform its services. The behavior of a use case can be described by a specification that is some kind of Behavior (through its ownedBehavior relationship), such as interactions, activities, and state machines, or by pre-conditions and post-conditions as well as by natural language text where appropriate. It may also be described indirectly through a Collaboration that uses the use case and its actors as the classifiers that type its parts. Which of these techniques to use depends on the nature of the use case behavior as well as on the intended reader. These descriptions can be combined. An example of a use case with an associated state machine description is shown in Figure 405. "

 		    superclasses 	(list inheritance_relationship_list

 			(object Inheritance_Relationship

 			    quid       	"3C1F026D004B"

@@ -60743,6 +60464,7 @@
 			    quidu      	"3CC0D5FF02D3")))

 		(object Class "ExtensionPoint"

 		    quid       	"3C8C9E4B0284"

+		    documentation 	"An ExtensionPoint is a feature of a use case that identifies a point where the behavior of a use case can be augmented with elements of another (extending) use case. "

 		    superclasses 	(list inheritance_relationship_list

 			(object Inheritance_Relationship

 			    quid       	"3C8CA0D60140"

@@ -60750,6 +60472,7 @@
 			    quidu      	"3CAB007101D7")))

 		(object Class "Classifier"

 		    quid       	"3D2CCA7402DF"

+		    documentation 	"Extends a classifier with the capability to own use cases. Although the owning classifier typically represents the subject to which the owned use cases apply, this is not necessarily the case. In principle, the same use case can be applied to "

 		    superclasses 	(list inheritance_relationship_list

 			(object Inheritance_Relationship

 			    quid       	"3D2CCAFE00AD"

@@ -61088,7 +60811,51 @@
 			    width      	338

 			    height     	124

 			    annotation 	8)

-			(object ClassView "Class" "Logical View::UML::Classes::Kernel::Constraint" @2638

+			(object ClassView "Class" "Logical View::UML::Classes::Kernel::Classifier" @2638

+			    ShowCompartmentStereotypes 	TRUE

+			    SuppressAttribute 	TRUE

+			    SuppressOperation 	TRUE

+			    IncludeAttribute 	TRUE

+			    IncludeOperation 	TRUE

+			    location   	(2430, 174)

+			    font       	(object Font

+				size       	10

+				face       	"Arial"

+				bold       	FALSE

+				italics    	TRUE

+				underline  	FALSE

+				strike     	FALSE

+				color      	0

+				default_color 	TRUE)

+			    label      	(object ItemLabel

+				Parent_View 	@2638

+				location   	(2134, 119)

+				nlines     	1

+				max_width  	592

+				justify    	0

+				label      	"Classifier")

+			    icon_style 	"Label"

+			    fill_color 	16777215

+			    quidu      	"3CAAECE80199"

+			    width      	610

+			    height     	135

+			    annotation 	8)

+			(object InheritView "" @2639

+			    stereotype 	TRUE

+			    quidu      	"3D289995018F"

+			    client     	@2636

+			    supplier   	@2638

+			    line_style 	3

+			    origin_attachment 	(2642, 721)

+			    terminal_attachment 	(2642, 240))

+			(object InheritTreeView "" @2640

+			    location   	(1782, 1761)

+			    fill_color 	13434879

+			    supplier   	@2637

+			    vertices   	(list Points

+				(1782, 1761)

+				(1782, 1882)))

+			(object ClassView "Class" "Logical View::UML::Classes::Kernel::Constraint" @2641

 			    ShowCompartmentStereotypes 	TRUE

 			    SuppressAttribute 	TRUE

 			    SuppressOperation 	TRUE

@@ -61105,7 +60872,7 @@
 				color      	0

 				default_color 	TRUE)

 			    label      	(object ItemLabel

-				Parent_View 	@2638

+				Parent_View 	@2641

 				location   	(585, 1530)

 				nlines     	1

 				max_width  	270

@@ -61116,7 +60883,7 @@
 			    width      	288

 			    height     	131

 			    annotation 	8)

-			(object ClassView "Class" "Logical View::UML::UseCases::Include" @2639

+			(object ClassView "Class" "Logical View::UML::UseCases::Include" @2642

 			    ShowCompartmentStereotypes 	TRUE

 			    SuppressOperation 	TRUE

 			    IncludeAttribute 	TRUE

@@ -61132,7 +60899,7 @@
 				color      	0

 				default_color 	TRUE)

 			    label      	(object ItemLabel

-				Parent_View 	@2639

+				Parent_View 	@2642

 				location   	(1891, 1148)

 				nlines     	1

 				max_width  	370

@@ -61144,7 +60911,34 @@
 			    width      	388

 			    height     	138

 			    annotation 	8)

-			(object ClassView "Class" "Logical View::UML::UseCases::ExtensionPoint" @2640

+			(object InheritView "" @2643

+			    font       	(object Font

+				size       	10

+				face       	"Arial"

+				bold       	FALSE

+				italics    	FALSE

+				underline  	FALSE

+				strike     	FALSE

+				color      	0

+				default_color 	TRUE)

+			    stereotype 	TRUE

+			    quidu      	"3634CF2B02C6"

+			    client     	@2642

+			    supplier   	@2632

+			    line_style 	3

+			    origin_attachment 	(2025, 1274)

+			    terminal_attachment 	(2025, 1395)

+			    drawSupplier 	@2633)

+			(object InheritView "" @2644

+			    stereotype 	TRUE

+			    quidu      	"4011A9DD033F"

+			    client     	@2642

+			    supplier   	@2637

+			    line_style 	3

+			    origin_attachment 	(2102, 1275)

+			    terminal_attachment 	(2102, 1761)

+			    drawSupplier 	@2640)

+			(object ClassView "Class" "Logical View::UML::UseCases::ExtensionPoint" @2645

 			    ShowCompartmentStereotypes 	TRUE

 			    SuppressOperation 	TRUE

 			    IncludeAttribute 	TRUE

@@ -61160,7 +60954,7 @@
 				color      	0

 				default_color 	TRUE)

 			    label      	(object ItemLabel

-				Parent_View 	@2640

+				Parent_View 	@2645

 				location   	(281, 752)

 				nlines     	1

 				max_width  	326

@@ -61172,7 +60966,7 @@
 			    width      	344

 			    height     	150

 			    annotation 	8)

-			(object InheritView "" @2641

+			(object InheritView "" @2646

 			    font       	(object Font

 				size       	10

 				face       	"Arial"

@@ -61184,12 +60978,12 @@
 				default_color 	TRUE)

 			    stereotype 	TRUE

 			    quidu      	"3C8CA0D60140"

-			    client     	@2640

+			    client     	@2645

 			    supplier   	@2634

 			    line_style 	3

 			    origin_attachment 	(446, 741)

 			    terminal_attachment 	(446, 508))

-			(object ClassView "Class" "Logical View::UML::UseCases::Extend" @2642

+			(object ClassView "Class" "Logical View::UML::UseCases::Extend" @2647

 			    ShowCompartmentStereotypes 	TRUE

 			    SuppressOperation 	TRUE

 			    IncludeAttribute 	TRUE

@@ -61205,7 +60999,7 @@
 				color      	0

 				default_color 	TRUE)

 			    label      	(object ItemLabel

-				Parent_View 	@2642

+				Parent_View 	@2647

 				location   	(1330, 1142)

 				nlines     	1

 				max_width  	376

@@ -61216,8 +61010,8 @@
 			    quidu      	"35FDD683021C"

 			    width      	394

 			    height     	138)

-			(object AssociationViewNew "$UNNAMED$410" @2643

-			    location   	(1287, 1567)

+			(object AssociationViewNew "$UNNAMED$410" @2648

+			    location   	(967, 1269)

 			    font       	(object Font

 				size       	10

 				face       	"Arial"

@@ -61230,9 +61024,9 @@
 			    stereotype 	TRUE

 			    quidu      	"3C8C9F00027A"

 			    roleview_list 	(list RoleViews

-				(object RoleView "condition" @2644

-				    Parent_View 	@2643

-				    location   	(219, -407)

+				(object RoleView "condition" @2649

+				    Parent_View 	@2648

+				    location   	(-101, -705)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -61242,9 +61036,9 @@
 					strike     	FALSE

 					color      	0

 					default_color 	TRUE)

-				    label      	(object SegLabel @2645

-					Parent_View 	@2644

-					location   	(1011, 1608)

+				    label      	(object SegLabel @2650

+					Parent_View 	@2649

+					location   	(691, 1310)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61266,14 +61060,18 @@
 				    stereotype 	TRUE

 				    line_color 	3342489

 				    quidu      	"3C8C9F020006"

-				    client     	@2643

-				    supplier   	@2638

+				    client     	@2648

+				    supplier   	@2641

+				    vertices   	(list Points

+					(967, 1269)

+					(864, 1269)

+					(864, 1519))

 				    line_style 	3

-				    origin_attachment 	(1287, 1567)

-				    terminal_attachment 	(864, 1567)

-				    label      	(object SegLabel @2646

-					Parent_View 	@2644

-					location   	(938, 1518)

+				    origin_attachment 	(967, 1269)

+				    terminal_attachment 	(864, 1519)

+				    label      	(object SegLabel @2651

+					Parent_View 	@2649

+					location   	(618, 1220)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61292,9 +61090,9 @@
 					pctDist    	0.824658

 					height     	50

 					orientation 	1)

-				    label      	(object SegLabel @2647

-					Parent_View 	@2644

-					location   	(1118, 1662)

+				    label      	(object SegLabel @2652

+					Parent_View 	@2649

+					location   	(798, 1364)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61313,9 +61111,9 @@
 					pctDist    	0.400000

 					height     	95

 					orientation 	0))

-				(object RoleView "$UNNAMED$411" @2648

-				    Parent_View 	@2643

-				    location   	(219, -407)

+				(object RoleView "$UNNAMED$411" @2653

+				    Parent_View 	@2648

+				    location   	(-101, -705)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -61328,18 +61126,14 @@
 				    stereotype 	TRUE

 				    line_color 	3342489

 				    quidu      	"3C8C9F0201AB"

-				    client     	@2643

-				    supplier   	@2642

-				    vertices   	(list Points

-					(1287, 1567)

-					(1412, 1567)

-					(1412, 1269))

+				    client     	@2648

+				    supplier   	@2647

 				    line_style 	3

-				    origin_attachment 	(1287, 1567)

-				    terminal_attachment 	(1412, 1269)

-				    label      	(object SegLabel @2649

-					Parent_View 	@2648

-					location   	(1324, 1314)

+				    origin_attachment 	(1934, 2538)

+				    terminal_attachment 	(2839, 2469)

+				    label      	(object SegLabel @2654

+					Parent_View 	@2653

+					location   	(1004, 1016)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61358,8 +61152,8 @@
 					pctDist    	0.893443

 					height     	89

 					orientation 	0))))

-			(object AssociationViewNew "$UNNAMED$412" @2650

-			    location   	(742, 1175)

+			(object AssociationViewNew "$UNNAMED$412" @2655

+			    location   	(891, 2350)

 			    font       	(object Font

 				size       	10

 				face       	"Arial"

@@ -61372,9 +61166,9 @@
 			    stereotype 	TRUE

 			    quidu      	"3D289635029B"

 			    roleview_list 	(list RoleViews

-				(object RoleView "extensionLocation" @2651

-				    Parent_View 	@2650

-				    location   	(-206, 215)

+				(object RoleView "extensionLocation" @2656

+				    Parent_View 	@2655

+				    location   	(-57, 1390)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -61384,9 +61178,9 @@
 					strike     	FALSE

 					color      	0

 					default_color 	TRUE)

-				    label      	(object SegLabel @2652

-					Parent_View 	@2651

-					location   	(663, 944)

+				    label      	(object SegLabel @2657

+					Parent_View 	@2656

+					location   	(812, 2119)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61407,18 +61201,20 @@
 					orientation 	1)

 				    stereotype 	TRUE

 				    quidu      	"3D289638024F"

-				    client     	@2650

-				    supplier   	@2640

+				    client     	@2655

+				    supplier   	@2645

 				    vertices   	(list Points

+					(891, 2350)

+					(742, 2350)

 					(742, 1175)

 					(448, 1175)

 					(448, 891))

 				    line_style 	3

-				    origin_attachment 	(742, 1175)

+				    origin_attachment 	(891, 2350)

 				    terminal_attachment 	(448, 891)

-				    label      	(object SegLabel @2653

-					Parent_View 	@2651

-					location   	(359, 938)

+				    label      	(object SegLabel @2658

+					Parent_View 	@2656

+					location   	(508, 2113)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61437,9 +61233,9 @@
 					pctDist    	0.918699

 					height     	90

 					orientation 	0)

-				    label      	(object SegLabel @2654

-					Parent_View 	@2651

-					location   	(330, 995)

+				    label      	(object SegLabel @2659

+					Parent_View 	@2656

+					location   	(479, 2170)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61458,9 +61254,9 @@
 					pctDist    	0.820380

 					height     	119

 					orientation 	0))

-				(object RoleView "extension" @2655

-				    Parent_View 	@2650

-				    location   	(-206, 215)

+				(object RoleView "extension" @2660

+				    Parent_View 	@2655

+				    location   	(-57, 1390)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -61472,14 +61268,18 @@
 					default_color 	TRUE)

 				    stereotype 	TRUE

 				    quidu      	"3D2896380259"

-				    client     	@2650

-				    supplier   	@2642

+				    client     	@2655

+				    supplier   	@2647

+				    vertices   	(list Points

+					(891, 2350)

+					(1713, 2350)

+					(1713, 1269))

 				    line_style 	3

-				    origin_attachment 	(742, 1175)

-				    terminal_attachment 	(1321, 1175)

-				    label      	(object SegLabel @2656

-					Parent_View 	@2655

-					location   	(1268, 1229)

+				    origin_attachment 	(891, 2350)

+				    terminal_attachment 	(1713, 1269)

+				    label      	(object SegLabel @2661

+					Parent_View 	@2660

+					location   	(1417, 2404)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61498,77 +61298,6 @@
 					pctDist    	0.908795

 					height     	54

 					orientation 	1))))

-			(object ClassView "Class" "Logical View::UML::Classes::Kernel::Classifier" @2657

-			    ShowCompartmentStereotypes 	TRUE

-			    SuppressAttribute 	TRUE

-			    SuppressOperation 	TRUE

-			    IncludeAttribute 	TRUE

-			    IncludeOperation 	TRUE

-			    location   	(2430, 174)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	TRUE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object ItemLabel

-				Parent_View 	@2657

-				location   	(2134, 119)

-				nlines     	1

-				max_width  	592

-				justify    	0

-				label      	"Classifier")

-			    icon_style 	"Label"

-			    fill_color 	16777215

-			    quidu      	"3CAAECE80199"

-			    width      	610

-			    height     	135

-			    annotation 	8)

-			(object InheritView "" @2658

-			    stereotype 	TRUE

-			    quidu      	"3D289995018F"

-			    client     	@2636

-			    supplier   	@2657

-			    line_style 	3

-			    origin_attachment 	(2642, 721)

-			    terminal_attachment 	(2642, 240))

-			(object InheritTreeView "" @2659

-			    location   	(1782, 1761)

-			    fill_color 	13434879

-			    supplier   	@2637

-			    vertices   	(list Points

-				(1782, 1761)

-				(1782, 1882)))

-			(object InheritView "" @2660

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	FALSE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    stereotype 	TRUE

-			    quidu      	"3634CF2B02C6"

-			    client     	@2639

-			    supplier   	@2632

-			    line_style 	3

-			    origin_attachment 	(2025, 1274)

-			    terminal_attachment 	(2025, 1395)

-			    drawSupplier 	@2633)

-			(object InheritView "" @2661

-			    stereotype 	TRUE

-			    quidu      	"4011A9DD033F"

-			    client     	@2639

-			    supplier   	@2637

-			    line_style 	3

-			    origin_attachment 	(2102, 1275)

-			    terminal_attachment 	(2102, 1761)

-			    drawSupplier 	@2659)

 			(object InheritView "" @2662

 			    font       	(object Font

 				size       	10

@@ -61581,7 +61310,7 @@
 				default_color 	TRUE)

 			    stereotype 	TRUE

 			    quidu      	"3634CF270366"

-			    client     	@2642

+			    client     	@2647

 			    supplier   	@2632

 			    line_style 	3

 			    origin_attachment 	(1575, 1269)

@@ -61590,13 +61319,51 @@
 			(object InheritView "" @2663

 			    stereotype 	TRUE

 			    quidu      	"4011A9F50271"

-			    client     	@2642

+			    client     	@2647

 			    supplier   	@2637

 			    line_style 	3

 			    origin_attachment 	(1496, 1268)

 			    terminal_attachment 	(1496, 1761)

-			    drawSupplier 	@2659)

-			(object ClassView "Class" "Logical View::UML::UseCases::UseCase" @2664

+			    drawSupplier 	@2640)

+			(object ClassView "Class" "Logical View::UML::UseCases::Classifier" @2664

+			    ShowCompartmentStereotypes 	TRUE

+			    SuppressOperation 	TRUE

+			    IncludeAttribute 	TRUE

+			    IncludeOperation 	TRUE

+			    location   	(1764, 408)

+			    font       	(object Font

+				size       	10

+				face       	"Arial"

+				bold       	FALSE

+				italics    	TRUE

+				underline  	FALSE

+				strike     	FALSE

+				color      	0

+				default_color 	TRUE)

+			    label      	(object ItemLabel

+				Parent_View 	@2664

+				location   	(1558, 354)

+				nlines     	1

+				max_width  	413

+				justify    	0

+				label      	"Classifier")

+			    icon_style 	"Icon"

+			    quidu      	"3D2CCA7402DF"

+			    width      	431

+			    height     	132)

+			(object InheritView "" @2665

+			    stereotype 	TRUE

+			    quidu      	"3D2CCAFE00AD"

+			    client     	@2664

+			    supplier   	@2638

+			    vertices   	(list Points

+				(1743, 342)

+				(1743, 168)

+				(2125, 168))

+			    line_style 	3

+			    origin_attachment 	(1743, 342)

+			    terminal_attachment 	(2125, 168))

+			(object ClassView "Class" "Logical View::UML::UseCases::UseCase" @2666

 			    ShowCompartmentStereotypes 	TRUE

 			    SuppressOperation 	TRUE

 			    IncludeAttribute 	TRUE

@@ -61612,7 +61379,7 @@
 				color      	0

 				default_color 	TRUE)

 			    label      	(object ItemLabel

-				Parent_View 	@2664

+				Parent_View 	@2666

 				location   	(1253, 734)

 				nlines     	1

 				max_width  	1022

@@ -61624,8 +61391,8 @@
 			    width      	1040

 			    height     	140

 			    annotation 	8)

-			(object AssociationViewNew "$UNNAMED$403" @2665

-			    location   	(2129, 999)

+			(object AssociationViewNew "$UNNAMED$403" @2667

+			    location   	(2076, 999)

 			    font       	(object Font

 				size       	10

 				face       	"Arial"

@@ -61638,9 +61405,9 @@
 			    stereotype 	TRUE

 			    quidu      	"3C1F05C801AE"

 			    roleview_list 	(list RoleViews

-				(object RoleView "includingCase" @2666

-				    Parent_View 	@2665

-				    location   	(791, -975)

+				(object RoleView "includingCase" @2668

+				    Parent_View 	@2667

+				    location   	(738, -975)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -61650,9 +61417,9 @@
 					strike     	FALSE

 					color      	0

 					default_color 	TRUE)

-				    label      	(object SegLabel @2667

-					Parent_View 	@2666

-					location   	(1969, 907)

+				    label      	(object SegLabel @2669

+					Parent_View 	@2668

+					location   	(1916, 907)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61674,14 +61441,14 @@
 				    stereotype 	TRUE

 				    line_color 	3342489

 				    quidu      	"3C1F05C9008D"

-				    client     	@2665

-				    supplier   	@2664

+				    client     	@2667

+				    supplier   	@2666

 				    line_style 	3

-				    origin_attachment 	(2129, 999)

-				    terminal_attachment 	(2129, 862)

-				    label      	(object SegLabel @2668

-					Parent_View 	@2666

-					location   	(2183, 906)

+				    origin_attachment 	(2076, 999)

+				    terminal_attachment 	(2076, 862)

+				    label      	(object SegLabel @2670

+					Parent_View 	@2668

+					location   	(2130, 906)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61700,9 +61467,9 @@
 					pctDist    	0.684211

 					height     	54

 					orientation 	1)

-				    label      	(object SegLabel @2669

-					Parent_View 	@2666

-					location   	(1978, 961)

+				    label      	(object SegLabel @2671

+					Parent_View 	@2668

+					location   	(1925, 961)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61721,9 +61488,9 @@
 					pctDist    	0.277372

 					height     	152

 					orientation 	0))

-				(object RoleView "include" @2670

-				    Parent_View 	@2665

-				    location   	(791, -975)

+				(object RoleView "include" @2672

+				    Parent_View 	@2667

+				    location   	(738, -975)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -61733,9 +61500,9 @@
 					strike     	FALSE

 					color      	0

 					default_color 	TRUE)

-				    label      	(object SegLabel @2671

-					Parent_View 	@2670

-					location   	(2018, 1050)

+				    label      	(object SegLabel @2673

+					Parent_View 	@2672

+					location   	(1965, 1050)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61757,14 +61524,14 @@
 				    stereotype 	TRUE

 				    line_color 	3342489

 				    quidu      	"3C1F05C90097"

-				    client     	@2665

-				    supplier   	@2639

+				    client     	@2667

+				    supplier   	@2642

 				    line_style 	3

-				    origin_attachment 	(2129, 999)

-				    terminal_attachment 	(2129, 1137)

-				    label      	(object SegLabel @2672

-					Parent_View 	@2670

-					location   	(2164, 1110)

+				    origin_attachment 	(2076, 999)

+				    terminal_attachment 	(2076, 1137)

+				    label      	(object SegLabel @2674

+					Parent_View 	@2672

+					location   	(2111, 1110)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61783,9 +61550,9 @@
 					pctDist    	0.812030

 					height     	35

 					orientation 	0)

-				    label      	(object SegLabel @2673

-					Parent_View 	@2670

-					location   	(1890, 1102)

+				    label      	(object SegLabel @2675

+					Parent_View 	@2672

+					location   	(1837, 1102)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61804,8 +61571,8 @@
 					pctDist    	0.744526

 					height     	240

 					orientation 	1))))

-			(object AssociationViewNew "$UNNAMED$404" @2674

-			    location   	(2266, 999)

+			(object AssociationViewNew "$UNNAMED$404" @2676

+			    location   	(2272, 999)

 			    font       	(object Font

 				size       	10

 				face       	"Arial"

@@ -61818,9 +61585,9 @@
 			    stereotype 	TRUE

 			    quidu      	"3C1F05DF0252"

 			    roleview_list 	(list RoleViews

-				(object RoleView "addition" @2675

-				    Parent_View 	@2674

-				    location   	(928, -975)

+				(object RoleView "addition" @2677

+				    Parent_View 	@2676

+				    location   	(934, -975)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -61830,9 +61597,9 @@
 					strike     	FALSE

 					color      	0

 					default_color 	TRUE)

-				    label      	(object SegLabel @2676

-					Parent_View 	@2675

-					location   	(2363, 930)

+				    label      	(object SegLabel @2678

+					Parent_View 	@2677

+					location   	(2369, 930)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61854,14 +61621,14 @@
 				    stereotype 	TRUE

 				    line_color 	3342489

 				    quidu      	"3C1F05E000EB"

-				    client     	@2674

-				    supplier   	@2664

+				    client     	@2676

+				    supplier   	@2666

 				    line_style 	3

-				    origin_attachment 	(2266, 999)

-				    terminal_attachment 	(2272, 862)

-				    label      	(object SegLabel @2677

-					Parent_View 	@2675

-					location   	(2225, 906)

+				    origin_attachment 	(2272, 999)

+				    terminal_attachment 	(2272, 861)

+				    label      	(object SegLabel @2679

+					Parent_View 	@2677

+					location   	(2231, 906)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61880,9 +61647,9 @@
 					pctDist    	0.686567

 					height     	42

 					orientation 	0)

-				    label      	(object SegLabel @2678

-					Parent_View 	@2675

-					location   	(2422, 992)

+				    label      	(object SegLabel @2680

+					Parent_View 	@2677

+					location   	(2428, 992)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61901,9 +61668,9 @@
 					pctDist    	0.058394

 					height     	156

 					orientation 	1))

-				(object RoleView "$UNNAMED$405" @2679

-				    Parent_View 	@2674

-				    location   	(928, -975)

+				(object RoleView "$UNNAMED$405" @2681

+				    Parent_View 	@2676

+				    location   	(934, -975)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -61916,14 +61683,14 @@
 				    stereotype 	TRUE

 				    line_color 	3342489

 				    quidu      	"3C1F05E000F5"

-				    client     	@2674

-				    supplier   	@2639

+				    client     	@2676

+				    supplier   	@2642

 				    line_style 	3

-				    origin_attachment 	(2266, 999)

-				    terminal_attachment 	(2266, 1136)

-				    label      	(object SegLabel @2680

-					Parent_View 	@2679

-					location   	(2231, 1108)

+				    origin_attachment 	(4544, 1998)

+				    terminal_attachment 	(4348, 2343)

+				    label      	(object SegLabel @2682

+					Parent_View 	@2681

+					location   	(2237, 1108)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61942,8 +61709,8 @@
 					pctDist    	0.805970

 					height     	36

 					orientation 	1))))

-			(object AssociationViewNew "$UNNAMED$409" @2681

-			    location   	(930, 806)

+			(object AssociationViewNew "$UNNAMED$409" @2683

+			    location   	(930, 801)

 			    font       	(object Font

 				size       	10

 				face       	"Arial"

@@ -61956,9 +61723,9 @@
 			    stereotype 	TRUE

 			    quidu      	"3C8C9EE0015C"

 			    roleview_list 	(list RoleViews

-				(object RoleView "extensionPoint" @2682

-				    Parent_View 	@2681

-				    location   	(-456, -772)

+				(object RoleView "extensionPoint" @2684

+				    Parent_View 	@2683

+				    location   	(-456, -777)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -61968,9 +61735,9 @@
 					strike     	FALSE

 					color      	0

 					default_color 	TRUE)

-				    label      	(object SegLabel @2683

-					Parent_View 	@2682

-					location   	(778, 706)

+				    label      	(object SegLabel @2685

+					Parent_View 	@2684

+					location   	(778, 701)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -61992,14 +61759,14 @@
 				    stereotype 	TRUE

 				    line_color 	3342489

 				    quidu      	"3C8C9EE102BC"

-				    client     	@2681

-				    supplier   	@2640

+				    client     	@2683

+				    supplier   	@2645

 				    line_style 	3

-				    origin_attachment 	(930, 806)

-				    terminal_attachment 	(616, 806)

-				    label      	(object SegLabel @2684

-					Parent_View 	@2682

-					location   	(671, 860)

+				    origin_attachment 	(930, 801)

+				    terminal_attachment 	(616, 801)

+				    label      	(object SegLabel @2686

+					Parent_View 	@2684

+					location   	(671, 855)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62018,9 +61785,9 @@
 					pctDist    	0.828221

 					height     	54

 					orientation 	0)

-				    label      	(object SegLabel @2685

-					Parent_View 	@2682

-					location   	(847, 766)

+				    label      	(object SegLabel @2687

+					Parent_View 	@2684

+					location   	(847, 761)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62039,9 +61806,9 @@
 					pctDist    	0.264331

 					height     	41

 					orientation 	1))

-				(object RoleView "useCase" @2686

-				    Parent_View 	@2681

-				    location   	(-456, -772)

+				(object RoleView "useCase" @2688

+				    Parent_View 	@2683

+				    location   	(-456, -777)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -62051,9 +61818,9 @@
 					strike     	FALSE

 					color      	0

 					default_color 	TRUE)

-				    label      	(object SegLabel @2687

-					Parent_View 	@2686

-					location   	(1141, 729)

+				    label      	(object SegLabel @2689

+					Parent_View 	@2688

+					location   	(1141, 724)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62075,14 +61842,14 @@
 				    stereotype 	TRUE

 				    line_color 	3342489

 				    quidu      	"3C8C9EE102C6"

-				    client     	@2681

-				    supplier   	@2664

+				    client     	@2683

+				    supplier   	@2666

 				    line_style 	3

-				    origin_attachment 	(930, 806)

-				    terminal_attachment 	(1244, 806)

-				    label      	(object SegLabel @2688

-					Parent_View 	@2686

-					location   	(1213, 860)

+				    origin_attachment 	(930, 801)

+				    terminal_attachment 	(1244, 801)

+				    label      	(object SegLabel @2690

+					Parent_View 	@2688

+					location   	(1213, 855)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62101,8 +61868,8 @@
 					pctDist    	0.900000

 					height     	54

 					orientation 	1))))

-			(object AssociationViewNew "$UNNAMED$406" @2689

-			    location   	(1516, 996)

+			(object AssociationViewNew "$UNNAMED$406" @2691

+			    location   	(1518, 996)

 			    font       	(object Font

 				size       	10

 				face       	"Arial"

@@ -62115,9 +61882,9 @@
 			    stereotype 	TRUE

 			    quidu      	"3C1F061E01EE"

 			    roleview_list 	(list RoleViews

-				(object RoleView "extendedCase" @2690

-				    Parent_View 	@2689

-				    location   	(-182, -984)

+				(object RoleView "extendedCase" @2692

+				    Parent_View 	@2691

+				    location   	(-180, -984)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -62127,9 +61894,9 @@
 					strike     	FALSE

 					color      	0

 					default_color 	TRUE)

-				    label      	(object SegLabel @2691

-					Parent_View 	@2690

-					location   	(1673, 907)

+				    label      	(object SegLabel @2693

+					Parent_View 	@2692

+					location   	(1675, 907)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62151,14 +61918,14 @@
 				    stereotype 	TRUE

 				    line_color 	3342489

 				    quidu      	"3C1F061F0023"

-				    client     	@2689

-				    supplier   	@2664

+				    client     	@2691

+				    supplier   	@2666

 				    line_style 	3

-				    origin_attachment 	(1516, 996)

-				    terminal_attachment 	(1516, 862)

-				    label      	(object SegLabel @2692

-					Parent_View 	@2690

-					location   	(1468, 891)

+				    origin_attachment 	(1518, 996)

+				    terminal_attachment 	(1518, 861)

+				    label      	(object SegLabel @2694

+					Parent_View 	@2692

+					location   	(1470, 891)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62177,9 +61944,9 @@
 					pctDist    	0.789474

 					height     	49

 					orientation 	0)

-				    label      	(object SegLabel @2693

-					Parent_View 	@2690

-					location   	(1667, 960)

+				    label      	(object SegLabel @2695

+					Parent_View 	@2692

+					location   	(1669, 960)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62198,9 +61965,9 @@
 					pctDist    	0.266667

 					height     	151

 					orientation 	1))

-				(object RoleView "$UNNAMED$407" @2694

-				    Parent_View 	@2689

-				    location   	(-182, -984)

+				(object RoleView "$UNNAMED$407" @2696

+				    Parent_View 	@2691

+				    location   	(-180, -984)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -62213,14 +61980,14 @@
 				    stereotype 	TRUE

 				    line_color 	3342489

 				    quidu      	"3C1F061F002D"

-				    client     	@2689

-				    supplier   	@2642

+				    client     	@2691

+				    supplier   	@2647

 				    line_style 	3

-				    origin_attachment 	(1516, 996)

-				    terminal_attachment 	(1516, 1131)

-				    label      	(object SegLabel @2695

-					Parent_View 	@2694

-					location   	(1479, 1108)

+				    origin_attachment 	(1518, 996)

+				    terminal_attachment 	(1518, 1131)

+				    label      	(object SegLabel @2697

+					Parent_View 	@2696

+					location   	(1481, 1108)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62239,8 +62006,8 @@
 					pctDist    	0.835821

 					height     	38

 					orientation 	1))))

-			(object AssociationViewNew "$UNNAMED$408" @2696

-			    location   	(1369, 995)

+			(object AssociationViewNew "$UNNAMED$408" @2698

+			    location   	(1375, 995)

 			    font       	(object Font

 				size       	10

 				face       	"Arial"

@@ -62250,9 +62017,9 @@
 				strike     	FALSE

 				color      	0

 				default_color 	TRUE)

-			    label      	(object SegLabel @2697

-				Parent_View 	@2696

-				location   	(1472, 980)

+			    label      	(object SegLabel @2699

+				Parent_View 	@2698

+				location   	(1478, 980)

 				font       	(object Font

 				    size       	10

 				    face       	"Arial"

@@ -62275,9 +62042,9 @@
 			    stereotype 	TRUE

 			    quidu      	"3C1F06220370"

 			    roleview_list 	(list RoleViews

-				(object RoleView "extension" @2698

-				    Parent_View 	@2696

-				    location   	(-329, -985)

+				(object RoleView "extension" @2700

+				    Parent_View 	@2698

+				    location   	(-323, -985)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -62287,9 +62054,9 @@
 					strike     	FALSE

 					color      	0

 					default_color 	TRUE)

-				    label      	(object SegLabel @2699

-					Parent_View 	@2698

-					location   	(1238, 923)

+				    label      	(object SegLabel @2701

+					Parent_View 	@2700

+					location   	(1244, 923)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62311,14 +62078,14 @@
 				    stereotype 	TRUE

 				    line_color 	3342489

 				    quidu      	"3C1F0623025A"

-				    client     	@2696

-				    supplier   	@2664

+				    client     	@2698

+				    supplier   	@2666

 				    line_style 	3

-				    origin_attachment 	(1369, 995)

+				    origin_attachment 	(1375, 995)

 				    terminal_attachment 	(1375, 861)

-				    label      	(object SegLabel @2700

-					Parent_View 	@2698

-					location   	(1414, 891)

+				    label      	(object SegLabel @2702

+					Parent_View 	@2700

+					location   	(1420, 891)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62337,9 +62104,9 @@
 					pctDist    	0.775362

 					height     	45

 					orientation 	1)

-				    label      	(object SegLabel @2701

-					Parent_View 	@2698

-					location   	(1199, 972)

+				    label      	(object SegLabel @2703

+					Parent_View 	@2700

+					location   	(1205, 972)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62358,9 +62125,9 @@
 					pctDist    	0.177778

 					height     	171

 					orientation 	0))

-				(object RoleView "extend" @2702

-				    Parent_View 	@2696

-				    location   	(-329, -985)

+				(object RoleView "extend" @2704

+				    Parent_View 	@2698

+				    location   	(-323, -985)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -62370,9 +62137,9 @@
 					strike     	FALSE

 					color      	0

 					default_color 	TRUE)

-				    label      	(object SegLabel @2703

-					Parent_View 	@2702

-					location   	(1274, 1067)

+				    label      	(object SegLabel @2705

+					Parent_View 	@2704

+					location   	(1280, 1067)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62394,14 +62161,14 @@
 				    stereotype 	TRUE

 				    line_color 	3342489

 				    quidu      	"3C1F06230264"

-				    client     	@2696

-				    supplier   	@2642

+				    client     	@2698

+				    supplier   	@2647

 				    line_style 	3

-				    origin_attachment 	(1369, 995)

-				    terminal_attachment 	(1369, 1130)

-				    label      	(object SegLabel @2704

-					Parent_View 	@2702

-					location   	(1403, 1101)

+				    origin_attachment 	(2750, 1990)

+				    terminal_attachment 	(2893, 2330)

+				    label      	(object SegLabel @2706

+					Parent_View 	@2704

+					location   	(1409, 1101)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62420,9 +62187,9 @@
 					pctDist    	0.792593

 					height     	34

 					orientation 	0)

-				    label      	(object SegLabel @2705

-					Parent_View 	@2702

-					location   	(1130, 1110)

+				    label      	(object SegLabel @2707

+					Parent_View 	@2704

+					location   	(1136, 1110)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62441,7 +62208,7 @@
 					pctDist    	0.859259

 					height     	240

 					orientation 	1))))

-			(object InheritView "" @2706

+			(object InheritView "" @2708

 			    font       	(object Font

 				size       	10

 				face       	"Arial"

@@ -62453,39 +62220,13 @@
 				default_color 	TRUE)

 			    stereotype 	TRUE

 			    quidu      	"3C1F026D004B"

-			    client     	@2664

+			    client     	@2666

 			    supplier   	@2635

 			    line_style 	3

 			    origin_attachment 	(1325, 721)

 			    terminal_attachment 	(1325, 478))

-			(object ClassView "Class" "Logical View::UML::UseCases::Classifier" @2707

-			    ShowCompartmentStereotypes 	TRUE

-			    SuppressOperation 	TRUE

-			    IncludeAttribute 	TRUE

-			    IncludeOperation 	TRUE

-			    location   	(1764, 408)

-			    font       	(object Font

-				size       	10

-				face       	"Arial"

-				bold       	FALSE

-				italics    	TRUE

-				underline  	FALSE

-				strike     	FALSE

-				color      	0

-				default_color 	TRUE)

-			    label      	(object ItemLabel

-				Parent_View 	@2707

-				location   	(1558, 354)

-				nlines     	1

-				max_width  	413

-				justify    	0

-				label      	"Classifier")

-			    icon_style 	"Icon"

-			    quidu      	"3D2CCA7402DF"

-			    width      	431

-			    height     	132)

-			(object AssociationViewNew "$UNNAMED$413" @2708

-			    location   	(1847, 597)

+			(object AssociationViewNew "$UNNAMED$413" @2709

+			    location   	(1764, 598)

 			    font       	(object Font

 				size       	10

 				face       	"Arial"

@@ -62498,9 +62239,9 @@
 			    stereotype 	TRUE

 			    quidu      	"3D2897F30256"

 			    roleview_list 	(list RoleViews

-				(object RoleView "ownedUseCase" @2709

-				    Parent_View 	@2708

-				    location   	(275, 435)

+				(object RoleView "ownedUseCase" @2710

+				    Parent_View 	@2709

+				    location   	(192, 436)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -62510,9 +62251,9 @@
 					strike     	FALSE

 					color      	0

 					default_color 	TRUE)

-				    label      	(object SegLabel @2710

-					Parent_View 	@2709

-					location   	(2025, 596)

+				    label      	(object SegLabel @2711

+					Parent_View 	@2710

+					location   	(1942, 597)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62533,14 +62274,14 @@
 					orientation 	0)

 				    stereotype 	TRUE

 				    quidu      	"3D2897F5008D"

-				    client     	@2708

-				    supplier   	@2664

+				    client     	@2709

+				    supplier   	@2666

 				    line_style 	3

-				    origin_attachment 	(1847, 597)

-				    terminal_attachment 	(1847, 721)

-				    label      	(object SegLabel @2711

-					Parent_View 	@2709

-					location   	(1893, 700)

+				    origin_attachment 	(1764, 598)

+				    terminal_attachment 	(1764, 722)

+				    label      	(object SegLabel @2712

+					Parent_View 	@2710

+					location   	(1810, 701)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62559,9 +62300,9 @@
 					pctDist    	0.830645

 					height     	46

 					orientation 	0)

-				    label      	(object SegLabel @2712

-					Parent_View 	@2709

-					location   	(2085, 647)

+				    label      	(object SegLabel @2713

+					Parent_View 	@2710

+					location   	(2002, 648)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62580,9 +62321,9 @@
 					pctDist    	0.403226

 					height     	238

 					orientation 	0))

-				(object RoleView "$UNNAMED$414" @2713

-				    Parent_View 	@2708

-				    location   	(275, 435)

+				(object RoleView "$UNNAMED$414" @2714

+				    Parent_View 	@2709

+				    location   	(192, 436)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -62594,14 +62335,14 @@
 					default_color 	TRUE)

 				    stereotype 	TRUE

 				    quidu      	"3D2897F50097"

-				    client     	@2708

-				    supplier   	@2707

+				    client     	@2709

+				    supplier   	@2664

 				    line_style 	3

-				    origin_attachment 	(1847, 597)

-				    terminal_attachment 	(1847, 473)

-				    label      	(object SegLabel @2714

-					Parent_View 	@2713

-					location   	(1916, 512)

+				    origin_attachment 	(1764, 598)

+				    terminal_attachment 	(1764, 474)

+				    label      	(object SegLabel @2715

+					Parent_View 	@2714

+					location   	(1833, 513)

 					font       	(object Font

 					    size       	10

 					    face       	"Arial"

@@ -62620,18 +62361,6 @@
 					pctDist    	0.685484

 					height     	69

 					orientation 	1))))

-			(object InheritView "" @2715

-			    stereotype 	TRUE

-			    quidu      	"3D2CCAFE00AD"

-			    client     	@2707

-			    supplier   	@2657

-			    vertices   	(list Points

-				(1743, 342)

-				(1743, 168)

-				(2125, 168))

-			    line_style 	3

-			    origin_attachment 	(1743, 342)

-			    terminal_attachment 	(2125, 168))

 			(object AssociationViewNew "$UNNAMED$415" @2716

 			    location   	(1764, 597)

 			    font       	(object Font

@@ -62684,7 +62413,7 @@
 				    line_color 	3342489

 				    quidu      	"40AB9E74024E"

 				    client     	@2716

-				    supplier   	@2707

+				    supplier   	@2664

 				    line_style 	0

 				    label      	(object SegLabel @2719

 					Parent_View 	@2717

@@ -62744,7 +62473,7 @@
 				    line_color 	3342489

 				    quidu      	"40AB9E740250"

 				    client     	@2716

-				    supplier   	@2664

+				    supplier   	@2666

 				    line_style 	0

 				    label      	(object SegLabel @2722

 					Parent_View 	@2720

@@ -62995,25 +62724,21 @@
 				(object ClassAttribute "isComposite"

 				    quid       	"3C612C28022F"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    exportControl 	"Public"

 				    derived    	TRUE)

 				(object ClassAttribute "isOrthogonal"

 				    quid       	"3C6136B401B9"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    exportControl 	"Public"

 				    derived    	TRUE)

 				(object ClassAttribute "isSimple"

 				    quid       	"3C613764000E"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    exportControl 	"Public"

 				    derived    	TRUE)

 				(object ClassAttribute "isSubmachineState"

 				    quid       	"3C678F5300CA"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    exportControl 	"Public"

 				    derived    	TRUE))

 			    language   	"none")

@@ -63068,6 +62793,7 @@
 			    language   	"C++")

 			(object Class "ConnectionPointReference"

 			    quid       	"3B8A548E03CC"

+			    documentation 	"Connection point references of a submachine state can be used as sources/targets of transitions. They represent entries into or exits out of the submachine state machine referenced by the submachine state. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3B8A54F70034"

@@ -63663,22 +63389,6 @@
 					label      	"<<enumeration>>")

 				    icon_style 	"Icon"

 				    quidu      	"3B94B827009C"

-				    compartment 	(object Compartment

-					Parent_View 	@2731

-					location   	(2636, 399)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	10

-					max_width  	271)

 				    width      	422

 				    height     	678

 				    autoResize 	TRUE)

@@ -63815,22 +63525,6 @@
 					label      	"Pseudostate")

 				    icon_style 	"Icon"

 				    quidu      	"328A47F10064"

-				    compartment 	(object Compartment

-					Parent_View 	@2736

-					location   	(409, 1716)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	1

-					max_width  	431)

 				    width      	472

 				    height     	160)

 				(object ClassView "Class" "Logical View::UML::StateMachines::BehaviorStateMachines::ConnectionPointReference" @2737

@@ -63862,7 +63556,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$421" @2738

-				    location   	(538, 1876)

+				    location   	(661, 1876)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -63877,7 +63571,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "entry" @2739

 					    Parent_View 	@2738

-					    location   	(118, -117)

+					    location   	(241, -117)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -63889,7 +63583,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2740

 						Parent_View 	@2739

-						location   	(629, 1833)

+						location   	(752, 1833)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -63914,11 +63608,11 @@
 					    client     	@2738

 					    supplier   	@2736

 					    line_style 	3

-					    origin_attachment 	(538, 1876)

-					    terminal_attachment 	(538, 1802)

+					    origin_attachment 	(661, 1876)

+					    terminal_attachment 	(661, 1801)

 					    label      	(object SegLabel @2741

 						Parent_View 	@2739

-						location   	(511, 1830)

+						location   	(634, 1830)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -63939,7 +63633,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$422" @2742

 					    Parent_View 	@2738

-					    location   	(118, -117)

+					    location   	(241, -117)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -63951,7 +63645,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2743

 						Parent_View 	@2742

-						location   	(675, 1916)

+						location   	(798, 1916)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -63977,11 +63671,11 @@
 					    client     	@2738

 					    supplier   	@2737

 					    line_style 	3

-					    origin_attachment 	(538, 1876)

-					    terminal_attachment 	(538, 1951)

+					    origin_attachment 	(661, 1876)

+					    terminal_attachment 	(661, 1952)

 					    label      	(object SegLabel @2744

 						Parent_View 	@2742

-						location   	(499, 1922)

+						location   	(622, 1922)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64001,7 +63695,7 @@
 						height     	40

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$429" @2745

-				    location   	(784, 1876)

+				    location   	(661, 1876)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -64016,7 +63710,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "exit" @2746

 					    Parent_View 	@2745

-					    location   	(346, -338)

+					    location   	(223, -338)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -64028,7 +63722,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2747

 						Parent_View 	@2746

-						location   	(861, 1820)

+						location   	(738, 1820)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64052,11 +63746,11 @@
 					    client     	@2745

 					    supplier   	@2736

 					    line_style 	3

-					    origin_attachment 	(784, 1876)

-					    terminal_attachment 	(784, 1801)

+					    origin_attachment 	(661, 1876)

+					    terminal_attachment 	(661, 1801)

 					    label      	(object SegLabel @2748

 						Parent_View 	@2746

-						location   	(737, 1844)

+						location   	(614, 1844)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64077,7 +63771,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$430" @2749

 					    Parent_View 	@2745

-					    location   	(346, -338)

+					    location   	(223, -338)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -64089,7 +63783,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2750

 						Parent_View 	@2749

-						location   	(666, 1942)

+						location   	(543, 1942)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64114,11 +63808,11 @@
 					    client     	@2745

 					    supplier   	@2737

 					    line_style 	3

-					    origin_attachment 	(784, 1876)

-					    terminal_attachment 	(784, 1952)

+					    origin_attachment 	(661, 1876)

+					    terminal_attachment 	(661, 1952)

 					    label      	(object SegLabel @2751

 						Parent_View 	@2749

-						location   	(749, 1921)

+						location   	(626, 1921)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64179,7 +63873,7 @@
 				    origin_attachment 	(1549, 610)

 				    terminal_attachment 	(1549, 430))

 				(object AssociationViewNew "$UNNAMED$436" @2754

-				    location   	(232, 813)

+				    location   	(232, 812)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -64194,7 +63888,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "connectionPoint" @2755

 					    Parent_View 	@2754

-					    location   	(-1502, 75)

+					    location   	(-1502, 74)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -64206,7 +63900,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2756

 						Parent_View 	@2755

-						location   	(414, 1562)

+						location   	(414, 1561)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64231,15 +63925,15 @@
 					    client     	@2754

 					    supplier   	@2736

 					    vertices   	(list Points

-						(232, 813)

+						(232, 812)

 						(232, 1660)

 						(400, 1660))

 					    line_style 	3

-					    origin_attachment 	(232, 813)

+					    origin_attachment 	(232, 812)

 					    terminal_attachment 	(400, 1660)

 					    label      	(object SegLabel @2757

 						Parent_View 	@2755

-						location   	(365, 1711)

+						location   	(365, 1710)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64260,7 +63954,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2758

 						Parent_View 	@2755

-						location   	(486, 1605)

+						location   	(486, 1604)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64281,7 +63975,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$437" @2759

 					    Parent_View 	@2754

-					    location   	(-1502, 75)

+					    location   	(-1502, 74)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -64297,15 +63991,15 @@
 					    client     	@2754

 					    supplier   	@2752

 					    vertices   	(list Points

-						(232, 813)

+						(232, 812)

 						(232, 752)

 						(1243, 752))

 					    line_style 	3

-					    origin_attachment 	(232, 813)

+					    origin_attachment 	(232, 812)

 					    terminal_attachment 	(1243, 752)

 					    label      	(object SegLabel @2760

 						Parent_View 	@2759

-						location   	(1152, 797)

+						location   	(1152, 796)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64350,7 +64044,7 @@
 				    width      	728

 				    height     	545)

 				(object AssociationViewNew "$UNNAMED$423" @2762

-				    location   	(930, 2143)

+				    location   	(930, 2078)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -64365,7 +64059,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$424" @2763

 					    Parent_View 	@2762

-					    location   	(510, 150)

+					    location   	(510, 85)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -64380,12 +64074,16 @@
 					    quidu      	"3B8A553B0186"

 					    client     	@2762

 					    supplier   	@2761

+					    vertices   	(list Points

+						(930, 2078)

+						(930, 2013)

+						(1202, 2013))

 					    line_style 	3

-					    origin_attachment 	(930, 2143)

-					    terminal_attachment 	(1202, 2143)

+					    origin_attachment 	(930, 2078)

+					    terminal_attachment 	(1202, 2013)

 					    label      	(object SegLabel @2764

 						Parent_View 	@2763

-						location   	(1135, 2089)

+						location   	(1135, 2024)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64406,7 +64104,7 @@
 						orientation 	0))

 					(object RoleView "connection" @2765

 					    Parent_View 	@2762

-					    location   	(510, 150)

+					    location   	(510, 85)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -64418,7 +64116,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2766

 						Parent_View 	@2765

-						location   	(794, 2178)

+						location   	(794, 2113)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64443,15 +64141,16 @@
 					    client     	@2762

 					    supplier   	@2737

 					    vertices   	(list Points

+						(930, 2078)

 						(930, 2143)

 						(720, 2143)

 						(720, 2080))

 					    line_style 	3

-					    origin_attachment 	(930, 2143)

+					    origin_attachment 	(930, 2078)

 					    terminal_attachment 	(720, 2080)

 					    label      	(object SegLabel @2767

 						Parent_View 	@2765

-						location   	(756, 2165)

+						location   	(756, 2100)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64472,7 +64171,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2768

 						Parent_View 	@2765

-						location   	(766, 2058)

+						location   	(766, 1993)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64756,7 +64455,7 @@
 				    height     	143

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$416" @2782

-				    location   	(1058, 1102)

+				    location   	(1227, 2204)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -64771,7 +64470,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "subvertex" @2783

 					    Parent_View 	@2782

-					    location   	(345, -45)

+					    location   	(514, 1057)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -64783,7 +64482,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2784

 						Parent_View 	@2783

-						location   	(1023, 1159)

+						location   	(1192, 2261)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64807,15 +64506,17 @@
 					    client     	@2782

 					    supplier   	@2776

 					    vertices   	(list Points

+						(1227, 2204)

+						(1058, 2204)

 						(1058, 1102)

 						(908, 1102)

 						(908, 1256))

 					    line_style 	3

-					    origin_attachment 	(1058, 1102)

+					    origin_attachment 	(1227, 2204)

 					    terminal_attachment 	(908, 1256)

 					    label      	(object SegLabel @2785

 						Parent_View 	@2783

-						location   	(864, 1217)

+						location   	(1033, 2319)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64836,7 +64537,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2786

 						Parent_View 	@2783

-						location   	(1157, 1209)

+						location   	(1326, 2311)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64857,7 +64558,7 @@
 						orientation 	1))

 					(object RoleView "container" @2787

 					    Parent_View 	@2782

-					    location   	(345, -45)

+					    location   	(514, 1057)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -64869,7 +64570,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2788

 						Parent_View 	@2787

-						location   	(1238, 1026)

+						location   	(1407, 2128)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64892,12 +64593,16 @@
 					    quidu      	"3288D8C70172"

 					    client     	@2782

 					    supplier   	@2781

+					    vertices   	(list Points

+						(1227, 2204)

+						(1767, 2204)

+						(1767, 1169))

 					    line_style 	3

-					    origin_attachment 	(1058, 1102)

-					    terminal_attachment 	(1363, 1102)

+					    origin_attachment 	(1227, 2204)

+					    terminal_attachment 	(1767, 1169)

 					    label      	(object SegLabel @2789

 						Parent_View 	@2787

-						location   	(1302, 1147)

+						location   	(1471, 2249)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -64918,7 +64623,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2790

 						Parent_View 	@2787

-						location   	(1158, 1071)

+						location   	(1327, 2173)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65334,7 +65039,7 @@
 				    height     	125

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$431" @2811

-				    location   	(1880, 2347)

+				    location   	(1881, 2347)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -65349,7 +65054,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "deferrableTrigger" @2812

 					    Parent_View 	@2811

-					    location   	(188, 445)

+					    location   	(189, 445)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -65361,7 +65066,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2813

 						Parent_View 	@2812

-						location   	(1845, 2387)

+						location   	(1846, 2387)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65386,15 +65091,15 @@
 					    client     	@2811

 					    supplier   	@2810

 					    vertices   	(list Points

-						(1880, 2347)

+						(1881, 2347)

 						(2053, 2347)

 						(2053, 2422))

 					    line_style 	3

-					    origin_attachment 	(1880, 2347)

+					    origin_attachment 	(1881, 2347)

 					    terminal_attachment 	(2053, 2422)

 					    label      	(object SegLabel @2814

 						Parent_View 	@2812

-						location   	(2093, 2384)

+						location   	(2094, 2384)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65415,7 +65120,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$432" @2815

 					    Parent_View 	@2811

-					    location   	(188, 445)

+					    location   	(189, 445)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -65427,7 +65132,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2816

 						Parent_View 	@2815

-						location   	(1747, 2241)

+						location   	(1748, 2241)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65453,15 +65158,15 @@
 					    client     	@2811

 					    supplier   	@2761

 					    vertices   	(list Points

-						(1880, 2347)

+						(1881, 2347)

 						(1788, 2347)

 						(1788, 2192))

 					    line_style 	3

-					    origin_attachment 	(1880, 2347)

+					    origin_attachment 	(1881, 2347)

 					    terminal_attachment 	(1788, 2192)

 					    label      	(object SegLabel @2817

 						Parent_View 	@2815

-						location   	(1842, 2218)

+						location   	(1843, 2218)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65509,7 +65214,7 @@
 				    height     	119

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$460" @2819

-				    location   	(1629, 2522)

+				    location   	(1868, 5044)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -65524,7 +65229,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "stateInvariant" @2820

 					    Parent_View 	@2819

-					    location   	(299, 632)

+					    location   	(538, 3154)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -65536,7 +65241,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2821

 						Parent_View 	@2820

-						location   	(1573, 2653)

+						location   	(1812, 5175)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65561,16 +65266,17 @@
 					    client     	@2819

 					    supplier   	@2818

 					    vertices   	(list Points

-						(1629, 2522)

+						(1868, 5044)

+						(1629, 5044)

 						(1629, 2613)

 						(1750, 2613)

 						(1750, 2731))

 					    line_style 	3

-					    origin_attachment 	(1629, 2522)

+					    origin_attachment 	(1868, 5044)

 					    terminal_attachment 	(1750, 2731)

 					    label      	(object SegLabel @2822

 						Parent_View 	@2820

-						location   	(1801, 2686)

+						location   	(2040, 5208)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65591,7 +65297,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2823

 						Parent_View 	@2820

-						location   	(1476, 2701)

+						location   	(1715, 5223)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65612,7 +65318,7 @@
 						orientation 	1))

 					(object RoleView "owningState" @2824

 					    Parent_View 	@2819

-					    location   	(299, 632)

+					    location   	(538, 3154)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -65624,7 +65330,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2825

 						Parent_View 	@2824

-						location   	(1503, 2271)

+						location   	(1742, 4793)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65648,12 +65354,16 @@
 					    quidu      	"3DFF235A030A"

 					    client     	@2819

 					    supplier   	@2761

+					    vertices   	(list Points

+						(1868, 5044)

+						(1928, 5044)

+						(1928, 2192))

 					    line_style 	3

-					    origin_attachment 	(1629, 2522)

-					    terminal_attachment 	(1629, 2192)

+					    origin_attachment 	(1868, 5044)

+					    terminal_attachment 	(1928, 2192)

 					    label      	(object SegLabel @2826

 						Parent_View 	@2824

-						location   	(1690, 2229)

+						location   	(1929, 4751)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65701,7 +65411,7 @@
 				    height     	528

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$458" @2828

-				    location   	(2221, 2147)

+				    location   	(2221, 1951)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -65716,7 +65426,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "doActivity" @2829

 					    Parent_View 	@2828

-					    location   	(891, 257)

+					    location   	(891, 61)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -65728,7 +65438,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2830

 						Parent_View 	@2829

-						location   	(2389, 2076)

+						location   	(2389, 1880)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65752,11 +65462,11 @@
 					    client     	@2828

 					    supplier   	@2827

 					    line_style 	3

-					    origin_attachment 	(2221, 2147)

-					    terminal_attachment 	(2513, 2147)

+					    origin_attachment 	(2221, 1951)

+					    terminal_attachment 	(2513, 1951)

 					    label      	(object SegLabel @2831

 						Parent_View 	@2829

-						location   	(2438, 2177)

+						location   	(2438, 1981)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65777,7 +65487,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2832

 						Parent_View 	@2829

-						location   	(2256, 2113)

+						location   	(2256, 1917)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65798,7 +65508,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$459" @2833

 					    Parent_View 	@2828

-					    location   	(891, 257)

+					    location   	(891, 61)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -65813,11 +65523,11 @@
 					    client     	@2828

 					    supplier   	@2761

 					    line_style 	3

-					    origin_attachment 	(2221, 2147)

-					    terminal_attachment 	(1930, 2147)

+					    origin_attachment 	(2221, 1951)

+					    terminal_attachment 	(1930, 1951)

 					    label      	(object SegLabel @2834

 						Parent_View 	@2833

-						location   	(1991, 2192)

+						location   	(1991, 1996)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65837,7 +65547,7 @@
 						height     	45

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$456" @2835

-				    location   	(2221, 1990)

+				    location   	(2221, 1951)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -65852,7 +65562,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "exit" @2836

 					    Parent_View 	@2835

-					    location   	(891, 100)

+					    location   	(891, 61)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -65864,7 +65574,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2837

 						Parent_View 	@2836

-						location   	(2423, 1903)

+						location   	(2423, 1864)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65888,11 +65598,11 @@
 					    client     	@2835

 					    supplier   	@2827

 					    line_style 	3

-					    origin_attachment 	(2221, 1990)

-					    terminal_attachment 	(2513, 1990)

+					    origin_attachment 	(2221, 1951)

+					    terminal_attachment 	(2513, 1951)

 					    label      	(object SegLabel @2838

 						Parent_View 	@2836

-						location   	(2435, 2014)

+						location   	(2435, 1975)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65913,7 +65623,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2839

 						Parent_View 	@2836

-						location   	(2245, 1941)

+						location   	(2245, 1902)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65934,7 +65644,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$457" @2840

 					    Parent_View 	@2835

-					    location   	(891, 100)

+					    location   	(891, 61)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -65949,11 +65659,11 @@
 					    client     	@2835

 					    supplier   	@2761

 					    line_style 	3

-					    origin_attachment 	(2221, 1990)

-					    terminal_attachment 	(1930, 1990)

+					    origin_attachment 	(2221, 1951)

+					    terminal_attachment 	(1930, 1951)

 					    label      	(object SegLabel @2841

 						Parent_View 	@2840

-						location   	(1985, 2035)

+						location   	(1985, 1996)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -65973,7 +65683,7 @@
 						height     	45

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$454" @2842

-				    location   	(2221, 1817)

+				    location   	(2221, 1951)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -65988,7 +65698,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "entry" @2843

 					    Parent_View 	@2842

-					    location   	(891, -73)

+					    location   	(891, 61)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -66000,7 +65710,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2844

 						Parent_View 	@2843

-						location   	(2411, 1728)

+						location   	(2411, 1862)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66024,11 +65734,11 @@
 					    client     	@2842

 					    supplier   	@2827

 					    line_style 	3

-					    origin_attachment 	(2221, 1817)

-					    terminal_attachment 	(2513, 1817)

+					    origin_attachment 	(2221, 1951)

+					    terminal_attachment 	(2513, 1951)

 					    label      	(object SegLabel @2845

 						Parent_View 	@2843

-						location   	(2435, 1846)

+						location   	(2435, 1980)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66049,7 +65759,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2846

 						Parent_View 	@2843

-						location   	(2262, 1777)

+						location   	(2262, 1911)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66070,7 +65780,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$455" @2847

 					    Parent_View 	@2842

-					    location   	(891, -73)

+					    location   	(891, 61)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -66085,11 +65795,11 @@
 					    client     	@2842

 					    supplier   	@2761

 					    line_style 	3

-					    origin_attachment 	(2221, 1817)

-					    terminal_attachment 	(1930, 1817)

+					    origin_attachment 	(2221, 1951)

+					    terminal_attachment 	(1930, 1951)

 					    label      	(object SegLabel @2848

 						Parent_View 	@2847

-						location   	(1980, 1862)

+						location   	(1980, 1996)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66130,26 +65840,10 @@
 					label      	"Transition")

 				    icon_style 	"Icon"

 				    quidu      	"3288D70A0212"

-				    compartment 	(object Compartment

-					Parent_View 	@2849

-					location   	(1856, 1331)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	1

-					max_width  	378)

 				    width      	1106

 				    height     	250)

 				(object AssociationViewNew "$UNNAMED$418" @2850

-				    location   	(1423, 1315)

+				    location   	(1423, 1356)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -66164,7 +65858,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "source" @2851

 					    Parent_View 	@2850

-					    location   	(772, 168)

+					    location   	(772, 209)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -66176,7 +65870,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2852

 						Parent_View 	@2851

-						location   	(1090, 1273)

+						location   	(1090, 1314)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66200,11 +65894,11 @@
 					    client     	@2850

 					    supplier   	@2776

 					    line_style 	3

-					    origin_attachment 	(1423, 1315)

-					    terminal_attachment 	(1000, 1315)

+					    origin_attachment 	(1423, 1356)

+					    terminal_attachment 	(1000, 1356)

 					    label      	(object SegLabel @2853

 						Parent_View 	@2851

-						location   	(1052, 1349)

+						location   	(1052, 1390)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66225,7 +65919,7 @@
 						orientation 	0))

 					(object RoleView "outgoing" @2854

 					    Parent_View 	@2850

-					    location   	(772, 168)

+					    location   	(772, 209)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -66237,7 +65931,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2855

 						Parent_View 	@2854

-						location   	(1705, 1283)

+						location   	(1705, 1324)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66261,11 +65955,11 @@
 					    client     	@2850

 					    supplier   	@2849

 					    line_style 	3

-					    origin_attachment 	(1423, 1315)

-					    terminal_attachment 	(1847, 1315)

+					    origin_attachment 	(1423, 1356)

+					    terminal_attachment 	(1847, 1356)

 					    label      	(object SegLabel @2856

 						Parent_View 	@2854

-						location   	(1782, 1348)

+						location   	(1782, 1389)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66285,7 +65979,7 @@
 						height     	33

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$419" @2857

-				    location   	(1423, 1421)

+				    location   	(1423, 1356)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -66300,7 +65994,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "target" @2858

 					    Parent_View 	@2857

-					    location   	(772, 274)

+					    location   	(772, 209)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -66312,7 +66006,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2859

 						Parent_View 	@2858

-						location   	(1072, 1391)

+						location   	(1072, 1326)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66336,11 +66030,11 @@
 					    client     	@2857

 					    supplier   	@2776

 					    line_style 	3

-					    origin_attachment 	(1423, 1421)

-					    terminal_attachment 	(1000, 1421)

+					    origin_attachment 	(1423, 1356)

+					    terminal_attachment 	(1000, 1356)

 					    label      	(object SegLabel @2860

 						Parent_View 	@2858

-						location   	(1052, 1460)

+						location   	(1052, 1395)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66361,7 +66055,7 @@
 						orientation 	0))

 					(object RoleView "incoming" @2861

 					    Parent_View 	@2857

-					    location   	(772, 274)

+					    location   	(772, 209)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -66373,7 +66067,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2862

 						Parent_View 	@2861

-						location   	(1705, 1382)

+						location   	(1705, 1317)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66397,11 +66091,11 @@
 					    client     	@2857

 					    supplier   	@2849

 					    line_style 	3

-					    origin_attachment 	(1423, 1421)

-					    terminal_attachment 	(1847, 1421)

+					    origin_attachment 	(1423, 1356)

+					    terminal_attachment 	(1847, 1356)

 					    label      	(object SegLabel @2863

 						Parent_View 	@2861

-						location   	(1785, 1461)

+						location   	(1785, 1396)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66421,7 +66115,7 @@
 						height     	40

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$417" @2864

-				    location   	(1936, 1096)

+				    location   	(1936, 2130)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -66436,7 +66130,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "transition" @2865

 					    Parent_View 	@2864

-					    location   	(448, 11)

+					    location   	(448, 1045)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -66448,7 +66142,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2866

 						Parent_View 	@2865

-						location   	(2129, 1167)

+						location   	(2129, 2201)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66472,15 +66166,16 @@
 					    client     	@2864

 					    supplier   	@2849

 					    vertices   	(list Points

+						(1936, 2130)

 						(1936, 1096)

 						(1996, 1096)

 						(1996, 1255))

 					    line_style 	3

-					    origin_attachment 	(1936, 1096)

+					    origin_attachment 	(1936, 2130)

 					    terminal_attachment 	(1996, 1255)

 					    label      	(object SegLabel @2867

 						Parent_View 	@2865

-						location   	(1968, 1230)

+						location   	(1968, 2264)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66501,7 +66196,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2868

 						Parent_View 	@2865

-						location   	(2253, 1215)

+						location   	(2253, 2249)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66522,7 +66217,7 @@
 						orientation 	0))

 					(object RoleView "container" @2869

 					    Parent_View 	@2864

-					    location   	(448, 11)

+					    location   	(448, 1045)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -66534,7 +66229,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2870

 						Parent_View 	@2869

-						location   	(1894, 1032)

+						location   	(1894, 2066)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66557,12 +66252,17 @@
 					    quidu      	"3288D72700C8"

 					    client     	@2864

 					    supplier   	@2781

+					    vertices   	(list Points

+						(1936, 2130)

+						(1936, 2192)

+						(1767, 2192)

+						(1767, 1169))

 					    line_style 	3

-					    origin_attachment 	(1936, 1096)

-					    terminal_attachment 	(1769, 1096)

+					    origin_attachment 	(1936, 2130)

+					    terminal_attachment 	(1767, 1169)

 					    label      	(object SegLabel @2871

 						Parent_View 	@2869

-						location   	(1839, 1146)

+						location   	(1839, 2180)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66583,7 +66283,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2872

 						Parent_View 	@2869

-						location   	(1977, 1076)

+						location   	(1977, 2110)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66603,7 +66303,7 @@
 						height     	20

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$433" @2873

-				    location   	(2915, 2245)

+				    location   	(2561, 2245)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -66618,7 +66318,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$434" @2874

 					    Parent_View 	@2873

-					    location   	(47, -119)

+					    location   	(-307, -119)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -66633,12 +66333,16 @@
 					    quidu      	"3BE6BE6D0118"

 					    client     	@2873

 					    supplier   	@2849

+					    vertices   	(list Points

+						(2561, 2245)

+						(2208, 2245)

+						(2208, 1505))

 					    line_style 	3

-					    origin_attachment 	(2915, 2245)

-					    terminal_attachment 	(2915, 1505)

+					    origin_attachment 	(2561, 2245)

+					    terminal_attachment 	(2208, 1505)

 					    label      	(object SegLabel @2875

 						Parent_View 	@2874

-						location   	(2877, 1558)

+						location   	(2523, 1558)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66659,7 +66363,7 @@
 						orientation 	0))

 					(object RoleView "trigger" @2876

 					    Parent_View 	@2873

-					    location   	(47, -119)

+					    location   	(-307, -119)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -66671,7 +66375,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2877

 						Parent_View 	@2876

-						location   	(2476, 2392)

+						location   	(2122, 2392)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66696,16 +66400,17 @@
 					    client     	@2873

 					    supplier   	@2810

 					    vertices   	(list Points

+						(2561, 2245)

 						(2915, 2245)

 						(2915, 2310)

 						(2352, 2310)

 						(2352, 2422))

 					    line_style 	3

-					    origin_attachment 	(2915, 2245)

+					    origin_attachment 	(2561, 2245)

 					    terminal_attachment 	(2352, 2422)

 					    label      	(object SegLabel @2878

 						Parent_View 	@2876

-						location   	(2255, 2383)

+						location   	(1901, 2383)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66725,7 +66430,7 @@
 						height     	98

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$443" @2879

-				    location   	(3059, 2576)

+				    location   	(3059, 2569)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -66740,7 +66445,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "guard" @2880

 					    Parent_View 	@2879

-					    location   	(887, 1208)

+					    location   	(887, 1201)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -66752,7 +66457,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2881

 						Parent_View 	@2880

-						location   	(2078, 2689)

+						location   	(2078, 2682)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66777,15 +66482,15 @@
 					    client     	@2879

 					    supplier   	@2818

 					    vertices   	(list Points

-						(3059, 2576)

+						(3059, 2569)

 						(3059, 2775)

 						(1971, 2775))

 					    line_style 	3

-					    origin_attachment 	(3059, 2576)

+					    origin_attachment 	(3059, 2569)

 					    terminal_attachment 	(1971, 2775)

 					    label      	(object SegLabel @2882

 						Parent_View 	@2880

-						location   	(2052, 2827)

+						location   	(2052, 2820)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66806,7 +66511,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2883

 						Parent_View 	@2880

-						location   	(2234, 2744)

+						location   	(2234, 2737)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66827,7 +66532,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$444" @2884

 					    Parent_View 	@2879

-					    location   	(887, 1208)

+					    location   	(887, 1201)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -66843,15 +66548,15 @@
 					    client     	@2879

 					    supplier   	@2849

 					    vertices   	(list Points

-						(3059, 2576)

+						(3059, 2569)

 						(3059, 1380)

 						(2953, 1380))

 					    line_style 	3

-					    origin_attachment 	(3059, 2576)

+					    origin_attachment 	(3059, 2569)

 					    terminal_attachment 	(2953, 1380)

 					    label      	(object SegLabel @2885

 						Parent_View 	@2884

-						location   	(2998, 1459)

+						location   	(2998, 1452)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66871,7 +66576,7 @@
 						height     	61

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$452" @2886

-				    location   	(2641, 1607)

+				    location   	(2700, 1607)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -66886,7 +66591,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "effect" @2887

 					    Parent_View 	@2886

-					    location   	(471, 237)

+					    location   	(530, 237)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -66898,7 +66603,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2888

 						Parent_View 	@2887

-						location   	(2554, 1608)

+						location   	(2613, 1608)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66922,11 +66627,11 @@
 					    client     	@2886

 					    supplier   	@2827

 					    line_style 	3

-					    origin_attachment 	(2641, 1607)

-					    terminal_attachment 	(2641, 1710)

+					    origin_attachment 	(2700, 1607)

+					    terminal_attachment 	(2700, 1710)

 					    label      	(object SegLabel @2889

 						Parent_View 	@2887

-						location   	(2709, 1681)

+						location   	(2768, 1681)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -66947,7 +66652,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2890

 						Parent_View 	@2887

-						location   	(2393, 1645)

+						location   	(2452, 1645)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -66968,7 +66673,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$453" @2891

 					    Parent_View 	@2886

-					    location   	(471, 237)

+					    location   	(530, 237)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -66983,11 +66688,11 @@
 					    client     	@2886

 					    supplier   	@2849

 					    line_style 	3

-					    origin_attachment 	(2641, 1607)

-					    terminal_attachment 	(2641, 1504)

+					    origin_attachment 	(2700, 1607)

+					    terminal_attachment 	(2700, 1505)

 					    label      	(object SegLabel @2892

 						Parent_View 	@2891

-						location   	(2587, 1530)

+						location   	(2646, 1530)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -67086,22 +66791,6 @@
 					label      	"<<enumeration>>")

 				    icon_style 	"Icon"

 				    quidu      	"3E5B99180230"

-				    compartment 	(object Compartment

-					Parent_View 	@2896

-					location   	(2187, 406)

-					font       	(object Font

-					    size       	10

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	3

-					max_width  	153)

 				    width      	396

 				    height     	305)))

 			(object ClassDiagram "Redefinitions"

@@ -67346,7 +67035,7 @@
 				    width      	345

 				    height     	177)

 				(object AssociationViewNew "$UNNAMED$425" @2908

-				    location   	(2732, 935)

+				    location   	(2732, 933)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -67361,7 +67050,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "redefinedState" @2909

 					    Parent_View 	@2908

-					    location   	(1760, 141)

+					    location   	(1760, 139)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -67373,7 +67062,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2910

 						Parent_View 	@2909

-						location   	(2704, 733)

+						location   	(2704, 731)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -67398,15 +67087,15 @@
 					    client     	@2908

 					    supplier   	@2907

 					    vertices   	(list Points

-						(2732, 935)

+						(2732, 933)

 						(2732, 878)

 						(2602, 878))

 					    line_style 	3

-					    origin_attachment 	(2732, 935)

+					    origin_attachment 	(2732, 933)

 					    terminal_attachment 	(2602, 878)

 					    label      	(object SegLabel @2911

 						Parent_View 	@2909

-						location   	(2624, 828)

+						location   	(2624, 826)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -67427,7 +67116,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2912

 						Parent_View 	@2909

-						location   	(2807, 788)

+						location   	(2807, 786)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -67448,7 +67137,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$426" @2913

 					    Parent_View 	@2908

-					    location   	(1760, 141)

+					    location   	(1760, 139)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -67464,15 +67153,15 @@
 					    client     	@2908

 					    supplier   	@2907

 					    vertices   	(list Points

-						(2732, 935)

+						(2732, 933)

 						(2732, 989)

 						(2602, 989))

 					    line_style 	3

-					    origin_attachment 	(2732, 935)

+					    origin_attachment 	(2732, 933)

 					    terminal_attachment 	(2602, 989)

 					    label      	(object SegLabel @2914

 						Parent_View 	@2913

-						location   	(2664, 1028)

+						location   	(2664, 1026)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -67515,7 +67204,7 @@
 				    width      	336

 				    height     	177)

 				(object AssociationViewNew "$UNNAMED$427" @2916

-				    location   	(3329, 1110)

+				    location   	(3329, 1109)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -67530,7 +67219,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "redefinedTransition" @2917

 					    Parent_View 	@2916

-					    location   	(1781, 324)

+					    location   	(1781, 323)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -67542,7 +67231,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2918

 						Parent_View 	@2917

-						location   	(3380, 914)

+						location   	(3380, 913)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -67567,15 +67256,15 @@
 					    client     	@2916

 					    supplier   	@2915

 					    vertices   	(list Points

-						(3329, 1110)

+						(3329, 1109)

 						(3329, 1050)

 						(3204, 1050))

 					    line_style 	3

-					    origin_attachment 	(3329, 1110)

+					    origin_attachment 	(3329, 1109)

 					    terminal_attachment 	(3204, 1050)

 					    label      	(object SegLabel @2919

 						Parent_View 	@2917

-						location   	(3281, 1082)

+						location   	(3281, 1081)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -67596,7 +67285,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2920

 						Parent_View 	@2917

-						location   	(3466, 984)

+						location   	(3466, 983)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -67617,7 +67306,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$428" @2921

 					    Parent_View 	@2916

-					    location   	(1781, 324)

+					    location   	(1781, 323)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -67633,15 +67322,15 @@
 					    client     	@2916

 					    supplier   	@2915

 					    vertices   	(list Points

-						(3329, 1110)

+						(3329, 1109)

 						(3329, 1169)

 						(3204, 1169))

 					    line_style 	3

-					    origin_attachment 	(3329, 1110)

+					    origin_attachment 	(3329, 1109)

 					    terminal_attachment 	(3204, 1169)

 					    label      	(object SegLabel @2922

 						Parent_View 	@2921

-						location   	(3281, 1220)

+						location   	(3281, 1219)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -67689,7 +67378,7 @@
 				    height     	519

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$446" @2924

-				    location   	(1078, 774)

+				    location   	(1078, 804)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -67704,7 +67393,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "/redefinitionContext" @2925

 					    Parent_View 	@2924

-					    location   	(-444, -179)

+					    location   	(-444, -149)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -67716,7 +67405,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2926

 						Parent_View 	@2925

-						location   	(903, 693)

+						location   	(903, 723)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -67741,11 +67430,11 @@
 					    client     	@2924

 					    supplier   	@2923

 					    line_style 	3

-					    origin_attachment 	(1078, 774)

-					    terminal_attachment 	(650, 774)

+					    origin_attachment 	(1078, 804)

+					    terminal_attachment 	(650, 804)

 					    label      	(object SegLabel @2927

 						Parent_View 	@2925

-						location   	(687, 801)

+						location   	(687, 831)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -67766,7 +67455,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2928

 						Parent_View 	@2925

-						location   	(977, 745)

+						location   	(977, 775)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -67787,7 +67476,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$447" @2929

 					    Parent_View 	@2924

-					    location   	(-444, -179)

+					    location   	(-444, -149)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -67803,11 +67492,11 @@
 					    client     	@2924

 					    supplier   	@2899

 					    line_style 	3

-					    origin_attachment 	(1078, 774)

-					    terminal_attachment 	(1506, 774)

+					    origin_attachment 	(1078, 804)

+					    terminal_attachment 	(1506, 804)

 					    label      	(object SegLabel @2930

 						Parent_View 	@2929

-						location   	(1457, 821)

+						location   	(1457, 851)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -67827,7 +67516,7 @@
 						height     	47

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$448" @2931

-				    location   	(1454, 980)

+				    location   	(1454, 954)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -67842,7 +67531,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$449" @2932

 					    Parent_View 	@2931

-					    location   	(607, -200)

+					    location   	(607, -226)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -67858,11 +67547,11 @@
 					    client     	@2931

 					    supplier   	@2907

 					    line_style 	3

-					    origin_attachment 	(1454, 980)

-					    terminal_attachment 	(2258, 980)

+					    origin_attachment 	(1454, 954)

+					    terminal_attachment 	(2258, 954)

 					    label      	(object SegLabel @2933

 						Parent_View 	@2932

-						location   	(2239, 965)

+						location   	(2239, 939)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -67883,7 +67572,7 @@
 						orientation 	0))

 					(object RoleView "/redefinitionContext" @2934

 					    Parent_View 	@2931

-					    location   	(607, -200)

+					    location   	(607, -226)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -67895,7 +67584,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2935

 						Parent_View 	@2934

-						location   	(914, 882)

+						location   	(914, 856)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -67920,11 +67609,11 @@
 					    client     	@2931

 					    supplier   	@2923

 					    line_style 	3

-					    origin_attachment 	(1454, 980)

-					    terminal_attachment 	(650, 980)

+					    origin_attachment 	(1454, 954)

+					    terminal_attachment 	(650, 954)

 					    label      	(object SegLabel @2936

 						Parent_View 	@2934

-						location   	(694, 1022)

+						location   	(694, 996)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -67945,7 +67634,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2937

 						Parent_View 	@2934

-						location   	(998, 924)

+						location   	(998, 898)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -67965,7 +67654,7 @@
 						height     	56

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$450" @2938

-				    location   	(1759, 1166)

+				    location   	(1759, 1116)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -67980,7 +67669,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$451" @2939

 					    Parent_View 	@2938

-					    location   	(913, -14)

+					    location   	(913, -64)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -67996,11 +67685,11 @@
 					    client     	@2938

 					    supplier   	@2915

 					    line_style 	3

-					    origin_attachment 	(1759, 1166)

-					    terminal_attachment 	(2868, 1166)

+					    origin_attachment 	(1759, 1116)

+					    terminal_attachment 	(2868, 1116)

 					    label      	(object SegLabel @2940

 						Parent_View 	@2939

-						location   	(2817, 1188)

+						location   	(2817, 1138)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -68021,7 +67710,7 @@
 						orientation 	1))

 					(object RoleView "/redefinitionContext" @2941

 					    Parent_View 	@2938

-					    location   	(913, -14)

+					    location   	(913, -64)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -68033,7 +67722,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2942

 						Parent_View 	@2941

-						location   	(906, 1092)

+						location   	(906, 1042)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -68058,11 +67747,11 @@
 					    client     	@2938

 					    supplier   	@2923

 					    line_style 	3

-					    origin_attachment 	(1759, 1166)

-					    terminal_attachment 	(650, 1166)

+					    origin_attachment 	(1759, 1116)

+					    terminal_attachment 	(650, 1116)

 					    label      	(object SegLabel @2943

 						Parent_View 	@2941

-						location   	(696, 1220)

+						location   	(696, 1170)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -68083,7 +67772,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2944

 						Parent_View 	@2941

-						location   	(981, 1134)

+						location   	(981, 1084)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -68596,6 +68285,7 @@
 				    quidu      	"3BAFE2B3012C")))

 			(object Class "ProtocolTransition"

 			    quid       	"3B208BE80384"

+			    documentation 	"A protocol transition (transition as specialized in the ProtocolStateMachines package) specifies a legal transition for an operation. Transitions of protocol state machines have the following information: a pre condition (guard), on trigger, and a post condition. Every protocol transition is associated to zero or one operation (referred BehavioralFeature) that belongs to the context classifier of the protocol state machine. The protocol transition specifies that the associated (referred) operation can be called for an instance in the origin state under the initial condition (guard), and that at the end of the transition, the destination state will be reached under the final condition (post). "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E11ED8200A0"

@@ -68880,7 +68570,7 @@
 				    width      	625

 				    height     	312)

 				(object AssociationViewNew "$UNNAMED$462" @2972

-				    location   	(691, 369)

+				    location   	(691, 406)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -68895,7 +68585,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "protocol" @2973

 					    Parent_View 	@2972

-					    location   	(499, -39)

+					    location   	(499, -2)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -68907,7 +68597,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2974

 						Parent_View 	@2973

-						location   	(801, 418)

+						location   	(801, 455)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -68931,11 +68621,11 @@
 					    client     	@2972

 					    supplier   	@2971

 					    line_style 	3

-					    origin_attachment 	(691, 369)

-					    terminal_attachment 	(918, 369)

+					    origin_attachment 	(691, 406)

+					    terminal_attachment 	(918, 406)

 					    label      	(object SegLabel @2975

 						Parent_View 	@2973

-						location   	(867, 328)

+						location   	(867, 365)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -68956,7 +68646,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$463" @2976

 					    Parent_View 	@2972

-					    location   	(499, -39)

+					    location   	(499, -2)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -68968,7 +68658,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2977

 						Parent_View 	@2976

-						location   	(548, 411)

+						location   	(548, 448)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -68993,11 +68683,11 @@
 					    client     	@2972

 					    supplier   	@2968

 					    line_style 	3

-					    origin_attachment 	(691, 369)

-					    terminal_attachment 	(464, 369)

+					    origin_attachment 	(691, 406)

+					    terminal_attachment 	(464, 406)

 					    label      	(object SegLabel @2978

 						Parent_View 	@2976

-						location   	(496, 344)

+						location   	(496, 381)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69017,7 +68707,7 @@
 						height     	26

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$465" @2979

-				    location   	(689, 622)

+				    location   	(689, 592)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -69032,7 +68722,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "protocol" @2980

 					    Parent_View 	@2979

-					    location   	(497, 46)

+					    location   	(497, 16)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -69044,7 +68734,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2981

 						Parent_View 	@2980

-						location   	(826, 675)

+						location   	(826, 645)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69068,11 +68758,11 @@
 					    client     	@2979

 					    supplier   	@2971

 					    line_style 	3

-					    origin_attachment 	(689, 622)

-					    terminal_attachment 	(918, 622)

+					    origin_attachment 	(689, 592)

+					    terminal_attachment 	(918, 592)

 					    label      	(object SegLabel @2982

 						Parent_View 	@2980

-						location   	(870, 586)

+						location   	(870, 556)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69093,7 +68783,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2983

 						Parent_View 	@2980

-						location   	(947, 757)

+						location   	(947, 727)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69114,7 +68804,7 @@
 						orientation 	1))

 					(object RoleView "interface" @2984

 					    Parent_View 	@2979

-					    location   	(497, 46)

+					    location   	(497, 16)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -69126,7 +68816,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2985

 						Parent_View 	@2984

-						location   	(564, 685)

+						location   	(564, 655)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69150,11 +68840,11 @@
 					    client     	@2979

 					    supplier   	@2969

 					    line_style 	3

-					    origin_attachment 	(689, 622)

-					    terminal_attachment 	(461, 622)

+					    origin_attachment 	(689, 592)

+					    terminal_attachment 	(461, 592)

 					    label      	(object SegLabel @2986

 						Parent_View 	@2984

-						location   	(504, 573)

+						location   	(504, 543)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69175,7 +68865,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2987

 						Parent_View 	@2984

-						location   	(434, 754)

+						location   	(434, 724)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69195,7 +68885,7 @@
 						height     	132

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$466" @2988

-				    location   	(1980, 583)

+				    location   	(1980, 504)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -69210,7 +68900,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "generalMachine" @2989

 					    Parent_View 	@2988

-					    location   	(-1662, -665)

+					    location   	(-1662, -744)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -69222,7 +68912,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2990

 						Parent_View 	@2989

-						location   	(1724, 621)

+						location   	(1724, 542)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69247,11 +68937,11 @@
 					    client     	@2988

 					    supplier   	@2971

 					    line_style 	3

-					    origin_attachment 	(1980, 583)

-					    terminal_attachment 	(1542, 583)

+					    origin_attachment 	(1980, 504)

+					    terminal_attachment 	(1542, 504)

 					    label      	(object SegLabel @2991

 						Parent_View 	@2989

-						location   	(1606, 546)

+						location   	(1606, 467)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69272,7 +68962,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @2992

 						Parent_View 	@2989

-						location   	(1726, 682)

+						location   	(1726, 603)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69293,7 +68983,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$467" @2993

 					    Parent_View 	@2988

-					    location   	(-1662, -665)

+					    location   	(-1662, -744)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -69309,11 +68999,11 @@
 					    client     	@2988

 					    supplier   	@2970

 					    line_style 	3

-					    origin_attachment 	(1980, 583)

-					    terminal_attachment 	(2418, 583)

+					    origin_attachment 	(1980, 504)

+					    terminal_attachment 	(2418, 504)

 					    label      	(object SegLabel @2994

 						Parent_View 	@2993

-						location   	(2383, 556)

+						location   	(2383, 477)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69333,7 +69023,7 @@
 						height     	28

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$461" @2995

-				    location   	(1980, 410)

+				    location   	(1980, 504)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -69348,7 +69038,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "conformance" @2996

 					    Parent_View 	@2995

-					    location   	(-708, -928)

+					    location   	(-708, -834)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -69360,7 +69050,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @2997

 						Parent_View 	@2996

-						location   	(2240, 443)

+						location   	(2240, 537)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69385,11 +69075,11 @@
 					    client     	@2995

 					    supplier   	@2970

 					    line_style 	3

-					    origin_attachment 	(1980, 410)

-					    terminal_attachment 	(2418, 410)

+					    origin_attachment 	(1980, 504)

+					    terminal_attachment 	(2418, 504)

 					    label      	(object SegLabel @2998

 						Parent_View 	@2996

-						location   	(2390, 357)

+						location   	(2390, 451)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69410,7 +69100,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @2999

 						Parent_View 	@2996

-						location   	(2163, 483)

+						location   	(2163, 577)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69431,7 +69121,7 @@
 						orientation 	1))

 					(object RoleView "specificMachine" @3000

 					    Parent_View 	@2995

-					    location   	(-708, -928)

+					    location   	(-708, -834)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -69443,7 +69133,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3001

 						Parent_View 	@3000

-						location   	(1741, 306)

+						location   	(1741, 400)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69468,11 +69158,11 @@
 					    client     	@2995

 					    supplier   	@2971

 					    line_style 	3

-					    origin_attachment 	(1980, 410)

-					    terminal_attachment 	(1542, 410)

+					    origin_attachment 	(1980, 504)

+					    terminal_attachment 	(1542, 504)

 					    label      	(object SegLabel @3002

 						Parent_View 	@3000

-						location   	(1602, 465)

+						location   	(1602, 559)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69493,7 +69183,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3003

 						Parent_View 	@3000

-						location   	(1880, 366)

+						location   	(1880, 460)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69631,13 +69321,13 @@
 				    height     	169

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$468" @3009

-				    location   	(1859, 2307)

+				    location   	(3474, 2383)

 				    stereotype 	TRUE

 				    quidu      	"3D04172101D8"

 				    roleview_list 	(list RoleViews

 					(object RoleView "stateInvariant" @3010

 					    Parent_View 	@3009

-					    location   	(923, 9)

+					    location   	(2538, 85)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -69649,7 +69339,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3011

 						Parent_View 	@3010

-						location   	(2300, 2070)

+						location   	(3915, 2146)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69673,15 +69363,17 @@
 					    client     	@3009

 					    supplier   	@3008

 					    vertices   	(list Points

-						(1859, 2307)

+						(3474, 2383)

+						(3718, 2383)

+						(3718, 2307)

 						(2141, 2307)

 						(2141, 2022))

 					    line_style 	3

-					    origin_attachment 	(1859, 2307)

+					    origin_attachment 	(3474, 2383)

 					    terminal_attachment 	(2141, 2022)

 					    label      	(object SegLabel @3012

 						Parent_View 	@3010

-						location   	(2071, 2067)

+						location   	(3686, 2143)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69702,7 +69394,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3013

 						Parent_View 	@3010

-						location   	(2392, 2119)

+						location   	(4007, 2195)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69723,7 +69415,7 @@
 						orientation 	1))

 					(object RoleView "owningState" @3014

 					    Parent_View 	@3009

-					    location   	(923, 9)

+					    location   	(2538, 85)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -69735,7 +69427,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3015

 						Parent_View 	@3014

-						location   	(1495, 2259)

+						location   	(3110, 2335)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69759,11 +69451,11 @@
 					    client     	@3009

 					    supplier   	@3007

 					    line_style 	3

-					    origin_attachment 	(1859, 2307)

-					    terminal_attachment 	(1292, 2307)

+					    origin_attachment 	(3474, 2383)

+					    terminal_attachment 	(1292, 2383)

 					    label      	(object SegLabel @3016

 						Parent_View 	@3014

-						location   	(1349, 2361)

+						location   	(2964, 2437)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69784,7 +69476,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3017

 						Parent_View 	@3014

-						location   	(1577, 2350)

+						location   	(3192, 2426)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69857,7 +69549,7 @@
 				    height     	166

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$464" @3020

-				    location   	(1641, 1991)

+				    location   	(1641, 1931)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -69872,7 +69564,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "postCondition" @3021

 					    Parent_View 	@3020

-					    location   	(-753, 767)

+					    location   	(-753, 707)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -69884,7 +69576,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3022

 						Parent_View 	@3021

-						location   	(1830, 2023)

+						location   	(1830, 1963)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69909,11 +69601,11 @@
 					    client     	@3020

 					    supplier   	@3008

 					    line_style 	3

-					    origin_attachment 	(1641, 1991)

-					    terminal_attachment 	(1998, 1991)

+					    origin_attachment 	(1641, 1931)

+					    terminal_attachment 	(1998, 1931)

 					    label      	(object SegLabel @3023

 						Parent_View 	@3021

-						location   	(1925, 1965)

+						location   	(1925, 1905)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69934,7 +69626,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3024

 						Parent_View 	@3021

-						location   	(1759, 2070)

+						location   	(1759, 2010)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69955,7 +69647,7 @@
 						orientation 	1))

 					(object RoleView "owningTransition" @3025

 					    Parent_View 	@3020

-					    location   	(-753, 767)

+					    location   	(-753, 707)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -69967,7 +69659,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3026

 						Parent_View 	@3025

-						location   	(1473, 1950)

+						location   	(1473, 1890)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -69992,11 +69684,11 @@
 					    client     	@3020

 					    supplier   	@3019

 					    line_style 	3

-					    origin_attachment 	(1641, 1991)

-					    terminal_attachment 	(1284, 1991)

+					    origin_attachment 	(1641, 1931)

+					    terminal_attachment 	(1284, 1931)

 					    label      	(object SegLabel @3027

 						Parent_View 	@3025

-						location   	(1385, 2042)

+						location   	(1385, 1982)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -70017,7 +69709,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3028

 						Parent_View 	@3025

-						location   	(1320, 2099)

+						location   	(1320, 2039)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -70037,7 +69729,7 @@
 						height     	108

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$470" @3029

-				    location   	(1641, 1866)

+				    location   	(1641, 1931)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -70052,7 +69744,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "preCondition" @3030

 					    Parent_View 	@3029

-					    location   	(561, -60)

+					    location   	(561, 5)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -70064,7 +69756,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3031

 						Parent_View 	@3030

-						location   	(1725, 1817)

+						location   	(1725, 1882)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -70088,11 +69780,11 @@
 					    client     	@3029

 					    supplier   	@3008

 					    line_style 	3

-					    origin_attachment 	(1641, 1866)

-					    terminal_attachment 	(1998, 1866)

+					    origin_attachment 	(1641, 1931)

+					    terminal_attachment 	(1998, 1931)

 					    label      	(object SegLabel @3032

 						Parent_View 	@3030

-						location   	(1920, 1895)

+						location   	(1920, 1960)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -70113,7 +69805,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3033

 						Parent_View 	@3030

-						location   	(2033, 1818)

+						location   	(2033, 1883)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -70134,7 +69826,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$471" @3034

 					    Parent_View 	@3029

-					    location   	(561, -60)

+					    location   	(561, 5)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -70149,11 +69841,11 @@
 					    client     	@3029

 					    supplier   	@3019

 					    line_style 	3

-					    origin_attachment 	(1641, 1866)

-					    terminal_attachment 	(1284, 1866)

+					    origin_attachment 	(1641, 1931)

+					    terminal_attachment 	(1284, 1931)

 					    label      	(object SegLabel @3035

 						Parent_View 	@3034

-						location   	(1407, 1803)

+						location   	(1407, 1868)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -70179,7 +69871,7 @@
 				    supplier   	@3004

 				    line_style 	0)

 				(object AssociationViewNew " " @3037

-				    location   	(722, 1887)

+				    location   	(722, 1905)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -70194,7 +69886,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "/referred" @3038

 					    Parent_View 	@3037

-					    location   	(-358, -39)

+					    location   	(-358, -21)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -70206,7 +69898,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3039

 						Parent_View 	@3038

-						location   	(678, 1948)

+						location   	(678, 1966)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -70230,11 +69922,11 @@
 					    client     	@3037

 					    supplier   	@3018

 					    line_style 	3

-					    origin_attachment 	(722, 1887)

-					    terminal_attachment 	(568, 1887)

+					    origin_attachment 	(722, 1905)

+					    terminal_attachment 	(568, 1905)

 					    label      	(object SegLabel @3040

 						Parent_View 	@3038

-						location   	(619, 1841)

+						location   	(619, 1859)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -70255,7 +69947,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$469" @3041

 					    Parent_View 	@3037

-					    location   	(-358, -39)

+					    location   	(-358, -21)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -70270,11 +69962,11 @@
 					    client     	@3037

 					    supplier   	@3019

 					    line_style 	3

-					    origin_attachment 	(722, 1887)

-					    terminal_attachment 	(876, 1887)

+					    origin_attachment 	(722, 1905)

+					    terminal_attachment 	(876, 1905)

 					    label      	(object SegLabel @3042

 						Parent_View 	@3041

-						location   	(859, 1841)

+						location   	(859, 1859)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -70617,7 +70309,7 @@
 				    height     	126

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$474" @3055

-				    location   	(1100, 644)

+				    location   	(1100, 666)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -70632,7 +70324,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "region" @3056

 					    Parent_View 	@3055

-					    location   	(-114, 209)

+					    location   	(-114, 231)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -70644,7 +70336,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3057

 						Parent_View 	@3056

-						location   	(1286, 551)

+						location   	(1286, 573)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -70669,11 +70361,11 @@
 					    client     	@3055

 					    supplier   	@3046

 					    line_style 	3

-					    origin_attachment 	(1100, 644)

-					    terminal_attachment 	(1409, 644)

+					    origin_attachment 	(1100, 666)

+					    terminal_attachment 	(1409, 666)

 					    label      	(object SegLabel @3058

 						Parent_View 	@3056

-						location   	(1352, 688)

+						location   	(1352, 710)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -70694,7 +70386,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3059

 						Parent_View 	@3056

-						location   	(1208, 601)

+						location   	(1208, 623)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -70715,7 +70407,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$475" @3060

 					    Parent_View 	@3055

-					    location   	(-114, 209)

+					    location   	(-114, 231)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -70731,11 +70423,11 @@
 					    client     	@3055

 					    supplier   	@3054

 					    line_style 	3

-					    origin_attachment 	(1100, 644)

-					    terminal_attachment 	(792, 644)

+					    origin_attachment 	(1100, 666)

+					    terminal_attachment 	(792, 666)

 					    label      	(object SegLabel @3061

 						Parent_View 	@3060

-						location   	(855, 695)

+						location   	(855, 717)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -71378,7 +71070,7 @@
 				    origin_attachment 	(382, 719)

 				    terminal_attachment 	(382, 304))

 				(object AssociationViewNew "$UNNAMED$477" @3085

-				    location   	(549, 511)

+				    location   	(390, 512)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -71394,7 +71086,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "represented" @3086

 					    Parent_View 	@3085

-					    location   	(-111, -293)

+					    location   	(-270, -292)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -71406,7 +71098,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3087

 						Parent_View 	@3086

-						location   	(713, 350)

+						location   	(554, 351)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -71431,11 +71123,11 @@
 					    client     	@3085

 					    supplier   	@3083

 					    line_style 	3

-					    origin_attachment 	(549, 511)

-					    terminal_attachment 	(549, 304)

+					    origin_attachment 	(390, 512)

+					    terminal_attachment 	(390, 305)

 					    label      	(object SegLabel @3088

 						Parent_View 	@3086

-						location   	(503, 359)

+						location   	(344, 360)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -71456,7 +71148,7 @@
 						orientation 	0))

 					(object RoleView "representation" @3089

 					    Parent_View 	@3085

-					    location   	(-111, -293)

+					    location   	(-270, -292)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -71468,7 +71160,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3090

 						Parent_View 	@3089

-						location   	(743, 625)

+						location   	(584, 626)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -71493,11 +71185,11 @@
 					    client     	@3085

 					    supplier   	@3080

 					    line_style 	3

-					    origin_attachment 	(549, 511)

-					    terminal_attachment 	(549, 718)

+					    origin_attachment 	(390, 512)

+					    terminal_attachment 	(390, 719)

 					    label      	(object SegLabel @3091

 						Parent_View 	@3089

-						location   	(603, 697)

+						location   	(444, 698)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -71700,7 +71392,7 @@
 						height     	54

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$478" @3101

-				    location   	(1232, 228)

+				    location   	(804, 719)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -71716,7 +71408,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "conveyed" @3102

 					    Parent_View 	@3101

-					    location   	(-298, -594)

+					    location   	(-726, -103)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -71728,7 +71420,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3103

 						Parent_View 	@3102

-						location   	(842, 187)

+						location   	(414, 678)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -71752,12 +71444,16 @@
 					    quidu      	"3DD3DE33021E"

 					    client     	@3101

 					    supplier   	@3083

+					    vertices   	(list Points

+						(804, 719)

+						(744, 719)

+						(744, 305))

 					    line_style 	3

-					    origin_attachment 	(1232, 228)

-					    terminal_attachment 	(744, 228)

+					    origin_attachment 	(804, 719)

+					    terminal_attachment 	(744, 305)

 					    label      	(object SegLabel @3104

 						Parent_View 	@3102

-						location   	(794, 282)

+						location   	(366, 773)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -71778,7 +71474,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$479" @3105

 					    Parent_View 	@3101

-					    location   	(-298, -594)

+					    location   	(-726, -103)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -71793,16 +71489,12 @@
 					    quidu      	"3DD3DE33025A"

 					    client     	@3101

 					    supplier   	@3092

-					    vertices   	(list Points

-						(1232, 228)

-						(1292, 228)

-						(1292, 719))

 					    line_style 	3

-					    origin_attachment 	(1232, 228)

-					    terminal_attachment 	(1292, 719)

+					    origin_attachment 	(1608, 1438)

+					    terminal_attachment 	(2791, 1541)

 					    label      	(object SegLabel @3106

 						Parent_View 	@3105

-						location   	(1346, 663)

+						location   	(918, 1154)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -71873,6 +71565,7 @@
 		    logical_models 	(list unit_reference_list

 			(object Class "Model"

 			    quid       	"327A5D1E0032"

+			    documentation 	"The Model construct is defined as a Package. It contains a (hierarchical) set of elements that together describe the physical system being modeled. A Model may also contain a set of elements that represents the environment of the system, typically Actors, together with their interrelationships, such as Associations and Dependencies "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"33EDB5860140"

@@ -71881,8 +71574,7 @@
 			    class_attributes 	(list class_attribute_list

 				(object ClassAttribute "viewpoint"

 				    quid       	"3D2C32860188"

-				    type       	"String"

-				    quidu      	"3CA010B103C3"))

+				    type       	"String"))

 			    language   	"none"))

 		    logical_presentations 	(list unit_reference_list

 			(object ClassDiagram "Models"

@@ -71968,6 +71660,7 @@
 		    logical_models 	(list unit_reference_list

 			(object Class "TemplateSignature"

 			    quid       	"3E2803EE016E"

+			    documentation 	"A TemplateSignature is owned by a TemplateableElement and has one or more TemplateParameters that define the signature for binding this template. A TemplateSignature may reference a set of nested template signatures to reflect the hierarchical nature of a template. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E374687007C"

@@ -71975,6 +71668,7 @@
 				    quidu      	"3CAAEC0D0176")))

 			(object Class "NamedElement"

 			    quid       	"3E28042802DA"

+			    documentation 	"NamedElement specializes Kernel::NamedElement and adds a composition association to Expression. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E3128AF016D"

@@ -71988,11 +71682,11 @@
 				(object ClassAttribute "name"

 				    quid       	"3E5B9236025F"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public"))

 			    abstract   	TRUE)

 			(object Class "TemplateParameter"

 			    quid       	"3E28044C000B"

+			    documentation 	"TemplateParameter references a ParameterableElement which is exposed as a formal template parameter in the containing template. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E37469C0162"

@@ -72007,6 +71701,7 @@
 				    quidu      	"3E31269A001C")))

 			(object Class "TemplateBinding"

 			    quid       	"3E28129D0079"

+			    documentation 	"TemplateBinding is a directed relationship from a bound templateable element to the template signature of the target template. A TemplateBinding owns a set of template parameter substitutions. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E37760F0336"

@@ -72014,6 +71709,7 @@
 				    quidu      	"3CAAEC1902BE")))

 			(object Class "TemplateParameterSubstitution"

 			    quid       	"3E2812AA028B"

+			    documentation 	"TemplateParameterSubstitution associates one or more actual parameters with a formal template parameter within the context of a TemplateBinding. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E37756703DE"

@@ -72032,6 +71728,7 @@
 				    quidu      	"3CAC07C901D9")))

 			(object Class "TemplateableElement"

 			    quid       	"3E31269A001C"

+			    documentation 	"TemplateableElement may contain a template signature which specifies the formal template parameters. A TemplateableElement that contains a template signature is often referred to as a template. TemplateableElement may contain bindings to templates that describe how the templateable element is constructed by replacing the formal template parameters with actual parameters. A TemplateableElement containing bindings is often referred to as a bound element. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E37450F002B"

@@ -72048,6 +71745,7 @@
 			    abstract   	TRUE)

 			(object Class "ParameterableElement"

 			    quid       	"3E3126A90208"

+			    documentation 	"A ParameterableElement can be referenced by a TemplateParameter when defining a formal template parameter for a template. A ParameterableElement can be referenced by a TemplateParameterSubstitution when used as an actual parameter in a binding of a template. ParameterableElement is an abstract metaclass. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E3746AB03BD"

@@ -72056,6 +71754,7 @@
 			    abstract   	TRUE)

 			(object Class "Package"

 			    quid       	"3E3127B302AB"

+			    documentation 	"Package specializes TemplateableElement and PackageableElement specializes ParameterableElement to specify that a package can be used as a template and a PackageableElement as a template parameter. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E3127E10329"

@@ -72097,6 +71796,7 @@
 				    quidu      	"3CAB1DD70016")))

 			(object Class "Property"

 			    quid       	"3E33D1FA011E"

+			    documentation 	"Property specializes ParameterableElement to specify that a property can be exposed as a formal template parameter, and provided as an actual parameter in a binding of a template. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E33F5F100C8"

@@ -72112,6 +71812,7 @@
 				    quidu      	"3B99825E03B4")))

 			(object Class "ValueSpecification"

 			    quid       	"3E33F60301F0"

+			    documentation 	"ValueSpecification specializes ParameterableElement to specify that a value specification can be exposed as a formal template parameter, and provided as an actual parameter in a binding of a template. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E33F6170221"

@@ -72146,6 +71847,7 @@
 				    quidu      	"3E5921EE010A")))

 			(object Class "Operation"

 			    quid       	"3E39AEDB0021"

+			    documentation 	"Operation specializes ParameterableElement to specify that an operation can be exposed as a formal template parameter, and provided as an actual parameter in a binding of a template. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E39AEEC03BE"

@@ -72161,6 +71863,7 @@
 				    quidu      	"3E31269A001C")))

 			(object Class "OperationTemplateParameter"

 			    quid       	"3E39B0960190"

+			    documentation 	"OperationTemplateParameter is a template parameter where the parametered element is an Operation. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E39B0AA003A"

@@ -72180,6 +71883,7 @@
 			    abstract   	TRUE)

 			(object Class "Classifier"

 			    quid       	"3E4B543E01A9"

+			    documentation 	"Classifier specializes Kernel::Classifier TemplateableElement and ParameterableElement to specify that a classifier can be parameterized, be exposed as a formal template parameter, and can be specified as an actual parameter in a binding of a template. A classifier with template parameters is often called a template classifier, while a classifier with a binding is often called a bound classifier. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E4B54A400BF"

@@ -72196,6 +71900,7 @@
 			    abstract   	TRUE)

 			(object Class "ClassifierTemplateParameter"

 			    quid       	"3E37943B026A"

+			    documentation 	"ClassifierTemplateParameter is a template parameter where the parametered element is a Classifier in its capacity of being a kind of ParameterableElement. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E37944C0192"

@@ -72205,7 +71910,6 @@
 				(object ClassAttribute "allowSubstitutable"

 				    quid       	"3E3EDEA50241"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"true")))

 			(object Class "ParameterableClassifier"

 			    quid       	"3E3EAE9F00D6"

@@ -72221,6 +71925,7 @@
 			    abstract   	TRUE)

 			(object Class "RedefinableTemplateSignature"

 			    quid       	"3E377D55006C"

+			    documentation 	"RedefinableTemplateSignature specializes both TemplateSignature and RedefinableElement in order to allow the addition of new formal template parameters in the context of a specializing template Classifier. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E377D6402D0"

@@ -72244,6 +71949,7 @@
 			    abstract   	TRUE)

 			(object Class "ConnectableElement"

 			    quid       	"3E4900540335"

+			    documentation 	"ConnectableElement is the connectable element of a ConnectableElementTemplateParameter. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E4900700187"

@@ -72256,6 +71962,7 @@
 			    abstract   	TRUE)

 			(object Class "ConnectableElementTemplateParameter"

 			    quid       	"3E497E54039B"

+			    documentation 	"ConnectableElementTemplateParameter is a template parameter where the parametered element is a ConnectableElement. "

 			    superclasses 	(list inheritance_relationship_list

 				(object Inheritance_Relationship

 				    quid       	"3E497EC70183"

@@ -72898,7 +72605,7 @@
 				    origin_attachment 	(798, 795)

 				    terminal_attachment 	(798, 687))

 				(object AssociationViewNew "$UNNAMED$498" @3124

-				    location   	(1559, 931)

+				    location   	(1559, 966)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -72913,7 +72620,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "ownedTemplateSignature" @3125

 					    Parent_View 	@3124

-					    location   	(-547, 187)

+					    location   	(-547, 222)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -72925,7 +72632,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3126

 						Parent_View 	@3125

-						location   	(1319, 889)

+						location   	(1319, 924)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -72950,11 +72657,11 @@
 					    client     	@3124

 					    supplier   	@3122

 					    line_style 	3

-					    origin_attachment 	(1559, 931)

-					    terminal_attachment 	(1031, 931)

+					    origin_attachment 	(1559, 966)

+					    terminal_attachment 	(1031, 966)

 					    label      	(object SegLabel @3127

 						Parent_View 	@3125

-						location   	(1096, 972)

+						location   	(1096, 1007)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -72975,7 +72682,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3128

 						Parent_View 	@3125

-						location   	(1309, 1031)

+						location   	(1309, 1066)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -72996,7 +72703,7 @@
 						orientation 	0))

 					(object RoleView "template" @3129

 					    Parent_View 	@3124

-					    location   	(-547, 187)

+					    location   	(-547, 222)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -73008,7 +72715,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3130

 						Parent_View 	@3129

-						location   	(1959, 885)

+						location   	(1959, 920)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73033,11 +72740,11 @@
 					    client     	@3124

 					    supplier   	@3120

 					    line_style 	3

-					    origin_attachment 	(1559, 931)

-					    terminal_attachment 	(2088, 931)

+					    origin_attachment 	(1559, 966)

+					    terminal_attachment 	(2088, 966)

 					    label      	(object SegLabel @3131

 						Parent_View 	@3129

-						location   	(2057, 987)

+						location   	(2057, 1022)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73058,7 +72765,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3132

 						Parent_View 	@3129

-						location   	(1902, 1042)

+						location   	(1902, 1077)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73132,7 +72839,7 @@
 				    height     	779

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$480" @3135

-				    location   	(928, 1336)

+				    location   	(812, 1335)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -73147,7 +72854,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "parameter" @3136

 					    Parent_View 	@3135

-					    location   	(478, 910)

+					    location   	(362, 909)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -73159,7 +72866,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3137

 						Parent_View 	@3136

-						location   	(1059, 1469)

+						location   	(943, 1468)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73184,11 +72891,11 @@
 					    client     	@3135

 					    supplier   	@3134

 					    line_style 	3

-					    origin_attachment 	(928, 1336)

-					    terminal_attachment 	(928, 1584)

+					    origin_attachment 	(812, 1335)

+					    terminal_attachment 	(812, 1584)

 					    label      	(object SegLabel @3138

 						Parent_View 	@3136

-						location   	(876, 1534)

+						location   	(760, 1533)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73209,17 +72916,17 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$481" @3139

 					    Parent_View 	@3135

-					    location   	(478, 910)

+					    location   	(362, 909)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3E2805380336"

 					    client     	@3135

 					    supplier   	@3122

 					    line_style 	3

-					    origin_attachment 	(928, 1336)

-					    terminal_attachment 	(928, 1088))))

+					    origin_attachment 	(812, 1335)

+					    terminal_attachment 	(812, 1087))))

 				(object AssociationViewNew "$UNNAMED$482" @3140

-				    location   	(691, 1336)

+				    location   	(812, 1335)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -73234,7 +72941,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "ownedParameter" @3141

 					    Parent_View 	@3140

-					    location   	(241, 910)

+					    location   	(362, 909)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -73246,7 +72953,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3142

 						Parent_View 	@3141

-						location   	(486, 1445)

+						location   	(607, 1444)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73271,11 +72978,11 @@
 					    client     	@3140

 					    supplier   	@3134

 					    line_style 	3

-					    origin_attachment 	(691, 1336)

-					    terminal_attachment 	(691, 1584)

+					    origin_attachment 	(812, 1335)

+					    terminal_attachment 	(812, 1584)

 					    label      	(object SegLabel @3143

 						Parent_View 	@3141

-						location   	(727, 1553)

+						location   	(848, 1552)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73296,7 +73003,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3144

 						Parent_View 	@3141

-						location   	(410, 1533)

+						location   	(531, 1532)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73320,7 +73027,7 @@
 						orientation 	1))

 					(object RoleView "signature" @3145

 					    Parent_View 	@3140

-					    location   	(241, 910)

+					    location   	(362, 909)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -73332,7 +73039,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3146

 						Parent_View 	@3145

-						location   	(583, 1142)

+						location   	(704, 1141)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73357,11 +73064,11 @@
 					    client     	@3140

 					    supplier   	@3122

 					    line_style 	3

-					    origin_attachment 	(691, 1336)

-					    terminal_attachment 	(691, 1088)

+					    origin_attachment 	(812, 1335)

+					    terminal_attachment 	(812, 1087)

 					    label      	(object SegLabel @3147

 						Parent_View 	@3145

-						location   	(744, 1132)

+						location   	(865, 1131)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73382,7 +73089,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3148

 						Parent_View 	@3145

-						location   	(514, 1212)

+						location   	(635, 1211)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73410,13 +73117,13 @@
 				    origin_attachment 	(790, 2363)

 				    terminal_attachment 	(790, 2498))

 				(object AssociationViewNew "$UNNAMED$496" @3150

-				    location   	(1714, 1931)

+				    location   	(1714, 1974)

 				    stereotype 	TRUE

 				    quidu      	"3E3127040104"

 				    roleview_list 	(list RoleViews

 					(object RoleView "templateParameter" @3151

 					    Parent_View 	@3150

-					    location   	(-68, 1169)

+					    location   	(-68, 1212)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -73428,7 +73135,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3152

 						Parent_View 	@3151

-						location   	(1324, 1885)

+						location   	(1324, 1928)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73453,11 +73160,11 @@
 					    client     	@3150

 					    supplier   	@3134

 					    line_style 	3

-					    origin_attachment 	(1714, 1931)

-					    terminal_attachment 	(1012, 1931)

+					    origin_attachment 	(1714, 1974)

+					    terminal_attachment 	(1012, 1974)

 					    label      	(object SegLabel @3153

 						Parent_View 	@3151

-						location   	(1097, 1966)

+						location   	(1097, 2009)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73478,7 +73185,7 @@
 						orientation 	0))

 					(object RoleView "parameteredElement" @3154

 					    Parent_View 	@3150

-					    location   	(-68, 1169)

+					    location   	(-68, 1212)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -73490,7 +73197,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3155

 						Parent_View 	@3154

-						location   	(2082, 1895)

+						location   	(2082, 1938)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73515,11 +73222,11 @@
 					    client     	@3150

 					    supplier   	@3133

 					    line_style 	3

-					    origin_attachment 	(1714, 1931)

-					    terminal_attachment 	(2416, 1931)

+					    origin_attachment 	(1714, 1974)

+					    terminal_attachment 	(2416, 1974)

 					    label      	(object SegLabel @3156

 						Parent_View 	@3154

-						location   	(2312, 1965)

+						location   	(2312, 2008)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73539,7 +73246,7 @@
 						height     	34

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$499" @3157

-				    location   	(1714, 1662)

+				    location   	(1714, 1974)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -73554,7 +73261,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "ownedParameteredElement" @3158

 					    Parent_View 	@3157

-					    location   	(880, 246)

+					    location   	(880, 558)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -73566,7 +73273,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3159

 						Parent_View 	@3158

-						location   	(2011, 1613)

+						location   	(2011, 1925)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73591,11 +73298,11 @@
 					    client     	@3157

 					    supplier   	@3133

 					    line_style 	3

-					    origin_attachment 	(1714, 1662)

-					    terminal_attachment 	(2416, 1662)

+					    origin_attachment 	(1714, 1974)

+					    terminal_attachment 	(2416, 1974)

 					    label      	(object SegLabel @3160

 						Parent_View 	@3158

-						location   	(2344, 1700)

+						location   	(2344, 2012)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73616,7 +73323,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3161

 						Parent_View 	@3158

-						location   	(2023, 1747)

+						location   	(2023, 2059)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73640,7 +73347,7 @@
 						orientation 	1))

 					(object RoleView "owningParameter" @3162

 					    Parent_View 	@3157

-					    location   	(880, 246)

+					    location   	(880, 558)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -73652,7 +73359,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3163

 						Parent_View 	@3162

-						location   	(1297, 1608)

+						location   	(1297, 1920)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73677,11 +73384,11 @@
 					    client     	@3157

 					    supplier   	@3134

 					    line_style 	3

-					    origin_attachment 	(1714, 1662)

-					    terminal_attachment 	(1012, 1662)

+					    origin_attachment 	(1714, 1974)

+					    terminal_attachment 	(1012, 1974)

 					    label      	(object SegLabel @3164

 						Parent_View 	@3162

-						location   	(1094, 1715)

+						location   	(1094, 2027)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73702,7 +73409,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3165

 						Parent_View 	@3162

-						location   	(1355, 1747)

+						location   	(1355, 2059)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73725,7 +73432,7 @@
 						height     	85

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$500" @3166

-				    location   	(1714, 2107)

+				    location   	(1714, 1974)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -73740,7 +73447,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "default" @3167

 					    Parent_View 	@3166

-					    location   	(904, 451)

+					    location   	(904, 318)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -73752,7 +73459,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3168

 						Parent_View 	@3167

-						location   	(2253, 2078)

+						location   	(2253, 1945)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73776,11 +73483,11 @@
 					    client     	@3166

 					    supplier   	@3133

 					    line_style 	3

-					    origin_attachment 	(1714, 2107)

-					    terminal_attachment 	(2416, 2107)

+					    origin_attachment 	(1714, 1974)

+					    terminal_attachment 	(2416, 1974)

 					    label      	(object SegLabel @3169

 						Parent_View 	@3167

-						location   	(2333, 2153)

+						location   	(2333, 2020)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73801,16 +73508,16 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$501" @3170

 					    Parent_View 	@3166

-					    location   	(904, 451)

+					    location   	(904, 318)

 					    stereotype 	TRUE

 					    quidu      	"3E376FF60377"

 					    client     	@3166

 					    supplier   	@3134

 					    line_style 	3

-					    origin_attachment 	(1714, 2107)

-					    terminal_attachment 	(1012, 2107))))

+					    origin_attachment 	(1714, 1974)

+					    terminal_attachment 	(1012, 1974))))

 				(object AssociationViewNew "$UNNAMED$502" @3171

-				    location   	(1714, 2299)

+				    location   	(1714, 1974)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -73825,7 +73532,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "ownedDefault" @3172

 					    Parent_View 	@3171

-					    location   	(904, 727)

+					    location   	(904, 402)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -73837,7 +73544,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3173

 						Parent_View 	@3172

-						location   	(2185, 2261)

+						location   	(2185, 1936)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73861,11 +73568,11 @@
 					    client     	@3171

 					    supplier   	@3133

 					    line_style 	3

-					    origin_attachment 	(1714, 2299)

-					    terminal_attachment 	(2416, 2299)

+					    origin_attachment 	(1714, 1974)

+					    terminal_attachment 	(2416, 1974)

 					    label      	(object SegLabel @3174

 						Parent_View 	@3172

-						location   	(2348, 2348)

+						location   	(2348, 2023)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73886,7 +73593,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3175

 						Parent_View 	@3172

-						location   	(2022, 2375)

+						location   	(2022, 2050)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73910,7 +73617,7 @@
 						orientation 	1))

 					(object RoleView "owningDefault" @3176

 					    Parent_View 	@3171

-					    location   	(904, 727)

+					    location   	(904, 402)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -73922,7 +73629,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3177

 						Parent_View 	@3176

-						location   	(1245, 2243)

+						location   	(1245, 1918)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73946,11 +73653,11 @@
 					    client     	@3171

 					    supplier   	@3134

 					    line_style 	3

-					    origin_attachment 	(1714, 2299)

-					    terminal_attachment 	(1012, 2299)

+					    origin_attachment 	(1714, 1974)

+					    terminal_attachment 	(1012, 1974)

 					    label      	(object SegLabel @3178

 						Parent_View 	@3176

-						location   	(1130, 2345)

+						location   	(1130, 2020)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -73971,7 +73678,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3179

 						Parent_View 	@3176

-						location   	(1280, 2392)

+						location   	(1280, 2067)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -74233,7 +73940,7 @@
 					    supplier   	@3182

 					    line_style 	0)))

 				(object AssociationViewNew "$UNNAMED$486" @3191

-				    location   	(1459, 1349)

+				    location   	(2848, 1429)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -74249,7 +73956,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "bodyExpression" @3192

 					    Parent_View 	@3191

-					    location   	(-347, 137)

+					    location   	(1042, 217)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -74261,7 +73968,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3193

 						Parent_View 	@3192

-						location   	(1748, 1530)

+						location   	(3137, 1610)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -74286,15 +73993,17 @@
 					    client     	@3191

 					    supplier   	@3184

 					    vertices   	(list Points

-						(1459, 1349)

+						(2848, 1429)

+						(2918, 1429)

+						(2918, 1349)

 						(1569, 1349)

 						(1569, 1633))

 					    line_style 	3

-					    origin_attachment 	(1459, 1349)

+					    origin_attachment 	(2848, 1429)

 					    terminal_attachment 	(1569, 1633)

 					    label      	(object SegLabel @3194

 						Parent_View 	@3192

-						location   	(1508, 1584)

+						location   	(2897, 1664)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -74315,7 +74024,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3195

 						Parent_View 	@3192

-						location   	(1816, 1587)

+						location   	(3205, 1667)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -74336,15 +74045,15 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$487" @3196

 					    Parent_View 	@3191

-					    location   	(-347, 137)

+					    location   	(1042, 217)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3E2813070072"

 					    client     	@3191

 					    supplier   	@3183

 					    line_style 	3

-					    origin_attachment 	(1459, 1349)

-					    terminal_attachment 	(1065, 1349))))

+					    origin_attachment 	(2848, 1429)

+					    terminal_attachment 	(1065, 1429))))

 				(object AssociationViewNew "$UNNAMED$497" @3197

 				    location   	(1888, 1945)

 				    font       	(object Font

@@ -74825,7 +74534,7 @@
 				    height     	412

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$491" @3219

-				    location   	(1577, 1624)

+				    location   	(1577, 1602)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -74840,7 +74549,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "signature" @3220

 					    Parent_View 	@3219

-					    location   	(-697, 634)

+					    location   	(-697, 612)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -74852,7 +74561,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3221

 						Parent_View 	@3220

-						location   	(1213, 1583)

+						location   	(1213, 1561)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -74877,11 +74586,11 @@
 					    client     	@3219

 					    supplier   	@3216

 					    line_style 	3

-					    origin_attachment 	(1577, 1624)

-					    terminal_attachment 	(1122, 1624)

+					    origin_attachment 	(1577, 1602)

+					    terminal_attachment 	(1122, 1602)

 					    label      	(object SegLabel @3222

 						Parent_View 	@3220

-						location   	(1174, 1672)

+						location   	(1174, 1650)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -74902,7 +74611,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3223

 						Parent_View 	@3220

-						location   	(1361, 1672)

+						location   	(1361, 1650)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -74923,17 +74632,17 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$492" @3224

 					    Parent_View 	@3219

-					    location   	(-697, 634)

+					    location   	(-697, 612)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3E2814DA0380"

 					    client     	@3219

 					    supplier   	@3218

 					    line_style 	3

-					    origin_attachment 	(1577, 1624)

-					    terminal_attachment 	(2033, 1624))))

+					    origin_attachment 	(1577, 1602)

+					    terminal_attachment 	(2033, 1602))))

 				(object AssociationViewNew "$UNNAMED$488" @3225

-				    location   	(1585, 1346)

+				    location   	(1585, 1350)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -74948,7 +74657,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "boundElement" @3226

 					    Parent_View 	@3225

-					    location   	(-689, 356)

+					    location   	(-689, 360)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -74960,7 +74669,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3227

 						Parent_View 	@3226

-						location   	(1311, 1305)

+						location   	(1311, 1309)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -74985,11 +74694,11 @@
 					    client     	@3225

 					    supplier   	@3217

 					    line_style 	3

-					    origin_attachment 	(1585, 1346)

-					    terminal_attachment 	(1137, 1346)

+					    origin_attachment 	(1585, 1350)

+					    terminal_attachment 	(1137, 1350)

 					    label      	(object SegLabel @3228

 						Parent_View 	@3226

-						location   	(1171, 1391)

+						location   	(1171, 1395)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75010,7 +74719,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3229

 						Parent_View 	@3226

-						location   	(1347, 1410)

+						location   	(1347, 1414)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75034,7 +74743,7 @@
 						orientation 	0))

 					(object RoleView "templateBinding" @3230

 					    Parent_View 	@3225

-					    location   	(-689, 356)

+					    location   	(-689, 360)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -75046,7 +74755,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3231

 						Parent_View 	@3230

-						location   	(1858, 1302)

+						location   	(1858, 1306)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75071,11 +74780,11 @@
 					    client     	@3225

 					    supplier   	@3218

 					    line_style 	3

-					    origin_attachment 	(1585, 1346)

-					    terminal_attachment 	(2033, 1346)

+					    origin_attachment 	(1585, 1350)

+					    terminal_attachment 	(2033, 1350)

 					    label      	(object SegLabel @3232

 						Parent_View 	@3230

-						location   	(1998, 1391)

+						location   	(1998, 1395)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75096,7 +74805,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3233

 						Parent_View 	@3230

-						location   	(1801, 1440)

+						location   	(1801, 1444)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75208,7 +74917,7 @@
 				    height     	393

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$493" @3238

-				    location   	(2277, 1053)

+				    location   	(2292, 1054)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -75223,7 +74932,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "parameterSubstitution" @3239

 					    Parent_View 	@3238

-					    location   	(-39, 63)

+					    location   	(-24, 64)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -75235,7 +74944,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3240

 						Parent_View 	@3239

-						location   	(2504, 855)

+						location   	(2519, 856)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75260,11 +74969,11 @@
 					    client     	@3238

 					    supplier   	@3237

 					    line_style 	3

-					    origin_attachment 	(2277, 1053)

-					    terminal_attachment 	(2277, 819)

+					    origin_attachment 	(2292, 1054)

+					    terminal_attachment 	(2292, 820)

 					    label      	(object SegLabel @3241

 						Parent_View 	@3239

-						location   	(2237, 845)

+						location   	(2252, 846)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75285,7 +74994,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3242

 						Parent_View 	@3239

-						location   	(2336, 909)

+						location   	(2351, 910)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75306,7 +75015,7 @@
 						orientation 	1))

 					(object RoleView "templateBinding" @3243

 					    Parent_View 	@3238

-					    location   	(-39, 63)

+					    location   	(-24, 64)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -75318,7 +75027,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3244

 						Parent_View 	@3243

-						location   	(2464, 1177)

+						location   	(2479, 1178)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75343,11 +75052,11 @@
 					    client     	@3238

 					    supplier   	@3218

 					    line_style 	3

-					    origin_attachment 	(2277, 1053)

-					    terminal_attachment 	(2277, 1287)

+					    origin_attachment 	(2292, 1054)

+					    terminal_attachment 	(2292, 1288)

 					    label      	(object SegLabel @3245

 						Parent_View 	@3243

-						location   	(2230, 1237)

+						location   	(2245, 1238)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75368,7 +75077,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3246

 						Parent_View 	@3243

-						location   	(2455, 1233)

+						location   	(2470, 1234)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75388,7 +75097,7 @@
 						height     	178

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$489" @3247

-				    location   	(1542, 469)

+				    location   	(1542, 468)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -75403,7 +75112,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "formal" @3248

 					    Parent_View 	@3247

-					    location   	(-696, 355)

+					    location   	(-696, 354)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -75415,7 +75124,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3249

 						Parent_View 	@3248

-						location   	(1204, 423)

+						location   	(1204, 422)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75440,11 +75149,11 @@
 					    client     	@3247

 					    supplier   	@3235

 					    line_style 	3

-					    origin_attachment 	(1542, 469)

-					    terminal_attachment 	(1107, 469)

+					    origin_attachment 	(1542, 468)

+					    terminal_attachment 	(1107, 468)

 					    label      	(object SegLabel @3250

 						Parent_View 	@3248

-						location   	(1152, 523)

+						location   	(1152, 522)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75465,15 +75174,15 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$490" @3251

 					    Parent_View 	@3247

-					    location   	(-696, 355)

+					    location   	(-696, 354)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3E28149400AE"

 					    client     	@3247

 					    supplier   	@3237

 					    line_style 	3

-					    origin_attachment 	(1542, 469)

-					    terminal_attachment 	(1977, 469))))

+					    origin_attachment 	(1542, 468)

+					    terminal_attachment 	(1977, 468))))

 				(object InheritView "" @3252

 				    stereotype 	TRUE

 				    quidu      	"3E37756703DE"

@@ -75483,7 +75192,7 @@
 				    origin_attachment 	(2253, 427)

 				    terminal_attachment 	(2253, 307))

 				(object AssociationViewNew "$UNNAMED$494" @3253

-				    location   	(1537, 635)

+				    location   	(1537, 696)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -75498,7 +75207,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "actual" @3254

 					    Parent_View 	@3253

-					    location   	(-701, 521)

+					    location   	(-701, 582)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -75510,7 +75219,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3255

 						Parent_View 	@3254

-						location   	(1208, 587)

+						location   	(1208, 648)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75535,11 +75244,11 @@
 					    client     	@3253

 					    supplier   	@3236

 					    line_style 	3

-					    origin_attachment 	(1537, 635)

-					    terminal_attachment 	(1098, 635)

+					    origin_attachment 	(1537, 696)

+					    terminal_attachment 	(1098, 696)

 					    label      	(object SegLabel @3256

 						Parent_View 	@3254

-						location   	(1161, 685)

+						location   	(1161, 746)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75560,17 +75269,17 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$495" @3257

 					    Parent_View 	@3253

-					    location   	(-701, 521)

+					    location   	(-701, 582)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"3E28148D02AD"

 					    client     	@3253

 					    supplier   	@3237

 					    line_style 	3

-					    origin_attachment 	(1537, 635)

-					    terminal_attachment 	(1977, 635))))

+					    origin_attachment 	(1537, 696)

+					    terminal_attachment 	(1977, 696))))

 				(object AssociationViewNew "$UNNAMED$503" @3258

-				    location   	(1537, 788)

+				    location   	(1537, 696)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -75585,7 +75294,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "ownedActual" @3259

 					    Parent_View 	@3258

-					    location   	(-695, 164)

+					    location   	(-695, 72)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -75597,7 +75306,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3260

 						Parent_View 	@3259

-						location   	(1281, 759)

+						location   	(1281, 667)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75621,11 +75330,11 @@
 					    client     	@3258

 					    supplier   	@3236

 					    line_style 	3

-					    origin_attachment 	(1537, 788)

-					    terminal_attachment 	(1098, 788)

+					    origin_attachment 	(1537, 696)

+					    terminal_attachment 	(1098, 696)

 					    label      	(object SegLabel @3261

 						Parent_View 	@3259

-						location   	(1142, 842)

+						location   	(1142, 750)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75646,7 +75355,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3262

 						Parent_View 	@3259

-						location   	(1357, 852)

+						location   	(1357, 760)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75670,7 +75379,7 @@
 						orientation 	0))

 					(object RoleView "owningSubstitution" @3263

 					    Parent_View 	@3258

-					    location   	(-695, 164)

+					    location   	(-695, 72)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -75682,7 +75391,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3264

 						Parent_View 	@3263

-						location   	(1784, 747)

+						location   	(1784, 655)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75706,11 +75415,11 @@
 					    client     	@3258

 					    supplier   	@3237

 					    line_style 	3

-					    origin_attachment 	(1537, 788)

-					    terminal_attachment 	(1977, 788)

+					    origin_attachment 	(1537, 696)

+					    terminal_attachment 	(1977, 696)

 					    label      	(object SegLabel @3265

 						Parent_View 	@3263

-						location   	(1932, 842)

+						location   	(1932, 750)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -75731,7 +75440,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3266

 						Parent_View 	@3263

-						location   	(1832, 889)

+						location   	(1832, 797)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -85427,7 +85136,6 @@
 				(object ClassAttribute "isReplaceAll"

 				    quid       	"3CCDFA2D00F4"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"))

 			    language   	"ObjectSwitch")

 			(object Class "ReadIsClassifiedObjectAction"

@@ -85441,7 +85149,6 @@
 				(object ClassAttribute "isDirect"

 				    quid       	"39739DEF0061"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public"))

 			    language   	"ObjectSwitch")

@@ -86101,13 +85808,13 @@
 				    terminal_attachment 	(1918, 304)

 				    drawSupplier 	@3733)

 				(object AssociationViewNew "$UNNAMED$518" @3737

-				    location   	(1930, 856)

+				    location   	(1938, 856)

 				    stereotype 	TRUE

 				    quidu      	"3A7858D00028"

 				    roleview_list 	(list RoleViews

 					(object RoleView "object" @3738

 					    Parent_View 	@3737

-					    location   	(-72, 362)

+					    location   	(-64, 362)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -86119,7 +85826,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3739

 						Parent_View 	@3738

-						location   	(1837, 1041)

+						location   	(1845, 1041)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86144,11 +85851,11 @@
 					    client     	@3737

 					    supplier   	@3734

 					    line_style 	3

-					    origin_attachment 	(1930, 856)

-					    terminal_attachment 	(1930, 1150)

+					    origin_attachment 	(1938, 856)

+					    terminal_attachment 	(1938, 1150)

 					    label      	(object SegLabel @3740

 						Parent_View 	@3738

-						location   	(1985, 1091)

+						location   	(1993, 1091)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86169,7 +85876,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3741

 						Parent_View 	@3738

-						location   	(1798, 1091)

+						location   	(1806, 1091)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86190,7 +85897,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$519" @3742

 					    Parent_View 	@3737

-					    location   	(-72, 362)

+					    location   	(-64, 362)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -86206,11 +85913,11 @@
 					    client     	@3737

 					    supplier   	@3735

 					    line_style 	3

-					    origin_attachment 	(1930, 856)

-					    terminal_attachment 	(1930, 562)

+					    origin_attachment 	(1938, 856)

+					    terminal_attachment 	(1938, 562)

 					    label      	(object SegLabel @3743

 						Parent_View 	@3742

-						location   	(1999, 624)

+						location   	(2007, 624)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86321,14 +86028,14 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$504" @3747

-				    location   	(116, 850)

+				    location   	(216, 850)

 				    stereotype 	TRUE

 				    line_color 	4194368

 				    quidu      	"395CFBA20393"

 				    roleview_list 	(list RoleViews

 					(object RoleView "result" @3748

 					    Parent_View 	@3747

-					    location   	(-1024, 252)

+					    location   	(-924, 252)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -86340,7 +86047,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3749

 						Parent_View 	@3748

-						location   	(200, 1042)

+						location   	(300, 1042)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86365,11 +86072,11 @@
 					    client     	@3747

 					    supplier   	@3744

 					    line_style 	3

-					    origin_attachment 	(116, 850)

-					    terminal_attachment 	(116, 1138)

+					    origin_attachment 	(216, 850)

+					    terminal_attachment 	(216, 1138)

 					    label      	(object SegLabel @3750

 						Parent_View 	@3748

-						location   	(69, 1075)

+						location   	(169, 1075)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86390,7 +86097,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3751

 						Parent_View 	@3748

-						location   	(266, 1097)

+						location   	(366, 1097)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86411,7 +86118,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$505" @3752

 					    Parent_View 	@3747

-					    location   	(-1024, 252)

+					    location   	(-924, 252)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -86427,11 +86134,11 @@
 					    client     	@3747

 					    supplier   	@3746

 					    line_style 	3

-					    origin_attachment 	(116, 850)

-					    terminal_attachment 	(116, 562)

+					    origin_attachment 	(216, 850)

+					    terminal_attachment 	(216, 562)

 					    label      	(object SegLabel @3753

 						Parent_View 	@3752

-						location   	(164, 653)

+						location   	(264, 653)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86497,7 +86204,7 @@
 				    terminal_attachment 	(801, 304)

 				    drawSupplier 	@3733)

 				(object AssociationViewNew "$UNNAMED$544" @3757

-				    location   	(656, 677)

+				    location   	(616, 677)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -86513,18 +86220,18 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$545" @3758

 					    Parent_View 	@3757

-					    location   	(111, 412)

+					    location   	(71, 412)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3DF3A5BE02AF"

 					    client     	@3757

 					    supplier   	@3755

 					    line_style 	3

-					    origin_attachment 	(656, 677)

-					    terminal_attachment 	(656, 571))

+					    origin_attachment 	(616, 677)

+					    terminal_attachment 	(616, 571))

 					(object RoleView "object" @3759

 					    Parent_View 	@3757

-					    location   	(111, 412)

+					    location   	(71, 412)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -86536,7 +86243,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3760

 						Parent_View 	@3759

-						location   	(565, 695)

+						location   	(525, 695)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86561,11 +86268,11 @@
 					    client     	@3757

 					    supplier   	@3745

 					    line_style 	3

-					    origin_attachment 	(656, 677)

-					    terminal_attachment 	(656, 783)

+					    origin_attachment 	(616, 677)

+					    terminal_attachment 	(616, 784)

 					    label      	(object SegLabel @3761

 						Parent_View 	@3759

-						location   	(708, 758)

+						location   	(668, 758)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86586,7 +86293,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3762

 						Parent_View 	@3759

-						location   	(524, 737)

+						location   	(484, 737)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86665,7 +86372,7 @@
 				    height     	113

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$506" @3765

-				    location   	(399, 993)

+				    location   	(439, 1809)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -86677,7 +86384,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @3766

 					Parent_View 	@3765

-					location   	(397, 936)

+					location   	(437, 1752)

 					font       	(object Font

 					    size       	8

 					    face       	"Arial"

@@ -86702,7 +86409,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "classifier" @3767

 					    Parent_View 	@3765

-					    location   	(-664, -86)

+					    location   	(-624, 730)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -86714,7 +86421,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3768

 						Parent_View 	@3767

-						location   	(492, 1234)

+						location   	(532, 2050)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86738,15 +86445,15 @@
 					    client     	@3765

 					    supplier   	@3764

 					    vertices   	(list Points

-						(399, 993)

+						(439, 1809)

 						(399, 1190)

 						(632, 1190))

 					    line_style 	3

-					    origin_attachment 	(399, 993)

+					    origin_attachment 	(439, 1809)

 					    terminal_attachment 	(632, 1190)

 					    label      	(object SegLabel @3769

 						Parent_View 	@3767

-						location   	(568, 1160)

+						location   	(608, 1976)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86767,7 +86474,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$507" @3770

 					    Parent_View 	@3765

-					    location   	(-664, -86)

+					    location   	(-624, 730)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -86781,12 +86488,17 @@
 					    quidu      	"38C95C840330"

 					    client     	@3765

 					    supplier   	@3746

+					    vertices   	(list Points

+						(439, 1809)

+						(399, 1986)

+						(439, 1986)

+						(439, 562))

 					    line_style 	3

-					    origin_attachment 	(399, 993)

-					    terminal_attachment 	(399, 562)

+					    origin_attachment 	(439, 1809)

+					    terminal_attachment 	(439, 562)

 					    label      	(object SegLabel @3771

 						Parent_View 	@3770

-						location   	(453, 613)

+						location   	(493, 1429)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86806,13 +86518,13 @@
 						height     	54

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$508" @3772

-				    location   	(790, 854)

+				    location   	(804, 854)

 				    stereotype 	TRUE

 				    quidu      	"38DBEB100312"

 				    roleview_list 	(list RoleViews

 					(object RoleView "oldClassifier" @3773

 					    Parent_View 	@3772

-					    location   	(-667, 331)

+					    location   	(-653, 331)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -86824,7 +86536,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3774

 						Parent_View 	@3773

-						location   	(673, 1031)

+						location   	(687, 1031)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86849,11 +86561,11 @@
 					    client     	@3772

 					    supplier   	@3764

 					    line_style 	3

-					    origin_attachment 	(790, 854)

-					    terminal_attachment 	(790, 1138)

+					    origin_attachment 	(804, 854)

+					    terminal_attachment 	(804, 1138)

 					    label      	(object SegLabel @3775

 						Parent_View 	@3773

-						location   	(818, 1045)

+						location   	(832, 1045)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86874,7 +86586,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$509" @3776

 					    Parent_View 	@3772

-					    location   	(-667, 331)

+					    location   	(-653, 331)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -86890,11 +86602,11 @@
 					    client     	@3772

 					    supplier   	@3755

 					    line_style 	3

-					    origin_attachment 	(790, 854)

-					    terminal_attachment 	(790, 571)

+					    origin_attachment 	(804, 854)

+					    terminal_attachment 	(804, 571)

 					    label      	(object SegLabel @3777

 						Parent_View 	@3776

-						location   	(844, 629)

+						location   	(858, 629)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86914,13 +86626,13 @@
 						height     	54

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$510" @3778

-				    location   	(928, 854)

+				    location   	(804, 854)

 				    stereotype 	TRUE

 				    quidu      	"38DBEB4102EB"

 				    roleview_list 	(list RoleViews

 					(object RoleView "newClassifier" @3779

 					    Parent_View 	@3778

-					    location   	(-525, 331)

+					    location   	(-649, 331)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -86932,7 +86644,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3780

 						Parent_View 	@3779

-						location   	(1052, 1027)

+						location   	(928, 1027)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86957,11 +86669,11 @@
 					    client     	@3778

 					    supplier   	@3764

 					    line_style 	3

-					    origin_attachment 	(928, 854)

-					    terminal_attachment 	(928, 1138)

+					    origin_attachment 	(804, 854)

+					    terminal_attachment 	(804, 1138)

 					    label      	(object SegLabel @3781

 						Parent_View 	@3779

-						location   	(905, 1038)

+						location   	(781, 1038)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -86982,7 +86694,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$511" @3782

 					    Parent_View 	@3778

-					    location   	(-525, 331)

+					    location   	(-649, 331)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -86998,11 +86710,11 @@
 					    client     	@3778

 					    supplier   	@3755

 					    line_style 	3

-					    origin_attachment 	(928, 854)

-					    terminal_attachment 	(928, 571)

+					    origin_attachment 	(804, 854)

+					    terminal_attachment 	(804, 571)

 					    label      	(object SegLabel @3783

 						Parent_View 	@3782

-						location   	(905, 627)

+						location   	(781, 627)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87081,14 +86793,14 @@
 				    height     	112

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$514" @3786

-				    location   	(1362, 854)

+				    location   	(1434, 854)

 				    stereotype 	TRUE

 				    line_color 	4194368

 				    quidu      	"39739EA700DE"

 				    roleview_list 	(list RoleViews

 					(object RoleView "result" @3787

 					    Parent_View 	@3786

-					    location   	(-922, 361)

+					    location   	(-850, 361)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -87100,7 +86812,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3788

 						Parent_View 	@3787

-						location   	(1434, 1032)

+						location   	(1506, 1032)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87125,11 +86837,11 @@
 					    client     	@3786

 					    supplier   	@3763

 					    line_style 	3

-					    origin_attachment 	(1362, 854)

-					    terminal_attachment 	(1362, 1143)

+					    origin_attachment 	(1434, 854)

+					    terminal_attachment 	(1434, 1144)

 					    label      	(object SegLabel @3789

 						Parent_View 	@3787

-						location   	(1322, 1084)

+						location   	(1394, 1084)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87150,7 +86862,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3790

 						Parent_View 	@3787

-						location   	(1501, 1073)

+						location   	(1573, 1073)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87171,7 +86883,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$515" @3791

 					    Parent_View 	@3786

-					    location   	(-922, 361)

+					    location   	(-850, 361)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -87187,11 +86899,11 @@
 					    client     	@3786

 					    supplier   	@3785

 					    line_style 	3

-					    origin_attachment 	(1362, 854)

-					    terminal_attachment 	(1362, 565)

+					    origin_attachment 	(1434, 854)

+					    terminal_attachment 	(1434, 565)

 					    label      	(object SegLabel @3792

 						Parent_View 	@3791

-						location   	(1302, 618)

+						location   	(1374, 618)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87211,14 +86923,14 @@
 						height     	61

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$512" @3793

-				    location   	(1197, 978)

+				    location   	(1553, 1956)

 				    stereotype 	TRUE

 				    line_color 	4194368

 				    quidu      	"39739E2B0324"

 				    roleview_list 	(list RoleViews

 					(object RoleView "classifier" @3794

 					    Parent_View 	@3793

-					    location   	(-1082, 484)

+					    location   	(-726, 1462)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -87230,7 +86942,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3795

 						Parent_View 	@3794

-						location   	(1093, 1222)

+						location   	(1449, 2200)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87255,15 +86967,16 @@
 					    client     	@3793

 					    supplier   	@3764

 					    vertices   	(list Points

-						(1197, 978)

+						(1553, 1956)

+						(1197, 1956)

 						(1197, 1169)

 						(976, 1169))

 					    line_style 	3

-					    origin_attachment 	(1197, 978)

+					    origin_attachment 	(1553, 1956)

 					    terminal_attachment 	(976, 1169)

 					    label      	(object SegLabel @3796

 						Parent_View 	@3794

-						location   	(1025, 1122)

+						location   	(1381, 2100)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87284,15 +86997,19 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$513" @3797

 					    Parent_View 	@3793

-					    location   	(-1082, 484)

+					    location   	(-726, 1462)

 					    stereotype 	TRUE

 					    line_color 	3342489

 					    quidu      	"39739E2C02A4"

 					    client     	@3793

 					    supplier   	@3785

+					    vertices   	(list Points

+						(1553, 1956)

+						(1613, 1956)

+						(1613, 566))

 					    line_style 	3

-					    origin_attachment 	(1197, 978)

-					    terminal_attachment 	(1197, 566))))

+					    origin_attachment 	(1553, 1956)

+					    terminal_attachment 	(1613, 566))))

 				(object InheritView "" @3798

 				    stereotype 	TRUE

 				    quidu      	"3DF4082902E8"

@@ -87303,14 +87020,14 @@
 				    terminal_attachment 	(1331, 304)

 				    drawSupplier 	@3733)

 				(object AssociationViewNew "$UNNAMED$516" @3799

-				    location   	(1537, 698)

+				    location   	(1543, 698)

 				    stereotype 	TRUE

 				    line_color 	4194368

 				    quidu      	"39739E5B0251"

 				    roleview_list 	(list RoleViews

 					(object RoleView "object" @3800

 					    Parent_View 	@3799

-					    location   	(-745, 204)

+					    location   	(-739, 204)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -87322,7 +87039,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3801

 						Parent_View 	@3800

-						location   	(1623, 721)

+						location   	(1629, 721)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87347,11 +87064,11 @@
 					    client     	@3799

 					    supplier   	@3784

 					    line_style 	3

-					    origin_attachment 	(1537, 698)

-					    terminal_attachment 	(1537, 831)

+					    origin_attachment 	(1543, 698)

+					    terminal_attachment 	(1543, 831)

 					    label      	(object SegLabel @3802

 						Parent_View 	@3800

-						location   	(1498, 774)

+						location   	(1504, 774)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87372,7 +87089,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3803

 						Parent_View 	@3800

-						location   	(1672, 772)

+						location   	(1678, 772)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87393,7 +87110,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$517" @3804

 					    Parent_View 	@3799

-					    location   	(-745, 204)

+					    location   	(-739, 204)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -87409,11 +87126,11 @@
 					    client     	@3799

 					    supplier   	@3785

 					    line_style 	3

-					    origin_attachment 	(1537, 698)

-					    terminal_attachment 	(1537, 565)

+					    origin_attachment 	(1543, 698)

+					    terminal_attachment 	(1543, 566)

 					    label      	(object SegLabel @3805

 						Parent_View 	@3804

-						location   	(1478, 607)

+						location   	(1484, 607)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87605,13 +87322,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$522" @3812

-				    location   	(780, 719)

+				    location   	(780, 723)

 				    stereotype 	TRUE

 				    quidu      	"38C9668602D9"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$523" @3813

 					    Parent_View 	@3812

-					    location   	(93, -1023)

+					    location   	(93, -1019)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -87623,7 +87340,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3814

 						Parent_View 	@3813

-						location   	(629, 761)

+						location   	(629, 765)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87649,11 +87366,11 @@
 					    client     	@3812

 					    supplier   	@3811

 					    line_style 	3

-					    origin_attachment 	(780, 719)

-					    terminal_attachment 	(591, 719)

+					    origin_attachment 	(780, 723)

+					    terminal_attachment 	(591, 723)

 					    label      	(object SegLabel @3815

 						Parent_View 	@3813

-						location   	(622, 686)

+						location   	(622, 690)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87674,7 +87391,7 @@
 						orientation 	1))

 					(object RoleView "qualifier" @3816

 					    Parent_View 	@3812

-					    location   	(93, -1023)

+					    location   	(93, -1019)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -87686,7 +87403,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3817

 						Parent_View 	@3816

-						location   	(871, 767)

+						location   	(871, 771)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87711,11 +87428,11 @@
 					    client     	@3812

 					    supplier   	@3809

 					    line_style 	3

-					    origin_attachment 	(780, 719)

-					    terminal_attachment 	(969, 719)

+					    origin_attachment 	(780, 723)

+					    terminal_attachment 	(969, 723)

 					    label      	(object SegLabel @3818

 						Parent_View 	@3816

-						location   	(942, 675)

+						location   	(942, 679)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87744,15 +87461,15 @@
 					(778, 719))

 				    line_style 	3

 				    origin_attachment 	(983, 879)

-				    terminal_attachment 	(781, 719))

+				    terminal_attachment 	(781, 723))

 				(object AssociationViewNew "$UNNAMED$520" @3820

-				    location   	(288, 564)

+				    location   	(369, 563)

 				    stereotype 	TRUE

 				    quidu      	"38C96637032F"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$521" @3821

 					    Parent_View 	@3820

-					    location   	(-620, -290)

+					    location   	(-539, -291)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -87764,7 +87481,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3822

 						Parent_View 	@3821

-						location   	(248, 491)

+						location   	(329, 490)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87789,11 +87506,11 @@
 					    client     	@3820

 					    supplier   	@3810

 					    line_style 	3

-					    origin_attachment 	(288, 564)

-					    terminal_attachment 	(288, 472)

+					    origin_attachment 	(369, 563)

+					    terminal_attachment 	(369, 471)

 					    label      	(object SegLabel @3823

 						Parent_View 	@3821

-						location   	(342, 506)

+						location   	(423, 505)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87814,7 +87531,7 @@
 						orientation 	1))

 					(object RoleView "qualifier" @3824

 					    Parent_View 	@3820

-					    location   	(-620, -290)

+					    location   	(-539, -291)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -87826,7 +87543,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3825

 						Parent_View 	@3824

-						location   	(389, 616)

+						location   	(470, 615)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87850,11 +87567,11 @@
 					    client     	@3820

 					    supplier   	@3811

 					    line_style 	3

-					    origin_attachment 	(288, 564)

-					    terminal_attachment 	(288, 656)

+					    origin_attachment 	(369, 563)

+					    terminal_attachment 	(369, 656)

 					    label      	(object SegLabel @3826

 						Parent_View 	@3824

-						location   	(240, 622)

+						location   	(321, 621)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87912,13 +87629,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$524" @3829

-				    location   	(416, 834)

+				    location   	(426, 834)

 				    stereotype 	TRUE

 				    quidu      	"38C966AF03DC"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$525" @3830

 					    Parent_View 	@3829

-					    location   	(-154, -212)

+					    location   	(-144, -212)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -87930,7 +87647,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3831

 						Parent_View 	@3830

-						location   	(376, 774)

+						location   	(386, 774)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87956,11 +87673,11 @@
 					    client     	@3829

 					    supplier   	@3811

 					    line_style 	3

-					    origin_attachment 	(416, 834)

-					    terminal_attachment 	(416, 759)

+					    origin_attachment 	(426, 834)

+					    terminal_attachment 	(426, 759)

 					    label      	(object SegLabel @3832

 						Parent_View 	@3830

-						location   	(379, 791)

+						location   	(389, 791)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -87981,7 +87698,7 @@
 						orientation 	0))

 					(object RoleView "value" @3833

 					    Parent_View 	@3829

-					    location   	(-154, -212)

+					    location   	(-144, -212)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -87993,7 +87710,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3834

 						Parent_View 	@3833

-						location   	(515, 881)

+						location   	(525, 881)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88018,11 +87735,11 @@
 					    client     	@3829

 					    supplier   	@3828

 					    line_style 	3

-					    origin_attachment 	(416, 834)

-					    terminal_attachment 	(416, 910)

+					    origin_attachment 	(426, 834)

+					    terminal_attachment 	(426, 910)

 					    label      	(object SegLabel @3835

 						Parent_View 	@3833

-						location   	(369, 888)

+						location   	(379, 888)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88191,14 +87908,14 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$528" @3843

-				    location   	(177, 628)

+				    location   	(168, 628)

 				    stereotype 	TRUE

 				    line_color 	4194368

 				    quidu      	"38C9690800B5"

 				    roleview_list 	(list RoleViews

 					(object RoleView "end" @3844

 					    Parent_View 	@3843

-					    location   	(-1867, -270)

+					    location   	(-1876, -270)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -88210,7 +87927,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3845

 						Parent_View 	@3844

-						location   	(117, 718)

+						location   	(108, 718)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88234,11 +87951,11 @@
 					    client     	@3843

 					    supplier   	@3841

 					    line_style 	3

-					    origin_attachment 	(177, 628)

-					    terminal_attachment 	(177, 760)

+					    origin_attachment 	(168, 628)

+					    terminal_attachment 	(168, 761)

 					    label      	(object SegLabel @3846

 						Parent_View 	@3844

-						location   	(216, 724)

+						location   	(207, 724)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88259,7 +87976,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$529" @3847

 					    Parent_View 	@3843

-					    location   	(-1867, -270)

+					    location   	(-1876, -270)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -88274,11 +87991,11 @@
 					    client     	@3843

 					    supplier   	@3842

 					    line_style 	3

-					    origin_attachment 	(177, 628)

-					    terminal_attachment 	(177, 496)

+					    origin_attachment 	(168, 628)

+					    terminal_attachment 	(168, 496)

 					    label      	(object SegLabel @3848

 						Parent_View 	@3847

-						location   	(129, 531)

+						location   	(120, 531)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88368,14 +88085,14 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$530" @3852

-				    location   	(497, 717)

+				    location   	(558, 1374)

 				    stereotype 	TRUE

 				    line_color 	4194368

 				    quidu      	"395CD5AD0098"

 				    roleview_list 	(list RoleViews

 					(object RoleView "result" @3853

 					    Parent_View 	@3852

-					    location   	(110, 84)

+					    location   	(171, 741)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -88387,7 +88104,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3854

 						Parent_View 	@3853

-						location   	(588, 832)

+						location   	(649, 1489)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88412,15 +88129,17 @@
 					    client     	@3852

 					    supplier   	@3851

 					    vertices   	(list Points

-						(497, 717)

+						(558, 1374)

+						(558, 1434)

+						(497, 1434)

 						(497, 787)

 						(648, 787))

 					    line_style 	3

-					    origin_attachment 	(497, 717)

+					    origin_attachment 	(558, 1374)

 					    terminal_attachment 	(648, 787)

 					    label      	(object SegLabel @3855

 						Parent_View 	@3853

-						location   	(609, 735)

+						location   	(670, 1392)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88441,7 +88160,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3856

 						Parent_View 	@3853

-						location   	(537, 876)

+						location   	(598, 1533)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88462,7 +88181,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$531" @3857

 					    Parent_View 	@3852

-					    location   	(110, 84)

+					    location   	(171, 741)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -88478,11 +88197,11 @@
 					    client     	@3852

 					    supplier   	@3842

 					    line_style 	3

-					    origin_attachment 	(497, 717)

-					    terminal_attachment 	(497, 496)

+					    origin_attachment 	(558, 1374)

+					    terminal_attachment 	(558, 496)

 					    label      	(object SegLabel @3858

 						Parent_View 	@3857

-						location   	(556, 578)

+						location   	(617, 1235)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88532,14 +88251,14 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$526" @3860

-				    location   	(381, 905)

+				    location   	(381, 906)

 				    stereotype 	TRUE

 				    line_color 	4194368

 				    quidu      	"38C968E002AC"

 				    roleview_list 	(list RoleViews

 					(object RoleView "object" @3861

 					    Parent_View 	@3860

-					    location   	(-1665, 7)

+					    location   	(-1665, 8)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -88551,7 +88270,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3862

 						Parent_View 	@3861

-						location   	(580, 1087)

+						location   	(580, 1088)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88575,15 +88294,15 @@
 					    client     	@3860

 					    supplier   	@3859

 					    vertices   	(list Points

-						(381, 905)

+						(381, 906)

 						(381, 1047)

 						(649, 1047))

 					    line_style 	3

-					    origin_attachment 	(381, 905)

+					    origin_attachment 	(381, 906)

 					    terminal_attachment 	(649, 1047)

 					    label      	(object SegLabel @3863

 						Parent_View 	@3861

-						location   	(610, 1015)

+						location   	(610, 1016)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88604,7 +88323,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3864

 						Parent_View 	@3861

-						location   	(540, 1136)

+						location   	(540, 1137)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88625,7 +88344,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$527" @3865

 					    Parent_View 	@3860

-					    location   	(-1665, 7)

+					    location   	(-1665, 8)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -88640,11 +88359,11 @@
 					    client     	@3860

 					    supplier   	@3842

 					    line_style 	3

-					    origin_attachment 	(381, 905)

-					    terminal_attachment 	(381, 495)

+					    origin_attachment 	(762, 1812)

+					    terminal_attachment 	(687, 940)

 					    label      	(object SegLabel @3866

 						Parent_View 	@3865

-						location   	(437, 581)

+						location   	(437, 582)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88695,14 +88414,14 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$536" @3868

-				    location   	(1472, 604)

+				    location   	(1467, 604)

 				    stereotype 	TRUE

 				    line_color 	4194368

 				    quidu      	"38C96A0A0283"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$537" @3869

 					    Parent_View 	@3868

-					    location   	(374, -657)

+					    location   	(369, -657)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -88714,7 +88433,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3870

 						Parent_View 	@3869

-						location   	(1431, 518)

+						location   	(1426, 518)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -88740,11 +88459,11 @@
 					    client     	@3868

 					    supplier   	@3867

 					    line_style 	3

-					    origin_attachment 	(1472, 604)

-					    terminal_attachment 	(1472, 496)

+					    origin_attachment 	(1467, 604)

+					    terminal_attachment 	(1467, 495)

 					    label      	(object SegLabel @3871

 						Parent_View 	@3869

-						location   	(1538, 518)

+						location   	(1533, 518)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88765,7 +88484,7 @@
 						orientation 	1))

 					(object RoleView "qualifier" @3872

 					    Parent_View 	@3868

-					    location   	(374, -657)

+					    location   	(369, -657)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -88777,7 +88496,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3873

 						Parent_View 	@3872

-						location   	(1375, 667)

+						location   	(1370, 667)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88802,11 +88521,11 @@
 					    client     	@3868

 					    supplier   	@3850

 					    line_style 	3

-					    origin_attachment 	(1472, 604)

-					    terminal_attachment 	(1472, 713)

+					    origin_attachment 	(1467, 604)

+					    terminal_attachment 	(1467, 713)

 					    label      	(object SegLabel @3874

 						Parent_View 	@3872

-						location   	(1528, 679)

+						location   	(1523, 679)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -88834,7 +88553,7 @@
 					(1278, 603)

 					(1278, 968))

 				    line_style 	3

-				    origin_attachment 	(1471, 603)

+				    origin_attachment 	(1468, 603)

 				    terminal_attachment 	(1283, 968))

 				(object AssociationViewNew "$UNNAMED$534" @3876

 				    location   	(1058, 699)

@@ -88947,8 +88666,8 @@
 					    client     	@3876

 					    supplier   	@3867

 					    line_style 	3

-					    origin_attachment 	(1058, 699)

-					    terminal_attachment 	(1058, 495)

+					    origin_attachment 	(2116, 1398)

+					    terminal_attachment 	(2366, 940)

 					    label      	(object SegLabel @3882

 						Parent_View 	@3881

 						location   	(1141, 520)

@@ -89088,8 +88807,8 @@
 					    client     	@3884

 					    supplier   	@3867

 					    line_style 	3

-					    origin_attachment 	(1203, 903)

-					    terminal_attachment 	(1203, 495)

+					    origin_attachment 	(2406, 1806)

+					    terminal_attachment 	(2511, 940)

 					    label      	(object SegLabel @3890

 						Parent_View 	@3889

 						location   	(1272, 528)

@@ -89120,7 +88839,7 @@
 					(295, 628)

 					(295, 922))

 				    line_style 	3

-				    origin_attachment 	(178, 628)

+				    origin_attachment 	(169, 628)

 				    terminal_attachment 	(268, 922))))

 			(object ClassDiagram "WriteLinkActions"

 			    quid       	"3DF3A6A10109"

@@ -89283,7 +89002,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$540" @3897

-				    location   	(1223, 617)

+				    location   	(1230, 617)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -89299,7 +89018,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "qualifier" @3898

 					    Parent_View 	@3897

-					    location   	(-387, -1562)

+					    location   	(-380, -1562)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -89311,7 +89030,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3899

 						Parent_View 	@3898

-						location   	(1322, 689)

+						location   	(1329, 689)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -89336,11 +89055,11 @@
 					    client     	@3897

 					    supplier   	@3894

 					    line_style 	3

-					    origin_attachment 	(1223, 617)

-					    terminal_attachment 	(1223, 720)

+					    origin_attachment 	(1230, 617)

+					    terminal_attachment 	(1230, 721)

 					    label      	(object SegLabel @3900

 						Parent_View 	@3898

-						location   	(1159, 679)

+						location   	(1166, 679)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -89361,7 +89080,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3901

 						Parent_View 	@3898

-						location   	(1117, 635)

+						location   	(1124, 635)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -89382,15 +89101,15 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$541" @3902

 					    Parent_View 	@3897

-					    location   	(-387, -1562)

+					    location   	(-380, -1562)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3DF14C9E0167"

 					    client     	@3897

 					    supplier   	@3896

 					    line_style 	3

-					    origin_attachment 	(1223, 617)

-					    terminal_attachment 	(1223, 514))))

+					    origin_attachment 	(1230, 617)

+					    terminal_attachment 	(1230, 514))))

 				(object ClassView "Class" "Logical View::UML::Actions::CompleteActions::CreateLinkObjectAction" @3903

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressOperation 	TRUE

@@ -89421,13 +89140,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$538" @3904

-				    location   	(345, 602)

+				    location   	(336, 601)

 				    stereotype 	TRUE

 				    quidu      	"38D7E68103B2"

 				    roleview_list 	(list RoleViews

 					(object RoleView "result" @3905

 					    Parent_View 	@3904

-					    location   	(-1126, -1393)

+					    location   	(-1135, -1394)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -89439,7 +89158,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3906

 						Parent_View 	@3905

-						location   	(257, 664)

+						location   	(248, 663)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -89464,11 +89183,11 @@
 					    client     	@3904

 					    supplier   	@3895

 					    line_style 	3

-					    origin_attachment 	(345, 602)

-					    terminal_attachment 	(345, 702)

+					    origin_attachment 	(336, 601)

+					    terminal_attachment 	(336, 702)

 					    label      	(object SegLabel @3907

 						Parent_View 	@3905

-						location   	(387, 683)

+						location   	(378, 682)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -89489,7 +89208,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3908

 						Parent_View 	@3905

-						location   	(527, 657)

+						location   	(518, 656)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -89510,7 +89229,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$539" @3909

 					    Parent_View 	@3904

-					    location   	(-1126, -1393)

+					    location   	(-1135, -1394)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -89526,11 +89245,11 @@
 					    client     	@3904

 					    supplier   	@3903

 					    line_style 	3

-					    origin_attachment 	(345, 602)

-					    terminal_attachment 	(345, 502)

+					    origin_attachment 	(336, 601)

+					    terminal_attachment 	(336, 501)

 					    label      	(object SegLabel @3910

 						Parent_View 	@3909

-						location   	(393, 540)

+						location   	(384, 539)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -89558,7 +89277,7 @@
 				    origin_attachment 	(333, 398)

 				    terminal_attachment 	(333, 193))

 				(object AssociationViewNew "$UNNAMED$542" @3912

-				    location   	(778, 454)

+				    location   	(778, 456)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -89574,7 +89293,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "endData" @3913

 					    Parent_View 	@3912

-					    location   	(237, -1716)

+					    location   	(237, -1714)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -89586,7 +89305,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3914

 						Parent_View 	@3913

-						location   	(909, 410)

+						location   	(909, 412)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -89611,11 +89330,11 @@
 					    client     	@3912

 					    supplier   	@3896

 					    line_style 	3

-					    origin_attachment 	(778, 454)

-					    terminal_attachment 	(1038, 454)

+					    origin_attachment 	(778, 456)

+					    terminal_attachment 	(1038, 456)

 					    label      	(object SegLabel @3915

 						Parent_View 	@3913

-						location   	(969, 498)

+						location   	(969, 500)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -89636,7 +89355,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3916

 						Parent_View 	@3913

-						location   	(878, 548)

+						location   	(878, 550)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -89657,15 +89376,15 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$543" @3917

 					    Parent_View 	@3912

-					    location   	(237, -1716)

+					    location   	(237, -1714)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3DF14CDD0253"

 					    client     	@3912

 					    supplier   	@3903

 					    line_style 	3

-					    origin_attachment 	(778, 454)

-					    terminal_attachment 	(518, 454))))

+					    origin_attachment 	(778, 456)

+					    terminal_attachment 	(518, 456))))

 				(object InheritView "" @3918

 				    stereotype 	TRUE

 				    line_color 	4194368

@@ -89814,7 +89533,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$546" @3924

-				    location   	(691, 419)

+				    location   	(691, 426)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -89830,7 +89549,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "trigger" @3925

 					    Parent_View 	@3924

-					    location   	(-564, -261)

+					    location   	(-564, -254)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -89842,7 +89561,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3926

 						Parent_View 	@3925

-						location   	(707, 458)

+						location   	(707, 465)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -89867,11 +89586,11 @@
 					    client     	@3924

 					    supplier   	@3921

 					    line_style 	3

-					    origin_attachment 	(691, 419)

-					    terminal_attachment 	(756, 419)

+					    origin_attachment 	(691, 426)

+					    terminal_attachment 	(756, 426)

 					    label      	(object SegLabel @3927

 						Parent_View 	@3925

-						location   	(720, 376)

+						location   	(720, 383)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -89892,17 +89611,17 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$547" @3928

 					    Parent_View 	@3924

-					    location   	(-564, -261)

+					    location   	(-564, -254)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3DF142AB02BF"

 					    client     	@3924

 					    supplier   	@3923

 					    line_style 	3

-					    origin_attachment 	(691, 419)

-					    terminal_attachment 	(627, 419))))

+					    origin_attachment 	(691, 426)

+					    terminal_attachment 	(627, 426))))

 				(object AssociationViewNew "$UNNAMED$548" @3929

-				    location   	(577, 588)

+				    location   	(703, 469)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -89918,7 +89637,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "result" @3930

 					    Parent_View 	@3929

-					    location   	(-678, -92)

+					    location   	(-552, -211)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -89930,7 +89649,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3931

 						Parent_View 	@3930

-						location   	(690, 638)

+						location   	(816, 519)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -89954,12 +89673,16 @@
 					    quidu      	"3DF142BB00AB"

 					    client     	@3929

 					    supplier   	@3922

+					    vertices   	(list Points

+						(703, 469)

+						(763, 469)

+						(763, 556))

 					    line_style 	3

-					    origin_attachment 	(577, 588)

-					    terminal_attachment 	(763, 588)

+					    origin_attachment 	(703, 469)

+					    terminal_attachment 	(763, 556)

 					    label      	(object SegLabel @3932

 						Parent_View 	@3930

-						location   	(725, 545)

+						location   	(851, 426)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -89980,7 +89703,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3933

 						Parent_View 	@3930

-						location   	(753, 692)

+						location   	(879, 573)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90001,19 +89724,15 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$549" @3934

 					    Parent_View 	@3929

-					    location   	(-678, -92)

+					    location   	(-552, -211)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3DF142BB0138"

 					    client     	@3929

 					    supplier   	@3923

-					    vertices   	(list Points

-						(577, 588)

-						(509, 588)

-						(509, 469))

 					    line_style 	3

-					    origin_attachment 	(577, 588)

-					    terminal_attachment 	(509, 469))))

+					    origin_attachment 	(1406, 938)

+					    terminal_attachment 	(1059, 895))))

 				(object ClassView "Class" "Logical View::UML::Activities::BasicActivities::OutputPin" @3935

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressAttribute 	TRUE

@@ -90077,7 +89796,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$550" @3937

-				    location   	(431, 1115)

+				    location   	(438, 1115)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -90093,7 +89812,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "returnInformation" @3938

 					    Parent_View 	@3937

-					    location   	(-1149, 695)

+					    location   	(-1142, 695)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -90105,7 +89824,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3939

 						Parent_View 	@3938

-						location   	(605, 1120)

+						location   	(612, 1120)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90130,11 +89849,11 @@
 					    client     	@3937

 					    supplier   	@3935

 					    line_style 	3

-					    origin_attachment 	(431, 1115)

-					    terminal_attachment 	(431, 1221)

+					    origin_attachment 	(438, 1115)

+					    terminal_attachment 	(438, 1222)

 					    label      	(object SegLabel @3940

 						Parent_View 	@3938

-						location   	(396, 1133)

+						location   	(403, 1133)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90155,7 +89874,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3941

 						Parent_View 	@3938

-						location   	(573, 1169)

+						location   	(580, 1169)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90176,15 +89895,15 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$551" @3942

 					    Parent_View 	@3937

-					    location   	(-1149, 695)

+					    location   	(-1142, 695)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3DFA855702AF"

 					    client     	@3937

 					    supplier   	@3936

 					    line_style 	3

-					    origin_attachment 	(431, 1115)

-					    terminal_attachment 	(431, 1009))))

+					    origin_attachment 	(438, 1115)

+					    terminal_attachment 	(438, 1009))))

 				(object ClassView "Class" "Logical View::UML::Activities::BasicActivities::InputPin" @3943

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressAttribute 	TRUE

@@ -90246,7 +89965,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$552" @3945

-				    location   	(745, 956)

+				    location   	(745, 966)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -90262,7 +89981,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "trigger" @3946

 					    Parent_View 	@3945

-					    location   	(-815, 551)

+					    location   	(-815, 561)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -90274,7 +89993,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3947

 						Parent_View 	@3946

-						location   	(804, 847)

+						location   	(804, 857)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90299,11 +90018,11 @@
 					    client     	@3945

 					    supplier   	@3944

 					    line_style 	3

-					    origin_attachment 	(745, 956)

-					    terminal_attachment 	(876, 956)

+					    origin_attachment 	(745, 966)

+					    terminal_attachment 	(876, 966)

 					    label      	(object SegLabel @3948

 						Parent_View 	@3946

-						location   	(743, 894)

+						location   	(743, 904)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90324,15 +90043,15 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$553" @3949

 					    Parent_View 	@3945

-					    location   	(-815, 551)

+					    location   	(-815, 561)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3DFA84C90138"

 					    client     	@3945

 					    supplier   	@3936

 					    line_style 	3

-					    origin_attachment 	(745, 956)

-					    terminal_attachment 	(614, 956))))

+					    origin_attachment 	(745, 966)

+					    terminal_attachment 	(614, 966))))

 				(object ClassView "Class" "Logical View::UML::Actions::CompleteActions::ReplyAction" @3950

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressAttribute 	TRUE

@@ -90375,7 +90094,7 @@
 				    terminal_attachment 	(1506, 301)

 				    drawSupplier 	@3920)

 				(object AssociationViewNew "$UNNAMED$556" @3952

-				    location   	(1444, 581)

+				    location   	(1548, 582)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -90391,7 +90110,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "replyValue" @3953

 					    Parent_View 	@3952

-					    location   	(-566, 186)

+					    location   	(-462, 187)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -90403,7 +90122,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3954

 						Parent_View 	@3953

-						location   	(1329, 652)

+						location   	(1433, 653)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90428,11 +90147,11 @@
 					    client     	@3952

 					    supplier   	@3943

 					    line_style 	3

-					    origin_attachment 	(1444, 581)

-					    terminal_attachment 	(1444, 712)

+					    origin_attachment 	(1548, 582)

+					    terminal_attachment 	(1548, 713)

 					    label      	(object SegLabel @3955

 						Parent_View 	@3953

-						location   	(1399, 608)

+						location   	(1503, 609)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90453,7 +90172,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3956

 						Parent_View 	@3953

-						location   	(1302, 694)

+						location   	(1406, 695)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90474,24 +90193,24 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$557" @3957

 					    Parent_View 	@3952

-					    location   	(-566, 186)

+					    location   	(-462, 187)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3DFA8A88036B"

 					    client     	@3952

 					    supplier   	@3950

 					    line_style 	3

-					    origin_attachment 	(1444, 581)

-					    terminal_attachment 	(1444, 450))))

+					    origin_attachment 	(1548, 582)

+					    terminal_attachment 	(1548, 451))))

 				(object AssociationViewNew "$UNNAMED$558" @3958

-				    location   	(1534, 581)

+				    location   	(1548, 582)

 				    stereotype 	TRUE

 				    line_color 	4194368

 				    quidu      	"3DFA8AF30399"

 				    roleview_list 	(list RoleViews

 					(object RoleView "returnInformation" @3959

 					    Parent_View 	@3958

-					    location   	(-476, 186)

+					    location   	(-462, 187)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -90503,7 +90222,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3960

 						Parent_View 	@3959

-						location   	(1694, 649)

+						location   	(1708, 650)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90528,11 +90247,11 @@
 					    client     	@3958

 					    supplier   	@3943

 					    line_style 	3

-					    origin_attachment 	(1534, 581)

-					    terminal_attachment 	(1534, 713)

+					    origin_attachment 	(1548, 582)

+					    terminal_attachment 	(1548, 713)

 					    label      	(object SegLabel @3961

 						Parent_View 	@3959

-						location   	(1571, 599)

+						location   	(1585, 600)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90553,7 +90272,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3962

 						Parent_View 	@3959

-						location   	(1671, 688)

+						location   	(1685, 689)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90574,17 +90293,17 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$559" @3963

 					    Parent_View 	@3958

-					    location   	(-476, 186)

+					    location   	(-462, 187)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3DFA8AF403DA"

 					    client     	@3958

 					    supplier   	@3950

 					    line_style 	3

-					    origin_attachment 	(1534, 581)

-					    terminal_attachment 	(1534, 450))))

+					    origin_attachment 	(1548, 582)

+					    terminal_attachment 	(1548, 451))))

 				(object AssociationViewNew "$UNNAMED$554" @3964

-				    location   	(1138, 524)

+				    location   	(1415, 797)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -90600,7 +90319,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "replyToCall" @3965

 					    Parent_View 	@3964

-					    location   	(-872, 129)

+					    location   	(-595, 402)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -90612,7 +90331,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3966

 						Parent_View 	@3965

-						location   	(1265, 869)

+						location   	(1542, 1142)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90636,12 +90355,16 @@
 					    quidu      	"3DFA8A2D032C"

 					    client     	@3964

 					    supplier   	@3944

+					    vertices   	(list Points

+						(1415, 797)

+						(1415, 916)

+						(1188, 916))

 					    line_style 	3

-					    origin_attachment 	(1138, 524)

-					    terminal_attachment 	(1138, 916)

+					    origin_attachment 	(1415, 797)

+					    terminal_attachment 	(1188, 916)

 					    label      	(object SegLabel @3967

 						Parent_View 	@3965

-						location   	(1089, 871)

+						location   	(1366, 1144)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90662,19 +90385,15 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$555" @3968

 					    Parent_View 	@3964

-					    location   	(-872, 129)

+					    location   	(-595, 402)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3DFA8A2D034B"

 					    client     	@3964

 					    supplier   	@3950

-					    vertices   	(list Points

-						(1138, 524)

-						(1138, 408)

-						(1415, 408))

 					    line_style 	3

-					    origin_attachment 	(1138, 524)

-					    terminal_attachment 	(1415, 408))))

+					    origin_attachment 	(2830, 1594)

+					    terminal_attachment 	(2963, 859))))

 				(object InheritView "" @3969

 				    stereotype 	TRUE

 				    quidu      	"3E11B33703E6"

@@ -90763,7 +90482,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$560" @3973

-				    location   	(757, 463)

+				    location   	(757, 452)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -90779,7 +90498,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "exception" @3974

 					    Parent_View 	@3973

-					    location   	(-108, -444)

+					    location   	(-108, -455)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -90791,7 +90510,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3975

 						Parent_View 	@3974

-						location   	(839, 371)

+						location   	(839, 360)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90816,11 +90535,11 @@
 					    client     	@3973

 					    supplier   	@3971

 					    line_style 	3

-					    origin_attachment 	(757, 463)

-					    terminal_attachment 	(948, 463)

+					    origin_attachment 	(757, 452)

+					    terminal_attachment 	(948, 452)

 					    label      	(object SegLabel @3976

 						Parent_View 	@3974

-						location   	(904, 528)

+						location   	(904, 517)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90841,7 +90560,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3977

 						Parent_View 	@3974

-						location   	(833, 424)

+						location   	(833, 413)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -90862,15 +90581,15 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$561" @3978

 					    Parent_View 	@3973

-					    location   	(-108, -444)

+					    location   	(-108, -455)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3DFE674902CE"

 					    client     	@3973

 					    supplier   	@3972

 					    line_style 	3

-					    origin_attachment 	(757, 463)

-					    terminal_attachment 	(566, 463))))

+					    origin_attachment 	(757, 452)

+					    terminal_attachment 	(566, 452))))

 				(object ClassView "Class" "Logical View::UML::Activities::BasicActivities::Action" @3979

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressAttribute 	TRUE

@@ -90953,13 +90672,11 @@
 				(object ClassAttribute "isDestroyLinks"

 				    quid       	"408A5B510111"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")

 				(object ClassAttribute "isDestroyOwnedObjects"

 				    quid       	"408A5B5D0399"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")))

 			(object Class "TestIdentityAction"

@@ -91028,7 +90745,6 @@
 				(object ClassAttribute "isReplaceAll"

 				    quid       	"3A78A64D0112"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public"))

 			    language   	"ObjectSwitch")

@@ -91067,7 +90783,6 @@
 				(object ClassAttribute "isReplaceAll"

 				    quid       	"3A785E8003E3"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public")))

 			(object Class "CreateLinkAction"

@@ -91145,7 +90860,6 @@
 				(object ClassAttribute "isReplaceAll"

 				    quid       	"3A79B05202CE"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"false"

 				    exportControl 	"Public"))

 			    language   	"ObjectSwitch")

@@ -91175,13 +90889,11 @@
 				(object ClassAttribute "body"

 				    quid       	"3913392D021C"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public")

 				(object ClassAttribute "language"

 				    quid       	"3745C54B024E"

 				    stereotype 	"0..1"

 				    type       	"String"

-				    quidu      	"3CA010B103C3"

 				    exportControl 	"Public")))

 			(object Class "CallAction"

 			    quid       	"3DF12EC000DA"

@@ -91194,7 +90906,6 @@
 				(object ClassAttribute "isSynchronous"

 				    quid       	"3E54F8A40273"

 				    type       	"Boolean"

-				    quidu      	"3CA010AC0090"

 				    initv      	"true"

 				    exportControl 	"Public"))

 			    abstract   	TRUE)

@@ -91940,14 +91651,14 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$574" @3983

-				    location   	(1935, 705)

+				    location   	(1824, 705)

 				    stereotype 	TRUE

 				    line_color 	4194368

 				    quidu      	"395CFBA0032C"

 				    roleview_list 	(list RoleViews

 					(object RoleView "result" @3984

 					    Parent_View 	@3983

-					    location   	(1589, 105)

+					    location   	(1478, 105)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -91959,7 +91670,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3985

 						Parent_View 	@3984

-						location   	(1873, 728)

+						location   	(1762, 728)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -91984,11 +91695,11 @@
 					    client     	@3983

 					    supplier   	@3981

 					    line_style 	3

-					    origin_attachment 	(1935, 705)

-					    terminal_attachment 	(1935, 838)

+					    origin_attachment 	(1824, 705)

+					    terminal_attachment 	(1824, 838)

 					    label      	(object SegLabel @3986

 						Parent_View 	@3984

-						location   	(1972, 792)

+						location   	(1861, 792)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92009,7 +91720,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @3987

 						Parent_View 	@3984

-						location   	(1799, 773)

+						location   	(1688, 773)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92030,7 +91741,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$575" @3988

 					    Parent_View 	@3983

-					    location   	(1589, 105)

+					    location   	(1478, 105)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -92046,11 +91757,11 @@
 					    client     	@3983

 					    supplier   	@3982

 					    line_style 	3

-					    origin_attachment 	(1935, 705)

-					    terminal_attachment 	(1935, 573)

+					    origin_attachment 	(1824, 705)

+					    terminal_attachment 	(1824, 573)

 					    label      	(object SegLabel @3989

 						Parent_View 	@3988

-						location   	(1862, 618)

+						location   	(1751, 618)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92154,7 +91865,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$564" @3993

-				    location   	(394, 705)

+				    location   	(403, 705)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -92166,7 +91877,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @3994

 					Parent_View 	@3993

-					location   	(394, 646)

+					location   	(403, 646)

 					font       	(object Font

 					    size       	8

 					    face       	"Arial"

@@ -92191,7 +91902,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "result" @3995

 					    Parent_View 	@3993

-					    location   	(64, 181)

+					    location   	(73, 181)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -92203,7 +91914,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @3996

 						Parent_View 	@3995

-						location   	(474, 753)

+						location   	(483, 753)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92228,11 +91939,11 @@
 					    client     	@3993

 					    supplier   	@3990

 					    line_style 	3

-					    origin_attachment 	(394, 705)

-					    terminal_attachment 	(394, 843)

+					    origin_attachment 	(403, 705)

+					    terminal_attachment 	(403, 844)

 					    label      	(object SegLabel @3997

 						Parent_View 	@3995

-						location   	(349, 782)

+						location   	(358, 782)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92253,7 +91964,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @3998

 						Parent_View 	@3995

-						location   	(538, 793)

+						location   	(547, 793)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92274,7 +91985,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$565" @3999

 					    Parent_View 	@3993

-					    location   	(64, 181)

+					    location   	(73, 181)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -92290,11 +92001,11 @@
 					    client     	@3993

 					    supplier   	@3992

 					    line_style 	3

-					    origin_attachment 	(394, 705)

-					    terminal_attachment 	(394, 567)

+					    origin_attachment 	(403, 705)

+					    terminal_attachment 	(403, 567)

 					    label      	(object SegLabel @4000

 						Parent_View 	@3999

-						location   	(446, 629)

+						location   	(455, 629)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92314,7 +92025,7 @@
 						height     	52

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$562" @4001

-				    location   	(122, 708)

+				    location   	(162, 708)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -92326,7 +92037,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @4002

 					Parent_View 	@4001

-					location   	(122, 649)

+					location   	(162, 649)

 					font       	(object Font

 					    size       	8

 					    face       	"Arial"

@@ -92351,7 +92062,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "classifier" @4003

 					    Parent_View 	@4001

-					    location   	(-1212, -27)

+					    location   	(-1172, -27)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -92363,7 +92074,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4004

 						Parent_View 	@4003

-						location   	(207, 785)

+						location   	(247, 785)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92387,11 +92098,11 @@
 					    client     	@4001

 					    supplier   	@3991

 					    line_style 	3

-					    origin_attachment 	(122, 708)

-					    terminal_attachment 	(122, 848)

+					    origin_attachment 	(162, 708)

+					    terminal_attachment 	(162, 849)

 					    label      	(object SegLabel @4005

 						Parent_View 	@4003

-						location   	(82, 788)

+						location   	(122, 788)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92412,7 +92123,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$563" @4006

 					    Parent_View 	@4001

-					    location   	(-1212, -27)

+					    location   	(-1172, -27)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -92427,11 +92138,11 @@
 					    client     	@4001

 					    supplier   	@3992

 					    line_style 	3

-					    origin_attachment 	(122, 708)

-					    terminal_attachment 	(122, 568)

+					    origin_attachment 	(162, 708)

+					    terminal_attachment 	(162, 567)

 					    label      	(object SegLabel @4007

 						Parent_View 	@4006

-						location   	(148, 610)

+						location   	(188, 610)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92569,7 +92280,7 @@
 				    terminal_attachment 	(831, 350)

 				    drawSupplier 	@4009)

 				(object AssociationViewNew "$UNNAMED$566" @4015

-				    location   	(848, 721)

+				    location   	(864, 721)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -92581,7 +92292,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @4016

 					Parent_View 	@4015

-					location   	(848, 662)

+					location   	(864, 662)

 					font       	(object Font

 					    size       	8

 					    face       	"Arial"

@@ -92606,7 +92317,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "target" @4017

 					    Parent_View 	@4015

-					    location   	(-1012, 45)

+					    location   	(-996, 45)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -92618,7 +92329,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4018

 						Parent_View 	@4017

-						location   	(921, 813)

+						location   	(937, 813)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92643,11 +92354,11 @@
 					    client     	@4015

 					    supplier   	@4012

 					    line_style 	3

-					    origin_attachment 	(848, 721)

-					    terminal_attachment 	(848, 844)

+					    origin_attachment 	(864, 721)

+					    terminal_attachment 	(864, 844)

 					    label      	(object SegLabel @4019

 						Parent_View 	@4017

-						location   	(808, 805)

+						location   	(824, 805)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92668,7 +92379,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @4020

 						Parent_View 	@4017

-						location   	(980, 773)

+						location   	(996, 773)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92689,7 +92400,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$567" @4021

 					    Parent_View 	@4015

-					    location   	(-1012, 45)

+					    location   	(-996, 45)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -92705,11 +92416,11 @@
 					    client     	@4015

 					    supplier   	@4013

 					    line_style 	3

-					    origin_attachment 	(848, 721)

-					    terminal_attachment 	(848, 599)

+					    origin_attachment 	(864, 721)

+					    terminal_attachment 	(864, 598)

 					    label      	(object SegLabel @4022

 						Parent_View 	@4021

-						location   	(921, 653)

+						location   	(937, 653)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92813,7 +92524,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$572" @4026

-				    location   	(1347, 711)

+				    location   	(1354, 711)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -92828,7 +92539,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "result" @4027

 					    Parent_View 	@4026

-					    location   	(770, -137)

+					    location   	(777, -137)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -92840,7 +92551,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4028

 						Parent_View 	@4027

-						location   	(1423, 727)

+						location   	(1430, 727)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92864,11 +92575,11 @@
 					    client     	@4026

 					    supplier   	@4023

 					    line_style 	3

-					    origin_attachment 	(1347, 711)

-					    terminal_attachment 	(1347, 843)

+					    origin_attachment 	(1354, 711)

+					    terminal_attachment 	(1354, 844)

 					    label      	(object SegLabel @4029

 						Parent_View 	@4027

-						location   	(1307, 767)

+						location   	(1314, 767)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92889,7 +92600,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @4030

 						Parent_View 	@4027

-						location   	(1491, 769)

+						location   	(1498, 769)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92910,7 +92621,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$573" @4031

 					    Parent_View 	@4026

-					    location   	(770, -137)

+					    location   	(777, -137)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -92925,11 +92636,11 @@
 					    client     	@4026

 					    supplier   	@4025

 					    line_style 	3

-					    origin_attachment 	(1347, 711)

-					    terminal_attachment 	(1347, 580)

+					    origin_attachment 	(1354, 711)

+					    terminal_attachment 	(1354, 579)

 					    label      	(object SegLabel @4032

 						Parent_View 	@4031

-						location   	(1284, 623)

+						location   	(1291, 623)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -92958,7 +92669,7 @@
 				    terminal_attachment 	(1409, 350)

 				    drawSupplier 	@4009)

 				(object AssociationViewNew "$UNNAMED$568" @4034

-				    location   	(1300, 320)

+				    location   	(1389, 320)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -92973,7 +92684,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "first" @4035

 					    Parent_View 	@4034

-					    location   	(726, -529)

+					    location   	(815, -529)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -92985,7 +92696,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4036

 						Parent_View 	@4035

-						location   	(1238, 202)

+						location   	(1327, 202)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93009,11 +92720,11 @@
 					    client     	@4034

 					    supplier   	@4024

 					    line_style 	3

-					    origin_attachment 	(1300, 320)

-					    terminal_attachment 	(1300, 166)

+					    origin_attachment 	(1389, 320)

+					    terminal_attachment 	(1389, 166)

 					    label      	(object SegLabel @4037

 						Parent_View 	@4035

-						location   	(1344, 210)

+						location   	(1433, 210)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93034,7 +92745,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @4038

 						Parent_View 	@4035

-						location   	(1174, 245)

+						location   	(1263, 245)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93055,7 +92766,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$569" @4039

 					    Parent_View 	@4034

-					    location   	(726, -529)

+					    location   	(815, -529)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -93070,11 +92781,11 @@
 					    client     	@4034

 					    supplier   	@4025

 					    line_style 	3

-					    origin_attachment 	(1300, 320)

-					    terminal_attachment 	(1300, 475)

+					    origin_attachment 	(1389, 320)

+					    terminal_attachment 	(1389, 475)

 					    label      	(object SegLabel @4040

 						Parent_View 	@4039

-						location   	(1234, 445)

+						location   	(1323, 445)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93094,7 +92805,7 @@
 						height     	67

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$570" @4041

-				    location   	(1522, 320)

+				    location   	(1389, 320)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -93109,7 +92820,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "second" @4042

 					    Parent_View 	@4041

-					    location   	(944, -524)

+					    location   	(811, -524)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -93121,7 +92832,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4043

 						Parent_View 	@4042

-						location   	(1620, 201)

+						location   	(1487, 201)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93145,11 +92856,11 @@
 					    client     	@4041

 					    supplier   	@4024

 					    line_style 	3

-					    origin_attachment 	(1522, 320)

-					    terminal_attachment 	(1522, 166)

+					    origin_attachment 	(1389, 320)

+					    terminal_attachment 	(1389, 166)

 					    label      	(object SegLabel @4044

 						Parent_View 	@4042

-						location   	(1485, 214)

+						location   	(1352, 214)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93170,7 +92881,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @4045

 						Parent_View 	@4042

-						location   	(1665, 248)

+						location   	(1532, 248)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93191,7 +92902,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$571" @4046

 					    Parent_View 	@4041

-					    location   	(944, -524)

+					    location   	(811, -524)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -93206,11 +92917,11 @@
 					    client     	@4041

 					    supplier   	@4025

 					    line_style 	3

-					    origin_attachment 	(1522, 320)

-					    terminal_attachment 	(1522, 475)

+					    origin_attachment 	(1389, 320)

+					    terminal_attachment 	(1389, 475)

 					    label      	(object SegLabel @4047

 						Parent_View 	@4046

-						location   	(1594, 455)

+						location   	(1461, 455)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93353,13 +93064,13 @@
 				    height     	94

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$580" @4052

-				    location   	(375, 886)

+				    location   	(378, 886)

 				    stereotype 	TRUE

 				    quidu      	"395CE0B30154"

 				    roleview_list 	(list RoleViews

 					(object RoleView "result" @4053

 					    Parent_View 	@4052

-					    location   	(-451, 133)

+					    location   	(-448, 133)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -93371,7 +93082,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4054

 						Parent_View 	@4053

-						location   	(463, 936)

+						location   	(466, 936)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93396,11 +93107,11 @@
 					    client     	@4052

 					    supplier   	@4050

 					    line_style 	3

-					    origin_attachment 	(375, 886)

-					    terminal_attachment 	(375, 999)

+					    origin_attachment 	(378, 886)

+					    terminal_attachment 	(378, 1000)

 					    label      	(object SegLabel @4055

 						Parent_View 	@4053

-						location   	(301, 959)

+						location   	(304, 959)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93421,7 +93132,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @4056

 						Parent_View 	@4053

-						location   	(518, 969)

+						location   	(521, 969)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93442,7 +93153,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$581" @4057

 					    Parent_View 	@4052

-					    location   	(-451, 133)

+					    location   	(-448, 133)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -93458,11 +93169,11 @@
 					    client     	@4052

 					    supplier   	@4051

 					    line_style 	3

-					    origin_attachment 	(375, 886)

-					    terminal_attachment 	(375, 773)

+					    origin_attachment 	(378, 886)

+					    terminal_attachment 	(378, 773)

 					    label      	(object SegLabel @4058

 						Parent_View 	@4057

-						location   	(460, 816)

+						location   	(463, 816)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93623,13 +93334,13 @@
 				    terminal_attachment 	(1901, 547)

 				    drawSupplier 	@4063)

 				(object AssociationViewNew "$UNNAMED$576" @4066

-				    location   	(668, 347)

+				    location   	(668, 357)

 				    stereotype 	TRUE

 				    quidu      	"38DC08B80279"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$577" @4067

 					    Parent_View 	@4066

-					    location   	(-2121, -330)

+					    location   	(-2121, -320)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -93641,7 +93352,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4068

 						Parent_View 	@4067

-						location   	(788, 389)

+						location   	(788, 399)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -93667,11 +93378,11 @@
 					    client     	@4066

 					    supplier   	@4062

 					    line_style 	3

-					    origin_attachment 	(668, 347)

-					    terminal_attachment 	(818, 347)

+					    origin_attachment 	(668, 357)

+					    terminal_attachment 	(818, 357)

 					    label      	(object SegLabel @4069

 						Parent_View 	@4067

-						location   	(781, 314)

+						location   	(781, 324)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93692,7 +93403,7 @@
 						orientation 	0))

 					(object RoleView "structuralFeature" @4070

 					    Parent_View 	@4066

-					    location   	(-2121, -330)

+					    location   	(-2121, -320)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -93704,7 +93415,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4071

 						Parent_View 	@4070

-						location   	(658, 381)

+						location   	(658, 391)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93729,11 +93440,11 @@
 					    client     	@4066

 					    supplier   	@4060

 					    line_style 	3

-					    origin_attachment 	(668, 347)

-					    terminal_attachment 	(518, 347)

+					    origin_attachment 	(668, 357)

+					    terminal_attachment 	(518, 357)

 					    label      	(object SegLabel @4072

 						Parent_View 	@4070

-						location   	(546, 302)

+						location   	(546, 312)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93753,13 +93464,13 @@
 						height     	46

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$578" @4073

-				    location   	(1463, 369)

+				    location   	(1463, 361)

 				    stereotype 	TRUE

 				    quidu      	"38DC073A0161"

 				    roleview_list 	(list RoleViews

 					(object RoleView "object" @4074

 					    Parent_View 	@4073

-					    location   	(-727, -65)

+					    location   	(-727, -73)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -93771,7 +93482,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4075

 						Parent_View 	@4074

-						location   	(1563, 402)

+						location   	(1563, 394)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93796,11 +93507,11 @@
 					    client     	@4073

 					    supplier   	@4061

 					    line_style 	3

-					    origin_attachment 	(1463, 369)

-					    terminal_attachment 	(1645, 369)

+					    origin_attachment 	(1463, 361)

+					    terminal_attachment 	(1645, 361)

 					    label      	(object SegLabel @4076

 						Parent_View 	@4074

-						location   	(1587, 329)

+						location   	(1587, 321)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93821,7 +93532,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @4077

 						Parent_View 	@4074

-						location   	(1516, 442)

+						location   	(1516, 434)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93842,7 +93553,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$579" @4078

 					    Parent_View 	@4073

-					    location   	(-727, -65)

+					    location   	(-727, -73)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -93858,11 +93569,11 @@
 					    client     	@4073

 					    supplier   	@4062

 					    line_style 	3

-					    origin_attachment 	(1463, 369)

-					    terminal_attachment 	(1282, 369)

+					    origin_attachment 	(1463, 361)

+					    terminal_attachment 	(1282, 361)

 					    label      	(object SegLabel @4079

 						Parent_View 	@4078

-						location   	(1337, 336)

+						location   	(1337, 328)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -93914,22 +93625,6 @@
 				    icon_style 	"Icon"

 				    fill_color 	16777215

 				    quidu      	"3A787176007B"

-				    compartment 	(object Compartment

-					Parent_View 	@4081

-					location   	(981, 1062)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	1

-					max_width  	453)

 				    width      	636

 				    height     	112)

 				(object ClassView "Class" "Logical View::UML::Activities::BasicActivities::InputPin" @4082

@@ -93963,13 +93658,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$584" @4083

-				    location   	(1148, 1311)

+				    location   	(1148, 1232)

 				    stereotype 	TRUE

 				    quidu      	"3960D15B0367"

 				    roleview_list 	(list RoleViews

 					(object RoleView "insertAt" @4084

 					    Parent_View 	@4083

-					    location   	(-261, 603)

+					    location   	(-261, 524)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -93981,7 +93676,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4085

 						Parent_View 	@4084

-						location   	(991, 1353)

+						location   	(991, 1274)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94005,12 +93700,17 @@
 					    quidu      	"3960D15E0004"

 					    client     	@4083

 					    supplier   	@4082

+					    vertices   	(list Points

+						(1148, 1232)

+						(1148, 1172)

+						(887, 1172)

+						(887, 1276))

 					    line_style 	3

-					    origin_attachment 	(1148, 1311)

-					    terminal_attachment 	(887, 1311)

+					    origin_attachment 	(1148, 1232)

+					    terminal_attachment 	(887, 1276)

 					    label      	(object SegLabel @4086

 						Parent_View 	@4084

-						location   	(955, 1275)

+						location   	(955, 1196)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94031,7 +93731,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @4087

 						Parent_View 	@4084

-						location   	(1173, 1356)

+						location   	(1173, 1277)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94052,7 +93752,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$585" @4088

 					    Parent_View 	@4083

-					    location   	(-261, 603)

+					    location   	(-261, 524)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -94068,15 +93768,16 @@
 					    client     	@4083

 					    supplier   	@4081

 					    vertices   	(list Points

+						(1148, 1232)

 						(1148, 1311)

 						(1210, 1311)

 						(1210, 1112))

 					    line_style 	3

-					    origin_attachment 	(1148, 1311)

+					    origin_attachment 	(1148, 1232)

 					    terminal_attachment 	(1210, 1112)

 					    label      	(object SegLabel @4089

 						Parent_View 	@4088

-						location   	(1293, 1159)

+						location   	(1293, 1080)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94149,13 +93850,13 @@
 				    terminal_attachment 	(1262, 547)

 				    drawSupplier 	@4063)

 				(object AssociationViewNew "$UNNAMED$582" @4094

-				    location   	(744, 864)

+				    location   	(1010, 1085)

 				    stereotype 	TRUE

 				    quidu      	"3907396402D5"

 				    roleview_list 	(list RoleViews

 					(object RoleView "value" @4095

 					    Parent_View 	@4094

-					    location   	(-1129, -126)

+					    location   	(-863, 95)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -94167,7 +93868,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4096

 						Parent_View 	@4095

-						location   	(828, 1155)

+						location   	(1094, 1376)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94191,12 +93892,16 @@
 					    quidu      	"39073965015A"

 					    client     	@4094

 					    supplier   	@4082

+					    vertices   	(list Points

+						(1010, 1085)

+						(1010, 1276)

+						(887, 1276))

 					    line_style 	3

-					    origin_attachment 	(744, 864)

-					    terminal_attachment 	(744, 1276)

+					    origin_attachment 	(1010, 1085)

+					    terminal_attachment 	(887, 1276)

 					    label      	(object SegLabel @4097

 						Parent_View 	@4095

-						location   	(709, 1228)

+						location   	(975, 1449)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94217,7 +93922,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @4098

 						Parent_View 	@4095

-						location   	(881, 1203)

+						location   	(1147, 1424)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94238,7 +93943,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$583" @4099

 					    Parent_View 	@4094

-					    location   	(-1129, -126)

+					    location   	(-863, 95)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -94253,16 +93958,12 @@
 					    quidu      	"390739650182"

 					    client     	@4094

 					    supplier   	@4090

-					    vertices   	(list Points

-						(744, 864)

-						(744, 719)

-						(1010, 719))

 					    line_style 	3

-					    origin_attachment 	(744, 864)

-					    terminal_attachment 	(1010, 719)

+					    origin_attachment 	(2020, 2170)

+					    terminal_attachment 	(2276, 1490)

 					    label      	(object SegLabel @4100

 						Parent_View 	@4099

-						location   	(960, 687)

+						location   	(1226, 908)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94472,7 +94173,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$590" @4109

-				    location   	(702, 567)

+				    location   	(698, 567)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -94487,7 +94188,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "end" @4110

 					    Parent_View 	@4109

-					    location   	(-222, 119)

+					    location   	(-226, 119)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -94499,7 +94200,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4111

 						Parent_View 	@4110

-						location   	(764, 644)

+						location   	(760, 644)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94523,11 +94224,11 @@
 					    client     	@4109

 					    supplier   	@4105

 					    line_style 	3

-					    origin_attachment 	(702, 567)

-					    terminal_attachment 	(702, 694)

+					    origin_attachment 	(698, 567)

+					    terminal_attachment 	(698, 694)

 					    label      	(object SegLabel @4112

 						Parent_View 	@4110

-						location   	(661, 650)

+						location   	(657, 650)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94548,7 +94249,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$591" @4113

 					    Parent_View 	@4109

-					    location   	(-222, 119)

+					    location   	(-226, 119)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -94563,11 +94264,11 @@
 					    client     	@4109

 					    supplier   	@4108

 					    line_style 	3

-					    origin_attachment 	(702, 567)

-					    terminal_attachment 	(702, 441)

+					    origin_attachment 	(698, 567)

+					    terminal_attachment 	(698, 441)

 					    label      	(object SegLabel @4114

 						Parent_View 	@4113

-						location   	(737, 485)

+						location   	(733, 485)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94587,13 +94288,13 @@
 						height     	35

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$586" @4115

-				    location   	(529, 401)

+				    location   	(529, 396)

 				    stereotype 	TRUE

 				    quidu      	"38DC049F0298"

 				    roleview_list 	(list RoleViews

 					(object RoleView "endData" @4116

 					    Parent_View 	@4115

-					    location   	(-1302, -771)

+					    location   	(-1302, -776)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -94605,7 +94306,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4117

 						Parent_View 	@4116

-						location   	(572, 439)

+						location   	(572, 434)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94630,11 +94331,11 @@
 					    client     	@4115

 					    supplier   	@4108

 					    line_style 	3

-					    origin_attachment 	(529, 401)

-					    terminal_attachment 	(674, 401)

+					    origin_attachment 	(529, 396)

+					    terminal_attachment 	(674, 396)

 					    label      	(object SegLabel @4118

 						Parent_View 	@4116

-						location   	(632, 358)

+						location   	(632, 353)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94655,7 +94356,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$587" @4119

 					    Parent_View 	@4115

-					    location   	(-1302, -771)

+					    location   	(-1302, -776)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -94667,7 +94368,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4120

 						Parent_View 	@4119

-						location   	(413, 315)

+						location   	(413, 310)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94693,11 +94394,11 @@
 					    client     	@4115

 					    supplier   	@4106

 					    line_style 	3

-					    origin_attachment 	(529, 401)

-					    terminal_attachment 	(384, 401)

+					    origin_attachment 	(529, 396)

+					    terminal_attachment 	(384, 396)

 					    label      	(object SegLabel @4121

 						Parent_View 	@4119

-						location   	(416, 450)

+						location   	(416, 445)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94755,13 +94456,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$588" @4124

-				    location   	(899, 568)

+				    location   	(869, 567)

 				    stereotype 	TRUE

 				    quidu      	"38C965AD0164"

 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$589" @4125

 					    Parent_View 	@4124

-					    location   	(315, -376)

+					    location   	(285, -377)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -94773,7 +94474,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4126

 						Parent_View 	@4125

-						location   	(858, 468)

+						location   	(828, 467)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -94799,11 +94500,11 @@
 					    client     	@4124

 					    supplier   	@4108

 					    line_style 	3

-					    origin_attachment 	(899, 568)

-					    terminal_attachment 	(899, 442)

+					    origin_attachment 	(869, 567)

+					    terminal_attachment 	(869, 441)

 					    label      	(object SegLabel @4127

 						Parent_View 	@4125

-						location   	(949, 482)

+						location   	(919, 481)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94824,7 +94525,7 @@
 						orientation 	1))

 					(object RoleView "value" @4128

 					    Parent_View 	@4124

-					    location   	(315, -376)

+					    location   	(285, -377)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -94836,7 +94537,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4129

 						Parent_View 	@4128

-						location   	(983, 613)

+						location   	(953, 612)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94861,11 +94562,11 @@
 					    client     	@4124

 					    supplier   	@4123

 					    line_style 	3

-					    origin_attachment 	(899, 568)

-					    terminal_attachment 	(899, 694)

+					    origin_attachment 	(869, 567)

+					    terminal_attachment 	(869, 694)

 					    label      	(object SegLabel @4130

 						Parent_View 	@4128

-						location   	(964, 660)

+						location   	(934, 659)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -94959,13 +94660,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$592" @4134

-				    location   	(670, 600)

+				    location   	(670, 618)

 				    stereotype 	TRUE

 				    quidu      	"395CD521012D"

 				    roleview_list 	(list RoleViews

 					(object RoleView "result" @4135

 					    Parent_View 	@4134

-					    location   	(326, -166)

+					    location   	(326, -148)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -94977,7 +94678,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4136

 						Parent_View 	@4135

-						location   	(799, 647)

+						location   	(799, 665)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -95002,11 +94703,11 @@
 					    client     	@4134

 					    supplier   	@4132

 					    line_style 	3

-					    origin_attachment 	(670, 600)

-					    terminal_attachment 	(883, 600)

+					    origin_attachment 	(670, 618)

+					    terminal_attachment 	(883, 618)

 					    label      	(object SegLabel @4137

 						Parent_View 	@4135

-						location   	(839, 565)

+						location   	(839, 583)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -95027,7 +94728,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @4138

 						Parent_View 	@4135

-						location   	(745, 684)

+						location   	(745, 702)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -95048,7 +94749,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$593" @4139

 					    Parent_View 	@4134

-					    location   	(326, -166)

+					    location   	(326, -148)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -95064,11 +94765,11 @@
 					    client     	@4134

 					    supplier   	@4133

 					    line_style 	3

-					    origin_attachment 	(670, 600)

-					    terminal_attachment 	(457, 600)

+					    origin_attachment 	(670, 618)

+					    terminal_attachment 	(457, 618)

 					    label      	(object SegLabel @4140

 						Parent_View 	@4139

-						location   	(524, 566)

+						location   	(524, 584)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -95415,13 +95116,13 @@
 				    height     	112

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$596" @4157

-				    location   	(463, 1224)

+				    location   	(531, 1224)

 				    stereotype 	TRUE

 				    quidu      	"393AD8C202F5"

 				    roleview_list 	(list RoleViews

 					(object RoleView "endData" @4158

 					    Parent_View 	@4157

-					    location   	(-511, -265)

+					    location   	(-443, -265)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -95433,7 +95134,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4159

 						Parent_View 	@4158

-						location   	(562, 1232)

+						location   	(630, 1232)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -95457,11 +95158,11 @@
 					    client     	@4157

 					    supplier   	@4156

 					    line_style 	3

-					    origin_attachment 	(463, 1224)

-					    terminal_attachment 	(463, 1330)

+					    origin_attachment 	(531, 1224)

+					    terminal_attachment 	(531, 1329)

 					    label      	(object SegLabel @4160

 						Parent_View 	@4158

-						location   	(425, 1288)

+						location   	(493, 1288)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -95482,7 +95183,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @4161

 						Parent_View 	@4158

-						location   	(640, 1272)

+						location   	(708, 1272)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -95503,7 +95204,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$597" @4162

 					    Parent_View 	@4157

-					    location   	(-511, -265)

+					    location   	(-443, -265)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -95518,11 +95219,11 @@
 					    client     	@4157

 					    supplier   	@4153

 					    line_style 	3

-					    origin_attachment 	(463, 1224)

-					    terminal_attachment 	(463, 1119)

+					    origin_attachment 	(531, 1224)

+					    terminal_attachment 	(531, 1120)

 					    label      	(object SegLabel @4163

 						Parent_View 	@4162

-						location   	(422, 1146)

+						location   	(490, 1146)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -95550,13 +95251,13 @@
 				    origin_attachment 	(251, 1329)

 				    terminal_attachment 	(251, 1104))

 				(object AssociationViewNew "$UNNAMED$594" @4165

-				    location   	(817, 1378)

+				    location   	(817, 1377)

 				    stereotype 	TRUE

 				    quidu      	"3960C173020D"

 				    roleview_list 	(list RoleViews

 					(object RoleView "insertAt" @4166

 					    Parent_View 	@4165

-					    location   	(517, 120)

+					    location   	(517, 119)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -95568,7 +95269,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4167

 						Parent_View 	@4166

-						location   	(881, 1425)

+						location   	(881, 1424)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -95593,11 +95294,11 @@
 					    client     	@4165

 					    supplier   	@4155

 					    line_style 	3

-					    origin_attachment 	(817, 1378)

-					    terminal_attachment 	(955, 1378)

+					    origin_attachment 	(817, 1377)

+					    terminal_attachment 	(955, 1377)

 					    label      	(object SegLabel @4168

 						Parent_View 	@4166

-						location   	(892, 1336)

+						location   	(892, 1335)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -95618,7 +95319,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$595" @4169

 					    Parent_View 	@4165

-					    location   	(517, 120)

+					    location   	(517, 119)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -95634,11 +95335,11 @@
 					    client     	@4165

 					    supplier   	@4156

 					    line_style 	3

-					    origin_attachment 	(817, 1378)

-					    terminal_attachment 	(680, 1378)

+					    origin_attachment 	(817, 1377)

+					    terminal_attachment 	(680, 1377)

 					    label      	(object SegLabel @4170

 						Parent_View 	@4169

-						location   	(729, 1416)

+						location   	(729, 1415)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -95746,13 +95447,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$600" @4174

-				    location   	(1175, 633)

+				    location   	(1122, 633)

 				    stereotype 	TRUE

 				    quidu      	"3A787C74030C"

 				    roleview_list 	(list RoleViews

 					(object RoleView "association" @4175

 					    Parent_View 	@4174

-					    location   	(-842, 9)

+					    location   	(-895, 9)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -95764,7 +95465,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4176

 						Parent_View 	@4175

-						location   	(1044, 807)

+						location   	(991, 807)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -95789,11 +95490,11 @@
 					    client     	@4174

 					    supplier   	@4171

 					    line_style 	3

-					    origin_attachment 	(1175, 633)

-					    terminal_attachment 	(1175, 838)

+					    origin_attachment 	(1122, 633)

+					    terminal_attachment 	(1122, 838)

 					    label      	(object SegLabel @4177

 						Parent_View 	@4175

-						location   	(1215, 807)

+						location   	(1162, 807)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -95814,7 +95515,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$601" @4178

 					    Parent_View 	@4174

-					    location   	(-842, 9)

+					    location   	(-895, 9)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -95830,11 +95531,11 @@
 					    client     	@4174

 					    supplier   	@4173

 					    line_style 	3

-					    origin_attachment 	(1175, 633)

-					    terminal_attachment 	(1175, 429)

+					    origin_attachment 	(1122, 633)

+					    terminal_attachment 	(1122, 429)

 					    label      	(object SegLabel @4179

 						Parent_View 	@4178

-						location   	(1241, 473)

+						location   	(1188, 473)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -96307,13 +96008,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$602" @4201

-				    location   	(997, 384)

+				    location   	(997, 383)

 				    stereotype 	TRUE

 				    quidu      	"39078A380397"

 				    roleview_list 	(list RoleViews

 					(object RoleView "variable" @4202

 					    Parent_View 	@4201

-					    location   	(-1735, -304)

+					    location   	(-1735, -305)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -96325,7 +96026,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4203

 						Parent_View 	@4202

-						location   	(1084, 422)

+						location   	(1084, 421)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -96350,11 +96051,11 @@
 					    client     	@4201

 					    supplier   	@4199

 					    line_style 	3

-					    origin_attachment 	(997, 384)

-					    terminal_attachment 	(1161, 384)

+					    origin_attachment 	(997, 383)

+					    terminal_attachment 	(1161, 383)

 					    label      	(object SegLabel @4204

 						Parent_View 	@4202

-						location   	(1111, 350)

+						location   	(1111, 349)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -96375,7 +96076,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$603" @4205

 					    Parent_View 	@4201

-					    location   	(-1735, -304)

+					    location   	(-1735, -305)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -96391,11 +96092,11 @@
 					    client     	@4201

 					    supplier   	@4200

 					    line_style 	3

-					    origin_attachment 	(997, 384)

-					    terminal_attachment 	(833, 384)

+					    origin_attachment 	(997, 383)

+					    terminal_attachment 	(833, 383)

 					    label      	(object SegLabel @4206

 						Parent_View 	@4205

-						location   	(882, 343)

+						location   	(882, 342)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -96560,13 +96261,13 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$606" @4217

-				    location   	(522, 882)

+				    location   	(800, 1100)

 				    stereotype 	TRUE

 				    quidu      	"39078AE90125"

 				    roleview_list 	(list RoleViews

 					(object RoleView "value" @4218

 					    Parent_View 	@4217

-					    location   	(-2116, -1206)

+					    location   	(-1838, -988)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -96578,7 +96279,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4219

 						Parent_View 	@4218

-						location   	(447, 1227)

+						location   	(725, 1445)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -96602,12 +96303,16 @@
 					    quidu      	"39078AE90392"

 					    client     	@4217

 					    supplier   	@4216

+					    vertices   	(list Points

+						(800, 1100)

+						(800, 1317)

+						(707, 1317))

 					    line_style 	3

-					    origin_attachment 	(522, 882)

-					    terminal_attachment 	(522, 1317)

+					    origin_attachment 	(800, 1100)

+					    terminal_attachment 	(707, 1317)

 					    label      	(object SegLabel @4220

 						Parent_View 	@4218

-						location   	(558, 1246)

+						location   	(836, 1464)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -96628,7 +96333,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @4221

 						Parent_View 	@4218

-						location   	(396, 1267)

+						location   	(674, 1485)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -96649,7 +96354,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$607" @4222

 					    Parent_View 	@4217

-					    location   	(-2116, -1206)

+					    location   	(-1838, -988)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -96664,16 +96369,12 @@
 					    quidu      	"39078AEA000E"

 					    client     	@4217

 					    supplier   	@4212

-					    vertices   	(list Points

-						(522, 882)

-						(522, 725)

-						(800, 725))

 					    line_style 	3

-					    origin_attachment 	(522, 882)

-					    terminal_attachment 	(800, 725)

+					    origin_attachment 	(1600, 2200)

+					    terminal_attachment 	(1808, 1528)

 					    label      	(object SegLabel @4223

 						Parent_View 	@4222

-						location   	(754, 684)

+						location   	(1032, 902)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -96721,13 +96422,13 @@
 				    height     	112

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$608" @4225

-				    location   	(965, 1350)

+				    location   	(965, 1283)

 				    stereotype 	TRUE

 				    quidu      	"39610D2F020B"

 				    roleview_list 	(list RoleViews

 					(object RoleView "insertAt" @4226

 					    Parent_View 	@4225

-					    location   	(20, 557)

+					    location   	(20, 490)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -96739,7 +96440,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4227

 						Parent_View 	@4226

-						location   	(797, 1395)

+						location   	(797, 1328)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -96763,12 +96464,17 @@
 					    quidu      	"39610D32030A"

 					    client     	@4225

 					    supplier   	@4216

+					    vertices   	(list Points

+						(965, 1283)

+						(965, 1223)

+						(706, 1223)

+						(706, 1318))

 					    line_style 	3

-					    origin_attachment 	(965, 1350)

-					    terminal_attachment 	(707, 1350)

+					    origin_attachment 	(965, 1283)

+					    terminal_attachment 	(706, 1318)

 					    label      	(object SegLabel @4228

 						Parent_View 	@4226

-						location   	(805, 1318)

+						location   	(805, 1251)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -96789,7 +96495,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @4229

 						Parent_View 	@4226

-						location   	(987, 1397)

+						location   	(987, 1330)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -96810,7 +96516,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$609" @4230

 					    Parent_View 	@4225

-					    location   	(20, 557)

+					    location   	(20, 490)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -96826,15 +96532,16 @@
 					    client     	@4225

 					    supplier   	@4224

 					    vertices   	(list Points

+						(965, 1283)

 						(965, 1350)

 						(1025, 1350)

 						(1025, 1130))

 					    line_style 	3

-					    origin_attachment 	(965, 1350)

+					    origin_attachment 	(965, 1283)

 					    terminal_attachment 	(1025, 1130)

 					    label      	(object SegLabel @4231

 						Parent_View 	@4230

-						location   	(969, 1181)

+						location   	(969, 1114)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -96938,22 +96645,6 @@
 				    icon_style 	"Icon"

 				    fill_color 	16777215

 				    quidu      	"3745C4E50064"

-				    compartment 	(object Compartment

-					Parent_View 	@4235

-					location   	(961, 413)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	2

-					max_width  	265)

 				    width      	413

 				    height     	163)

 				(object ClassView "Class" "Logical View::UML::Activities::BasicActivities::OutputPin" @4236

@@ -97047,7 +96738,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$610" @4239

-				    location   	(771, 427)

+				    location   	(771, 414)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -97059,7 +96750,7 @@
 					default_color 	TRUE)

 				    label      	(object SegLabel @4240

 					Parent_View 	@4239

-					location   	(771, 368)

+					location   	(771, 355)

 					font       	(object Font

 					    size       	8

 					    face       	"Arial"

@@ -97084,7 +96775,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "function" @4241

 					    Parent_View 	@4239

-					    location   	(-1314, -1336)

+					    location   	(-1314, -1349)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -97096,7 +96787,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4242

 						Parent_View 	@4241

-						location   	(845, 391)

+						location   	(845, 378)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -97121,11 +96812,11 @@
 					    client     	@4239

 					    supplier   	@4235

 					    line_style 	3

-					    origin_attachment 	(771, 427)

-					    terminal_attachment 	(952, 427)

+					    origin_attachment 	(771, 414)

+					    terminal_attachment 	(952, 414)

 					    label      	(object SegLabel @4243

 						Parent_View 	@4241

-						location   	(889, 463)

+						location   	(889, 450)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -97146,7 +96837,7 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$611" @4244

 					    Parent_View 	@4239

-					    location   	(-1314, -1336)

+					    location   	(-1314, -1349)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -97162,11 +96853,11 @@
 					    client     	@4239

 					    supplier   	@4238

 					    line_style 	3

-					    origin_attachment 	(771, 427)

-					    terminal_attachment 	(591, 427)

+					    origin_attachment 	(771, 414)

+					    terminal_attachment 	(591, 414)

 					    label      	(object SegLabel @4245

 						Parent_View 	@4244

-						location   	(659, 465)

+						location   	(659, 452)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -97186,7 +96877,7 @@
 						height     	38

 						orientation 	0))))

 				(object AssociationViewNew "$UNNAMED$614" @4246

-				    location   	(209, 582)

+				    location   	(271, 582)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -97201,7 +96892,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "result" @4247

 					    Parent_View 	@4246

-					    location   	(-914, -385)

+					    location   	(-852, -385)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -97213,7 +96904,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4248

 						Parent_View 	@4247

-						location   	(282, 569)

+						location   	(344, 569)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -97237,11 +96928,11 @@
 					    client     	@4246

 					    supplier   	@4236

 					    line_style 	3

-					    origin_attachment 	(209, 582)

-					    terminal_attachment 	(209, 700)

+					    origin_attachment 	(271, 582)

+					    terminal_attachment 	(271, 699)

 					    label      	(object SegLabel @4249

 						Parent_View 	@4247

-						location   	(168, 643)

+						location   	(230, 643)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -97262,7 +96953,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @4250

 						Parent_View 	@4247

-						location   	(338, 635)

+						location   	(400, 635)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -97286,14 +96977,14 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$615" @4251

 					    Parent_View 	@4246

-					    location   	(-914, -385)

+					    location   	(-852, -385)

 					    stereotype 	TRUE

 					    quidu      	"3CA732CB0065"

 					    client     	@4246

 					    supplier   	@4238

 					    line_style 	3

-					    origin_attachment 	(209, 582)

-					    terminal_attachment 	(209, 465))))

+					    origin_attachment 	(271, 582)

+					    terminal_attachment 	(271, 466))))

 				(object InheritView "" @4252

 				    stereotype 	TRUE

 				    quidu      	"3DF409D700FC"

@@ -97303,7 +96994,7 @@
 				    origin_attachment 	(384, 362)

 				    terminal_attachment 	(384, 188))

 				(object AssociationViewNew "$UNNAMED$612" @4253

-				    location   	(559, 586)

+				    location   	(530, 585)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -97318,7 +97009,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "argument" @4254

 					    Parent_View 	@4253

-					    location   	(-567, -378)

+					    location   	(-596, -379)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -97330,7 +97021,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4255

 						Parent_View 	@4254

-						location   	(678, 610)

+						location   	(649, 609)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -97354,11 +97045,11 @@
 					    client     	@4253

 					    supplier   	@4237

 					    line_style 	3

-					    origin_attachment 	(559, 586)

-					    terminal_attachment 	(559, 706)

+					    origin_attachment 	(530, 585)

+					    terminal_attachment 	(530, 705)

 					    label      	(object SegLabel @4256

 						Parent_View 	@4254

-						location   	(526, 646)

+						location   	(497, 645)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -97379,7 +97070,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @4257

 						Parent_View 	@4254

-						location   	(703, 654)

+						location   	(674, 653)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -97400,14 +97091,14 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$613" @4258

 					    Parent_View 	@4253

-					    location   	(-567, -378)

+					    location   	(-596, -379)

 					    stereotype 	TRUE

 					    quidu      	"3CA732A30298"

 					    client     	@4253

 					    supplier   	@4238

 					    line_style 	3

-					    origin_attachment 	(559, 586)

-					    terminal_attachment 	(559, 466))))

+					    origin_attachment 	(530, 585)

+					    terminal_attachment 	(530, 466))))

 				(object ClassView "Class" "Logical View::UML::Classes::Kernel::PackageableElement" @4259

 				    ShowCompartmentStereotypes 	TRUE

 				    IncludeAttribute 	TRUE

@@ -97434,23 +97125,6 @@
 				    line_color 	3342489

 				    fill_color 	13434879

 				    quidu      	"3CB1F3A0024D"

-				    compartment 	(object Compartment

-					Parent_View 	@4259

-					location   	(926, 107)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	FALSE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					fill_color 	13434879

-					anchor     	2

-					nlines     	2

-					max_width  	400)

 				    width      	482

 				    height     	230

 				    annotation 	8)

@@ -97527,26 +97201,10 @@
 				    icon_style 	"Icon"

 				    line_color 	4194368

 				    quidu      	"3DF12EC000DA"

-				    compartment 	(object Compartment

-					Parent_View 	@4262

-					location   	(464, 816)

-					font       	(object Font

-					    size       	8

-					    face       	"Arial"

-					    bold       	FALSE

-					    italics    	TRUE

-					    underline  	FALSE

-					    strike     	FALSE

-					    color      	0

-					    default_color 	TRUE)

-					icon_style 	"Icon"

-					anchor     	2

-					nlines     	1

-					max_width  	471)

 				    width      	506

 				    height     	113)

 				(object AssociationViewNew "$UNNAMED$626" @4263

-				    location   	(384, 813)

+				    location   	(367, 753)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -97561,7 +97219,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "result" @4264

 					    Parent_View 	@4263

-					    location   	(-892, -355)

+					    location   	(-909, -415)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -97573,7 +97231,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4265

 						Parent_View 	@4264

-						location   	(242, 704)

+						location   	(225, 644)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -97597,15 +97255,16 @@
 					    client     	@4263

 					    supplier   	@4261

 					    vertices   	(list Points

-						(384, 813)

-						(324, 813)

-						(324, 661))

+						(367, 753)

+						(410, 753)

+						(410, 660)

+						(366, 660))

 					    line_style 	3

-					    origin_attachment 	(384, 813)

-					    terminal_attachment 	(324, 661)

+					    origin_attachment 	(367, 753)

+					    terminal_attachment 	(366, 660)

 					    label      	(object SegLabel @4266

 						Parent_View 	@4264

-						location   	(368, 730)

+						location   	(351, 670)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -97626,7 +97285,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @4267

 						Parent_View 	@4264

-						location   	(189, 773)

+						location   	(172, 713)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -97647,13 +97306,18 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$627" @4268

 					    Parent_View 	@4263

-					    location   	(-892, -355)

+					    location   	(-909, -415)

 					    stereotype 	TRUE

 					    quidu      	"3CA72E04016A"

 					    client     	@4263

 					    supplier   	@4262

+					    vertices   	(list Points

+						(367, 753)

+						(324, 753)

+						(324, 813)

+						(455, 813))

 					    line_style 	3

-					    origin_attachment 	(384, 813)

+					    origin_attachment 	(367, 753)

 					    terminal_attachment 	(455, 813))))

 				(object ClassView "Class" "Logical View::UML::CommonBehaviors::BasicBehaviors::Behavior" @4269

 				    ShowCompartmentStereotypes 	TRUE

@@ -97963,7 +97627,7 @@
 				    height     	100

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$632" @4283

-				    location   	(1652, 958)

+				    location   	(1554, 958)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -97978,7 +97642,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "signal" @4284

 					    Parent_View 	@4283

-					    location   	(1069, -184)

+					    location   	(971, -184)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -97990,7 +97654,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4285

 						Parent_View 	@4284

-						location   	(1730, 1021)

+						location   	(1632, 1021)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98014,11 +97678,11 @@
 					    client     	@4283

 					    supplier   	@4282

 					    line_style 	3

-					    origin_attachment 	(1652, 958)

-					    terminal_attachment 	(1652, 1054)

+					    origin_attachment 	(1554, 958)

+					    terminal_attachment 	(1554, 1054)

 					    label      	(object SegLabel @4286

 						Parent_View 	@4284

-						location   	(1699, 971)

+						location   	(1601, 971)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98039,7 +97703,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$633" @4287

 					    Parent_View 	@4283

-					    location   	(1069, -184)

+					    location   	(971, -184)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -98054,11 +97718,11 @@
 					    client     	@4283

 					    supplier   	@4280

 					    line_style 	3

-					    origin_attachment 	(1652, 958)

-					    terminal_attachment 	(1652, 862)

+					    origin_attachment 	(1554, 958)

+					    terminal_attachment 	(1554, 863)

 					    label      	(object SegLabel @4288

 						Parent_View 	@4287

-						location   	(1694, 898)

+						location   	(1596, 898)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98105,7 +97769,7 @@
 				    height     	104

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$618" @4290

-				    location   	(663, 1440)

+				    location   	(684, 1441)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -98120,7 +97784,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$619" @4291

 					    Parent_View 	@4290

-					    location   	(273, -276)

+					    location   	(294, -275)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -98132,7 +97796,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4292

 						Parent_View 	@4291

-						location   	(622, 1348)

+						location   	(643, 1349)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -98157,11 +97821,11 @@
 					    client     	@4290

 					    supplier   	@4289

 					    line_style 	3

-					    origin_attachment 	(663, 1440)

-					    terminal_attachment 	(663, 1324)

+					    origin_attachment 	(684, 1441)

+					    terminal_attachment 	(684, 1324)

 					    label      	(object SegLabel @4293

 						Parent_View 	@4291

-						location   	(698, 1346)

+						location   	(719, 1347)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98182,7 +97846,7 @@
 						orientation 	1))

 					(object RoleView "operation" @4294

 					    Parent_View 	@4290

-					    location   	(273, -276)

+					    location   	(294, -275)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -98194,7 +97858,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4295

 						Parent_View 	@4294

-						location   	(563, 1522)

+						location   	(584, 1523)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98218,11 +97882,11 @@
 					    client     	@4290

 					    supplier   	@4281

 					    line_style 	3

-					    origin_attachment 	(663, 1440)

-					    terminal_attachment 	(663, 1557)

+					    origin_attachment 	(684, 1441)

+					    terminal_attachment 	(684, 1558)

 					    label      	(object SegLabel @4296

 						Parent_View 	@4294

-						location   	(714, 1519)

+						location   	(735, 1520)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98287,7 +97951,7 @@
 				    height     	107

 				    annotation 	8)

 				(object AssociationViewNew "$UNNAMED$634" @4299

-				    location   	(1331, 958)

+				    location   	(1328, 958)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -98302,7 +97966,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "signal" @4300

 					    Parent_View 	@4299

-					    location   	(440, -64)

+					    location   	(437, -64)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -98314,7 +97978,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4301

 						Parent_View 	@4300

-						location   	(1412, 1020)

+						location   	(1409, 1020)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98338,11 +98002,11 @@
 					    client     	@4299

 					    supplier   	@4282

 					    line_style 	3

-					    origin_attachment 	(1331, 958)

-					    terminal_attachment 	(1331, 1053)

+					    origin_attachment 	(1328, 958)

+					    terminal_attachment 	(1328, 1054)

 					    label      	(object SegLabel @4302

 						Parent_View 	@4300

-						location   	(1374, 974)

+						location   	(1371, 974)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98363,7 +98027,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$635" @4303

 					    Parent_View 	@4299

-					    location   	(440, -64)

+					    location   	(437, -64)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -98378,11 +98042,11 @@
 					    client     	@4299

 					    supplier   	@4298

 					    line_style 	3

-					    origin_attachment 	(1331, 958)

-					    terminal_attachment 	(1331, 863)

+					    origin_attachment 	(1328, 958)

+					    terminal_attachment 	(1328, 862)

 					    label      	(object SegLabel @4304

 						Parent_View 	@4303

-						location   	(1369, 901)

+						location   	(1366, 901)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98522,7 +98186,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$620" @4312

-				    location   	(1128, 1360)

+				    location   	(2182, 1360)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -98537,7 +98201,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "$UNNAMED$621" @4313

 					    Parent_View 	@4312

-					    location   	(854, 672)

+					    location   	(1908, 672)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -98549,7 +98213,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4314

 						Parent_View 	@4313

-						location   	(1069, 1231)

+						location   	(2123, 1231)

 						font       	(object Font

 						    size       	10

 						    face       	"Arial"

@@ -98574,15 +98238,16 @@
 					    client     	@4312

 					    supplier   	@4289

 					    vertices   	(list Points

+						(2182, 1360)

 						(1128, 1360)

 						(1128, 1272)

 						(1031, 1272))

 					    line_style 	3

-					    origin_attachment 	(1128, 1360)

+					    origin_attachment 	(2182, 1360)

 					    terminal_attachment 	(1031, 1272)

 					    label      	(object SegLabel @4315

 						Parent_View 	@4313

-						location   	(1084, 1224)

+						location   	(2138, 1224)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98603,7 +98268,7 @@
 						orientation 	1))

 					(object RoleView "target" @4316

 					    Parent_View 	@4312

-					    location   	(854, 672)

+					    location   	(1908, 672)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -98615,7 +98280,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4317

 						Parent_View 	@4316

-						location   	(1046, 1439)

+						location   	(2100, 1439)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98638,12 +98303,17 @@
 					    quidu      	"3AA6D29D008C"

 					    client     	@4312

 					    supplier   	@4311

+					    vertices   	(list Points

+						(2182, 1360)

+						(2256, 1360)

+						(2256, 1643)

+						(1373, 1643))

 					    line_style 	3

-					    origin_attachment 	(1128, 1360)

-					    terminal_attachment 	(1128, 1546)

+					    origin_attachment 	(2182, 1360)

+					    terminal_attachment 	(1373, 1643)

 					    label      	(object SegLabel @4318

 						Parent_View 	@4316

-						location   	(1156, 1479)

+						location   	(2210, 1479)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98664,7 +98334,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @4319

 						Parent_View 	@4316

-						location   	(1001, 1485)

+						location   	(2055, 1485)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98684,7 +98354,7 @@
 						height     	128

 						orientation 	1))))

 				(object AssociationViewNew "$UNNAMED$622" @4320

-				    location   	(1238, 1204)

+				    location   	(1216, 1203)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -98699,7 +98369,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "target" @4321

 					    Parent_View 	@4320

-					    location   	(513, 30)

+					    location   	(491, 29)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -98711,7 +98381,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4322

 						Parent_View 	@4321

-						location   	(1320, 1435)

+						location   	(1298, 1434)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98735,11 +98405,11 @@
 					    client     	@4320

 					    supplier   	@4311

 					    line_style 	3

-					    origin_attachment 	(1238, 1204)

-					    terminal_attachment 	(1238, 1546)

+					    origin_attachment 	(1216, 1203)

+					    terminal_attachment 	(1216, 1545)

 					    label      	(object SegLabel @4323

 						Parent_View 	@4321

-						location   	(1213, 1476)

+						location   	(1191, 1475)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98760,7 +98430,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @4324

 						Parent_View 	@4321

-						location   	(1379, 1477)

+						location   	(1357, 1476)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98781,7 +98451,7 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$623" @4325

 					    Parent_View 	@4320

-					    location   	(513, 30)

+					    location   	(491, 29)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -98796,11 +98466,11 @@
 					    client     	@4320

 					    supplier   	@4298

 					    line_style 	3

-					    origin_attachment 	(1238, 1204)

-					    terminal_attachment 	(1238, 863)

+					    origin_attachment 	(1216, 1203)

+					    terminal_attachment 	(1216, 862)

 					    label      	(object SegLabel @4326

 						Parent_View 	@4325

-						location   	(1171, 899)

+						location   	(1149, 898)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98850,7 +98520,7 @@
 				    annotation 	8

 				    autoResize 	TRUE)

 				(object AssociationViewNew "$UNNAMED$630" @4328

-				    location   	(1549, 328)

+				    location   	(1549, 334)

 				    font       	(object Font

 					size       	10

 					face       	"Arial"

@@ -98865,7 +98535,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "argument" @4329

 					    Parent_View 	@4328

-					    location   	(-23, -234)

+					    location   	(-23, -228)

 					    font       	(object Font

 						size       	10

 						face       	"Arial"

@@ -98877,7 +98547,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4330

 						Parent_View 	@4329

-						location   	(1734, 191)

+						location   	(1734, 197)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98901,11 +98571,11 @@
 					    client     	@4328

 					    supplier   	@4327

 					    line_style 	3

-					    origin_attachment 	(1549, 328)

-					    terminal_attachment 	(1855, 328)

+					    origin_attachment 	(1549, 334)

+					    terminal_attachment 	(1855, 334)

 					    label      	(object SegLabel @4331

 						Parent_View 	@4329

-						location   	(1813, 376)

+						location   	(1813, 382)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98926,7 +98596,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @4332

 						Parent_View 	@4329

-						location   	(1720, 255)

+						location   	(1720, 261)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -98950,14 +98620,14 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$631" @4333

 					    Parent_View 	@4328

-					    location   	(-23, -234)

+					    location   	(-23, -228)

 					    stereotype 	TRUE

 					    quidu      	"3CA72E4500CE"

 					    client     	@4328

 					    supplier   	@4305

 					    line_style 	3

-					    origin_attachment 	(1549, 328)

-					    terminal_attachment 	(1244, 328))))

+					    origin_attachment 	(1549, 334)

+					    terminal_attachment 	(1244, 334))))

 				(object ClassView "Class" "Logical View::UML::Actions::IntermediateActions::SendObjectAction" @4334

 				    ShowCompartmentStereotypes 	TRUE

 				    SuppressOperation 	TRUE

@@ -99007,7 +98677,7 @@
 				    terminal_attachment 	(1913, 582)

 				    drawSupplier 	@4306)

 				(object AssociationViewNew "$UNNAMED$624" @4336

-				    location   	(1968, 1527)

+				    location   	(2093, 3054)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -99023,7 +98693,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "target" @4337

 					    Parent_View 	@4336

-					    location   	(-472, 637)

+					    location   	(-347, 2164)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -99035,7 +98705,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4338

 						Parent_View 	@4337

-						location   	(1458, 1561)

+						location   	(1583, 3088)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -99060,15 +98730,16 @@
 					    client     	@4336

 					    supplier   	@4311

 					    vertices   	(list Points

-						(1968, 1527)

+						(2093, 3054)

+						(1968, 3054)

 						(1968, 1596)

 						(1373, 1596))

 					    line_style 	3

-					    origin_attachment 	(1968, 1527)

+					    origin_attachment 	(2093, 3054)

 					    terminal_attachment 	(1373, 1596)

 					    label      	(object SegLabel @4339

 						Parent_View 	@4337

-						location   	(1434, 1632)

+						location   	(1559, 3159)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -99089,7 +98760,7 @@
 						orientation 	0)

 					    label      	(object SegLabel @4340

 						Parent_View 	@4337

-						location   	(1630, 1564)

+						location   	(1755, 3091)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -99110,17 +98781,21 @@
 						orientation 	1))

 					(object RoleView "$UNNAMED$625" @4341

 					    Parent_View 	@4336

-					    location   	(-472, 637)

+					    location   	(-347, 2164)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3D63D6EC03D8"

 					    client     	@4336

 					    supplier   	@4334

+					    vertices   	(list Points

+						(2093, 3054)

+						(2153, 3054)

+						(2153, 863))

 					    line_style 	3

-					    origin_attachment 	(1968, 1527)

-					    terminal_attachment 	(1968, 863))))

+					    origin_attachment 	(2093, 3054)

+					    terminal_attachment 	(2153, 863))))

 				(object AssociationViewNew "$UNNAMED$628" @4342

-				    location   	(2050, 570)

+				    location   	(1998, 571)

 				    font       	(object Font

 					size       	8

 					face       	"Arial"

@@ -99136,7 +98811,7 @@
 				    roleview_list 	(list RoleViews

 					(object RoleView "request" @4343

 					    Parent_View 	@4342

-					    location   	(-390, -320)

+					    location   	(-442, -319)

 					    font       	(object Font

 						size       	8

 						face       	"Arial"

@@ -99148,7 +98823,7 @@
 						default_color 	TRUE)

 					    label      	(object SegLabel @4344

 						Parent_View 	@4343

-						location   	(1956, 424)

+						location   	(1904, 425)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -99173,11 +98848,11 @@
 					    client     	@4342

 					    supplier   	@4327

 					    line_style 	3

-					    origin_attachment 	(2050, 570)

-					    terminal_attachment 	(2050, 385)

+					    origin_attachment 	(1998, 571)

+					    terminal_attachment 	(1998, 386)

 					    label      	(object SegLabel @4345

 						Parent_View 	@4343

-						location   	(2098, 437)

+						location   	(2046, 438)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -99198,7 +98873,7 @@
 						orientation 	1)

 					    label      	(object SegLabel @4346

 						Parent_View 	@4343

-						location   	(1871, 462)

+						location   	(1819, 463)

 						font       	(object Font

 						    size       	8

 						    face       	"Arial"

@@ -99219,15 +98894,15 @@
 						orientation 	0))

 					(object RoleView "$UNNAMED$629" @4347

 					    Parent_View 	@4342

-					    location   	(-390, -320)

+					    location   	(-442, -319)

 					    stereotype 	TRUE

 					    line_color 	4194368

 					    quidu      	"3D63D7800271"

 					    client     	@4342

 					    supplier   	@4334

 					    line_style 	3

-					    origin_attachment 	(2050, 570)

-					    terminal_attachment 	(2050, 756)))))))))

+					    origin_attachment 	(1998, 571)

+					    terminal_attachment 	(1998, 757)))))))))

 	    logical_presentations 	(list unit_reference_list

 		(object ClassDiagram "Package Dependencies"

 		    quid       	"3E0C8C97037C"

diff --git a/deprecated/plugins/org.eclipse.uml2/model/UML2.ecore b/deprecated/plugins/org.eclipse.uml2/model/UML2.ecore
index 605df15..07e5cb8 100644
--- a/deprecated/plugins/org.eclipse.uml2/model/UML2.ecore
+++ b/deprecated/plugins/org.eclipse.uml2/model/UML2.ecore
@@ -10,6 +10,9 @@
   <eClassifiers xsi:type="ecore:EDataType" name="Sequence" instanceClassName="java.util.List"/>

   <eClassifiers xsi:type="ecore:EDataType" name="Set" instanceClassName="java.util.Set"/>

   <eClassifiers xsi:type="ecore:EClass" name="Element" abstract="true" eSuperTypes="../../org.eclipse.emf.ecore_2.0.0/src/model/Ecore.ecore#//EModelElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Element is an abstract metaclass with no superclass. It is used as the common superclass for all metaclasses in the infrastructure library. Element has a derived composition association to itself to support the general capability for elements to own other elements. "/>

+    </eAnnotations>

     <eOperations name="validateNotOwnSelf" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.ElementOperations.validateNotOwnSelf(this, diagnostics, context);"/>

@@ -58,6 +61,9 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="MultiplicityElement" abstract="true"

       eSuperTypes="#//Element">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A MultiplicityElement is an abstract metaclass which includes optional attributes for defining the bounds of a multiplicity. A MultiplicityElement also includes specifications of whether the values in an instantiation of this element must be unique or ordered. "/>

+    </eAnnotations>

     <eOperations name="lowerBound" eType="#//Integer">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.MultiplicityElementOperations.lowerBound(this);"/>

@@ -183,139 +189,10 @@
       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="DirectedRelationship" abstract="true"

-      eSuperTypes="#//Relationship">

-    <eOperations name="getRelatedElements" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="relatedElement"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//DirectedRelationship/source #//DirectedRelationship/target"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"

-        lowerBound="1" upperBound="-1" eType="#//Element" changeable="false" volatile="true"

-        transient="true" derived="true">

-      <eAnnotations source="union"/>

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Relationship#getRelatedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false"

-        lowerBound="1" upperBound="-1" eType="#//Element" changeable="false" volatile="true"

-        transient="true" derived="true">

-      <eAnnotations source="union"/>

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Relationship#getRelatedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Relationship" abstract="true" eSuperTypes="#//Element">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="relatedElement" ordered="false"

-        lowerBound="1" upperBound="-1" eType="#//Element" changeable="false" volatile="true"

-        transient="true" derived="true">

-      <eAnnotations source="union"/>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="OpaqueExpression" eSuperTypes="#//ValueSpecification">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" eType="#//String"

-        defaultValueLiteral=""/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="language" eType="#//String"

-        defaultValueLiteral=""/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="result" eType="#//Parameter"

-        changeable="false" volatile="true" transient="true" derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="behavior" eType="#//Behavior"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ValueSpecification" abstract="true"

-      eSuperTypes="#//TypedElement #//ParameterableElement">

-    <eOperations name="isComputable" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.isComputable(this);"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;false&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="integerValue" eType="#//Integer">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.integerValue(this);"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;Set{}&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="booleanValue" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.booleanValue(this);"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;Set{}&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="stringValue" eType="#//String">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.stringValue(this);"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;Set{}&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="unlimitedValue" eType="#//UnlimitedNatural">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.unlimitedValue(this);"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;Set{}&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="isNull" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.isNull(this);"/>

-        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;false&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-    </eOperations>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Expression" eSuperTypes="#//OpaqueExpression">

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Expression/operand"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="symbol" eType="#//String"

-        defaultValueLiteral=""/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="operand" upperBound="-1"

-        eType="#//ValueSpecification" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Comment" eSuperTypes="#//TemplateableElement">

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Comment/bodyExpression"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" eType="#//String"

-        defaultValueLiteral=""/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="annotatedElement" ordered="false"

-        upperBound="-1" eType="#//Element"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyExpression" eType="#//StringExpression"

-        containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="NamedElement" abstract="true" eSuperTypes="#//TemplateableElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A named element represents elements that may have a name. The name is used for identification of the named element within the namespace in which it is defined. A named element also has a qualified name that allows it to be unambiguously identified within a hierarchy of nested namespaces. NamedElement is an abstract metaclass. "/>

+    </eAnnotations>

     <eOperations name="validateNoName" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.NamedElementOperations.validateNoName(this, diagnostics, context);"/>

@@ -427,6 +304,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Namespace" abstract="true" eSuperTypes="#//NamedElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A namespace is a named element that can own other named elements. Each named element may be owned by at most one namespace. A namespace provides a means for identifying named elements by name. Named elements can be identified by name in a namespace either by being directly owned by the namespace or by being introduced into the namespace by other means e.g. importing or inheriting. Namespace is an abstract metaclass. A namespace can own constraints. The constraint does not necessarily apply to the namespace itself, but may also apply to elements in the namespace. A namespace has the ability to import either individial members or all members of a package, thereby making it possible to refer to those named elements without qualification in the importing namespace. In the case of conflicts, it is necessary to use qualified names or aliases to disambiguate the referenced elements. "/>

+    </eAnnotations>

     <eOperations name="validateMembersAreDistinguishable" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.NamespaceOperations.validateMembersAreDistinguishable(this, diagnostics, context);"/>

@@ -541,7 +421,160 @@
       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="DirectedRelationship" abstract="true"

+      eSuperTypes="#//Relationship">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A directed relationship references one or more source elements and one or more target elements. Directed relationship is an abstract metaclass. "/>

+    </eAnnotations>

+    <eOperations name="getRelatedElements" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="relatedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//DirectedRelationship/source #//DirectedRelationship/target"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"

+        lowerBound="1" upperBound="-1" eType="#//Element" changeable="false" volatile="true"

+        transient="true" derived="true">

+      <eAnnotations source="union"/>

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Relationship#getRelatedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false"

+        lowerBound="1" upperBound="-1" eType="#//Element" changeable="false" volatile="true"

+        transient="true" derived="true">

+      <eAnnotations source="union"/>

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Relationship#getRelatedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Relationship" abstract="true" eSuperTypes="#//Element">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A relationship references one or more related elements. Relationship is an abstract metaclass. "/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="relatedElement" ordered="false"

+        lowerBound="1" upperBound="-1" eType="#//Element" changeable="false" volatile="true"

+        transient="true" derived="true">

+      <eAnnotations source="union"/>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="OpaqueExpression" eSuperTypes="#//ValueSpecification">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An expression contains a language-specific text string used to describe a value or values, and an optional specification of the language. One predefined language for specifying expressions is OCL. Natural language or programming languages may also be used. "/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" eType="#//String"

+        defaultValueLiteral=""/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="language" eType="#//String"

+        defaultValueLiteral=""/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="result" eType="#//Parameter"

+        changeable="false" volatile="true" transient="true" derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="behavior" eType="#//Behavior"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ValueSpecification" abstract="true"

+      eSuperTypes="#//TypedElement #//ParameterableElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="ValueSpecification is an abstract metaclass used to identify a value or values in a model. It may reference an instance or it may be an expression denoting an instance or instances when evaluated. "/>

+    </eAnnotations>

+    <eOperations name="isComputable" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.isComputable(this);"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;false&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="integerValue" eType="#//Integer">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.integerValue(this);"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;Set{}&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="booleanValue" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.booleanValue(this);"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;Set{}&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="stringValue" eType="#//String">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.stringValue(this);"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;Set{}&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="unlimitedValue" eType="#//UnlimitedNatural">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.unlimitedValue(this);"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;Set{}&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="isNull" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.isNull(this);"/>

+        <details key="documentation" value="A query based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;false&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+    </eOperations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Expression" eSuperTypes="#//OpaqueExpression">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An expression represents a node in an expression tree, which may be non-terminal or terminal. It defines a symbol, and has a possibly empty sequence of operands which are value specifications. "/>

+    </eAnnotations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Expression/operand"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="symbol" eType="#//String"

+        defaultValueLiteral=""/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="operand" upperBound="-1"

+        eType="#//ValueSpecification" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Comment" eSuperTypes="#//TemplateableElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A comment gives the ability to attach various remarks to elements. A comment carries no semantic force, but may contain information that is useful to a modeler. A comment can be owned by any element. "/>

+    </eAnnotations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Comment/bodyExpression"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" eType="#//String"

+        defaultValueLiteral=""/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="annotatedElement" ordered="false"

+        upperBound="-1" eType="#//Element"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyExpression" eType="#//StringExpression"

+        containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Class" eSuperTypes="#//BehavioredClassifier #//EncapsulatedClassifier">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Class is a kind of classifier whose features are attributes and operations. Attributes of a class are represented by instances of Property that are owned by the class. Some of these attributes may represent the navigable ends of binary associations. "/>

+    </eAnnotations>

     <eOperations name="inherit" ordered="false" upperBound="-1" eType="#//Set">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.ClassOperations.inherit(this, inhs);"/>

@@ -668,6 +701,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Type" abstract="true" eSuperTypes="#//PackageableElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A type serves as a constraint on the range of values represented by a typed element. Type is an abstract metaclass. "/>

+    </eAnnotations>

     <eOperations name="conformsTo" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.TypeOperations.conformsTo(this, other);"/>

@@ -696,6 +732,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Property" eSuperTypes="#//StructuralFeature #//ConnectableElement #//DeploymentTarget">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Property represents a declared state of one or more instances in terms of a named relationship to a value or values. When a property is an attribute of a classifier, the value or values are related to the instance of the classifier by being held in slots of the instance. When a property is an association end, the value or values are related to the instance or instances at the other end(s) of the association (see semantics of Association). Property is indirectly a subclass of Constructs::TypedElement. The range of valid values represented by the property can be controlled by setting the property’s type. "/>

+    </eAnnotations>

     <eOperations name="validateOppositeIsOtherEnd" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.PropertyOperations.validateOppositeIsOtherEnd(this, diagnostics, context);"/>

@@ -936,6 +975,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Operation" eSuperTypes="#//BehavioralFeature #//TypedElement #//MultiplicityElement #//ParameterableElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An operation is a behavioral feature of a classifier that specifies the name, type, parameters, and constraints for invoking an associated behavior. "/>

+    </eAnnotations>

     <eOperations name="validateTypeOfResult" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.OperationOperations.validateTypeOfResult(this, diagnostics, context);"/>

@@ -1200,9 +1242,15 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="TypedElement" abstract="true" eSuperTypes="#//NamedElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A typed element is an element that has a type that serves as a constraint on the range of values the element can represent. Typed element is an abstract metaclass. "/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//Type" volatile="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="#//ConnectableElement #//TypedElement #//MultiplicityElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A parameter is a specification of an argument used to pass information into or out of an invocation of a behavioral feature. It has a type, and may have a multiplicity and an optional default value. "/>

+    </eAnnotations>

     <eOperations name="getNamespace" eType="#//Namespace">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

@@ -1255,6 +1303,9 @@
         upperBound="-1" eType="#//ParameterSet" eOpposite="#//ParameterSet/parameter"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Package" eSuperTypes="#//Namespace #//PackageableElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A package is a namespace for its members, and may contain other packages. Only packageable elements can be owned members of a package. By virtue of being a namespace, a package can import either individual members of other packages, or all the members of other packages. In addition a package can be merged with other packages. "/>

+    </eAnnotations>

     <eOperations name="validateElementsPublicOrPrivate" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.PackageOperations.validateElementsPublicOrPrivate(this, diagnostics, context);"/>

@@ -1368,6 +1419,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Enumeration" eSuperTypes="#//DataType">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Enumeration is a kind of data type, whose instances may be any of a number of user-defined enumeration literals. It is possible to extend the set of applicable enumeration literals in other packages or profiles. "/>

+    </eAnnotations>

     <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -1389,6 +1443,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="DataType" eSuperTypes="#//Classifier">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="DataType defines a kind of classifier in which operations are all pure functions (i.e., they can return data values but they cannot change data values, because they have no identity). For example, an “add” operation on a number with another number as an argument yields a third number as a result; the target and argument are unchanged. A DataType may also contain attributes to support the modeling of structured data types. "/>

+    </eAnnotations>

     <eOperations name="inherit" ordered="false" upperBound="-1" eType="#//Set">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.DataTypeOperations.inherit(this, inhs);"/>

@@ -1447,6 +1504,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="EnumerationLiteral" eSuperTypes="#//InstanceSpecification">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An enumeration literal is a user-defined data value for an enumeration. "/>

+    </eAnnotations>

     <eOperations name="getNamespace" eType="#//Namespace">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

@@ -1467,8 +1527,15 @@
       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType" eSuperTypes="#//DataType"/>

+  <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType" eSuperTypes="#//DataType">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="The instances of primitive type used in UML itself include Boolean, Integer, UnlimitedNatural, and String. "/>

+    </eAnnotations>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="LiteralBoolean" eSuperTypes="#//LiteralSpecification">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A literal boolean contains a Boolean-valued attribute. "/>

+    </eAnnotations>

     <eOperations name="isComputable" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.LiteralBooleanOperations.isComputable(this);"/>

@@ -1484,8 +1551,15 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//Boolean"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="LiteralSpecification" abstract="true"

-      eSuperTypes="#//ValueSpecification"/>

+      eSuperTypes="#//ValueSpecification">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A literal specification is an abstract specialization of ValueSpecification that identifies a literal constant being modeled. "/>

+    </eAnnotations>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="LiteralString" eSuperTypes="#//LiteralSpecification">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A literal string contains a String-valued attribute. "/>

+    </eAnnotations>

     <eOperations name="isComputable" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.LiteralStringOperations.isComputable(this);"/>

@@ -1502,6 +1576,9 @@
         defaultValueLiteral=""/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="LiteralNull" eSuperTypes="#//LiteralSpecification">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A literal null is used to represent null, i.e., the absence of a value. "/>

+    </eAnnotations>

     <eOperations name="isComputable" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.LiteralNullOperations.isComputable(this);"/>

@@ -1516,6 +1593,9 @@
     </eOperations>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="LiteralInteger" eSuperTypes="#//LiteralSpecification">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A literal integer contains an Integer-valued attribute. "/>

+    </eAnnotations>

     <eOperations name="isComputable" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.LiteralIntegerOperations.isComputable(this);"/>

@@ -1531,6 +1611,9 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//Integer"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="LiteralUnlimitedNatural" eSuperTypes="#//LiteralSpecification">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A literal unlimited natural contains a UnlimitedNatural-valued attribute. "/>

+    </eAnnotations>

     <eOperations name="isComputable" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.LiteralUnlimitedNaturalOperations.isComputable(this);"/>

@@ -1545,7 +1628,19 @@
     </eOperations>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//UnlimitedNatural"/>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="VisibilityKind">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="VisibilityKind is an enumeration of the following literal values: • public • private • protected • package "/>

+    </eAnnotations>

+    <eLiterals name="public"/>

+    <eLiterals name="private" value="1"/>

+    <eLiterals name="protected" value="2"/>

+    <eLiterals name="package" value="3"/>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Classifier" abstract="true" eSuperTypes="#//Namespace #//Type #//RedefinableElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A classifier is a namespace whose members can include features. Classifier is an abstract metaclass. A classifier is a type and can own generalizations, thereby making it possible to define generalization relationships to other classifiers. A classifier can specify a generalization hierarchy by referencing its general classifiers. A classifier is a redefinable element, meaning that it is possible to redefine nested classifiers. "/>

+    </eAnnotations>

     <eOperations name="allFeatures" ordered="false" upperBound="-1" eType="#//Set">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="try {&#xD;&#xA;&#x9;java.lang.reflect.Method method = getClass().getMethod(&quot;allFeatures&quot;, null); //$NON-NLS-1$&#xD;&#xA;&#x9;Set result = (Set) getCacheAdapter().get(this, method);&#xD;&#xA;&#xD;&#xA;&#x9;if (null == result) {&#xD;&#xA;&#x9;&#x9;result = java.util.Collections.unmodifiableSet(org.eclipse.uml2.internal.operation.ClassifierOperations.allFeatures(this));&#xD;&#xA;&#x9;&#x9;getCacheAdapter().put(this, method, result);&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;return result;&#xD;&#xA;} catch (Exception e) {&#xD;&#xA;&#x9;return org.eclipse.uml2.internal.operation.ClassifierOperations.allFeatures(this);&#xD;&#xA;}"/>

@@ -1777,6 +1872,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Feature" abstract="true" eSuperTypes="#//RedefinableElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A feature declares a behavioral or structural characteristic of instances of classifiers. Feature is an abstract metaclass. "/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EReference" name="featuringClassifier" ordered="false"

         upperBound="-1" eType="#//Classifier" changeable="false" volatile="true" transient="true"

         derived="true" eOpposite="#//Classifier/feature">

@@ -1786,6 +1884,9 @@
         defaultValueLiteral="false"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Constraint" eSuperTypes="#//PackageableElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Constraint contains a ValueSpecification that specifies additional semantics for one or more elements. Certain kinds of constraints (such as an association “xor” constraint) are predefined in UML, others may be user-defined. A user-defined Constraint is described using a specified language, whose syntax and interpretation is a tool responsibility. One predefined language for writing constraints is OCL. In some situations, a programming language such as Java may be appropriate for expressing a constraint. In other situations natural language may be used. Constraint is a condition (a Boolean expression) that restricts the extension of the associated element beyond what is imposed by the other language constructs applied to that element. Constraint contains an optional name, although they are commonly unnamed. "/>

+    </eAnnotations>

     <eOperations name="validateNotApplyToSelf" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.ConstraintOperations.validateNotApplyToSelf(this, diagnostics, context);"/>

@@ -1830,13 +1931,10 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="constrainedElement" upperBound="-1"

         eType="#//Element"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="VisibilityKind">

-    <eLiterals name="public"/>

-    <eLiterals name="private" value="1"/>

-    <eLiterals name="protected" value="2"/>

-    <eLiterals name="package" value="3"/>

-  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="BehavioralFeature" abstract="true" eSuperTypes="#//Namespace #//Feature">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A behavioral feature specifies that an instance of a classifier will respond to a designated request by invoking a behavior. BehavioralFeature is an abstract metaclass specializing Feature and Namespace. Kinds of behavioral aspects are modeled by subclasses of BehavioralFeature. "/>

+    </eAnnotations>

     <eOperations name="isDistinguishableFrom" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.BehavioralFeatureOperations.isDistinguishableFrom(this, n, ns);"/>

@@ -1896,11 +1994,17 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="concurrency" eType="#//CallConcurrencyKind"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="StructuralFeature" abstract="true" eSuperTypes="#//Feature #//TypedElement #//MultiplicityElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A structural feature is a typed feature of a classifier that specify the structure of instances of the classifier. Structural feature is an abstract metaclass. By specializing multiplicity element, it supports a multiplicity that specifies valid cardinalities for the set of values associated with an instantiation of the structural feature. "/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isReadOnly" eType="#//Boolean"

         volatile="true" defaultValueLiteral="false"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="RedefinableElement" abstract="true"

       eSuperTypes="#//NamedElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A redefinable element is a named element that can be redefined in the context of a generalization. RedefinableElement is an abstract metaclass. "/>

+    </eAnnotations>

     <eOperations name="validateRedefinitionContextValid" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.RedefinableElementOperations.validateRedefinitionContextValid(this, diagnostics, context);"/>

@@ -1950,7 +2054,112 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isLeaf" eType="#//Boolean"

         defaultValueLiteral="false"/>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="InstanceSpecification" eSuperTypes="#//PackageableElement #//DeploymentTarget #//DeployedArtifact">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="In the metamodel, InstanceSpecification is a specialization of DeploymentTarget and DeployedArtifact. "/>

+    </eAnnotations>

+    <eOperations name="validateSlotsAreDefined" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="return org.eclipse.uml2.internal.operation.InstanceSpecificationOperations.validateSlotsAreDefined(this, diagnostics, context);"/>

+        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;slot->forAll(s |&#xD;&#xA;  classifier->exists(c | c.allFeatures()->includes(s.definingFeature))&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+      <eAnnotations source="constraint"/>

+      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

+      <eParameters name="context" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

+    </eOperations>

+    <eOperations name="validateNoDuplicateSlots" eType="#//Boolean">

+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+        <details key="body" value="return org.eclipse.uml2.internal.operation.InstanceSpecificationOperations.validateNoDuplicateSlots(this, diagnostics, context);"/>

+        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;classifier->forAll(c |&#xD;&#xA;&#x9;(c.allFeatures()->forAll(f | slot->select(s | s.definingFeature = f)->size() &lt;= 1)&#xD;&#xA;&#x9;)&#xD;&#xA;&lt;/code>"/>

+      </eAnnotations>

+      <eAnnotations source="constraint"/>

+      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

+      <eParameters name="context" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

+    </eOperations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//InstanceSpecification/slot #//InstanceSpecification/specification"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="slot" ordered="false" upperBound="-1"

+        eType="#//Slot" containment="true" eOpposite="#//Slot/owningInstance">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="classifier" ordered="false"

+        upperBound="-1" eType="#//Classifier"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="specification" eType="#//ValueSpecification"

+        containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Slot" eSuperTypes="#//Element">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A slot is owned by an instance specification. It specifies the value or values for its defining feature, which must be a structural feature of a classifier of the instance specification owning the slot. "/>

+    </eAnnotations>

+    <eOperations name="getOwner" eType="#//Element">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="owner"/>

+        <details key="eOpposite" value="ownedElement"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Slot/owningInstance"/>

+    </eOperations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Slot/value"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="owningInstance" lowerBound="1"

+        eType="#//InstanceSpecification" transient="true" eOpposite="#//InstanceSpecification/slot">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" upperBound="-1"

+        eType="#//ValueSpecification" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="definingFeature" lowerBound="1"

+        eType="#//StructuralFeature"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="InstanceValue" eSuperTypes="#//ValueSpecification">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An instance value specifies the value modeled by an instance specification. "/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="instance" lowerBound="1"

+        eType="#//InstanceSpecification"/>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Generalization" eSuperTypes="#//DirectedRelationship">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A generalization relates a specific classifier to a more general classifier, and is owned by the specific classifier. "/>

+    </eAnnotations>

     <eOperations name="getSources" ordered="false" lowerBound="1" upperBound="-1"

         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

@@ -2001,101 +2210,11 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="generalizationSet" ordered="false"

         upperBound="-1" eType="#//GeneralizationSet" eOpposite="#//GeneralizationSet/generalization"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="InstanceSpecification" eSuperTypes="#//PackageableElement #//DeploymentTarget #//DeployedArtifact">

-    <eOperations name="validateSlotsAreDefined" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="return org.eclipse.uml2.internal.operation.InstanceSpecificationOperations.validateSlotsAreDefined(this, diagnostics, context);"/>

-        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;slot->forAll(s |&#xD;&#xA;  classifier->exists(c | c.allFeatures()->includes(s.definingFeature))&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-      <eAnnotations source="constraint"/>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-      <eParameters name="context" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-    </eOperations>

-    <eOperations name="validateNoDuplicateSlots" eType="#//Boolean">

-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-        <details key="body" value="return org.eclipse.uml2.internal.operation.InstanceSpecificationOperations.validateNoDuplicateSlots(this, diagnostics, context);"/>

-        <details key="documentation" value="An invariant constraint based on the following OCL expression:&#xD;&#xA;&lt;code>&#xD;&#xA;classifier->forAll(c |&#xD;&#xA;&#x9;(c.allFeatures()->forAll(f | slot->select(s | s.definingFeature = f)->size() &lt;= 1)&#xD;&#xA;&#x9;)&#xD;&#xA;&lt;/code>"/>

-      </eAnnotations>

-      <eAnnotations source="constraint"/>

-      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>

-      <eParameters name="context" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"/>

-    </eOperations>

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//InstanceSpecification/slot #//InstanceSpecification/specification"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="slot" ordered="false" upperBound="-1"

-        eType="#//Slot" containment="true" eOpposite="#//Slot/owningInstance">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="classifier" ordered="false"

-        upperBound="-1" eType="#//Classifier"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="specification" eType="#//ValueSpecification"

-        containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Slot" eSuperTypes="#//Element">

-    <eOperations name="getOwner" eType="#//Element">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="owner"/>

-        <details key="eOpposite" value="ownedElement"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Slot/owningInstance"/>

-    </eOperations>

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Slot/value"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="owningInstance" lowerBound="1"

-        eType="#//InstanceSpecification" transient="true" eOpposite="#//InstanceSpecification/slot">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" upperBound="-1"

-        eType="#//ValueSpecification" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="definingFeature" lowerBound="1"

-        eType="#//StructuralFeature"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="InstanceValue" eSuperTypes="#//ValueSpecification">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="instance" lowerBound="1"

-        eType="#//InstanceSpecification"/>

-  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="PackageableElement" abstract="true"

       eSuperTypes="#//NamedElement #//ParameterableElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A packageable element indicates a named element that may be owned directly by a package. "/>

+    </eAnnotations>

     <eOperations name="getVisibility" eType="#//VisibilityKind">

       <eAnnotations source="feature">

         <details key="derived" value="false"/>

@@ -2121,6 +2240,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="ElementImport" eSuperTypes="#//DirectedRelationship">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An element import is defined as a directed relationship between an importing namespace and a packageable element. The name of the packageable element or its alias is to be added to the namespace of the importing namespace. It is also possible to control whether the imported element can be further imported. "/>

+    </eAnnotations>

     <eOperations name="validateVisibilityPublicOrPrivate" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.ElementImportOperations.validateVisibilityPublicOrPrivate(this, diagnostics, context);"/>

@@ -2196,6 +2318,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="PackageImport" eSuperTypes="#//DirectedRelationship">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A package import is defined as a directed relationship that identifies a package whose members are to be imported by a namespace. "/>

+    </eAnnotations>

     <eOperations name="validatePublicOrPrivate" eType="#//Boolean">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="return org.eclipse.uml2.internal.operation.PackageImportOperations.validatePublicOrPrivate(this, diagnostics, context);"/>

@@ -2254,6 +2379,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Association" eSuperTypes="#//Classifier #//Relationship">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An association specifies a semantic relationship that can occur between typed instances. It has at least two ends represented by properties, each of which is connected to the type of the end. More than one end of the association may have the same type. When a property is owned by an association it represents a non-navigable end of the association. In this case the property does not appear in the namespace of any of the associated classifiers. When a property at an end of an association is owned by one of the associated classifiers it represents a navigable end of the association. In this case the property is also an attribute of the associated classifier. Only binary associations may have navigable ends. "/>

+    </eAnnotations>

     <eOperations name="getFeatures" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -2325,6 +2453,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="PackageMerge" eSuperTypes="#//DirectedRelationship">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A package merge is a relationship between two packages, where the contents of the target package (the one pointed at) is merged with the contents of the source package through specialization and redefinition, where applicable. This is a mechanism that should be used when elements of the same name are intended to represent the same concept, regardless of the package in which they are defined. A merging package will take elements of the same kind with the same name from one or more packages and merge them together into a single element using generalization and redefinitions. It should be noted that a package merge can be viewed as a short-hand way of explicitly defining those generalizations and redefinitions. The merged packages are still available, and the elements in those packages can be separately qualified. From an XMI point of view, it is either possible to exchange a model with all PackageMerges retained or a model where all PackageMerges have been transformed away (in which case package imports, generalizations, and redefinitions are used instead). "/>

+    </eAnnotations>

     <eOperations name="getSources" ordered="false" lowerBound="1" upperBound="-1"

         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

@@ -2373,12 +2504,18 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EEnum" name="ParameterDirectionKind">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="ParameterDirectionKind is an enumeration of the following literal values: • in Indicates that parameter values are passed into the behavioral element by the caller. • inout Indicates that parameter values are passed into a behavioral element by the caller and then back out to the caller from the behavioral element. • out Indicates that parameter values are passed from a behavioral element out to the caller. • return Indicates that parameter values are passed as return values from a behavioral element back to the caller. "/>

+    </eAnnotations>

     <eLiterals name="in"/>

     <eLiterals name="inout" value="1"/>

     <eLiterals name="out" value="2"/>

     <eLiterals name="return" value="3"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EEnum" name="AggregationKind">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="AggregationKind is an enumeration of the following literal values: • none Indicates that the property has no aggregation. • shared Indicates that the property has a shared aggregation. • composite Indicates that the property is aggregated compositely, i.e., the composite object has responsibility for the existence and storage of the composed objects (parts). "/>

+    </eAnnotations>

     <eLiterals name="none"/>

     <eLiterals name="shared" value="1"/>

     <eLiterals name="composite" value="2"/>

@@ -2503,6 +2640,9 @@
         lowerBound="1" upperBound="-1" eType="#//Classifier"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Behavior" abstract="true" eSuperTypes="#//Class">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Behavior is a specification of how its context classifier changes state over time. This specification may be either a definition of possible behavior execution or emergent behavior, or a selective illustration of an interesting subset of possible executions. The latter form is typically used for capturing examples, such as a trace of a particular execution. A classifier behavior is always a definition of behavior and not an illustration. It describes the sequence of state changes an instance of a classifier may undergo in the course of its lifetime. Its precise semantics depends on the kind of classifier. For example, the classifier behavior of a collaboration represents emergent behavior of all the parts, whereas the classifier behavior of a class is just the behavior of instances of the class separated from the behaviors of any of its parts. When a behavior is associated as the method of a behavioral feature, it defines the implementation of that feature; i.e., the computation that generates the effects of the behavioral feature. As a classifier, a behavior can be specialized. Instantiating a behavior is referred to as “invocating” the behavior, an instantiated behavior is also called a behavior “execution.” A behavior may be invoked directly or its invocation may be the result of invoking the behavioral feature that specifies this behavior. A behavior can also be instantiated as an object in virtue of it being a class. The specification of a behavior can take a number of forms, as described in the subclasses of Behavior. Behavior is an abstract metaclass factoring out the commonalities of these different specification mechanisms. When a behavior is invoked, its execution receives a set of input values that are used to affect the course of execution and as a result of its execution it produces a set of output values which are returned, as specified by its parameters. The observable effects of a behavior execution may include changes of values of various objects involved in the execution, the creation and destruction of objects, generation of communications between objects, as well as an explicit set of output values. "/>

+    </eAnnotations>

     <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

@@ -2576,6 +2716,9 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="BehavioredClassifier" abstract="true"

       eSuperTypes="#//Classifier">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A classifier can have behavior specifications defined in its namespace. One of these may specify the behavior of the classifier itself. "/>

+    </eAnnotations>

     <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -2651,6 +2794,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Activity" eSuperTypes="#//Behavior">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An activity contains a language-specific text string used to describe a computation, and an optional specification of the language. OCL, natural language, or programming languages may be used to specify an activity. "/>

+    </eAnnotations>

     <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -2713,6 +2859,9 @@
         defaultValueLiteral="false"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="GeneralizationSet" eSuperTypes="#//PackageableElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Each Generalization is a binary relationship that relates a specific Classifier to a more general Classifier (i.e., a subclass). Each GeneralizationSet defines a particular set of Generalization relationships that describe the way in which a specific Classifier "/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isCovering" eType="#//Boolean"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="isDisjoint" eType="#//Boolean"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="powertype" eType="#//Classifier"

@@ -2721,19 +2870,40 @@
         upperBound="-1" eType="#//Generalization" eOpposite="#//Generalization/generalizationSet"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Model" eSuperTypes="#//Package">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="The Model construct is defined as a Package. It contains a (hierarchical) set of elements that together describe the physical system being modeled. A Model may also contain a set of elements that represents the environment of the system, typically Actors, together with their interrelationships, such as Associations and Dependencies "/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewpoint" eType="#//String"

         defaultValueLiteral=""/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AssociationClass" eSuperTypes="#//Class #//Association"/>

-  <eClassifiers xsi:type="ecore:EClass" name="Permission" eSuperTypes="#//Dependency"/>

+  <eClassifiers xsi:type="ecore:EClass" name="AssociationClass" eSuperTypes="#//Class #//Association">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="In the metamodel, an AssociationClass is a declaration of a semantic relationship between Classifiers, which has a set of features of its own. AssociationClass is both an Association and a Class. "/>

+    </eAnnotations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Permission" eSuperTypes="#//Dependency">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A Permission signifies granting of access rights from the supplier model element to a client model element. Or to put it another way, it signifies that the client requires access to some or all of the constituent elements of the supplier. The supplier element gives the client permission to access some or all of its constituents elements. "/>

+    </eAnnotations>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Dependency" eSuperTypes="#//PackageableElement #//DirectedRelationship">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A dependency is a relationship that signifies that a single or a set of model elements requires other model elements for their specification or implementation. This means that the complete semantics of the depending elements is either semantically or structurally dependent on the definition of the supplier element(s). "/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EReference" name="client" ordered="false"

         lowerBound="1" upperBound="-1" eType="#//NamedElement" volatile="true" eOpposite="#//NamedElement/clientDependency"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="supplier" ordered="false"

         lowerBound="1" upperBound="-1" eType="#//NamedElement" volatile="true"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Usage" eSuperTypes="#//Dependency"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Usage" eSuperTypes="#//Dependency">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A usage is a relationship in which one element requires another element (or set of elements) for its full implementation or operation. In the metamodel, a Usage is a Dependency in which the client requires the presence of the supplier. "/>

+    </eAnnotations>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Abstraction" eSuperTypes="#//Dependency">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An abstraction is a relationship that relates two elements or sets of elements that represent the same concept at different levels of abstraction or from different viewpoints. (See also, the definition of abstration in the Glossary.) In the metamodel, an Abstraction is a Dependency in which there is a mapping between the supplier and the client. "/>

+    </eAnnotations>

     <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -2755,6 +2925,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Realization" eSuperTypes="#//Abstraction">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="In the metamodel, a Realization is a subtype of Dependencies::Realization. "/>

+    </eAnnotations>

     <eOperations name="getSources" ordered="false" lowerBound="1" upperBound="-1"

         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

@@ -2829,6 +3002,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Substitution" eSuperTypes="#//Realization">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A substitution is a relationship between two classifiers signifies that the substitutingClassifier complies with the contract specified by the contract classifier. This implies that instances of the substitutingClassifier are runtime substitutable where instances of the contract classifier are expected. "/>

+    </eAnnotations>

     <eOperations name="getSuppliers" ordered="false" lowerBound="1" upperBound="-1"

         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

@@ -2889,6 +3065,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="ConnectorEnd" eSuperTypes="#//MultiplicityElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A connector end is an endpoint of a connector, which attaches the connector to a connectable element. Each connector end is part of one connector. "/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EReference" name="definingEnd" eType="#//Property"

         changeable="false" volatile="true" transient="true" derived="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="role" eType="#//ConnectableElement"

@@ -2897,10 +3076,16 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="ConnectableElement" abstract="true"

       eSuperTypes="#//NamedElement #//ParameterableElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A ConnectableElement is an abstract metaclass representing a set of instances that are owned by a containing classifier instance. Connectable elements may be joined by attached connectors and specify configurations of linked instances to be created within an instance of the containing classifier. "/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EReference" name="end" ordered="false" upperBound="-1"

         eType="#//ConnectorEnd" eOpposite="#//ConnectorEnd/role"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Connector" eSuperTypes="#//Feature">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Each connector may be attached to two or more connectable elements, each representing a set of instances. Each connector end "/>

+    </eAnnotations>

     <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

@@ -2942,6 +3127,9 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="StructuredClassifier" abstract="true"

       eSuperTypes="#//Classifier">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A structured classifier is an abstract metaclass that represents any classifier whose behavior can be fully or partly described by the collaboration of owned or referenced instances. "/>

+    </eAnnotations>

     <eOperations name="getAttributes" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

@@ -3012,6 +3200,417 @@
       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Interface" eSuperTypes="#//Classifier">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An interface is a kind of classifier that represents a declaration of a set of coherent public features and obligations. In a sense, "/>

+    </eAnnotations>

+    <eOperations name="getAttributes" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="attribute"/>

+        <details key="eType" value="org.eclipse.uml2.Property"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Interface/ownedAttribute"/>

+    </eOperations>

+    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedMember"/>

+        <details key="eOpposite" value="namespace"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Interface/ownedAttribute #//Interface/ownedOperation #//Interface/nestedClassifier #//Interface/ownedReception #//Interface/protocol"/>

+    </eOperations>

+    <eOperations name="getFeatures" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="feature"/>

+        <details key="eOpposite" value="featuringClassifier"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="eType" value="org.eclipse.uml2.Feature"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Interface/ownedOperation #//Interface/ownedReception"/>

+    </eOperations>

+    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="redefinedElement"/>

+        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Interface/redefinedInterface"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedAttribute" upperBound="-1"

+        eType="#//Property" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Classifier#getAttributes" value=""/>

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedOperation" upperBound="-1"

+        eType="#//Operation" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Classifier#getFeatures" value=""/>

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedInterface" ordered="false"

+        upperBound="-1" eType="#//Interface">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="nestedClassifier" upperBound="-1"

+        eType="#//Classifier" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedReception" ordered="false"

+        upperBound="-1" eType="#//Reception" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Classifier#getFeatures" value=""/>

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="protocol" eType="#//ProtocolStateMachine"

+        containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Implementation" eSuperTypes="#//Realization">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An Implementation is a specialized Realization relationship between a Classifier and an Interface. The implementation relationship signifies that the realizing classifier conforms to the contract specified by the interface. "/>

+    </eAnnotations>

+    <eOperations name="getSuppliers" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="supplier"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="superset" references="#//Implementation/contract"/>

+    </eOperations>

+    <eOperations name="getTargets" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="target"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Implementation/contract"/>

+    </eOperations>

+    <eOperations name="getClients" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="client"/>

+        <details key="eOpposite" value="clientDependency"/>

+        <details key="derived" value="false"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="superset" references="#//Implementation/implementingClassifier"/>

+    </eOperations>

+    <eOperations name="getSources" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="source"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Implementation/implementingClassifier"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="contract" lowerBound="1"

+        eType="#//Interface" volatile="true">

+      <eAnnotations source="subsets" references="#//Dependency/supplier">

+        <details key="org.eclipse.uml2.Dependency#getSuppliers" value=""/>

+        <details key="org.eclipse.uml2.DirectedRelationship#getTargets" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="implementingClassifier"

+        lowerBound="1" eType="#//BehavioredClassifier" volatile="true" transient="true"

+        eOpposite="#//BehavioredClassifier/implementation">

+      <eAnnotations source="subsets" references="#//Dependency/client">

+        <details key="org.eclipse.uml2.Dependency#getClients" value=""/>

+        <details key="org.eclipse.uml2.DirectedRelationship#getSources" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Artifact" eSuperTypes="#//Classifier #//DeployedArtifact">

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Artifact/manifestation"/>

+    </eOperations>

+    <eOperations name="getClientDependencies" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="clientDependency"/>

+        <details key="eOpposite" value="client"/>

+        <details key="derived" value="false"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="eType" value="org.eclipse.uml2.Dependency"/>

+        <details key="eOpposite.lowerBound" value="1"/>

+      </eAnnotations>

+      <eAnnotations source="superset" references="#//Artifact/manifestation"/>

+    </eOperations>

+    <eOperations name="getFeatures" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="feature"/>

+        <details key="eOpposite" value="featuringClassifier"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="eType" value="org.eclipse.uml2.Feature"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Artifact/ownedOperation"/>

+    </eOperations>

+    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedMember"/>

+        <details key="eOpposite" value="namespace"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Artifact/ownedOperation #//Artifact/ownedAttribute"/>

+    </eOperations>

+    <eOperations name="getAttributes" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="attribute"/>

+        <details key="eType" value="org.eclipse.uml2.Property"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Artifact/ownedAttribute"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fileName" eType="#//String"

+        defaultValueLiteral=""/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="nestedArtifact" ordered="false"

+        upperBound="-1" eType="#//Artifact" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="manifestation" ordered="false"

+        upperBound="-1" eType="#//Manifestation" volatile="true" containment="true">

+      <eAnnotations source="subsets" references="#//NamedElement/clientDependency">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+        <details key="org.eclipse.uml2.NamedElement#getClientDependencies" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedOperation" upperBound="-1"

+        eType="#//Operation" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Classifier#getFeatures" value=""/>

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedAttribute" upperBound="-1"

+        eType="#//Property" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Classifier#getAttributes" value=""/>

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Manifestation" eSuperTypes="#//Abstraction">

+    <eOperations name="getSuppliers" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="supplier"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="superset" references="#//Manifestation/utilizedElement"/>

+    </eOperations>

+    <eOperations name="getTargets" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="target"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Manifestation/utilizedElement"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="utilizedElement" lowerBound="1"

+        eType="#//PackageableElement" volatile="true">

+      <eAnnotations source="subsets" references="#//Dependency/supplier">

+        <details key="org.eclipse.uml2.Dependency#getSuppliers" value=""/>

+        <details key="org.eclipse.uml2.DirectedRelationship#getTargets" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Actor" eSuperTypes="#//Classifier">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An Actor models a type of role played by an entity that interacts with the subject (e.g., by exchanging signals and data), "/>

+    </eAnnotations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Extend" eSuperTypes="#//NamedElement #//DirectedRelationship">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="This relationship specifies that the behavior of a use case may be extended by the behavior of another (usually supplementary) use case. The extension takes place at one or more specific extension points defined in the extended use case. Note, however, that the extended use case is defined independently of the extending use case and is meaningful independently of the extending use case. On the other hand, the extending use case typically defines behavior that may not necessarily be meaningful by itself. Instead, the extending use case defines a set of modular behavior increments that augment an execution of the extended use case under specific conditions. Note that the same extending use case can extend more than one use case. Furthermore, an extending use case may itself be extended. "/>

+    </eAnnotations>

+    <eOperations name="getTargets" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="target"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Extend/extendedCase"/>

+    </eOperations>

+    <eOperations name="getSources" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="source"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Extend/extension"/>

+    </eOperations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Extend/condition"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedCase" lowerBound="1"

+        eType="#//UseCase">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.DirectedRelationship#getTargets" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="extension" lowerBound="1"

+        eType="#//UseCase" transient="true" eOpposite="#//UseCase/extend">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.DirectedRelationship#getSources" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//Constraint"

+        containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="extensionLocation" lowerBound="1"

+        upperBound="-1" eType="#//ExtensionPoint"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="UseCase" eSuperTypes="#//BehavioredClassifier">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A UseCase is a kind of behaviored classifier that represents a declaration of an offered behavior. Each use case specifies some behavior, possibly including variants, that the subject can perform in collaboration with one or more actors. Use cases define the offered behavior of the subject without reference to its internal structure. These behaviors, involving interactions between the actor and the subject, may result in changes to the state of the subject and communications with its environment. A use case can include possible variations of its basic behavior, including exceptional behavior and error handling. The subject of a use case could be a physical system or any other element that may have behavior, such as a component, subsystem or class. Each use case specifies a unit of useful functionality that the subject provides to its users, i.e., a specific way of interacting with the subject. This functionality, which is initiated by an actor, must always be completed for the use case to complete. It is deemed complete if, after its execution, the subject will be in a state in which no further inputs or actions are expected and the use case can be initiated again or in an error state. Use cases can be used both for specification of the (external) requirements on a subject and for the specification of the functionality offered by a subject. Moreover, the use cases also state the requirements the specified subject poses on its environment by defining how they should interact with the subject so that it will be able to perform its services. The behavior of a use case can be described by a specification that is some kind of Behavior (through its ownedBehavior relationship), such as interactions, activities, and state machines, or by pre-conditions and post-conditions as well as by natural language text where appropriate. It may also be described indirectly through a Collaboration that uses the use case and its actors as the classifiers that type its parts. Which of these techniques to use depends on the nature of the use case behavior as well as on the intended reader. These descriptions can be combined. An example of a use case with an associated state machine description is shown in Figure 405. "/>

+    </eAnnotations>

+    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedMember"/>

+        <details key="eOpposite" value="namespace"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//UseCase/include #//UseCase/extend #//UseCase/extensionPoint"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="include" ordered="false"

+        upperBound="-1" eType="#//Include" containment="true" eOpposite="#//Include/includingCase">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="extend" ordered="false"

+        upperBound="-1" eType="#//Extend" containment="true" eOpposite="#//Extend/extension">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="extensionPoint" ordered="false"

+        upperBound="-1" eType="#//ExtensionPoint" containment="true" eOpposite="#//ExtensionPoint/useCase">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="subject" ordered="false"

+        upperBound="-1" eType="#//Classifier" eOpposite="#//Classifier/useCase"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ExtensionPoint" eSuperTypes="#//RedefinableElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An ExtensionPoint is a feature of a use case that identifies a point where the behavior of a use case can be augmented with elements of another (extending) use case. "/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="useCase" lowerBound="1"

+        eType="#//UseCase" transient="true" eOpposite="#//UseCase/extensionPoint"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Include" eSuperTypes="#//NamedElement #//DirectedRelationship">

+    <eOperations name="getSources" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="source"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Include/includingCase"/>

+    </eOperations>

+    <eOperations name="getTargets" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="target"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Include/addition"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="includingCase" lowerBound="1"

+        eType="#//UseCase" transient="true" eOpposite="#//UseCase/include">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.DirectedRelationship#getSources" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="addition" lowerBound="1"

+        eType="#//UseCase">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.DirectedRelationship#getTargets" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="ActivityEdge" abstract="true" eSuperTypes="#//RedefinableElement">

     <eOperations name="getOwner" eType="#//Element">

       <eAnnotations source="feature">

@@ -3390,7 +3989,27 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//ValueSpecification"

         containment="true"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Artifact" eSuperTypes="#//Classifier #//DeployedArtifact">

+  <eClassifiers xsi:type="ecore:EEnum" name="CallConcurrencyKind">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="CallConcurrencyKind is an enumeration with the following literals: • sequential No concurrency management mechanism is associated with the operation and, therefore, concurrency conflicts may occur. Instances that invoke a behavioral feature need to coordinate so that only one invocation to a target on any behavioral feature occurs at once. • guarded Multiple invocations of a behavioral feature may occur simultaneously to one instance, but only one is allowed to commence. The others are blocked until the performance of the first behavioral feature is complete. It is the responsibility of the system designer to ensure that deadlocks do not occur due to simultaneous blocks. • concurrent Multiple invocations of a behavioral feature may occur simultaneously to one instance and all of them may proceed concurrently. "/>

+    </eAnnotations>

+    <eLiterals name="sequential"/>

+    <eLiterals name="guarded" value="1"/>

+    <eLiterals name="concurrent" value="2"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="CallTrigger" eSuperTypes="#//MessageTrigger">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="operation" lowerBound="1"

+        eType="#//Operation"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="MessageTrigger" abstract="true" eSuperTypes="#//Trigger">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A message trigger specifies the an observable event caused by a either a call or a signal. MessageTrigger is an abstract metaclass. "/>

+    </eAnnotations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ChangeTrigger" eSuperTypes="#//Trigger">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A change trigger specifies an event that occurs when a Boolean-valued expression becomes true as a result of a change in "/>

+    </eAnnotations>

     <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -3402,33 +4021,40 @@
         <details key="eType" value="org.eclipse.uml2.Element"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//Artifact/manifestation"/>

+      <eAnnotations source="union" references="#//ChangeTrigger/changeExpression"/>

     </eOperations>

-    <eOperations name="getClientDependencies" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="clientDependency"/>

-        <details key="eOpposite" value="client"/>

-        <details key="derived" value="false"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="eType" value="org.eclipse.uml2.Dependency"/>

-        <details key="eOpposite.lowerBound" value="1"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="changeExpression" lowerBound="1"

+        eType="#//ValueSpecification" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

       </eAnnotations>

-      <eAnnotations source="superset" references="#//Artifact/manifestation"/>

-    </eOperations>

-    <eOperations name="getFeatures" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Trigger" abstract="true" eSuperTypes="#//NamedElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A trigger specifies the an event that may cause the execution of an associated behavior. An event is often ultimately caused by the execution of an action, but need not be. Trigger is an abstract metaclass. "/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="port" ordered="false" upperBound="-1"

+        eType="#//Port"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Reception" eSuperTypes="#//BehavioralFeature">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A reception is a declaration stating that a classifier is prepared to react to the receipt of a signal. A reception designates a signal and specifies the expected behavioral response. The details of handling a signal are specified by the behavior associated with the reception or the classifier itself. "/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="signal" eType="#//Signal"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Signal" eSuperTypes="#//Classifier">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A signal is a specification of type of send request instances communicated between objects. The receiving object handles the signal instance as specified by its receptions. The data carried by a send request and passed to it by the occurrence of the send invocation event that caused the request is represented as attributes of the signal instance. A signal is defined independently of the classifiers handling the signal. "/>

+    </eAnnotations>

+    <eOperations name="getAttributes" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="feature"/>

-        <details key="eOpposite" value="featuringClassifier"/>

         <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="eType" value="org.eclipse.uml2.Feature"/>

-        <details key="eOpposite.lowerBound" value="0"/>

+        <details key="name" value="attribute"/>

+        <details key="eType" value="org.eclipse.uml2.Property"/>

+        <details key="containment" value="false"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//Artifact/ownedOperation"/>

+      <eAnnotations source="union" references="#//Signal/ownedAttribute"/>

     </eOperations>

     <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

@@ -3441,35 +4067,8 @@
         <details key="eType" value="org.eclipse.uml2.NamedElement"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//Artifact/ownedOperation #//Artifact/ownedAttribute"/>

+      <eAnnotations source="union" references="#//Signal/ownedAttribute"/>

     </eOperations>

-    <eOperations name="getAttributes" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="attribute"/>

-        <details key="eType" value="org.eclipse.uml2.Property"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Artifact/ownedAttribute"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fileName" eType="#//String"

-        defaultValueLiteral=""/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="nestedArtifact" ordered="false"

-        upperBound="-1" eType="#//Artifact" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="manifestation" ordered="false"

-        upperBound="-1" eType="#//Manifestation" volatile="true" containment="true">

-      <eAnnotations source="subsets" references="#//NamedElement/clientDependency">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-        <details key="org.eclipse.uml2.NamedElement#getClientDependencies" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedOperation" upperBound="-1"

-        eType="#//Operation" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Classifier#getFeatures" value=""/>

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

     <eStructuralFeatures xsi:type="ecore:EReference" name="ownedAttribute" upperBound="-1"

         eType="#//Property" containment="true">

       <eAnnotations source="subsets">

@@ -3478,71 +4077,89 @@
       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Manifestation" eSuperTypes="#//Abstraction">

-    <eOperations name="getSuppliers" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+  <eClassifiers xsi:type="ecore:EClass" name="SignalTrigger" eSuperTypes="#//MessageTrigger">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="signal" upperBound="-1"

+        eType="#//Signal"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="TimeTrigger" eSuperTypes="#//Trigger">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A time trigger specifies a time event, which models the expiration of a specific deadline. "/>

+    </eAnnotations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="supplier"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="eOpposite.containment" value="false"/>

         <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="superset" references="#//Manifestation/utilizedElement"/>

-    </eOperations>

-    <eOperations name="getTargets" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

+        <details key="name" value="ownedElement"/>

+        <details key="eOpposite" value="owner"/>

         <details key="derived" value="true"/>

-        <details key="name" value="target"/>

+        <details key="eOpposite.upperBound" value="1"/>

         <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//Manifestation/utilizedElement"/>

+      <eAnnotations source="union" references="#//TimeTrigger/when"/>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="utilizedElement" lowerBound="1"

-        eType="#//PackageableElement" volatile="true">

-      <eAnnotations source="subsets" references="#//Dependency/supplier">

-        <details key="org.eclipse.uml2.Dependency#getSuppliers" value=""/>

-        <details key="org.eclipse.uml2.DirectedRelationship#getTargets" value=""/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isRelative" eType="#//Boolean"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="when" lowerBound="1" eType="#//ValueSpecification"

+        containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Interface" eSuperTypes="#//Classifier">

-    <eOperations name="getAttributes" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="attribute"/>

-        <details key="eType" value="org.eclipse.uml2.Property"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Interface/ownedAttribute"/>

-    </eOperations>

-    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+  <eClassifiers xsi:type="ecore:EClass" name="AnyTrigger" eSuperTypes="#//MessageTrigger">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An AnyTrigger for a given state specifies that the transition is triggered for all applicable message triggers except for those specified explicitly on other transitions for this state. "/>

+    </eAnnotations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="CollaborationOccurrence" eSuperTypes="#//NamedElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A collaboration occurrence represents one particular use of a collaboration to explain the relationships between the properties of a classifier. A collaboration occurrence indicates a set of roles and connectors that cooperate within the classifier according to a given collaboration, indicated by the type of the collaboration occurrence. There may be multiple occurrences of a given collaboration within a classifier, each involving a different set of roles and connectors. A given role or connector may be involved in multiple occurrences of the same or different collaborations. Associated dependencies map features of the collaboration type to features in the classifier. These dependencies indicate which role in the classifier plays which role in the collaboration. "/>

+    </eAnnotations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

         <details key="containment" value="false"/>

-        <details key="name" value="ownedMember"/>

-        <details key="eOpposite" value="namespace"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eOpposite" value="owner"/>

         <details key="derived" value="true"/>

         <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//Interface/ownedAttribute #//Interface/ownedOperation #//Interface/nestedClassifier #//Interface/ownedReception #//Interface/protocol"/>

+      <eAnnotations source="union" references="#//CollaborationOccurrence/roleBinding"/>

     </eOperations>

-    <eOperations name="getFeatures" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" lowerBound="1" eType="#//Collaboration"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="roleBinding" ordered="false"

+        upperBound="-1" eType="#//Dependency" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Collaboration" eSuperTypes="#//BehavioredClassifier #//StructuredClassifier">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A collaboration is represented as a kind of classifier and defines a set of cooperating entities to be played by instances (its roles), as well as a set of connectors that define communication paths between the participating instances. The cooperating entities are the properties of the collaboration (see “Property” on page 161). A collaboration specifies a view (or projection) of a set of cooperating classifiers. It describes the required links between instances that play the roles of the collaboration, as well as the features required of the classifiers that specify the participating instances. Several collaborations may describe different projections of the same set of classifiers. "/>

+    </eAnnotations>

+    <eOperations name="getRoles" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="feature"/>

-        <details key="eOpposite" value="featuringClassifier"/>

         <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="eType" value="org.eclipse.uml2.Feature"/>

-        <details key="eOpposite.lowerBound" value="0"/>

+        <details key="name" value="role"/>

+        <details key="eType" value="org.eclipse.uml2.ConnectableElement"/>

+        <details key="containment" value="false"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//Interface/ownedOperation #//Interface/ownedReception"/>

+      <eAnnotations source="union" references="#//Collaboration/collaborationRole"/>

     </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="collaborationRole" ordered="false"

+        upperBound="-1" eType="#//ConnectableElement">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.StructuredClassifier#getRoles" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Port" eSuperTypes="#//Property">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Ports represent interaction points between a classifier and its environment. The interfaces associated with a port specify the nature of the interactions that may occur over a port. The required interfaces of a port characterize the requests which may be made from the classifier to its environment through this port. The provided interfaces of a port characterize requests to the classifier that its environment may make through this port. A port has the ability to specify that any requests arriving at this port are handled by the behavior of the instance of the owning classifier, rather than being forwarded to any contained instances, if any. "/>

+    </eAnnotations>

     <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

@@ -3550,130 +4167,244 @@
         <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

         <details key="containment" value="false"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//Interface/redefinedInterface"/>

+      <eAnnotations source="union" references="#//Port/redefinedPort"/>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedAttribute" upperBound="-1"

-        eType="#//Property" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Classifier#getAttributes" value=""/>

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedOperation" upperBound="-1"

-        eType="#//Operation" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Classifier#getFeatures" value=""/>

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedInterface" ordered="false"

-        upperBound="-1" eType="#//Interface">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isBehavior" eType="#//Boolean"

+        defaultValueLiteral="false"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isService" eType="#//Boolean"

+        defaultValueLiteral="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="required" ordered="false"

+        upperBound="-1" eType="#//Interface" changeable="false" volatile="true" transient="true"

+        derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedPort" ordered="false"

+        upperBound="-1" eType="#//Port">

       <eAnnotations source="subsets">

         <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="nestedClassifier" upperBound="-1"

-        eType="#//Classifier" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="provided" ordered="false"

+        upperBound="-1" eType="#//Interface" changeable="false" volatile="true" transient="true"

+        derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="protocol" eType="#//ProtocolStateMachine"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="EncapsulatedClassifier" abstract="true"

+      eSuperTypes="#//StructuredClassifier">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Extends a classifier with the ability to own ports as specific and type checked interaction points. "/>

+    </eAnnotations>

+    <eOperations name="getFeatures" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="feature"/>

+        <details key="eOpposite" value="featuringClassifier"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="eType" value="org.eclipse.uml2.Feature"/>

+        <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedReception" ordered="false"

-        upperBound="-1" eType="#//Reception" containment="true">

+      <eAnnotations source="union" references="#//EncapsulatedClassifier/ownedPort"/>

+    </eOperations>

+    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedMember"/>

+        <details key="eOpposite" value="namespace"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//EncapsulatedClassifier/ownedPort"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedPort" ordered="false"

+        upperBound="-1" eType="#//Port" containment="true">

       <eAnnotations source="subsets">

         <details key="org.eclipse.uml2.Classifier#getFeatures" value=""/>

         <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="protocol" eType="#//ProtocolStateMachine"

-        containment="true">

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Variable" eSuperTypes="#//ConnectableElement #//TypedElement #//MultiplicityElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A variable is considered a connectable element. "/>

+    </eAnnotations>

+    <eOperations name="getOwner" eType="#//Element">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="owner"/>

+        <details key="eOpposite" value="ownedElement"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Variable/scope"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="scope" lowerBound="1" eType="#//StructuredActivityNode"

+        transient="true" eOpposite="#//StructuredActivityNode/variable">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="StructuredActivityNode" eSuperTypes="#//Action #//Namespace #//ActivityGroup">

+    <eOperations name="getActivity" eType="#//Activity">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="activity"/>

+        <details key="eOpposite" value="structuredNode"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="eType" value="org.eclipse.uml2.Activity"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//ActivityNode/activity #//ActivityGroup/activityGroup_activity">

+        <details key="org.eclipse.uml2.ActivityNode#getActivity" value=""/>

+        <details key="org.eclipse.uml2.ActivityGroup#getActivityGroup_activity" value=""/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="setActivity">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="activity"/>

+        <details key="eOpposite" value="structuredNode"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="eType" value="org.eclipse.uml2.Activity"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//ActivityNode/activity #//ActivityGroup/activityGroup_activity">

+        <details key="org.eclipse.uml2.ActivityNode#getActivity" value=""/>

+        <details key="org.eclipse.uml2.ActivityGroup#getActivityGroup_activity" value=""/>

+      </eAnnotations>

+      <eParameters name="newActivity" eType="#//Activity"/>

+    </eOperations>

+    <eOperations name="getActivityGroup_activity" eType="#//Activity">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="activityGroup_activity"/>

+        <details key="eOpposite" value="group"/>

+        <details key="derived" value="false"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="eType" value="org.eclipse.uml2.Activity"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="redefined" references="#//StructuredActivityNode/getActivity"/>

+    </eOperations>

+    <eOperations name="setActivityGroup_activity">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="true"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="activityGroup_activity"/>

+        <details key="eOpposite" value="group"/>

+        <details key="derived" value="false"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="eType" value="org.eclipse.uml2.Activity"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="redefined" references="#//StructuredActivityNode/setActivity"/>

+      <eParameters name="newActivityGroup_activity" eType="#//Activity"/>

+    </eOperations>

+    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedMember"/>

+        <details key="eOpposite" value="namespace"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//StructuredActivityNode/variable"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" ordered="false"

+        upperBound="-1" eType="#//Variable" containment="true" eOpposite="#//Variable/scope">

       <eAnnotations source="subsets">

         <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="containedNode" upperBound="-1"

+        eType="#//ActivityNode" containment="true" eOpposite="#//ActivityNode/inStructuredNode">

+      <eAnnotations source="redefines" references="#//ActivityGroup/getContainedNodes">

+        <details key="org.eclipse.uml2.ActivityGroup#getContainedNodes" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="containedEdge" upperBound="-1"

+        eType="#//ActivityEdge" containment="true" eOpposite="#//ActivityEdge/inStructuredNode">

+      <eAnnotations source="redefines" references="#//ActivityGroup/getContainedEdges">

+        <details key="org.eclipse.uml2.ActivityGroup#getContainedEdges" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mustIsolate" eType="#//Boolean"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Implementation" eSuperTypes="#//Realization">

-    <eOperations name="getSuppliers" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="supplier"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="superset" references="#//Implementation/contract"/>

-    </eOperations>

-    <eOperations name="getTargets" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="target"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Implementation/contract"/>

-    </eOperations>

-    <eOperations name="getClients" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+  <eClassifiers xsi:type="ecore:EClass" name="ConditionalNode" eSuperTypes="#//StructuredActivityNode">

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

         <details key="containment" value="false"/>

-        <details key="name" value="client"/>

-        <details key="eOpposite" value="clientDependency"/>

-        <details key="derived" value="false"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="superset" references="#//Implementation/implementingClassifier"/>

+      <eAnnotations source="union" references="#//ConditionalNode/clause"/>

     </eOperations>

-    <eOperations name="getSources" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+    <eOperations name="getOutputs" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

-        <details key="name" value="source"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="name" value="output"/>

+        <details key="eType" value="org.eclipse.uml2.OutputPin"/>

         <details key="containment" value="false"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//Implementation/implementingClassifier"/>

+      <eAnnotations source="union" references="#//ConditionalNode/result"/>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="contract" lowerBound="1"

-        eType="#//Interface" volatile="true">

-      <eAnnotations source="subsets" references="#//Dependency/supplier">

-        <details key="org.eclipse.uml2.Dependency#getSuppliers" value=""/>

-        <details key="org.eclipse.uml2.DirectedRelationship#getTargets" value=""/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isDeterminate" eType="#//Boolean"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isAssured" eType="#//Boolean"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="clause" ordered="false"

+        lowerBound="1" upperBound="-1" eType="#//Clause" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="implementingClassifier"

-        lowerBound="1" eType="#//BehavioredClassifier" volatile="true" transient="true"

-        eOpposite="#//BehavioredClassifier/implementation">

-      <eAnnotations source="subsets" references="#//Dependency/client">

-        <details key="org.eclipse.uml2.Dependency#getClients" value=""/>

-        <details key="org.eclipse.uml2.DirectedRelationship#getSources" value=""/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="result" upperBound="-1"

+        eType="#//OutputPin" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Action#getOutputs" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Actor" eSuperTypes="#//Classifier"/>

-  <eClassifiers xsi:type="ecore:EClass" name="Extend" eSuperTypes="#//NamedElement #//DirectedRelationship">

-    <eOperations name="getTargets" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+  <eClassifiers xsi:type="ecore:EClass" name="Clause" eSuperTypes="#//Element">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="test" ordered="false" upperBound="-1"

+        eType="#//ActivityNode"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" upperBound="-1"

+        eType="#//ActivityNode"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="predecessorClause" ordered="false"

+        upperBound="-1" eType="#//Clause" eOpposite="#//Clause/successorClause"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="successorClause" ordered="false"

+        upperBound="-1" eType="#//Clause" eOpposite="#//Clause/predecessorClause"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="decider" lowerBound="1"

+        eType="#//OutputPin"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyOutput" ordered="false"

+        upperBound="-1" eType="#//OutputPin"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="LoopNode" eSuperTypes="#//StructuredActivityNode">

+    <eOperations name="getOutputs" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

-        <details key="name" value="target"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="name" value="output"/>

+        <details key="eType" value="org.eclipse.uml2.OutputPin"/>

         <details key="containment" value="false"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//Extend/extendedCase"/>

-    </eOperations>

-    <eOperations name="getSources" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="source"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Extend/extension"/>

+      <eAnnotations source="union" references="#//LoopNode/result"/>

     </eOperations>

     <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

@@ -3686,103 +4417,51 @@
         <details key="eType" value="org.eclipse.uml2.Element"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//Extend/condition"/>

+      <eAnnotations source="union" references="#//LoopNode/loopVariable"/>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedCase" lowerBound="1"

-        eType="#//UseCase">

+    <eOperations name="getInputs" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="input"/>

+        <details key="eType" value="org.eclipse.uml2.InputPin"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//LoopNode/loopVariableInput"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isTestedFirst" eType="#//Boolean"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyPart" ordered="false"

+        upperBound="-1" eType="#//ActivityNode"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="setupPart" ordered="false"

+        upperBound="-1" eType="#//ActivityNode"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="decider" lowerBound="1"

+        eType="#//OutputPin"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="test" ordered="false" upperBound="-1"

+        eType="#//ActivityNode"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="result" upperBound="-1"

+        eType="#//OutputPin" containment="true">

       <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.DirectedRelationship#getTargets" value=""/>

+        <details key="org.eclipse.uml2.Action#getOutputs" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="extension" lowerBound="1"

-        eType="#//UseCase" transient="true" eOpposite="#//UseCase/extend">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.DirectedRelationship#getSources" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//Constraint"

-        containment="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="loopVariable" upperBound="-1"

+        eType="#//OutputPin" containment="true">

       <eAnnotations source="subsets">

         <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="extensionLocation" lowerBound="1"

-        upperBound="-1" eType="#//ExtensionPoint"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="UseCase" eSuperTypes="#//BehavioredClassifier">

-    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedMember"/>

-        <details key="eOpposite" value="namespace"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//UseCase/include #//UseCase/extend #//UseCase/extensionPoint"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="include" ordered="false"

-        upperBound="-1" eType="#//Include" containment="true" eOpposite="#//Include/includingCase">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyOutput" ordered="false"

+        upperBound="-1" eType="#//OutputPin"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="loopVariableInput" upperBound="-1"

+        eType="#//InputPin" containment="true">

       <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="extend" ordered="false"

-        upperBound="-1" eType="#//Extend" containment="true" eOpposite="#//Extend/extension">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="extensionPoint" ordered="false"

-        upperBound="-1" eType="#//ExtensionPoint" containment="true" eOpposite="#//ExtensionPoint/useCase">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="subject" ordered="false"

-        upperBound="-1" eType="#//Classifier" eOpposite="#//Classifier/useCase"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ExtensionPoint" eSuperTypes="#//RedefinableElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="useCase" lowerBound="1"

-        eType="#//UseCase" transient="true" eOpposite="#//UseCase/extensionPoint"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Include" eSuperTypes="#//NamedElement #//DirectedRelationship">

-    <eOperations name="getSources" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="source"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Include/includingCase"/>

-    </eOperations>

-    <eOperations name="getTargets" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="target"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Include/addition"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="includingCase" lowerBound="1"

-        eType="#//UseCase" transient="true" eOpposite="#//UseCase/include">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.DirectedRelationship#getSources" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="addition" lowerBound="1"

-        eType="#//UseCase">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.DirectedRelationship#getTargets" value=""/>

+        <details key="org.eclipse.uml2.Action#getInputs" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="TemplateSignature" eSuperTypes="#//Element">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A TemplateSignature is owned by a TemplateableElement and has one or more TemplateParameters that define the signature for binding this template. A TemplateSignature may reference a set of nested template signatures to reflect the hierarchical nature of a template. "/>

+    </eAnnotations>

     <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -3833,6 +4512,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter" eSuperTypes="#//Element">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="TemplateParameter references a ParameterableElement which is exposed as a formal template parameter in the containing template. "/>

+    </eAnnotations>

     <eOperations name="getOwner" eType="#//Element">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -3890,6 +4572,9 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="TemplateableElement" abstract="true"

       eSuperTypes="#//Element">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="TemplateableElement may contain a template signature which specifies the formal template parameters. A TemplateableElement that contains a template signature is often referred to as a template. TemplateableElement may contain bindings to templates that describe how the templateable element is constructed by replacing the formal template parameters with actual parameters. A TemplateableElement containing bindings is often referred to as a bound element. "/>

+    </eAnnotations>

     <eOperations name="parameterableElements" ordered="false" upperBound="-1" eType="#//Set">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="body" value="try {&#xD;&#xA;&#x9;java.lang.reflect.Method method = getClass().getMethod(&quot;parameterableElements&quot;, null); //$NON-NLS-1$&#xD;&#xA;&#x9;Set result = (Set) getCacheAdapter().get(this, method);&#xD;&#xA;&#xD;&#xA;&#x9;if (null == result) {&#xD;&#xA;&#x9;&#x9;result = java.util.Collections.unmodifiableSet(org.eclipse.uml2.internal.operation.TemplateableElementOperations.parameterableElements(this));&#xD;&#xA;&#x9;&#x9;getCacheAdapter().put(this, method, result);&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;return result;&#xD;&#xA;} catch (Exception e) {&#xD;&#xA;&#x9;return org.eclipse.uml2.internal.operation.TemplateableElementOperations.parameterableElements(this);&#xD;&#xA;}"/>

@@ -3963,6 +4648,9 @@
   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="ParameterableElement" abstract="true"

       eSuperTypes="#//Element">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A ParameterableElement can be referenced by a TemplateParameter when defining a formal template parameter for a template. A ParameterableElement can be referenced by a TemplateParameterSubstitution when used as an actual parameter in a binding of a template. ParameterableElement is an abstract metaclass. "/>

+    </eAnnotations>

     <eOperations name="getOwner" eType="#//Element">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -3990,6 +4678,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="TemplateBinding" eSuperTypes="#//DirectedRelationship">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="TemplateBinding is a directed relationship from a bound templateable element to the template signature of the target template. A TemplateBinding owns a set of template parameter substitutions. "/>

+    </eAnnotations>

     <eOperations name="getOwner" eType="#//Element">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -4058,6 +4749,9 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="TemplateParameterSubstitution" eSuperTypes="#//Element">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="TemplateParameterSubstitution associates one or more actual parameters with a formal template parameter within the context of a TemplateBinding. "/>

+    </eAnnotations>

     <eOperations name="getOwner" eType="#//Element">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -4104,120 +4798,32 @@
       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Collaboration" eSuperTypes="#//BehavioredClassifier #//StructuredClassifier">

-    <eOperations name="getRoles" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="role"/>

-        <details key="eType" value="org.eclipse.uml2.ConnectableElement"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Collaboration/collaborationRole"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="collaborationRole" ordered="false"

-        upperBound="-1" eType="#//ConnectableElement">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.StructuredClassifier#getRoles" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

+  <eClassifiers xsi:type="ecore:EClass" name="OperationTemplateParameter" eSuperTypes="#//TemplateParameter">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="OperationTemplateParameter is a template parameter where the parametered element is an Operation. "/>

+    </eAnnotations>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="OperationTemplateParameter" eSuperTypes="#//TemplateParameter"/>

   <eClassifiers xsi:type="ecore:EClass" name="ClassifierTemplateParameter" eSuperTypes="#//TemplateParameter">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="ClassifierTemplateParameter is a template parameter where the parametered element is a Classifier in its capacity of being a kind of ParameterableElement. "/>

+    </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="allowSubstitutable" eType="#//Boolean"

         defaultValueLiteral="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="ParameterableClassifier" abstract="true"

       eSuperTypes="#//Classifier"/>

-  <eClassifiers xsi:type="ecore:EClass" name="RedefinableTemplateSignature" eSuperTypes="#//RedefinableElement #//TemplateSignature"/>

+  <eClassifiers xsi:type="ecore:EClass" name="RedefinableTemplateSignature" eSuperTypes="#//RedefinableElement #//TemplateSignature">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="RedefinableTemplateSignature specializes both TemplateSignature and RedefinableElement in order to allow the addition of new formal template parameters in the context of a specializing template Classifier. "/>

+    </eAnnotations>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="TemplateableClassifier" abstract="true"

       eSuperTypes="#//Classifier"/>

   <eClassifiers xsi:type="ecore:EClass" name="ConnectableElementTemplateParameter"

-      eSuperTypes="#//TemplateParameter"/>

-  <eClassifiers xsi:type="ecore:EClass" name="CollaborationOccurrence" eSuperTypes="#//NamedElement">

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//CollaborationOccurrence/roleBinding"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" lowerBound="1" eType="#//Collaboration"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="roleBinding" ordered="false"

-        upperBound="-1" eType="#//Dependency" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Port" eSuperTypes="#//Property">

-    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="redefinedElement"/>

-        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Port/redefinedPort"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isBehavior" eType="#//Boolean"

-        defaultValueLiteral="false"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isService" eType="#//Boolean"

-        defaultValueLiteral="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="required" ordered="false"

-        upperBound="-1" eType="#//Interface" changeable="false" volatile="true" transient="true"

-        derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedPort" ordered="false"

-        upperBound="-1" eType="#//Port">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="provided" ordered="false"

-        upperBound="-1" eType="#//Interface" changeable="false" volatile="true" transient="true"

-        derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="protocol" eType="#//ProtocolStateMachine"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="EncapsulatedClassifier" abstract="true"

-      eSuperTypes="#//StructuredClassifier">

-    <eOperations name="getFeatures" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="feature"/>

-        <details key="eOpposite" value="featuringClassifier"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="eType" value="org.eclipse.uml2.Feature"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//EncapsulatedClassifier/ownedPort"/>

-    </eOperations>

-    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedMember"/>

-        <details key="eOpposite" value="namespace"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//EncapsulatedClassifier/ownedPort"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedPort" ordered="false"

-        upperBound="-1" eType="#//Port" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Classifier#getFeatures" value=""/>

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

+      eSuperTypes="#//TemplateParameter">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="ConnectableElementTemplateParameter is a template parameter where the parametered element is a ConnectableElement. "/>

+    </eAnnotations>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Interaction" eSuperTypes="#//Behavior #//InteractionFragment">

     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

@@ -4488,87 +5094,24 @@
     </eStructuralFeatures>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Stop" eSuperTypes="#//EventOccurrence"/>

-  <eClassifiers xsi:type="ecore:EClass" name="Variable" eSuperTypes="#//ConnectableElement #//TypedElement #//MultiplicityElement">

-    <eOperations name="getOwner" eType="#//Element">

+  <eClassifiers xsi:type="ecore:EClass" name="StateMachine" eSuperTypes="#//Behavior">

+    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="owner"/>

-        <details key="eOpposite" value="ownedElement"/>

         <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Variable/scope"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="scope" lowerBound="1" eType="#//StructuredActivityNode"

-        transient="true" eOpposite="#//StructuredActivityNode/variable">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="StructuredActivityNode" eSuperTypes="#//Action #//Namespace #//ActivityGroup">

-    <eOperations name="getActivity" eType="#//Activity">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

+        <details key="name" value="redefinedElement"/>

+        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

         <details key="containment" value="false"/>

-        <details key="name" value="activity"/>

-        <details key="eOpposite" value="structuredNode"/>

+      </eAnnotations>

+      <eAnnotations source="redefined" references="#//StateMachine/extendedStateMachine"/>

+    </eOperations>

+    <eOperations name="getRedefinitionContexts" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

         <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="eType" value="org.eclipse.uml2.Activity"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//ActivityNode/activity #//ActivityGroup/activityGroup_activity">

-        <details key="org.eclipse.uml2.ActivityNode#getActivity" value=""/>

-        <details key="org.eclipse.uml2.ActivityGroup#getActivityGroup_activity" value=""/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="setActivity">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

+        <details key="name" value="redefinitionContext"/>

+        <details key="eType" value="org.eclipse.uml2.Classifier"/>

         <details key="containment" value="false"/>

-        <details key="name" value="activity"/>

-        <details key="eOpposite" value="structuredNode"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="eType" value="org.eclipse.uml2.Activity"/>

-        <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="redefines" references="#//ActivityNode/activity #//ActivityGroup/activityGroup_activity">

-        <details key="org.eclipse.uml2.ActivityNode#getActivity" value=""/>

-        <details key="org.eclipse.uml2.ActivityGroup#getActivityGroup_activity" value=""/>

-      </eAnnotations>

-      <eParameters name="newActivity" eType="#//Activity"/>

-    </eOperations>

-    <eOperations name="getActivityGroup_activity" eType="#//Activity">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="activityGroup_activity"/>

-        <details key="eOpposite" value="group"/>

-        <details key="derived" value="false"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="eType" value="org.eclipse.uml2.Activity"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//StructuredActivityNode/getActivity"/>

-    </eOperations>

-    <eOperations name="setActivityGroup_activity">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="true"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="activityGroup_activity"/>

-        <details key="eOpposite" value="group"/>

-        <details key="derived" value="false"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="eType" value="org.eclipse.uml2.Activity"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//StructuredActivityNode/setActivity"/>

-      <eParameters name="newActivityGroup_activity" eType="#//Activity"/>

+      <eAnnotations source="redefined" references="#//StateMachine/stateMachine_redefinitionContext"/>

     </eOperations>

     <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

@@ -4581,89 +5124,54 @@
         <details key="eType" value="org.eclipse.uml2.NamedElement"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//StructuredActivityNode/variable"/>

+      <eAnnotations source="union" references="#//StateMachine/region #//StateMachine/connectionPoint"/>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" ordered="false"

-        upperBound="-1" eType="#//Variable" containment="true" eOpposite="#//Variable/scope">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="region" ordered="false"

+        lowerBound="1" upperBound="-1" eType="#//Region" containment="true" eOpposite="#//Region/stateMachine">

       <eAnnotations source="subsets">

         <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="containedNode" upperBound="-1"

-        eType="#//ActivityNode" containment="true" eOpposite="#//ActivityNode/inStructuredNode">

-      <eAnnotations source="redefines" references="#//ActivityGroup/getContainedNodes">

-        <details key="org.eclipse.uml2.ActivityGroup#getContainedNodes" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="containedEdge" upperBound="-1"

-        eType="#//ActivityEdge" containment="true" eOpposite="#//ActivityEdge/inStructuredNode">

-      <eAnnotations source="redefines" references="#//ActivityGroup/getContainedEdges">

-        <details key="org.eclipse.uml2.ActivityGroup#getContainedEdges" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mustIsolate" eType="#//Boolean"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ConditionalNode" eSuperTypes="#//StructuredActivityNode">

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ConditionalNode/clause"/>

-    </eOperations>

-    <eOperations name="getOutputs" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="output"/>

-        <details key="eType" value="org.eclipse.uml2.OutputPin"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ConditionalNode/result"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isDeterminate" eType="#//Boolean"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isAssured" eType="#//Boolean"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="clause" ordered="false"

-        lowerBound="1" upperBound="-1" eType="#//Clause" containment="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="connectionPoint" ordered="false"

+        upperBound="-1" eType="#//Pseudostate" containment="true">

       <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="result" upperBound="-1"

-        eType="#//OutputPin" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Action#getOutputs" value=""/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedStateMachine" eType="#//StateMachine">

+      <eAnnotations source="redefines">

+        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="stateMachine_redefinitionContext"

+        eType="#//BehavioredClassifier" volatile="true" transient="true" eOpposite="#//BehavioredClassifier/ownedStateMachine">

+      <eAnnotations source="redefines" references="#//RedefinableElement/redefinitionContext">

+        <details key="org.eclipse.uml2.RedefinableElement#getRedefinitionContexts"

+            value=""/>

       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Clause" eSuperTypes="#//Element">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="test" ordered="false" upperBound="-1"

-        eType="#//ActivityNode"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" upperBound="-1"

-        eType="#//ActivityNode"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="predecessorClause" ordered="false"

-        upperBound="-1" eType="#//Clause" eOpposite="#//Clause/successorClause"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="successorClause" ordered="false"

-        upperBound="-1" eType="#//Clause" eOpposite="#//Clause/predecessorClause"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="decider" lowerBound="1"

-        eType="#//OutputPin"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyOutput" ordered="false"

-        upperBound="-1" eType="#//OutputPin"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="LoopNode" eSuperTypes="#//StructuredActivityNode">

-    <eOperations name="getOutputs" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+  <eClassifiers xsi:type="ecore:EClass" name="Region" eSuperTypes="#//Namespace #//RedefinableElement">

+    <eOperations name="getRedefinitionContexts" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

-        <details key="name" value="output"/>

-        <details key="eType" value="org.eclipse.uml2.OutputPin"/>

+        <details key="name" value="redefinitionContext"/>

+        <details key="eType" value="org.eclipse.uml2.Classifier"/>

         <details key="containment" value="false"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//LoopNode/result"/>

+      <eAnnotations source="redefines" references="#//RedefinableElement/redefinitionContext">

+        <details key="org.eclipse.uml2.RedefinableElement#getRedefinitionContexts"

+            value=""/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="redefinedElement"/>

+        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="redefined" references="#//Region/extendedRegion"/>

     </eOperations>

     <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

@@ -4676,58 +5184,76 @@
         <details key="eType" value="org.eclipse.uml2.Element"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//LoopNode/loopVariable"/>

+      <eAnnotations source="union" references="#//Region/subvertex #//Region/transition"/>

     </eOperations>

-    <eOperations name="getInputs" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+    <eOperations name="getNamespace" eType="#//Namespace">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

-        <details key="name" value="input"/>

-        <details key="eType" value="org.eclipse.uml2.InputPin"/>

+        <details key="name" value="namespace"/>

+        <details key="eType" value="org.eclipse.uml2.Namespace"/>

         <details key="containment" value="false"/>

+        <details key="eOpposite" value="ownedMember"/>

+        <details key="eOpposite.containment" value="false"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+        <details key="eOpposite.upperBound" value="-1"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//LoopNode/loopVariableInput"/>

+      <eAnnotations source="union" references="#//Region/stateMachine #//Region/state"/>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isTestedFirst" eType="#//Boolean"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyPart" ordered="false"

-        upperBound="-1" eType="#//ActivityNode"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="setupPart" ordered="false"

-        upperBound="-1" eType="#//ActivityNode"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="decider" lowerBound="1"

-        eType="#//OutputPin"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="test" ordered="false" upperBound="-1"

-        eType="#//ActivityNode"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="result" upperBound="-1"

-        eType="#//OutputPin" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Action#getOutputs" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="loopVariable" upperBound="-1"

-        eType="#//OutputPin" containment="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="subvertex" ordered="false"

+        upperBound="-1" eType="#//Vertex" containment="true" eOpposite="#//Vertex/container">

       <eAnnotations source="subsets">

         <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="bodyOutput" ordered="false"

-        upperBound="-1" eType="#//OutputPin"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="loopVariableInput" upperBound="-1"

-        eType="#//InputPin" containment="true">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="transition" ordered="false"

+        upperBound="-1" eType="#//Transition" containment="true" eOpposite="#//Transition/container">

       <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Action#getInputs" value=""/>

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="stateMachine" eType="#//StateMachine"

+        transient="true" eOpposite="#//StateMachine/region">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.NamedElement#getNamespace" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="state" eType="#//State"

+        transient="true" eOpposite="#//State/region">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.NamedElement#getNamespace" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedRegion" eType="#//Region">

+      <eAnnotations source="redefines">

+        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="CallConcurrencyKind">

-    <eLiterals name="sequential"/>

-    <eLiterals name="guarded" value="1"/>

-    <eLiterals name="concurrent" value="2"/>

+  <eClassifiers xsi:type="ecore:EClass" name="Pseudostate" eSuperTypes="#//Vertex">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//PseudostateKind"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="CallTrigger" eSuperTypes="#//MessageTrigger">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="operation" lowerBound="1"

-        eType="#//Operation"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="MessageTrigger" abstract="true" eSuperTypes="#//Trigger"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ChangeTrigger" eSuperTypes="#//Trigger">

+  <eClassifiers xsi:type="ecore:EClass" name="State" eSuperTypes="#//Namespace #//RedefinableElement #//Vertex">

+    <eOperations name="getRedefinitionContexts" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="redefinitionContext"/>

+        <details key="eType" value="org.eclipse.uml2.Classifier"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//RedefinableElement/redefinitionContext">

+        <details key="org.eclipse.uml2.RedefinableElement#getRedefinitionContexts"

+            value=""/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="redefinedElement"/>

+        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="redefined" references="#//State/redefinedState"/>

+    </eOperations>

     <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -4739,31 +5265,7 @@
         <details key="eType" value="org.eclipse.uml2.Element"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//ChangeTrigger/changeExpression"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="changeExpression" lowerBound="1"

-        eType="#//ValueSpecification" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Trigger" abstract="true" eSuperTypes="#//NamedElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="port" ordered="false" upperBound="-1"

-        eType="#//Port"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Reception" eSuperTypes="#//BehavioralFeature">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="signal" eType="#//Signal"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Signal" eSuperTypes="#//Classifier">

-    <eOperations name="getAttributes" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="attribute"/>

-        <details key="eType" value="org.eclipse.uml2.Property"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Signal/ownedAttribute"/>

+      <eAnnotations source="union" references="#//State/connection #//State/entry #//State/exit #//State/doActivity #//State/stateInvariant"/>

     </eOperations>

     <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

@@ -4776,62 +5278,62 @@
         <details key="eType" value="org.eclipse.uml2.NamedElement"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//Signal/ownedAttribute"/>

+      <eAnnotations source="union" references="#//State/region"/>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedAttribute" upperBound="-1"

-        eType="#//Property" containment="true">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isComposite" eType="#//Boolean"

+        changeable="false" volatile="true" transient="true" derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isOrthogonal" eType="#//Boolean"

+        changeable="false" volatile="true" transient="true" derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSimple" eType="#//Boolean"

+        changeable="false" volatile="true" transient="true" derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSubmachineState" eType="#//Boolean"

+        changeable="false" volatile="true" transient="true" derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="submachine" eType="#//StateMachine"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="connection" ordered="false"

+        upperBound="-1" eType="#//ConnectionPointReference" containment="true">

       <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Classifier#getAttributes" value=""/>

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedState" eType="#//State">

+      <eAnnotations source="redefines">

+        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="deferrableTrigger" ordered="false"

+        upperBound="-1" eType="#//Trigger"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="region" ordered="false"

+        upperBound="-1" eType="#//Region" containment="true" eOpposite="#//Region/state">

+      <eAnnotations source="subsets">

         <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="SignalTrigger" eSuperTypes="#//MessageTrigger">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="signal" upperBound="-1"

-        eType="#//Signal"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="TimeTrigger" eSuperTypes="#//Trigger">

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="entry" eType="#//Activity"

+        containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//TimeTrigger/when"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isRelative" eType="#//Boolean"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="when" lowerBound="1" eType="#//ValueSpecification"

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="exit" eType="#//Activity"

+        containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="doActivity" eType="#//Activity"

+        containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="stateInvariant" eType="#//Constraint"

         containment="true">

       <eAnnotations source="subsets">

         <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="AnyTrigger" eSuperTypes="#//MessageTrigger"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ExpansionNode" eSuperTypes="#//ObjectNode">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="regionAsOutput" eType="#//ExpansionRegion"

-        eOpposite="#//ExpansionRegion/outputElement"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="regionAsInput" eType="#//ExpansionRegion"

-        eOpposite="#//ExpansionRegion/inputElement"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ExpansionRegion" eSuperTypes="#//StructuredActivityNode">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mode" eType="#//ExpansionKind"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="outputElement" ordered="false"

-        upperBound="-1" eType="#//ExpansionNode" eOpposite="#//ExpansionNode/regionAsOutput"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="inputElement" ordered="false"

-        lowerBound="1" upperBound="-1" eType="#//ExpansionNode" eOpposite="#//ExpansionNode/regionAsInput"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="ExpansionKind">

-    <eLiterals name="parallel"/>

-    <eLiterals name="iterative" value="1"/>

-    <eLiterals name="stream" value="2"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ExceptionHandler" eSuperTypes="#//Element">

+  <eClassifiers xsi:type="ecore:EClass" name="Vertex" abstract="true" eSuperTypes="#//NamedElement">

     <eOperations name="getOwner" eType="#//Element">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -4843,23 +5345,63 @@
         <details key="eType" value="org.eclipse.uml2.Element"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//ExceptionHandler/protectedNode"/>

+      <eAnnotations source="redefined" references="#//Vertex/container"/>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="protectedNode" lowerBound="1"

-        eType="#//ExecutableNode" transient="true" eOpposite="#//ExecutableNode/handler">

-      <eAnnotations source="subsets">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="container" eType="#//Region"

+        transient="true" eOpposite="#//Region/subvertex">

+      <eAnnotations source="redefines" references="#//Element/owner">

         <details key="org.eclipse.uml2.Element#getOwner" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="handlerBody" lowerBound="1"

-        eType="#//ExecutableNode"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="exceptionInput" lowerBound="1"

-        eType="#//ObjectNode"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="exceptionType" ordered="false"

-        lowerBound="1" upperBound="-1" eType="#//Classifier"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoing" ordered="false"

+        upperBound="-1" eType="#//Transition" eOpposite="#//Transition/source"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" ordered="false"

+        upperBound="-1" eType="#//Transition" eOpposite="#//Transition/target"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ForkNode" eSuperTypes="#//ControlNode"/>

-  <eClassifiers xsi:type="ecore:EClass" name="JoinNode" eSuperTypes="#//ControlNode">

+  <eClassifiers xsi:type="ecore:EClass" name="ConnectionPointReference" eSuperTypes="#//Vertex">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Connection point references of a submachine state can be used as sources/targets of transitions. They represent entries into or exits out of the submachine state machine referenced by the submachine state. "/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="entry" ordered="false"

+        upperBound="-1" eType="#//Pseudostate"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="exit" ordered="false" upperBound="-1"

+        eType="#//Pseudostate"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Transition" eSuperTypes="#//RedefinableElement">

+    <eOperations name="getRedefinitionContexts" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="redefinitionContext"/>

+        <details key="eType" value="org.eclipse.uml2.Classifier"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//RedefinableElement/redefinitionContext">

+        <details key="org.eclipse.uml2.RedefinableElement#getRedefinitionContexts"

+            value=""/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="redefinedElement"/>

+        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="redefined" references="#//Transition/redefinedTransition"/>

+    </eOperations>

+    <eOperations name="getOwner" eType="#//Element">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="owner"/>

+        <details key="eOpposite" value="ownedElement"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Transition/container"/>

+    </eOperations>

     <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -4871,63 +5413,57 @@
         <details key="eType" value="org.eclipse.uml2.Element"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//JoinNode/joinSpec"/>

+      <eAnnotations source="union" references="#//Transition/guard #//Transition/effect"/>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isCombineDuplicate" eType="#//Boolean"

-        defaultValueLiteral="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="joinSpec" lowerBound="1"

-        eType="#//ValueSpecification" containment="true">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//TransitionKind"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="container" lowerBound="1"

+        eType="#//Region" transient="true" eOpposite="#//Region/transition">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="source" lowerBound="1"

+        eType="#//Vertex" eOpposite="#//Vertex/outgoing"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"

+        eType="#//Vertex" eOpposite="#//Vertex/incoming"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedTransition" eType="#//Transition">

+      <eAnnotations source="redefines">

+        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="trigger" ordered="false"

+        upperBound="-1" eType="#//Trigger"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="guard" eType="#//Constraint"

+        volatile="true" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="effect" eType="#//Activity"

+        containment="true">

       <eAnnotations source="subsets">

         <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="FlowFinalNode" eSuperTypes="#//FinalNode"/>

-  <eClassifiers xsi:type="ecore:EClass" name="CentralBufferNode" eSuperTypes="#//ObjectNode"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ActivityPartition" eSuperTypes="#//NamedElement #//ActivityGroup">

-    <eOperations name="getSuperGroup" eType="#//ActivityGroup">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="superGroup"/>

-        <details key="eType" value="org.eclipse.uml2.ActivityGroup"/>

-        <details key="containment" value="false"/>

-        <details key="eOpposite" value="subgroup"/>

-        <details key="eOpposite.containment" value="false"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ActivityPartition/superPartition"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isDimension" eType="#//Boolean"

-        defaultValueLiteral="false"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isExternal" eType="#//Boolean"

-        defaultValueLiteral="false"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="containedEdge" upperBound="-1"

-        eType="#//ActivityEdge" eOpposite="#//ActivityEdge/inPartition">

-      <eAnnotations source="redefines" references="#//ActivityGroup/getContainedEdges">

-        <details key="org.eclipse.uml2.ActivityGroup#getContainedEdges" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="containedNode" upperBound="-1"

-        eType="#//ActivityNode" eOpposite="#//ActivityNode/inPartition">

-      <eAnnotations source="redefines" references="#//ActivityGroup/getContainedNodes">

-        <details key="org.eclipse.uml2.ActivityGroup#getContainedNodes" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="subgroup" ordered="false"

-        upperBound="-1" eType="#//ActivityPartition" containment="true" eOpposite="#//ActivityPartition/superPartition">

-      <eAnnotations source="redefines" references="#//ActivityGroup/getSubgroups">

-        <details key="org.eclipse.uml2.ActivityGroup#getSubgroups" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="superPartition" eType="#//ActivityPartition"

-        transient="true" eOpposite="#//ActivityPartition/subgroup">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.ActivityGroup#getSuperGroup" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="represents" eType="#//Element"/>

+  <eClassifiers xsi:type="ecore:EEnum" name="TransitionKind">

+    <eLiterals name="internal"/>

+    <eLiterals name="local" value="1"/>

+    <eLiterals name="external" value="2"/>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="PseudostateKind">

+    <eLiterals name="initial"/>

+    <eLiterals name="deepHistory" value="1"/>

+    <eLiterals name="shallowHistory" value="2"/>

+    <eLiterals name="join" value="3"/>

+    <eLiterals name="fork" value="4"/>

+    <eLiterals name="junction" value="5"/>

+    <eLiterals name="choice" value="6"/>

+    <eLiterals name="entryPoint" value="7"/>

+    <eLiterals name="exitPoint" value="8"/>

+    <eLiterals name="terminate" value="9"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="FinalState" eSuperTypes="#//State"/>

   <eClassifiers xsi:type="ecore:EClass" name="CreateObjectAction" eSuperTypes="#//Action">

     <eOperations name="getOutputs" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

@@ -5393,85 +5929,8 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="behavior" lowerBound="1"

         eType="#//Behavior"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="StateMachine" eSuperTypes="#//Behavior">

-    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="redefinedElement"/>

-        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//StateMachine/extendedStateMachine"/>

-    </eOperations>

-    <eOperations name="getRedefinitionContexts" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="redefinitionContext"/>

-        <details key="eType" value="org.eclipse.uml2.Classifier"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//StateMachine/stateMachine_redefinitionContext"/>

-    </eOperations>

-    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedMember"/>

-        <details key="eOpposite" value="namespace"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//StateMachine/region #//StateMachine/connectionPoint"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="region" ordered="false"

-        lowerBound="1" upperBound="-1" eType="#//Region" containment="true" eOpposite="#//Region/stateMachine">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="connectionPoint" ordered="false"

-        upperBound="-1" eType="#//Pseudostate" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedStateMachine" eType="#//StateMachine">

-      <eAnnotations source="redefines">

-        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="stateMachine_redefinitionContext"

-        eType="#//BehavioredClassifier" volatile="true" transient="true" eOpposite="#//BehavioredClassifier/ownedStateMachine">

-      <eAnnotations source="redefines" references="#//RedefinableElement/redefinitionContext">

-        <details key="org.eclipse.uml2.RedefinableElement#getRedefinitionContexts"

-            value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Region" eSuperTypes="#//Namespace #//RedefinableElement">

-    <eOperations name="getRedefinitionContexts" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="redefinitionContext"/>

-        <details key="eType" value="org.eclipse.uml2.Classifier"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//RedefinableElement/redefinitionContext">

-        <details key="org.eclipse.uml2.RedefinableElement#getRedefinitionContexts"

-            value=""/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="redefinedElement"/>

-        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//Region/extendedRegion"/>

-    </eOperations>

+  <eClassifiers xsi:type="ecore:EClass" name="ForkNode" eSuperTypes="#//ControlNode"/>

+  <eClassifiers xsi:type="ecore:EClass" name="JoinNode" eSuperTypes="#//ControlNode">

     <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -5483,156 +5942,82 @@
         <details key="eType" value="org.eclipse.uml2.Element"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//Region/subvertex #//Region/transition"/>

+      <eAnnotations source="union" references="#//JoinNode/joinSpec"/>

     </eOperations>

-    <eOperations name="getNamespace" eType="#//Namespace">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isCombineDuplicate" eType="#//Boolean"

+        defaultValueLiteral="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="joinSpec" lowerBound="1"

+        eType="#//ValueSpecification" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="FlowFinalNode" eSuperTypes="#//FinalNode"/>

+  <eClassifiers xsi:type="ecore:EClass" name="CentralBufferNode" eSuperTypes="#//ObjectNode"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ActivityPartition" eSuperTypes="#//NamedElement #//ActivityGroup">

+    <eOperations name="getSuperGroup" eType="#//ActivityGroup">

       <eAnnotations source="feature">

         <details key="derived" value="true"/>

-        <details key="name" value="namespace"/>

-        <details key="eType" value="org.eclipse.uml2.Namespace"/>

+        <details key="name" value="superGroup"/>

+        <details key="eType" value="org.eclipse.uml2.ActivityGroup"/>

         <details key="containment" value="false"/>

-        <details key="eOpposite" value="ownedMember"/>

+        <details key="eOpposite" value="subgroup"/>

         <details key="eOpposite.containment" value="false"/>

         <details key="eOpposite.lowerBound" value="0"/>

         <details key="eOpposite.upperBound" value="-1"/>

       </eAnnotations>

-      <eAnnotations source="union" references="#//Region/stateMachine #//Region/state"/>

+      <eAnnotations source="union" references="#//ActivityPartition/superPartition"/>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="subvertex" ordered="false"

-        upperBound="-1" eType="#//Vertex" containment="true" eOpposite="#//Vertex/container">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isDimension" eType="#//Boolean"

+        defaultValueLiteral="false"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isExternal" eType="#//Boolean"

+        defaultValueLiteral="false"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="containedEdge" upperBound="-1"

+        eType="#//ActivityEdge" eOpposite="#//ActivityEdge/inPartition">

+      <eAnnotations source="redefines" references="#//ActivityGroup/getContainedEdges">

+        <details key="org.eclipse.uml2.ActivityGroup#getContainedEdges" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="containedNode" upperBound="-1"

+        eType="#//ActivityNode" eOpposite="#//ActivityNode/inPartition">

+      <eAnnotations source="redefines" references="#//ActivityGroup/getContainedNodes">

+        <details key="org.eclipse.uml2.ActivityGroup#getContainedNodes" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="subgroup" ordered="false"

+        upperBound="-1" eType="#//ActivityPartition" containment="true" eOpposite="#//ActivityPartition/superPartition">

+      <eAnnotations source="redefines" references="#//ActivityGroup/getSubgroups">

+        <details key="org.eclipse.uml2.ActivityGroup#getSubgroups" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="superPartition" eType="#//ActivityPartition"

+        transient="true" eOpposite="#//ActivityPartition/subgroup">

       <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+        <details key="org.eclipse.uml2.ActivityGroup#getSuperGroup" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="transition" ordered="false"

-        upperBound="-1" eType="#//Transition" containment="true" eOpposite="#//Transition/container">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="stateMachine" eType="#//StateMachine"

-        transient="true" eOpposite="#//StateMachine/region">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.NamedElement#getNamespace" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="state" eType="#//State"

-        transient="true" eOpposite="#//State/region">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.NamedElement#getNamespace" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedRegion" eType="#//Region">

-      <eAnnotations source="redefines">

-        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="represents" eType="#//Element"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Pseudostate" eSuperTypes="#//Vertex">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//PseudostateKind"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ExpansionNode" eSuperTypes="#//ObjectNode">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="regionAsOutput" eType="#//ExpansionRegion"

+        eOpposite="#//ExpansionRegion/outputElement"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="regionAsInput" eType="#//ExpansionRegion"

+        eOpposite="#//ExpansionRegion/inputElement"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="State" eSuperTypes="#//Namespace #//RedefinableElement #//Vertex">

-    <eOperations name="getRedefinitionContexts" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="redefinitionContext"/>

-        <details key="eType" value="org.eclipse.uml2.Classifier"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//RedefinableElement/redefinitionContext">

-        <details key="org.eclipse.uml2.RedefinableElement#getRedefinitionContexts"

-            value=""/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="redefinedElement"/>

-        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//State/redefinedState"/>

-    </eOperations>

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//State/connection #//State/entry #//State/exit #//State/doActivity #//State/stateInvariant"/>

-    </eOperations>

-    <eOperations name="getOwnedMembers" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedMember"/>

-        <details key="eOpposite" value="namespace"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//State/region"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isComposite" eType="#//Boolean"

-        changeable="false" volatile="true" transient="true" derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isOrthogonal" eType="#//Boolean"

-        changeable="false" volatile="true" transient="true" derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSimple" eType="#//Boolean"

-        changeable="false" volatile="true" transient="true" derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isSubmachineState" eType="#//Boolean"

-        changeable="false" volatile="true" transient="true" derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="submachine" eType="#//StateMachine"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="connection" ordered="false"

-        upperBound="-1" eType="#//ConnectionPointReference" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedState" eType="#//State">

-      <eAnnotations source="redefines">

-        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="deferrableTrigger" ordered="false"

-        upperBound="-1" eType="#//Trigger"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="region" ordered="false"

-        upperBound="-1" eType="#//Region" containment="true" eOpposite="#//Region/state">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Namespace#getOwnedMembers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="entry" eType="#//Activity"

-        containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="exit" eType="#//Activity"

-        containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="doActivity" eType="#//Activity"

-        containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="stateInvariant" eType="#//Constraint"

-        containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

+  <eClassifiers xsi:type="ecore:EClass" name="ExpansionRegion" eSuperTypes="#//StructuredActivityNode">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mode" eType="#//ExpansionKind"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="outputElement" ordered="false"

+        upperBound="-1" eType="#//ExpansionNode" eOpposite="#//ExpansionNode/regionAsOutput"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="inputElement" ordered="false"

+        lowerBound="1" upperBound="-1" eType="#//ExpansionNode" eOpposite="#//ExpansionNode/regionAsInput"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Vertex" abstract="true" eSuperTypes="#//NamedElement">

+  <eClassifiers xsi:type="ecore:EEnum" name="ExpansionKind">

+    <eLiterals name="parallel"/>

+    <eLiterals name="iterative" value="1"/>

+    <eLiterals name="stream" value="2"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ExceptionHandler" eSuperTypes="#//Element">

     <eOperations name="getOwner" eType="#//Element">

       <eAnnotations source="feature">

         <details key="eOpposite.containment" value="false"/>

@@ -5644,125 +6029,24 @@
         <details key="eType" value="org.eclipse.uml2.Element"/>

         <details key="eOpposite.lowerBound" value="0"/>

       </eAnnotations>

-      <eAnnotations source="redefined" references="#//Vertex/container"/>

+      <eAnnotations source="union" references="#//ExceptionHandler/protectedNode"/>

     </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="container" eType="#//Region"

-        transient="true" eOpposite="#//Region/subvertex">

-      <eAnnotations source="redefines" references="#//Element/owner">

-        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="outgoing" ordered="false"

-        upperBound="-1" eType="#//Transition" eOpposite="#//Transition/source"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" ordered="false"

-        upperBound="-1" eType="#//Transition" eOpposite="#//Transition/target"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ConnectionPointReference" eSuperTypes="#//Vertex">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="entry" ordered="false"

-        upperBound="-1" eType="#//Pseudostate"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="exit" ordered="false" upperBound="-1"

-        eType="#//Pseudostate"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Transition" eSuperTypes="#//RedefinableElement">

-    <eOperations name="getRedefinitionContexts" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="redefinitionContext"/>

-        <details key="eType" value="org.eclipse.uml2.Classifier"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//RedefinableElement/redefinitionContext">

-        <details key="org.eclipse.uml2.RedefinableElement#getRedefinitionContexts"

-            value=""/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="getRedefinedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="redefinedElement"/>

-        <details key="eType" value="org.eclipse.uml2.RedefinableElement"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//Transition/redefinedTransition"/>

-    </eOperations>

-    <eOperations name="getOwner" eType="#//Element">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="owner"/>

-        <details key="eOpposite" value="ownedElement"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Transition/container"/>

-    </eOperations>

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Transition/guard #//Transition/effect"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//TransitionKind"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="container" lowerBound="1"

-        eType="#//Region" transient="true" eOpposite="#//Region/transition">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="protectedNode" lowerBound="1"

+        eType="#//ExecutableNode" transient="true" eOpposite="#//ExecutableNode/handler">

       <eAnnotations source="subsets">

         <details key="org.eclipse.uml2.Element#getOwner" value=""/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" lowerBound="1"

-        eType="#//Vertex" eOpposite="#//Vertex/outgoing"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"

-        eType="#//Vertex" eOpposite="#//Vertex/incoming"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedTransition" eType="#//Transition">

-      <eAnnotations source="redefines">

-        <details key="org.eclipse.uml2.RedefinableElement#getRedefinedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="trigger" ordered="false"

-        upperBound="-1" eType="#//Trigger"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="guard" eType="#//Constraint"

-        volatile="true" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="effect" eType="#//Activity"

-        containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="handlerBody" lowerBound="1"

+        eType="#//ExecutableNode"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="exceptionInput" lowerBound="1"

+        eType="#//ObjectNode"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="exceptionType" ordered="false"

+        lowerBound="1" upperBound="-1" eType="#//Classifier"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="TransitionKind">

-    <eLiterals name="internal"/>

-    <eLiterals name="local" value="1"/>

-    <eLiterals name="external" value="2"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="PseudostateKind">

-    <eLiterals name="initial"/>

-    <eLiterals name="deepHistory" value="1"/>

-    <eLiterals name="shallowHistory" value="2"/>

-    <eLiterals name="join" value="3"/>

-    <eLiterals name="fork" value="4"/>

-    <eLiterals name="junction" value="5"/>

-    <eLiterals name="choice" value="6"/>

-    <eLiterals name="entryPoint" value="7"/>

-    <eLiterals name="exitPoint" value="8"/>

-    <eLiterals name="terminate" value="9"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="FinalState" eSuperTypes="#//State"/>

   <eClassifiers xsi:type="ecore:EClass" name="InteractionOccurrence" eSuperTypes="#//InteractionFragment">

     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

-      <details key="documentation" value="A reference to an interaction with actual values. The interpretation is that the sequence diagram replaces the reference (with actual parameters substituted)"/>

+      <details key="documentation" value="InteractionOccurrence is a specialization of InteractionFragment. An InteractionOccurrence has a set of actual gates that must match the formal gates of the referenced Interaction. "/>

     </eAnnotations>

     <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

@@ -5954,507 +6238,6 @@
     <eLiterals name="assembly"/>

     <eLiterals name="delegation" value="1"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ProtocolConformance" eSuperTypes="#//DirectedRelationship">

-    <eOperations name="getSources" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="source"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ProtocolConformance/specificMachine"/>

-    </eOperations>

-    <eOperations name="getOwner" eType="#//Element">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="owner"/>

-        <details key="eOpposite" value="ownedElement"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ProtocolConformance/specificMachine"/>

-    </eOperations>

-    <eOperations name="getTargets" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="target"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ProtocolConformance/generalMachine"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="specificMachine" lowerBound="1"

-        eType="#//ProtocolStateMachine" transient="true" eOpposite="#//ProtocolStateMachine/conformance">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.DirectedRelationship#getSources" value=""/>

-        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="generalMachine" lowerBound="1"

-        eType="#//ProtocolStateMachine">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.DirectedRelationship#getTargets" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ProtocolStateMachine" eSuperTypes="#//StateMachine">

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ProtocolStateMachine/conformance"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="conformance" ordered="false"

-        upperBound="-1" eType="#//ProtocolConformance" containment="true" eOpposite="#//ProtocolConformance/specificMachine">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ProtocolTransition" eSuperTypes="#//Transition">

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ProtocolTransition/postCondition"/>

-    </eOperations>

-    <eOperations name="setGuard">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="guard"/>

-        <details key="eType" value="org.eclipse.uml2.Constraint"/>

-        <details key="containment" value="true"/>

-      </eAnnotations>

-      <eAnnotations source="superset" references="#//ProtocolTransition/preCondition"/>

-      <eParameters name="newGuard" eType="#//Constraint"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="postCondition" eType="#//Constraint"

-        containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="referred" ordered="false"

-        upperBound="-1" eType="#//Operation" changeable="false" volatile="true" transient="true"

-        derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="preCondition" eType="#//Constraint"

-        volatile="true" resolveProxies="false">

-      <eAnnotations source="subsets" references="#//Transition/guard">

-        <details key="org.eclipse.uml2.Transition#getGuard" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="TimeExpression" eSuperTypes="#//ValueSpecification">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstTime" eType="#//Boolean"

-        defaultValueLiteral="True"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="event" eType="#//NamedElement"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Duration" eSuperTypes="#//ValueSpecification">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstTime" eType="#//Boolean"

-        defaultValueLiteral="True"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="event" ordered="false"

-        upperBound="2" eType="#//NamedElement"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="TimeObservationAction" eSuperTypes="#//WriteStructuralFeatureAction">

-    <eOperations name="getValue" lowerBound="1" eType="#//InputPin">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="value"/>

-        <details key="eType" value="org.eclipse.uml2.InputPin"/>

-        <details key="containment" value="true"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//TimeObservationAction/now"/>

-    </eOperations>

-    <eOperations name="setValue" lowerBound="1">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="value"/>

-        <details key="eType" value="org.eclipse.uml2.InputPin"/>

-        <details key="containment" value="true"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//TimeObservationAction/now"/>

-      <eParameters name="newValue" eType="#//InputPin"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="now" upperBound="-1" eType="#//TimeExpression"

-        containment="true">

-      <eAnnotations source="redefines" references="#//WriteStructuralFeatureAction/value">

-        <details key="org.eclipse.uml2.WriteStructuralFeatureAction#getValue" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="DurationInterval" eSuperTypes="#//Interval">

-    <eOperations name="getMins" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="min"/>

-        <details key="eType" value="org.eclipse.uml2.Duration"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//Interval/min">

-        <details key="org.eclipse.uml2.Interval#getMins" value=""/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="getMaxes" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="max"/>

-        <details key="eType" value="org.eclipse.uml2.Duration"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//Interval/max">

-        <details key="org.eclipse.uml2.Interval#getMaxes" value=""/>

-      </eAnnotations>

-    </eOperations>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Interval" eSuperTypes="#//ValueSpecification">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="min" upperBound="-1" eType="#//ValueSpecification"

-        volatile="true">

-      <eAnnotations source="redefined">

-        <details key="lowerBound" value="1"/>

-        <details key="upperBound" value="1"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="max" upperBound="-1" eType="#//ValueSpecification"

-        volatile="true">

-      <eAnnotations source="redefined">

-        <details key="lowerBound" value="1"/>

-        <details key="upperBound" value="1"/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="TimeConstraint" eSuperTypes="#//IntervalConstraint">

-    <eOperations name="getSpecification" lowerBound="1" eType="#//ValueSpecification">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="specification"/>

-        <details key="eType" value="org.eclipse.uml2.TimeInterval"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//Constraint/specification #//IntervalConstraint/getSpecification">

-        <details key="org.eclipse.uml2.Constraint#getSpecification" value=""/>

-        <details key="org.eclipse.uml2.IntervalConstraint#getSpecification" value=""/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="setSpecification" lowerBound="1">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="specification"/>

-        <details key="eType" value="org.eclipse.uml2.TimeInterval"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//Constraint/specification #//IntervalConstraint/setSpecification">

-        <details key="org.eclipse.uml2.Constraint#getSpecification" value=""/>

-        <details key="org.eclipse.uml2.IntervalConstraint#getSpecification" value=""/>

-      </eAnnotations>

-      <eParameters name="newSpecification" eType="#//ValueSpecification"/>

-    </eOperations>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="IntervalConstraint" eSuperTypes="#//Constraint">

-    <eOperations name="getSpecification" lowerBound="1" eType="#//ValueSpecification">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="specification"/>

-        <details key="eType" value="org.eclipse.uml2.Interval"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//Constraint/specification">

-        <details key="org.eclipse.uml2.Constraint#getSpecification" value=""/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="setSpecification" lowerBound="1">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="specification"/>

-        <details key="eType" value="org.eclipse.uml2.Interval"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//Constraint/specification">

-        <details key="org.eclipse.uml2.Constraint#getSpecification" value=""/>

-      </eAnnotations>

-      <eParameters name="newSpecification" eType="#//ValueSpecification"/>

-    </eOperations>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="TimeInterval" eSuperTypes="#//Interval">

-    <eOperations name="getMaxes" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="max"/>

-        <details key="eType" value="org.eclipse.uml2.TimeExpression"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//Interval/max">

-        <details key="org.eclipse.uml2.Interval#getMaxes" value=""/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="getMins" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="min"/>

-        <details key="eType" value="org.eclipse.uml2.TimeExpression"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//Interval/min">

-        <details key="org.eclipse.uml2.Interval#getMins" value=""/>

-      </eAnnotations>

-    </eOperations>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="DurationObservationAction" eSuperTypes="#//WriteStructuralFeatureAction">

-    <eOperations name="getValue" lowerBound="1" eType="#//InputPin">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="value"/>

-        <details key="eType" value="org.eclipse.uml2.InputPin"/>

-        <details key="containment" value="true"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//DurationObservationAction/duration"/>

-    </eOperations>

-    <eOperations name="setValue" lowerBound="1">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="value"/>

-        <details key="eType" value="org.eclipse.uml2.InputPin"/>

-        <details key="containment" value="true"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//DurationObservationAction/duration"/>

-      <eParameters name="newValue" eType="#//InputPin"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="duration" upperBound="-1"

-        eType="#//Duration" containment="true">

-      <eAnnotations source="redefines" references="#//WriteStructuralFeatureAction/value">

-        <details key="org.eclipse.uml2.WriteStructuralFeatureAction#getValue" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="DurationConstraint" eSuperTypes="#//IntervalConstraint">

-    <eOperations name="getSpecification" lowerBound="1" eType="#//ValueSpecification">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="specification"/>

-        <details key="eType" value="org.eclipse.uml2.DurationInterval"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//Constraint/specification #//IntervalConstraint/getSpecification">

-        <details key="org.eclipse.uml2.Constraint#getSpecification" value=""/>

-        <details key="org.eclipse.uml2.IntervalConstraint#getSpecification" value=""/>

-      </eAnnotations>

-    </eOperations>

-    <eOperations name="setSpecification" lowerBound="1">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="specification"/>

-        <details key="eType" value="org.eclipse.uml2.DurationInterval"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="redefines" references="#//Constraint/specification #//IntervalConstraint/setSpecification">

-        <details key="org.eclipse.uml2.Constraint#getSpecification" value=""/>

-        <details key="org.eclipse.uml2.IntervalConstraint#getSpecification" value=""/>

-      </eAnnotations>

-      <eParameters name="newSpecification" eType="#//ValueSpecification"/>

-    </eOperations>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="DataStoreNode" eSuperTypes="#//CentralBufferNode"/>

-  <eClassifiers xsi:type="ecore:EEnum" name="ParameterEffectKind">

-    <eLiterals name="create"/>

-    <eLiterals name="read" value="1"/>

-    <eLiterals name="update" value="2"/>

-    <eLiterals name="delete" value="3"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="InterruptibleActivityRegion" eSuperTypes="#//ActivityGroup">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="interruptingEdge" ordered="false"

-        upperBound="-1" eType="#//ActivityEdge" eOpposite="#//ActivityEdge/interrupts"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="containedNode" upperBound="-1"

-        eType="#//ActivityNode" eOpposite="#//ActivityNode/inInterruptibleRegion">

-      <eAnnotations source="redefines" references="#//ActivityGroup/getContainedNodes">

-        <details key="org.eclipse.uml2.ActivityGroup#getContainedNodes" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EEnum" name="ObjectNodeOrderingKind">

-    <eLiterals name="unordered"/>

-    <eLiterals name="ordered" value="1"/>

-    <eLiterals name="LIFO" value="2"/>

-    <eLiterals name="FIFO" value="3"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="ParameterSet" eSuperTypes="#//NamedElement">

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//ParameterSet/condition"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" ordered="false"

-        lowerBound="1" upperBound="-1" eType="#//Parameter" eOpposite="#//Parameter/parameterSet"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="condition" ordered="false"

-        upperBound="-1" eType="#//Constraint" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Deployment" eSuperTypes="#//Dependency">

-    <eOperations name="getSuppliers" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="supplier"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="superset" references="#//Deployment/deployedArtifact"/>

-    </eOperations>

-    <eOperations name="getTargets" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="target"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Deployment/deployedArtifact"/>

-    </eOperations>

-    <eOperations name="getSources" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="true"/>

-        <details key="name" value="source"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="containment" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Deployment/location"/>

-    </eOperations>

-    <eOperations name="getClients" ordered="false" lowerBound="1" upperBound="-1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="client"/>

-        <details key="eOpposite" value="clientDependency"/>

-        <details key="derived" value="false"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="superset" references="#//Deployment/location"/>

-    </eOperations>

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//Deployment/configuration"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="deployedArtifact" ordered="false"

-        upperBound="-1" eType="#//DeployedArtifact" volatile="true">

-      <eAnnotations source="subsets" references="#//Dependency/supplier">

-        <details key="org.eclipse.uml2.Dependency#getSuppliers" value=""/>

-        <details key="org.eclipse.uml2.DirectedRelationship#getTargets" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="location" lowerBound="1"

-        eType="#//DeploymentTarget" volatile="true" transient="true" eOpposite="#//DeploymentTarget/deployment">

-      <eAnnotations source="subsets" references="#//Dependency/client">

-        <details key="org.eclipse.uml2.DirectedRelationship#getSources" value=""/>

-        <details key="org.eclipse.uml2.Dependency#getClients" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" ordered="false"

-        upperBound="-1" eType="#//DeploymentSpecification" containment="true">

-      <eAnnotations source="subsets">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="DeployedArtifact" abstract="true" eSuperTypes="#//NamedElement"/>

-  <eClassifiers xsi:type="ecore:EClass" name="DeploymentTarget" abstract="true" eSuperTypes="#//NamedElement">

-    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="ownedElement"/>

-        <details key="eOpposite" value="owner"/>

-        <details key="derived" value="true"/>

-        <details key="eOpposite.upperBound" value="1"/>

-        <details key="eType" value="org.eclipse.uml2.Element"/>

-        <details key="eOpposite.lowerBound" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="union" references="#//DeploymentTarget/deployment"/>

-    </eOperations>

-    <eOperations name="getClientDependencies" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="eOpposite.containment" value="false"/>

-        <details key="containment" value="false"/>

-        <details key="name" value="clientDependency"/>

-        <details key="eOpposite" value="client"/>

-        <details key="derived" value="false"/>

-        <details key="eOpposite.upperBound" value="-1"/>

-        <details key="eType" value="org.eclipse.uml2.Dependency"/>

-        <details key="eOpposite.lowerBound" value="1"/>

-      </eAnnotations>

-      <eAnnotations source="superset" references="#//DeploymentTarget/deployment"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="deployment" ordered="false"

-        upperBound="-1" eType="#//Deployment" volatile="true" containment="true" eOpposite="#//Deployment/location">

-      <eAnnotations source="subsets" references="#//NamedElement/clientDependency">

-        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

-        <details key="org.eclipse.uml2.NamedElement#getClientDependencies" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="deployedElement" ordered="false"

-        upperBound="-1" eType="#//PackageableElement" changeable="false" volatile="true"

-        transient="true" derived="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//Class #//DeploymentTarget">

-    <eOperations name="getNestedClassifiers" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

-      <eAnnotations source="feature">

-        <details key="derived" value="false"/>

-        <details key="name" value="nestedClassifier"/>

-        <details key="eType" value="org.eclipse.uml2.Classifier"/>

-        <details key="containment" value="true"/>

-      </eAnnotations>

-      <eAnnotations source="redefined" references="#//Node/nestedNode"/>

-    </eOperations>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="nestedNode" ordered="false"

-        upperBound="-1" eType="#//Node" containment="true">

-      <eAnnotations source="redefines" references="#//Class/nestedClassifier">

-        <details key="org.eclipse.uml2.Class#getNestedClassifiers" value=""/>

-      </eAnnotations>

-    </eStructuralFeatures>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Device" eSuperTypes="#//Node"/>

-  <eClassifiers xsi:type="ecore:EClass" name="ExecutionEnvironment" eSuperTypes="#//Node"/>

-  <eClassifiers xsi:type="ecore:EClass" name="CommunicationPath" eSuperTypes="#//Association"/>

   <eClassifiers xsi:type="ecore:EClass" name="ReadExtentAction" eSuperTypes="#//Action">

     <eOperations name="getOutputs" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

       <eAnnotations source="feature">

@@ -6746,6 +6529,540 @@
       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="DataStoreNode" eSuperTypes="#//CentralBufferNode"/>

+  <eClassifiers xsi:type="ecore:EEnum" name="ParameterEffectKind">

+    <eLiterals name="create"/>

+    <eLiterals name="read" value="1"/>

+    <eLiterals name="update" value="2"/>

+    <eLiterals name="delete" value="3"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="InterruptibleActivityRegion" eSuperTypes="#//ActivityGroup">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="interruptingEdge" ordered="false"

+        upperBound="-1" eType="#//ActivityEdge" eOpposite="#//ActivityEdge/interrupts"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="containedNode" upperBound="-1"

+        eType="#//ActivityNode" eOpposite="#//ActivityNode/inInterruptibleRegion">

+      <eAnnotations source="redefines" references="#//ActivityGroup/getContainedNodes">

+        <details key="org.eclipse.uml2.ActivityGroup#getContainedNodes" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="ObjectNodeOrderingKind">

+    <eLiterals name="unordered"/>

+    <eLiterals name="ordered" value="1"/>

+    <eLiterals name="LIFO" value="2"/>

+    <eLiterals name="FIFO" value="3"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ParameterSet" eSuperTypes="#//NamedElement">

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//ParameterSet/condition"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" ordered="false"

+        lowerBound="1" upperBound="-1" eType="#//Parameter" eOpposite="#//Parameter/parameterSet"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="condition" ordered="false"

+        upperBound="-1" eType="#//Constraint" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="TimeExpression" eSuperTypes="#//ValueSpecification">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A TimeExpression defines a value specification that represent a time value. "/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstTime" eType="#//Boolean"

+        defaultValueLiteral="True"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="event" eType="#//NamedElement"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Duration" eSuperTypes="#//ValueSpecification">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A duration defines a value specification that specifies the temporal distance between two time expressions that specify time instants. "/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstTime" eType="#//Boolean"

+        defaultValueLiteral="True"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="event" ordered="false"

+        upperBound="2" eType="#//NamedElement"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="TimeObservationAction" eSuperTypes="#//WriteStructuralFeatureAction">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A TimeObservationAction defines an action that observes the current point in time. "/>

+    </eAnnotations>

+    <eOperations name="getValue" lowerBound="1" eType="#//InputPin">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="value"/>

+        <details key="eType" value="org.eclipse.uml2.InputPin"/>

+        <details key="containment" value="true"/>

+      </eAnnotations>

+      <eAnnotations source="redefined" references="#//TimeObservationAction/now"/>

+    </eOperations>

+    <eOperations name="setValue" lowerBound="1">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="value"/>

+        <details key="eType" value="org.eclipse.uml2.InputPin"/>

+        <details key="containment" value="true"/>

+      </eAnnotations>

+      <eAnnotations source="redefined" references="#//TimeObservationAction/now"/>

+      <eParameters name="newValue" eType="#//InputPin"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="now" upperBound="-1" eType="#//TimeExpression"

+        containment="true">

+      <eAnnotations source="redefines" references="#//WriteStructuralFeatureAction/value">

+        <details key="org.eclipse.uml2.WriteStructuralFeatureAction#getValue" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="DurationInterval" eSuperTypes="#//Interval">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A DurationInterval defines the range between two Durations. "/>

+    </eAnnotations>

+    <eOperations name="getMins" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="min"/>

+        <details key="eType" value="org.eclipse.uml2.Duration"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//Interval/min">

+        <details key="org.eclipse.uml2.Interval#getMins" value=""/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="getMaxes" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="max"/>

+        <details key="eType" value="org.eclipse.uml2.Duration"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//Interval/max">

+        <details key="org.eclipse.uml2.Interval#getMaxes" value=""/>

+      </eAnnotations>

+    </eOperations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Interval" eSuperTypes="#//ValueSpecification">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="An Interval defines the range between two value specifications. "/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="min" upperBound="-1" eType="#//ValueSpecification"

+        volatile="true">

+      <eAnnotations source="redefined">

+        <details key="lowerBound" value="1"/>

+        <details key="upperBound" value="1"/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="max" upperBound="-1" eType="#//ValueSpecification"

+        volatile="true">

+      <eAnnotations source="redefined">

+        <details key="lowerBound" value="1"/>

+        <details key="upperBound" value="1"/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="TimeConstraint" eSuperTypes="#//IntervalConstraint">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A TimeConstraint defines a Constraint that refers to a TimeInterval. "/>

+    </eAnnotations>

+    <eOperations name="getSpecification" lowerBound="1" eType="#//ValueSpecification">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="specification"/>

+        <details key="eType" value="org.eclipse.uml2.TimeInterval"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//Constraint/specification #//IntervalConstraint/getSpecification">

+        <details key="org.eclipse.uml2.Constraint#getSpecification" value=""/>

+        <details key="org.eclipse.uml2.IntervalConstraint#getSpecification" value=""/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="setSpecification" lowerBound="1">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="specification"/>

+        <details key="eType" value="org.eclipse.uml2.TimeInterval"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//Constraint/specification #//IntervalConstraint/setSpecification">

+        <details key="org.eclipse.uml2.Constraint#getSpecification" value=""/>

+        <details key="org.eclipse.uml2.IntervalConstraint#getSpecification" value=""/>

+      </eAnnotations>

+      <eParameters name="newSpecification" eType="#//ValueSpecification"/>

+    </eOperations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="IntervalConstraint" eSuperTypes="#//Constraint">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A IntervalConstraint defines a Constraint that refers to an Interval. "/>

+    </eAnnotations>

+    <eOperations name="getSpecification" lowerBound="1" eType="#//ValueSpecification">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="specification"/>

+        <details key="eType" value="org.eclipse.uml2.Interval"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//Constraint/specification">

+        <details key="org.eclipse.uml2.Constraint#getSpecification" value=""/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="setSpecification" lowerBound="1">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="specification"/>

+        <details key="eType" value="org.eclipse.uml2.Interval"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//Constraint/specification">

+        <details key="org.eclipse.uml2.Constraint#getSpecification" value=""/>

+      </eAnnotations>

+      <eParameters name="newSpecification" eType="#//ValueSpecification"/>

+    </eOperations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="TimeInterval" eSuperTypes="#//Interval">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A TimeInterval defines the range between two TimeExpressions. "/>

+    </eAnnotations>

+    <eOperations name="getMaxes" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="max"/>

+        <details key="eType" value="org.eclipse.uml2.TimeExpression"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//Interval/max">

+        <details key="org.eclipse.uml2.Interval#getMaxes" value=""/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="getMins" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="min"/>

+        <details key="eType" value="org.eclipse.uml2.TimeExpression"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//Interval/min">

+        <details key="org.eclipse.uml2.Interval#getMins" value=""/>

+      </eAnnotations>

+    </eOperations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="DurationObservationAction" eSuperTypes="#//WriteStructuralFeatureAction">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A DurationObservationAction defines an action that observes duration in time. "/>

+    </eAnnotations>

+    <eOperations name="getValue" lowerBound="1" eType="#//InputPin">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="value"/>

+        <details key="eType" value="org.eclipse.uml2.InputPin"/>

+        <details key="containment" value="true"/>

+      </eAnnotations>

+      <eAnnotations source="redefined" references="#//DurationObservationAction/duration"/>

+    </eOperations>

+    <eOperations name="setValue" lowerBound="1">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="value"/>

+        <details key="eType" value="org.eclipse.uml2.InputPin"/>

+        <details key="containment" value="true"/>

+      </eAnnotations>

+      <eAnnotations source="redefined" references="#//DurationObservationAction/duration"/>

+      <eParameters name="newValue" eType="#//InputPin"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="duration" upperBound="-1"

+        eType="#//Duration" containment="true">

+      <eAnnotations source="redefines" references="#//WriteStructuralFeatureAction/value">

+        <details key="org.eclipse.uml2.WriteStructuralFeatureAction#getValue" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="DurationConstraint" eSuperTypes="#//IntervalConstraint">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A DurationConstraint defines a Constraint that refers to a DurationInterval. "/>

+    </eAnnotations>

+    <eOperations name="getSpecification" lowerBound="1" eType="#//ValueSpecification">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="specification"/>

+        <details key="eType" value="org.eclipse.uml2.DurationInterval"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//Constraint/specification #//IntervalConstraint/getSpecification">

+        <details key="org.eclipse.uml2.Constraint#getSpecification" value=""/>

+        <details key="org.eclipse.uml2.IntervalConstraint#getSpecification" value=""/>

+      </eAnnotations>

+    </eOperations>

+    <eOperations name="setSpecification" lowerBound="1">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="specification"/>

+        <details key="eType" value="org.eclipse.uml2.DurationInterval"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="redefines" references="#//Constraint/specification #//IntervalConstraint/setSpecification">

+        <details key="org.eclipse.uml2.Constraint#getSpecification" value=""/>

+        <details key="org.eclipse.uml2.IntervalConstraint#getSpecification" value=""/>

+      </eAnnotations>

+      <eParameters name="newSpecification" eType="#//ValueSpecification"/>

+    </eOperations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Deployment" eSuperTypes="#//Dependency">

+    <eOperations name="getSuppliers" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="supplier"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="superset" references="#//Deployment/deployedArtifact"/>

+    </eOperations>

+    <eOperations name="getTargets" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="target"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Deployment/deployedArtifact"/>

+    </eOperations>

+    <eOperations name="getSources" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="source"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Deployment/location"/>

+    </eOperations>

+    <eOperations name="getClients" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="client"/>

+        <details key="eOpposite" value="clientDependency"/>

+        <details key="derived" value="false"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="eType" value="org.eclipse.uml2.NamedElement"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="superset" references="#//Deployment/location"/>

+    </eOperations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//Deployment/configuration"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="deployedArtifact" ordered="false"

+        upperBound="-1" eType="#//DeployedArtifact" volatile="true">

+      <eAnnotations source="subsets" references="#//Dependency/supplier">

+        <details key="org.eclipse.uml2.Dependency#getSuppliers" value=""/>

+        <details key="org.eclipse.uml2.DirectedRelationship#getTargets" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="location" lowerBound="1"

+        eType="#//DeploymentTarget" volatile="true" transient="true" eOpposite="#//DeploymentTarget/deployment">

+      <eAnnotations source="subsets" references="#//Dependency/client">

+        <details key="org.eclipse.uml2.DirectedRelationship#getSources" value=""/>

+        <details key="org.eclipse.uml2.Dependency#getClients" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" ordered="false"

+        upperBound="-1" eType="#//DeploymentSpecification" containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="DeployedArtifact" abstract="true" eSuperTypes="#//NamedElement"/>

+  <eClassifiers xsi:type="ecore:EClass" name="DeploymentTarget" abstract="true" eSuperTypes="#//NamedElement">

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//DeploymentTarget/deployment"/>

+    </eOperations>

+    <eOperations name="getClientDependencies" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="clientDependency"/>

+        <details key="eOpposite" value="client"/>

+        <details key="derived" value="false"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="eType" value="org.eclipse.uml2.Dependency"/>

+        <details key="eOpposite.lowerBound" value="1"/>

+      </eAnnotations>

+      <eAnnotations source="superset" references="#//DeploymentTarget/deployment"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="deployment" ordered="false"

+        upperBound="-1" eType="#//Deployment" volatile="true" containment="true" eOpposite="#//Deployment/location">

+      <eAnnotations source="subsets" references="#//NamedElement/clientDependency">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+        <details key="org.eclipse.uml2.NamedElement#getClientDependencies" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="deployedElement" ordered="false"

+        upperBound="-1" eType="#//PackageableElement" changeable="false" volatile="true"

+        transient="true" derived="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//Class #//DeploymentTarget">

+    <eOperations name="getNestedClassifiers" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="nestedClassifier"/>

+        <details key="eType" value="org.eclipse.uml2.Classifier"/>

+        <details key="containment" value="true"/>

+      </eAnnotations>

+      <eAnnotations source="redefined" references="#//Node/nestedNode"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="nestedNode" ordered="false"

+        upperBound="-1" eType="#//Node" containment="true">

+      <eAnnotations source="redefines" references="#//Class/nestedClassifier">

+        <details key="org.eclipse.uml2.Class#getNestedClassifiers" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Device" eSuperTypes="#//Node"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ExecutionEnvironment" eSuperTypes="#//Node"/>

+  <eClassifiers xsi:type="ecore:EClass" name="CommunicationPath" eSuperTypes="#//Association"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ProtocolConformance" eSuperTypes="#//DirectedRelationship">

+    <eOperations name="getSources" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="source"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//ProtocolConformance/specificMachine"/>

+    </eOperations>

+    <eOperations name="getOwner" eType="#//Element">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="owner"/>

+        <details key="eOpposite" value="ownedElement"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="-1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//ProtocolConformance/specificMachine"/>

+    </eOperations>

+    <eOperations name="getTargets" ordered="false" lowerBound="1" upperBound="-1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="derived" value="true"/>

+        <details key="name" value="target"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="containment" value="false"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//ProtocolConformance/generalMachine"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="specificMachine" lowerBound="1"

+        eType="#//ProtocolStateMachine" transient="true" eOpposite="#//ProtocolStateMachine/conformance">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.DirectedRelationship#getSources" value=""/>

+        <details key="org.eclipse.uml2.Element#getOwner" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="generalMachine" lowerBound="1"

+        eType="#//ProtocolStateMachine">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.DirectedRelationship#getTargets" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ProtocolStateMachine" eSuperTypes="#//StateMachine">

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//ProtocolStateMachine/conformance"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="conformance" ordered="false"

+        upperBound="-1" eType="#//ProtocolConformance" containment="true" eOpposite="#//ProtocolConformance/specificMachine">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ProtocolTransition" eSuperTypes="#//Transition">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A protocol transition (transition as specialized in the ProtocolStateMachines package) specifies a legal transition for an operation. Transitions of protocol state machines have the following information: a pre condition (guard), on trigger, and a post condition. Every protocol transition is associated to zero or one operation (referred BehavioralFeature) that belongs to the context classifier of the protocol state machine. The protocol transition specifies that the associated (referred) operation can be called for an instance in the origin state under the initial condition (guard), and that at the end of the transition, the destination state will be reached under the final condition (post). "/>

+    </eAnnotations>

+    <eOperations name="getOwnedElements" ordered="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList">

+      <eAnnotations source="feature">

+        <details key="eOpposite.containment" value="false"/>

+        <details key="containment" value="false"/>

+        <details key="name" value="ownedElement"/>

+        <details key="eOpposite" value="owner"/>

+        <details key="derived" value="true"/>

+        <details key="eOpposite.upperBound" value="1"/>

+        <details key="eType" value="org.eclipse.uml2.Element"/>

+        <details key="eOpposite.lowerBound" value="0"/>

+      </eAnnotations>

+      <eAnnotations source="union" references="#//ProtocolTransition/postCondition"/>

+    </eOperations>

+    <eOperations name="setGuard">

+      <eAnnotations source="feature">

+        <details key="derived" value="false"/>

+        <details key="name" value="guard"/>

+        <details key="eType" value="org.eclipse.uml2.Constraint"/>

+        <details key="containment" value="true"/>

+      </eAnnotations>

+      <eAnnotations source="superset" references="#//ProtocolTransition/preCondition"/>

+      <eParameters name="newGuard" eType="#//Constraint"/>

+    </eOperations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="postCondition" eType="#//Constraint"

+        containment="true">

+      <eAnnotations source="subsets">

+        <details key="org.eclipse.uml2.Element#getOwnedElements" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="referred" ordered="false"

+        upperBound="-1" eType="#//Operation" changeable="false" volatile="true" transient="true"

+        derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="preCondition" eType="#//Constraint"

+        volatile="true" resolveProxies="false">

+      <eAnnotations source="subsets" references="#//Transition/guard">

+        <details key="org.eclipse.uml2.Transition#getGuard" value=""/>

+      </eAnnotations>

+    </eStructuralFeatures>

+  </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="DeploymentSpecification" eSuperTypes="#//Artifact">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="deploymentLocation" eType="#//String"

         defaultValueLiteral=""/>

diff --git a/deprecated/plugins/org.eclipse.uml2/model/UML2.genmodel b/deprecated/plugins/org.eclipse.uml2/model/UML2.genmodel
index 816a82e..82e66cd 100644
--- a/deprecated/plugins/org.eclipse.uml2/model/UML2.genmodel
+++ b/deprecated/plugins/org.eclipse.uml2/model/UML2.genmodel
@@ -28,6 +28,11 @@
       <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//AggregationKind/shared"/>

       <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//AggregationKind/composite"/>

     </genEnums>

+    <genEnums ecoreEnum="UML2.ecore#//CallConcurrencyKind">

+      <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//CallConcurrencyKind/sequential"/>

+      <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//CallConcurrencyKind/guarded"/>

+      <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//CallConcurrencyKind/concurrent"/>

+    </genEnums>

     <genEnums ecoreEnum="UML2.ecore#//MessageKind">

       <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//MessageKind/complete"/>

       <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//MessageKind/lost"/>

@@ -40,16 +45,6 @@
       <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//MessageSort/asynchCall"/>

       <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//MessageSort/asynchSignal"/>

     </genEnums>

-    <genEnums ecoreEnum="UML2.ecore#//CallConcurrencyKind">

-      <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//CallConcurrencyKind/sequential"/>

-      <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//CallConcurrencyKind/guarded"/>

-      <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//CallConcurrencyKind/concurrent"/>

-    </genEnums>

-    <genEnums ecoreEnum="UML2.ecore#//ExpansionKind">

-      <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//ExpansionKind/parallel"/>

-      <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//ExpansionKind/iterative"/>

-      <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//ExpansionKind/stream"/>

-    </genEnums>

     <genEnums ecoreEnum="UML2.ecore#//TransitionKind">

       <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//TransitionKind/internal"/>

       <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//TransitionKind/local"/>

@@ -67,6 +62,11 @@
       <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//PseudostateKind/exitPoint"/>

       <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//PseudostateKind/terminate"/>

     </genEnums>

+    <genEnums ecoreEnum="UML2.ecore#//ExpansionKind">

+      <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//ExpansionKind/parallel"/>

+      <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//ExpansionKind/iterative"/>

+      <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//ExpansionKind/stream"/>

+    </genEnums>

     <genEnums ecoreEnum="UML2.ecore#//InteractionOperator">

       <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//InteractionOperator/seq"/>

       <genEnumLiterals ecoreEnumLiteral="UML2.ecore#//InteractionOperator/alt"/>

@@ -158,39 +158,6 @@
       <genOperations ecoreOperation="UML2.ecore#//MultiplicityElement/upper"/>

       <genOperations ecoreOperation="UML2.ecore#//MultiplicityElement/getOwnedElements"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//DirectedRelationship">

-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//DirectedRelationship/source"/>

-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//DirectedRelationship/target"/>

-      <genOperations ecoreOperation="UML2.ecore#//DirectedRelationship/getRelatedElements"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Relationship">

-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Relationship/relatedElement"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//OpaqueExpression">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//OpaqueExpression/body"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//OpaqueExpression/language"/>

-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//OpaqueExpression/result"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//OpaqueExpression/behavior"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//ValueSpecification">

-      <genOperations ecoreOperation="UML2.ecore#//ValueSpecification/isComputable"/>

-      <genOperations ecoreOperation="UML2.ecore#//ValueSpecification/integerValue"/>

-      <genOperations ecoreOperation="UML2.ecore#//ValueSpecification/booleanValue"/>

-      <genOperations ecoreOperation="UML2.ecore#//ValueSpecification/stringValue"/>

-      <genOperations ecoreOperation="UML2.ecore#//ValueSpecification/unlimitedValue"/>

-      <genOperations ecoreOperation="UML2.ecore#//ValueSpecification/isNull"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Expression">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Expression/symbol"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Expression/operand"/>

-      <genOperations ecoreOperation="UML2.ecore#//Expression/getOwnedElements"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Comment">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Comment/body"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Comment/annotatedElement"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Comment/bodyExpression"/>

-      <genOperations ecoreOperation="UML2.ecore#//Comment/getOwnedElements"/>

-    </genClasses>

     <genClasses ecoreClass="UML2.ecore#//NamedElement">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//NamedElement/name"/>

       <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//NamedElement/qualifiedName.1"/>

@@ -248,6 +215,39 @@
       <genOperations ecoreOperation="UML2.ecore#//Namespace/getOwnedMembers"/>

       <genOperations ecoreOperation="UML2.ecore#//Namespace/getOwnedElements"/>

     </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//DirectedRelationship">

+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//DirectedRelationship/source"/>

+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//DirectedRelationship/target"/>

+      <genOperations ecoreOperation="UML2.ecore#//DirectedRelationship/getRelatedElements"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Relationship">

+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Relationship/relatedElement"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//OpaqueExpression">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//OpaqueExpression/body"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//OpaqueExpression/language"/>

+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//OpaqueExpression/result"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//OpaqueExpression/behavior"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//ValueSpecification">

+      <genOperations ecoreOperation="UML2.ecore#//ValueSpecification/isComputable"/>

+      <genOperations ecoreOperation="UML2.ecore#//ValueSpecification/integerValue"/>

+      <genOperations ecoreOperation="UML2.ecore#//ValueSpecification/booleanValue"/>

+      <genOperations ecoreOperation="UML2.ecore#//ValueSpecification/stringValue"/>

+      <genOperations ecoreOperation="UML2.ecore#//ValueSpecification/unlimitedValue"/>

+      <genOperations ecoreOperation="UML2.ecore#//ValueSpecification/isNull"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Expression">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Expression/symbol"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Expression/operand"/>

+      <genOperations ecoreOperation="UML2.ecore#//Expression/getOwnedElements"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Comment">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Comment/body"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Comment/annotatedElement"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Comment/bodyExpression"/>

+      <genOperations ecoreOperation="UML2.ecore#//Comment/getOwnedElements"/>

+    </genClasses>

     <genClasses ecoreClass="UML2.ecore#//Class">

       <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Class/ownedOperation"/>

       <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Class/superClass"/>

@@ -568,15 +568,6 @@
       </genOperations>

       <genOperations ecoreOperation="UML2.ecore#//RedefinableElement/getRedefinedElements"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Generalization">

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Generalization/specific"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Generalization/general"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Generalization/isSubstitutable"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Generalization/generalizationSet"/>

-      <genOperations ecoreOperation="UML2.ecore#//Generalization/getSources"/>

-      <genOperations ecoreOperation="UML2.ecore#//Generalization/getOwner"/>

-      <genOperations ecoreOperation="UML2.ecore#//Generalization/getTargets"/>

-    </genClasses>

     <genClasses ecoreClass="UML2.ecore#//InstanceSpecification">

       <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//InstanceSpecification/slot"/>

       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//InstanceSpecification/classifier"/>

@@ -601,6 +592,15 @@
     <genClasses ecoreClass="UML2.ecore#//InstanceValue">

       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//InstanceValue/instance"/>

     </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Generalization">

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Generalization/specific"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Generalization/general"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Generalization/isSubstitutable"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Generalization/generalizationSet"/>

+      <genOperations ecoreOperation="UML2.ecore#//Generalization/getSources"/>

+      <genOperations ecoreOperation="UML2.ecore#//Generalization/getOwner"/>

+      <genOperations ecoreOperation="UML2.ecore#//Generalization/getTargets"/>

+    </genClasses>

     <genClasses ecoreClass="UML2.ecore#//PackageableElement">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//PackageableElement/packageableElement_visibility"/>

       <genOperations ecoreOperation="UML2.ecore#//PackageableElement/getVisibility"/>

@@ -788,6 +788,69 @@
       <genOperations ecoreOperation="UML2.ecore#//StructuredClassifier/getMembers"/>

       <genOperations ecoreOperation="UML2.ecore#//StructuredClassifier/getFeatures"/>

     </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Interface">

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Interface/ownedAttribute"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Interface/ownedOperation"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Interface/redefinedInterface"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Interface/nestedClassifier"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Interface/ownedReception"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Interface/protocol"/>

+      <genOperations ecoreOperation="UML2.ecore#//Interface/getAttributes"/>

+      <genOperations ecoreOperation="UML2.ecore#//Interface/getOwnedMembers"/>

+      <genOperations ecoreOperation="UML2.ecore#//Interface/getFeatures"/>

+      <genOperations ecoreOperation="UML2.ecore#//Interface/getRedefinedElements"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Implementation">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Implementation/contract"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Implementation/implementingClassifier"/>

+      <genOperations ecoreOperation="UML2.ecore#//Implementation/getSuppliers"/>

+      <genOperations ecoreOperation="UML2.ecore#//Implementation/getTargets"/>

+      <genOperations ecoreOperation="UML2.ecore#//Implementation/getClients"/>

+      <genOperations ecoreOperation="UML2.ecore#//Implementation/getSources"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Artifact">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Artifact/fileName"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Artifact/nestedArtifact"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Artifact/manifestation"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Artifact/ownedOperation"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Artifact/ownedAttribute"/>

+      <genOperations ecoreOperation="UML2.ecore#//Artifact/getOwnedElements"/>

+      <genOperations ecoreOperation="UML2.ecore#//Artifact/getClientDependencies"/>

+      <genOperations ecoreOperation="UML2.ecore#//Artifact/getFeatures"/>

+      <genOperations ecoreOperation="UML2.ecore#//Artifact/getOwnedMembers"/>

+      <genOperations ecoreOperation="UML2.ecore#//Artifact/getAttributes"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Manifestation">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Manifestation/utilizedElement"/>

+      <genOperations ecoreOperation="UML2.ecore#//Manifestation/getSuppliers"/>

+      <genOperations ecoreOperation="UML2.ecore#//Manifestation/getTargets"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Actor"/>

+    <genClasses ecoreClass="UML2.ecore#//Extend">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Extend/extendedCase"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Extend/extension"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Extend/condition"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Extend/extensionLocation"/>

+      <genOperations ecoreOperation="UML2.ecore#//Extend/getTargets"/>

+      <genOperations ecoreOperation="UML2.ecore#//Extend/getSources"/>

+      <genOperations ecoreOperation="UML2.ecore#//Extend/getOwnedElements"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//UseCase">

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//UseCase/include"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//UseCase/extend"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//UseCase/extensionPoint"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//UseCase/subject"/>

+      <genOperations ecoreOperation="UML2.ecore#//UseCase/getOwnedMembers"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//ExtensionPoint">

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExtensionPoint/useCase"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Include">

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Include/includingCase"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Include/addition"/>

+      <genOperations ecoreOperation="UML2.ecore#//Include/getSources"/>

+      <genOperations ecoreOperation="UML2.ecore#//Include/getTargets"/>

+    </genClasses>

     <genClasses ecoreClass="UML2.ecore#//ActivityEdge">

       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ActivityEdge/activity"/>

       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ActivityEdge/source"/>

@@ -870,68 +933,105 @@
     <genClasses ecoreClass="UML2.ecore#//ValuePin">

       <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ValuePin/value"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Artifact">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Artifact/fileName"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Artifact/nestedArtifact"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Artifact/manifestation"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Artifact/ownedOperation"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Artifact/ownedAttribute"/>

-      <genOperations ecoreOperation="UML2.ecore#//Artifact/getOwnedElements"/>

-      <genOperations ecoreOperation="UML2.ecore#//Artifact/getClientDependencies"/>

-      <genOperations ecoreOperation="UML2.ecore#//Artifact/getFeatures"/>

-      <genOperations ecoreOperation="UML2.ecore#//Artifact/getOwnedMembers"/>

-      <genOperations ecoreOperation="UML2.ecore#//Artifact/getAttributes"/>

+    <genClasses ecoreClass="UML2.ecore#//CallTrigger">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//CallTrigger/operation"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Manifestation">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Manifestation/utilizedElement"/>

-      <genOperations ecoreOperation="UML2.ecore#//Manifestation/getSuppliers"/>

-      <genOperations ecoreOperation="UML2.ecore#//Manifestation/getTargets"/>

+    <genClasses ecoreClass="UML2.ecore#//MessageTrigger"/>

+    <genClasses ecoreClass="UML2.ecore#//ChangeTrigger">

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ChangeTrigger/changeExpression"/>

+      <genOperations ecoreOperation="UML2.ecore#//ChangeTrigger/getOwnedElements"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Interface">

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Interface/ownedAttribute"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Interface/ownedOperation"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Interface/redefinedInterface"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Interface/nestedClassifier"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Interface/ownedReception"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Interface/protocol"/>

-      <genOperations ecoreOperation="UML2.ecore#//Interface/getAttributes"/>

-      <genOperations ecoreOperation="UML2.ecore#//Interface/getOwnedMembers"/>

-      <genOperations ecoreOperation="UML2.ecore#//Interface/getFeatures"/>

-      <genOperations ecoreOperation="UML2.ecore#//Interface/getRedefinedElements"/>

+    <genClasses ecoreClass="UML2.ecore#//Trigger">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Trigger/port"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Implementation">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Implementation/contract"/>

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Implementation/implementingClassifier"/>

-      <genOperations ecoreOperation="UML2.ecore#//Implementation/getSuppliers"/>

-      <genOperations ecoreOperation="UML2.ecore#//Implementation/getTargets"/>

-      <genOperations ecoreOperation="UML2.ecore#//Implementation/getClients"/>

-      <genOperations ecoreOperation="UML2.ecore#//Implementation/getSources"/>

+    <genClasses ecoreClass="UML2.ecore#//Reception">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Reception/signal"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Actor"/>

-    <genClasses ecoreClass="UML2.ecore#//Extend">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Extend/extendedCase"/>

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Extend/extension"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Extend/condition"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Extend/extensionLocation"/>

-      <genOperations ecoreOperation="UML2.ecore#//Extend/getTargets"/>

-      <genOperations ecoreOperation="UML2.ecore#//Extend/getSources"/>

-      <genOperations ecoreOperation="UML2.ecore#//Extend/getOwnedElements"/>

+    <genClasses ecoreClass="UML2.ecore#//Signal">

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Signal/ownedAttribute"/>

+      <genOperations ecoreOperation="UML2.ecore#//Signal/getAttributes"/>

+      <genOperations ecoreOperation="UML2.ecore#//Signal/getOwnedMembers"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//UseCase">

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//UseCase/include"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//UseCase/extend"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//UseCase/extensionPoint"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//UseCase/subject"/>

-      <genOperations ecoreOperation="UML2.ecore#//UseCase/getOwnedMembers"/>

+    <genClasses ecoreClass="UML2.ecore#//SignalTrigger">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//SignalTrigger/signal"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//ExtensionPoint">

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExtensionPoint/useCase"/>

+    <genClasses ecoreClass="UML2.ecore#//TimeTrigger">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//TimeTrigger/isRelative"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//TimeTrigger/when"/>

+      <genOperations ecoreOperation="UML2.ecore#//TimeTrigger/getOwnedElements"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Include">

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Include/includingCase"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Include/addition"/>

-      <genOperations ecoreOperation="UML2.ecore#//Include/getSources"/>

-      <genOperations ecoreOperation="UML2.ecore#//Include/getTargets"/>

+    <genClasses ecoreClass="UML2.ecore#//AnyTrigger"/>

+    <genClasses ecoreClass="UML2.ecore#//CollaborationOccurrence">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//CollaborationOccurrence/type"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//CollaborationOccurrence/roleBinding"/>

+      <genOperations ecoreOperation="UML2.ecore#//CollaborationOccurrence/getOwnedElements"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Collaboration">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Collaboration/collaborationRole"/>

+      <genOperations ecoreOperation="UML2.ecore#//Collaboration/getRoles"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Port">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Port/isBehavior"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Port/isService"/>

+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Port/required"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Port/redefinedPort"/>

+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Port/provided"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Port/protocol"/>

+      <genOperations ecoreOperation="UML2.ecore#//Port/getRedefinedElements"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//EncapsulatedClassifier">

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//EncapsulatedClassifier/ownedPort"/>

+      <genOperations ecoreOperation="UML2.ecore#//EncapsulatedClassifier/getFeatures"/>

+      <genOperations ecoreOperation="UML2.ecore#//EncapsulatedClassifier/getOwnedMembers"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Variable">

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Variable/scope"/>

+      <genOperations ecoreOperation="UML2.ecore#//Variable/getOwner"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//StructuredActivityNode">

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//StructuredActivityNode/variable"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//StructuredActivityNode/containedNode"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//StructuredActivityNode/containedEdge"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//StructuredActivityNode/mustIsolate"/>

+      <genOperations ecoreOperation="UML2.ecore#//StructuredActivityNode/getActivity"/>

+      <genOperations ecoreOperation="UML2.ecore#//StructuredActivityNode/setActivity">

+        <genParameters ecoreParameter="UML2.ecore#//StructuredActivityNode/setActivity/newActivity"/>

+      </genOperations>

+      <genOperations ecoreOperation="UML2.ecore#//StructuredActivityNode/getActivityGroup_activity"/>

+      <genOperations ecoreOperation="UML2.ecore#//StructuredActivityNode/setActivityGroup_activity">

+        <genParameters ecoreParameter="UML2.ecore#//StructuredActivityNode/setActivityGroup_activity/newActivityGroup_activity"/>

+      </genOperations>

+      <genOperations ecoreOperation="UML2.ecore#//StructuredActivityNode/getOwnedMembers"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//ConditionalNode">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//ConditionalNode/isDeterminate"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//ConditionalNode/isAssured"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ConditionalNode/clause"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ConditionalNode/result"/>

+      <genOperations ecoreOperation="UML2.ecore#//ConditionalNode/getOwnedElements"/>

+      <genOperations ecoreOperation="UML2.ecore#//ConditionalNode/getOutputs"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Clause">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Clause/test"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Clause/body"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Clause/predecessorClause"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Clause/successorClause"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Clause/decider"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Clause/bodyOutput"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//LoopNode">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//LoopNode/isTestedFirst"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/bodyPart"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/setupPart"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/decider"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/test"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/result"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/loopVariable"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/bodyOutput"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/loopVariableInput"/>

+      <genOperations ecoreOperation="UML2.ecore#//LoopNode/getOutputs"/>

+      <genOperations ecoreOperation="UML2.ecore#//LoopNode/getOwnedElements"/>

+      <genOperations ecoreOperation="UML2.ecore#//LoopNode/getInputs"/>

     </genClasses>

     <genClasses ecoreClass="UML2.ecore#//TemplateSignature">

       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//TemplateSignature/parameter"/>

@@ -985,10 +1085,6 @@
       <genOperations ecoreOperation="UML2.ecore#//TemplateParameterSubstitution/getOwner"/>

       <genOperations ecoreOperation="UML2.ecore#//TemplateParameterSubstitution/getOwnedElements"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Collaboration">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Collaboration/collaborationRole"/>

-      <genOperations ecoreOperation="UML2.ecore#//Collaboration/getRoles"/>

-    </genClasses>

     <genClasses ecoreClass="UML2.ecore#//OperationTemplateParameter"/>

     <genClasses ecoreClass="UML2.ecore#//ClassifierTemplateParameter">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//ClassifierTemplateParameter/allowSubstitutable"/>

@@ -997,25 +1093,6 @@
     <genClasses ecoreClass="UML2.ecore#//RedefinableTemplateSignature"/>

     <genClasses ecoreClass="UML2.ecore#//TemplateableClassifier"/>

     <genClasses ecoreClass="UML2.ecore#//ConnectableElementTemplateParameter"/>

-    <genClasses ecoreClass="UML2.ecore#//CollaborationOccurrence">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//CollaborationOccurrence/type"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//CollaborationOccurrence/roleBinding"/>

-      <genOperations ecoreOperation="UML2.ecore#//CollaborationOccurrence/getOwnedElements"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Port">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Port/isBehavior"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Port/isService"/>

-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Port/required"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Port/redefinedPort"/>

-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Port/provided"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Port/protocol"/>

-      <genOperations ecoreOperation="UML2.ecore#//Port/getRedefinedElements"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//EncapsulatedClassifier">

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//EncapsulatedClassifier/ownedPort"/>

-      <genOperations ecoreOperation="UML2.ecore#//EncapsulatedClassifier/getFeatures"/>

-      <genOperations ecoreOperation="UML2.ecore#//EncapsulatedClassifier/getOwnedMembers"/>

-    </genClasses>

     <genClasses ecoreClass="UML2.ecore#//Interaction">

       <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Interaction/lifeline"/>

       <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Interaction/message"/>

@@ -1078,117 +1155,73 @@
       <genOperations ecoreOperation="UML2.ecore#//StateInvariant/getOwnedElements"/>

     </genClasses>

     <genClasses ecoreClass="UML2.ecore#//Stop"/>

-    <genClasses ecoreClass="UML2.ecore#//Variable">

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Variable/scope"/>

-      <genOperations ecoreOperation="UML2.ecore#//Variable/getOwner"/>

+    <genClasses ecoreClass="UML2.ecore#//StateMachine">

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//StateMachine/region"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//StateMachine/connectionPoint"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//StateMachine/extendedStateMachine"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//StateMachine/stateMachine_redefinitionContext"/>

+      <genOperations ecoreOperation="UML2.ecore#//StateMachine/getRedefinedElements"/>

+      <genOperations ecoreOperation="UML2.ecore#//StateMachine/getRedefinitionContexts"/>

+      <genOperations ecoreOperation="UML2.ecore#//StateMachine/getOwnedMembers"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//StructuredActivityNode">

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//StructuredActivityNode/variable"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//StructuredActivityNode/containedNode"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//StructuredActivityNode/containedEdge"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//StructuredActivityNode/mustIsolate"/>

-      <genOperations ecoreOperation="UML2.ecore#//StructuredActivityNode/getActivity"/>

-      <genOperations ecoreOperation="UML2.ecore#//StructuredActivityNode/setActivity">

-        <genParameters ecoreParameter="UML2.ecore#//StructuredActivityNode/setActivity/newActivity"/>

-      </genOperations>

-      <genOperations ecoreOperation="UML2.ecore#//StructuredActivityNode/getActivityGroup_activity"/>

-      <genOperations ecoreOperation="UML2.ecore#//StructuredActivityNode/setActivityGroup_activity">

-        <genParameters ecoreParameter="UML2.ecore#//StructuredActivityNode/setActivityGroup_activity/newActivityGroup_activity"/>

-      </genOperations>

-      <genOperations ecoreOperation="UML2.ecore#//StructuredActivityNode/getOwnedMembers"/>

+    <genClasses ecoreClass="UML2.ecore#//Region">

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Region/subvertex"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Region/transition"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Region/stateMachine"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Region/state"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Region/extendedRegion"/>

+      <genOperations ecoreOperation="UML2.ecore#//Region/getRedefinitionContexts"/>

+      <genOperations ecoreOperation="UML2.ecore#//Region/getRedefinedElements"/>

+      <genOperations ecoreOperation="UML2.ecore#//Region/getOwnedElements"/>

+      <genOperations ecoreOperation="UML2.ecore#//Region/getNamespace"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//ConditionalNode">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//ConditionalNode/isDeterminate"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//ConditionalNode/isAssured"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ConditionalNode/clause"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ConditionalNode/result"/>

-      <genOperations ecoreOperation="UML2.ecore#//ConditionalNode/getOwnedElements"/>

-      <genOperations ecoreOperation="UML2.ecore#//ConditionalNode/getOutputs"/>

+    <genClasses ecoreClass="UML2.ecore#//Pseudostate">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Pseudostate/kind"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Clause">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Clause/test"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Clause/body"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Clause/predecessorClause"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Clause/successorClause"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Clause/decider"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Clause/bodyOutput"/>

+    <genClasses ecoreClass="UML2.ecore#//State">

+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//State/isComposite"/>

+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//State/isOrthogonal"/>

+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//State/isSimple"/>

+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//State/isSubmachineState"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//State/submachine"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//State/connection"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//State/redefinedState"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//State/deferrableTrigger"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//State/region"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//State/entry"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//State/exit"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//State/doActivity"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//State/stateInvariant"/>

+      <genOperations ecoreOperation="UML2.ecore#//State/getRedefinitionContexts"/>

+      <genOperations ecoreOperation="UML2.ecore#//State/getRedefinedElements"/>

+      <genOperations ecoreOperation="UML2.ecore#//State/getOwnedElements"/>

+      <genOperations ecoreOperation="UML2.ecore#//State/getOwnedMembers"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//LoopNode">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//LoopNode/isTestedFirst"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/bodyPart"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/setupPart"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/decider"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/test"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/result"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/loopVariable"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/bodyOutput"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//LoopNode/loopVariableInput"/>

-      <genOperations ecoreOperation="UML2.ecore#//LoopNode/getOutputs"/>

-      <genOperations ecoreOperation="UML2.ecore#//LoopNode/getOwnedElements"/>

-      <genOperations ecoreOperation="UML2.ecore#//LoopNode/getInputs"/>

+    <genClasses ecoreClass="UML2.ecore#//Vertex">

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Vertex/container"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Vertex/outgoing"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Vertex/incoming"/>

+      <genOperations ecoreOperation="UML2.ecore#//Vertex/getOwner"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//CallTrigger">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//CallTrigger/operation"/>

+    <genClasses ecoreClass="UML2.ecore#//ConnectionPointReference">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ConnectionPointReference/entry"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ConnectionPointReference/exit"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//MessageTrigger"/>

-    <genClasses ecoreClass="UML2.ecore#//ChangeTrigger">

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ChangeTrigger/changeExpression"/>

-      <genOperations ecoreOperation="UML2.ecore#//ChangeTrigger/getOwnedElements"/>

+    <genClasses ecoreClass="UML2.ecore#//Transition">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Transition/kind"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Transition/container"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Transition/source"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Transition/target"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Transition/redefinedTransition"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Transition/trigger"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Transition/guard"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Transition/effect"/>

+      <genOperations ecoreOperation="UML2.ecore#//Transition/getRedefinitionContexts"/>

+      <genOperations ecoreOperation="UML2.ecore#//Transition/getRedefinedElements"/>

+      <genOperations ecoreOperation="UML2.ecore#//Transition/getOwner"/>

+      <genOperations ecoreOperation="UML2.ecore#//Transition/getOwnedElements"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Trigger">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Trigger/port"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Reception">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Reception/signal"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Signal">

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Signal/ownedAttribute"/>

-      <genOperations ecoreOperation="UML2.ecore#//Signal/getAttributes"/>

-      <genOperations ecoreOperation="UML2.ecore#//Signal/getOwnedMembers"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//SignalTrigger">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//SignalTrigger/signal"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//TimeTrigger">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//TimeTrigger/isRelative"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//TimeTrigger/when"/>

-      <genOperations ecoreOperation="UML2.ecore#//TimeTrigger/getOwnedElements"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//AnyTrigger"/>

-    <genClasses ecoreClass="UML2.ecore#//ExpansionNode">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExpansionNode/regionAsOutput"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExpansionNode/regionAsInput"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//ExpansionRegion">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//ExpansionRegion/mode"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExpansionRegion/outputElement"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExpansionRegion/inputElement"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//ExceptionHandler">

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExceptionHandler/protectedNode"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExceptionHandler/handlerBody"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExceptionHandler/exceptionInput"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExceptionHandler/exceptionType"/>

-      <genOperations ecoreOperation="UML2.ecore#//ExceptionHandler/getOwner"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//ForkNode"/>

-    <genClasses ecoreClass="UML2.ecore#//JoinNode">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//JoinNode/isCombineDuplicate"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//JoinNode/joinSpec"/>

-      <genOperations ecoreOperation="UML2.ecore#//JoinNode/getOwnedElements"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//FlowFinalNode"/>

-    <genClasses ecoreClass="UML2.ecore#//CentralBufferNode"/>

-    <genClasses ecoreClass="UML2.ecore#//ActivityPartition">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//ActivityPartition/isDimension"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//ActivityPartition/isExternal"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ActivityPartition/containedEdge"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ActivityPartition/containedNode"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ActivityPartition/subgroup"/>

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ActivityPartition/superPartition"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ActivityPartition/represents"/>

-      <genOperations ecoreOperation="UML2.ecore#//ActivityPartition/getSuperGroup"/>

-    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//FinalState"/>

     <genClasses ecoreClass="UML2.ecore#//CreateObjectAction">

       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//CreateObjectAction/classifier"/>

       <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//CreateObjectAction/result"/>

@@ -1319,73 +1352,40 @@
     <genClasses ecoreClass="UML2.ecore#//CallBehaviorAction">

       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//CallBehaviorAction/behavior"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//StateMachine">

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//StateMachine/region"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//StateMachine/connectionPoint"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//StateMachine/extendedStateMachine"/>

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//StateMachine/stateMachine_redefinitionContext"/>

-      <genOperations ecoreOperation="UML2.ecore#//StateMachine/getRedefinedElements"/>

-      <genOperations ecoreOperation="UML2.ecore#//StateMachine/getRedefinitionContexts"/>

-      <genOperations ecoreOperation="UML2.ecore#//StateMachine/getOwnedMembers"/>

+    <genClasses ecoreClass="UML2.ecore#//ForkNode"/>

+    <genClasses ecoreClass="UML2.ecore#//JoinNode">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//JoinNode/isCombineDuplicate"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//JoinNode/joinSpec"/>

+      <genOperations ecoreOperation="UML2.ecore#//JoinNode/getOwnedElements"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Region">

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Region/subvertex"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Region/transition"/>

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Region/stateMachine"/>

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Region/state"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Region/extendedRegion"/>

-      <genOperations ecoreOperation="UML2.ecore#//Region/getRedefinitionContexts"/>

-      <genOperations ecoreOperation="UML2.ecore#//Region/getRedefinedElements"/>

-      <genOperations ecoreOperation="UML2.ecore#//Region/getOwnedElements"/>

-      <genOperations ecoreOperation="UML2.ecore#//Region/getNamespace"/>

+    <genClasses ecoreClass="UML2.ecore#//FlowFinalNode"/>

+    <genClasses ecoreClass="UML2.ecore#//CentralBufferNode"/>

+    <genClasses ecoreClass="UML2.ecore#//ActivityPartition">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//ActivityPartition/isDimension"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//ActivityPartition/isExternal"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ActivityPartition/containedEdge"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ActivityPartition/containedNode"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ActivityPartition/subgroup"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ActivityPartition/superPartition"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ActivityPartition/represents"/>

+      <genOperations ecoreOperation="UML2.ecore#//ActivityPartition/getSuperGroup"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Pseudostate">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Pseudostate/kind"/>

+    <genClasses ecoreClass="UML2.ecore#//ExpansionNode">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExpansionNode/regionAsOutput"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExpansionNode/regionAsInput"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//State">

-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//State/isComposite"/>

-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//State/isOrthogonal"/>

-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//State/isSimple"/>

-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//State/isSubmachineState"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//State/submachine"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//State/connection"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//State/redefinedState"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//State/deferrableTrigger"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//State/region"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//State/entry"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//State/exit"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//State/doActivity"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//State/stateInvariant"/>

-      <genOperations ecoreOperation="UML2.ecore#//State/getRedefinitionContexts"/>

-      <genOperations ecoreOperation="UML2.ecore#//State/getRedefinedElements"/>

-      <genOperations ecoreOperation="UML2.ecore#//State/getOwnedElements"/>

-      <genOperations ecoreOperation="UML2.ecore#//State/getOwnedMembers"/>

+    <genClasses ecoreClass="UML2.ecore#//ExpansionRegion">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//ExpansionRegion/mode"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExpansionRegion/outputElement"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExpansionRegion/inputElement"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Vertex">

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Vertex/container"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Vertex/outgoing"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Vertex/incoming"/>

-      <genOperations ecoreOperation="UML2.ecore#//Vertex/getOwner"/>

+    <genClasses ecoreClass="UML2.ecore#//ExceptionHandler">

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExceptionHandler/protectedNode"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExceptionHandler/handlerBody"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExceptionHandler/exceptionInput"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ExceptionHandler/exceptionType"/>

+      <genOperations ecoreOperation="UML2.ecore#//ExceptionHandler/getOwner"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//ConnectionPointReference">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ConnectionPointReference/entry"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ConnectionPointReference/exit"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Transition">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Transition/kind"/>

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Transition/container"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Transition/source"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Transition/target"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Transition/redefinedTransition"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Transition/trigger"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Transition/guard"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Transition/effect"/>

-      <genOperations ecoreOperation="UML2.ecore#//Transition/getRedefinitionContexts"/>

-      <genOperations ecoreOperation="UML2.ecore#//Transition/getRedefinedElements"/>

-      <genOperations ecoreOperation="UML2.ecore#//Transition/getOwner"/>

-      <genOperations ecoreOperation="UML2.ecore#//Transition/getOwnedElements"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//FinalState"/>

     <genClasses ecoreClass="UML2.ecore#//InteractionOccurrence">

       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//InteractionOccurrence/refersTo"/>

       <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//InteractionOccurrence/actualGate"/>

@@ -1422,112 +1422,6 @@
       <genOperations ecoreOperation="UML2.ecore#//Component/getOwnedElements"/>

       <genOperations ecoreOperation="UML2.ecore#//Component/getClientDependencies"/>

     </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//ProtocolConformance">

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ProtocolConformance/specificMachine"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ProtocolConformance/generalMachine"/>

-      <genOperations ecoreOperation="UML2.ecore#//ProtocolConformance/getSources"/>

-      <genOperations ecoreOperation="UML2.ecore#//ProtocolConformance/getOwner"/>

-      <genOperations ecoreOperation="UML2.ecore#//ProtocolConformance/getTargets"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//ProtocolStateMachine">

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ProtocolStateMachine/conformance"/>

-      <genOperations ecoreOperation="UML2.ecore#//ProtocolStateMachine/getOwnedElements"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//ProtocolTransition">

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ProtocolTransition/postCondition"/>

-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ProtocolTransition/referred"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ProtocolTransition/preCondition"/>

-      <genOperations ecoreOperation="UML2.ecore#//ProtocolTransition/getOwnedElements"/>

-      <genOperations ecoreOperation="UML2.ecore#//ProtocolTransition/setGuard">

-        <genParameters ecoreParameter="UML2.ecore#//ProtocolTransition/setGuard/newGuard"/>

-      </genOperations>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//TimeExpression">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//TimeExpression/firstTime"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//TimeExpression/event"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Duration">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Duration/firstTime"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Duration/event"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//TimeObservationAction">

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//TimeObservationAction/now"/>

-      <genOperations ecoreOperation="UML2.ecore#//TimeObservationAction/getValue"/>

-      <genOperations ecoreOperation="UML2.ecore#//TimeObservationAction/setValue">

-        <genParameters ecoreParameter="UML2.ecore#//TimeObservationAction/setValue/newValue"/>

-      </genOperations>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//DurationInterval">

-      <genOperations ecoreOperation="UML2.ecore#//DurationInterval/getMins"/>

-      <genOperations ecoreOperation="UML2.ecore#//DurationInterval/getMaxes"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Interval">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Interval/min"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Interval/max"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//TimeConstraint">

-      <genOperations ecoreOperation="UML2.ecore#//TimeConstraint/getSpecification"/>

-      <genOperations ecoreOperation="UML2.ecore#//TimeConstraint/setSpecification">

-        <genParameters ecoreParameter="UML2.ecore#//TimeConstraint/setSpecification/newSpecification"/>

-      </genOperations>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//IntervalConstraint">

-      <genOperations ecoreOperation="UML2.ecore#//IntervalConstraint/getSpecification"/>

-      <genOperations ecoreOperation="UML2.ecore#//IntervalConstraint/setSpecification">

-        <genParameters ecoreParameter="UML2.ecore#//IntervalConstraint/setSpecification/newSpecification"/>

-      </genOperations>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//TimeInterval">

-      <genOperations ecoreOperation="UML2.ecore#//TimeInterval/getMaxes"/>

-      <genOperations ecoreOperation="UML2.ecore#//TimeInterval/getMins"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//DurationObservationAction">

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//DurationObservationAction/duration"/>

-      <genOperations ecoreOperation="UML2.ecore#//DurationObservationAction/getValue"/>

-      <genOperations ecoreOperation="UML2.ecore#//DurationObservationAction/setValue">

-        <genParameters ecoreParameter="UML2.ecore#//DurationObservationAction/setValue/newValue"/>

-      </genOperations>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//DurationConstraint">

-      <genOperations ecoreOperation="UML2.ecore#//DurationConstraint/getSpecification"/>

-      <genOperations ecoreOperation="UML2.ecore#//DurationConstraint/setSpecification">

-        <genParameters ecoreParameter="UML2.ecore#//DurationConstraint/setSpecification/newSpecification"/>

-      </genOperations>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//DataStoreNode"/>

-    <genClasses ecoreClass="UML2.ecore#//InterruptibleActivityRegion">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//InterruptibleActivityRegion/interruptingEdge"/>

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//InterruptibleActivityRegion/containedNode"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//ParameterSet">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ParameterSet/parameter"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ParameterSet/condition"/>

-      <genOperations ecoreOperation="UML2.ecore#//ParameterSet/getOwnedElements"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Deployment">

-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Deployment/deployedArtifact"/>

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Deployment/location"/>

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Deployment/configuration"/>

-      <genOperations ecoreOperation="UML2.ecore#//Deployment/getSuppliers"/>

-      <genOperations ecoreOperation="UML2.ecore#//Deployment/getTargets"/>

-      <genOperations ecoreOperation="UML2.ecore#//Deployment/getSources"/>

-      <genOperations ecoreOperation="UML2.ecore#//Deployment/getClients"/>

-      <genOperations ecoreOperation="UML2.ecore#//Deployment/getOwnedElements"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//DeployedArtifact"/>

-    <genClasses ecoreClass="UML2.ecore#//DeploymentTarget">

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//DeploymentTarget/deployment"/>

-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//DeploymentTarget/deployedElement"/>

-      <genOperations ecoreOperation="UML2.ecore#//DeploymentTarget/getOwnedElements"/>

-      <genOperations ecoreOperation="UML2.ecore#//DeploymentTarget/getClientDependencies"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Node">

-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Node/nestedNode"/>

-      <genOperations ecoreOperation="UML2.ecore#//Node/getNestedClassifiers"/>

-    </genClasses>

-    <genClasses ecoreClass="UML2.ecore#//Device"/>

-    <genClasses ecoreClass="UML2.ecore#//ExecutionEnvironment"/>

-    <genClasses ecoreClass="UML2.ecore#//CommunicationPath"/>

     <genClasses ecoreClass="UML2.ecore#//ReadExtentAction">

       <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ReadExtentAction/result"/>

       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ReadExtentAction/classifier"/>

@@ -1595,6 +1489,112 @@
       <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//RaiseExceptionAction/exception"/>

       <genOperations ecoreOperation="UML2.ecore#//RaiseExceptionAction/getInputs"/>

     </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//DataStoreNode"/>

+    <genClasses ecoreClass="UML2.ecore#//InterruptibleActivityRegion">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//InterruptibleActivityRegion/interruptingEdge"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//InterruptibleActivityRegion/containedNode"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//ParameterSet">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ParameterSet/parameter"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ParameterSet/condition"/>

+      <genOperations ecoreOperation="UML2.ecore#//ParameterSet/getOwnedElements"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//TimeExpression">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//TimeExpression/firstTime"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//TimeExpression/event"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Duration">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//Duration/firstTime"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Duration/event"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//TimeObservationAction">

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//TimeObservationAction/now"/>

+      <genOperations ecoreOperation="UML2.ecore#//TimeObservationAction/getValue"/>

+      <genOperations ecoreOperation="UML2.ecore#//TimeObservationAction/setValue">

+        <genParameters ecoreParameter="UML2.ecore#//TimeObservationAction/setValue/newValue"/>

+      </genOperations>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//DurationInterval">

+      <genOperations ecoreOperation="UML2.ecore#//DurationInterval/getMins"/>

+      <genOperations ecoreOperation="UML2.ecore#//DurationInterval/getMaxes"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Interval">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Interval/min"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Interval/max"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//TimeConstraint">

+      <genOperations ecoreOperation="UML2.ecore#//TimeConstraint/getSpecification"/>

+      <genOperations ecoreOperation="UML2.ecore#//TimeConstraint/setSpecification">

+        <genParameters ecoreParameter="UML2.ecore#//TimeConstraint/setSpecification/newSpecification"/>

+      </genOperations>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//IntervalConstraint">

+      <genOperations ecoreOperation="UML2.ecore#//IntervalConstraint/getSpecification"/>

+      <genOperations ecoreOperation="UML2.ecore#//IntervalConstraint/setSpecification">

+        <genParameters ecoreParameter="UML2.ecore#//IntervalConstraint/setSpecification/newSpecification"/>

+      </genOperations>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//TimeInterval">

+      <genOperations ecoreOperation="UML2.ecore#//TimeInterval/getMaxes"/>

+      <genOperations ecoreOperation="UML2.ecore#//TimeInterval/getMins"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//DurationObservationAction">

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//DurationObservationAction/duration"/>

+      <genOperations ecoreOperation="UML2.ecore#//DurationObservationAction/getValue"/>

+      <genOperations ecoreOperation="UML2.ecore#//DurationObservationAction/setValue">

+        <genParameters ecoreParameter="UML2.ecore#//DurationObservationAction/setValue/newValue"/>

+      </genOperations>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//DurationConstraint">

+      <genOperations ecoreOperation="UML2.ecore#//DurationConstraint/getSpecification"/>

+      <genOperations ecoreOperation="UML2.ecore#//DurationConstraint/setSpecification">

+        <genParameters ecoreParameter="UML2.ecore#//DurationConstraint/setSpecification/newSpecification"/>

+      </genOperations>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Deployment">

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Deployment/deployedArtifact"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//Deployment/location"/>

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Deployment/configuration"/>

+      <genOperations ecoreOperation="UML2.ecore#//Deployment/getSuppliers"/>

+      <genOperations ecoreOperation="UML2.ecore#//Deployment/getTargets"/>

+      <genOperations ecoreOperation="UML2.ecore#//Deployment/getSources"/>

+      <genOperations ecoreOperation="UML2.ecore#//Deployment/getClients"/>

+      <genOperations ecoreOperation="UML2.ecore#//Deployment/getOwnedElements"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//DeployedArtifact"/>

+    <genClasses ecoreClass="UML2.ecore#//DeploymentTarget">

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//DeploymentTarget/deployment"/>

+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//DeploymentTarget/deployedElement"/>

+      <genOperations ecoreOperation="UML2.ecore#//DeploymentTarget/getOwnedElements"/>

+      <genOperations ecoreOperation="UML2.ecore#//DeploymentTarget/getClientDependencies"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Node">

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//Node/nestedNode"/>

+      <genOperations ecoreOperation="UML2.ecore#//Node/getNestedClassifiers"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//Device"/>

+    <genClasses ecoreClass="UML2.ecore#//ExecutionEnvironment"/>

+    <genClasses ecoreClass="UML2.ecore#//CommunicationPath"/>

+    <genClasses ecoreClass="UML2.ecore#//ProtocolConformance">

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ProtocolConformance/specificMachine"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ProtocolConformance/generalMachine"/>

+      <genOperations ecoreOperation="UML2.ecore#//ProtocolConformance/getSources"/>

+      <genOperations ecoreOperation="UML2.ecore#//ProtocolConformance/getOwner"/>

+      <genOperations ecoreOperation="UML2.ecore#//ProtocolConformance/getTargets"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//ProtocolStateMachine">

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ProtocolStateMachine/conformance"/>

+      <genOperations ecoreOperation="UML2.ecore#//ProtocolStateMachine/getOwnedElements"/>

+    </genClasses>

+    <genClasses ecoreClass="UML2.ecore#//ProtocolTransition">

+      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference UML2.ecore#//ProtocolTransition/postCondition"/>

+      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ProtocolTransition/referred"/>

+      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference UML2.ecore#//ProtocolTransition/preCondition"/>

+      <genOperations ecoreOperation="UML2.ecore#//ProtocolTransition/getOwnedElements"/>

+      <genOperations ecoreOperation="UML2.ecore#//ProtocolTransition/setGuard">

+        <genParameters ecoreParameter="UML2.ecore#//ProtocolTransition/setGuard/newGuard"/>

+      </genOperations>

+    </genClasses>

     <genClasses ecoreClass="UML2.ecore#//DeploymentSpecification">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//DeploymentSpecification/deploymentLocation"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute UML2.ecore#//DeploymentSpecification/executionLocation"/>

diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Abstraction.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Abstraction.java
index b06998c..e17729a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Abstraction.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Abstraction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Abstraction.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: Abstraction.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Abstraction</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An abstraction is a relationship that relates two elements or sets of elements that represent the same concept at different levels of abstraction or from different viewpoints. (See also, the definition of abstration in the Glossary.) In the metamodel, an Abstraction is a Dependency in which there is a mapping between the supplier and the client. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Activity.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Activity.java
index 36c7930..30c269f 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Activity.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Activity.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Activity.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: Activity.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Activity</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An activity contains a language-specific text string used to describe a computation, and an optional specification of the language. OCL, natural language, or programming languages may be used to specify an activity. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Actor.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Actor.java
index e6fe0cd..8a14fb6 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Actor.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Actor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Actor.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: Actor.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Actor</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An Actor models a type of role played by an entity that interacts with the subject (e.g., by exchanging signals and data), 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getActor()
  * @model 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/AggregationKind.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/AggregationKind.java
index ba8bcd0..3dad4c9 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/AggregationKind.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/AggregationKind.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: AggregationKind.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: AggregationKind.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -23,6 +23,9 @@
  * A representation of the literals of the enumeration '<em><b>Aggregation Kind</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * AggregationKind is an enumeration of the following literal values: • none Indicates that the property has no aggregation. • shared Indicates that the property has a shared aggregation. • composite Indicates that the property is aggregated compositely, i.e., the composite object has responsibility for the existence and storage of the composed objects (parts). 
+ * <!-- end-model-doc -->
  * @see org.eclipse.uml2.UML2Package#getAggregationKind()
  * @model
  * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/AnyTrigger.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/AnyTrigger.java
index 6b11de7..6670a60 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/AnyTrigger.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/AnyTrigger.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: AnyTrigger.java,v 1.2 2004/04/10 04:09:49 khussey Exp $
+ * $Id: AnyTrigger.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Any Trigger</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An AnyTrigger for a given state specifies that the transition is triggered for all applicable message triggers except for those specified explicitly on other transitions for this state. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getAnyTrigger()
  * @model 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Association.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Association.java
index b5cc460..503a26b 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Association.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Association.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Association.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: Association.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Association</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An association specifies a semantic relationship that can occur between typed instances. It has at least two ends represented by properties, each of which is connected to the type of the end. More than one end of the association may have the same type. When a property is owned by an association it represents a non-navigable end of the association. In this case the property does not appear in the namespace of any of the associated classifiers. When a property at an end of an association is owned by one of the associated classifiers it represents a navigable end of the association. In this case the property is also an attribute of the associated classifier. Only binary associations may have navigable ends. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/AssociationClass.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/AssociationClass.java
index 5b88954..671f046 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/AssociationClass.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/AssociationClass.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: AssociationClass.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: AssociationClass.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Association Class</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * In the metamodel, an AssociationClass is a declaration of a semantic relationship between Classifiers, which has a set of features of its own. AssociationClass is both an Association and a Class. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getAssociationClass()
  * @model 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Behavior.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Behavior.java
index c0470b2..852d146 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Behavior.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Behavior.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Behavior.java,v 1.4 2004/05/20 03:20:04 khussey Exp $
+ * $Id: Behavior.java,v 1.5 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Behavior</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * Behavior is a specification of how its context classifier changes state over time. This specification may be either a definition of possible behavior execution or emergent behavior, or a selective illustration of an interesting subset of possible executions. The latter form is typically used for capturing examples, such as a trace of a particular execution. A classifier behavior is always a definition of behavior and not an illustration. It describes the sequence of state changes an instance of a classifier may undergo in the course of its lifetime. Its precise semantics depends on the kind of classifier. For example, the classifier behavior of a collaboration represents emergent behavior of all the parts, whereas the classifier behavior of a class is just the behavior of instances of the class separated from the behaviors of any of its parts. When a behavior is associated as the method of a behavioral feature, it defines the implementation of that feature; i.e., the computation that generates the effects of the behavioral feature. As a classifier, a behavior can be specialized. Instantiating a behavior is referred to as “invocating” the behavior, an instantiated behavior is also called a behavior “execution.” A behavior may be invoked directly or its invocation may be the result of invoking the behavioral feature that specifies this behavior. A behavior can also be instantiated as an object in virtue of it being a class. The specification of a behavior can take a number of forms, as described in the subclasses of Behavior. Behavior is an abstract metaclass factoring out the commonalities of these different specification mechanisms. When a behavior is invoked, its execution receives a set of input values that are used to affect the course of execution and as a result of its execution it produces a set of output values which are returned, as specified by its parameters. The observable effects of a behavior execution may include changes of values of various objects involved in the execution, the creation and destruction of objects, generation of communications between objects, as well as an explicit set of output values. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/BehavioralFeature.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/BehavioralFeature.java
index 033635c..b7c1123 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/BehavioralFeature.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/BehavioralFeature.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: BehavioralFeature.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: BehavioralFeature.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Behavioral Feature</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A behavioral feature specifies that an instance of a classifier will respond to a designated request by invoking a behavior. BehavioralFeature is an abstract metaclass specializing Feature and Namespace. Kinds of behavioral aspects are modeled by subclasses of BehavioralFeature. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/BehavioredClassifier.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/BehavioredClassifier.java
index 5c4ff9d..94e8c1a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/BehavioredClassifier.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/BehavioredClassifier.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: BehavioredClassifier.java,v 1.4 2004/05/20 03:20:04 khussey Exp $
+ * $Id: BehavioredClassifier.java,v 1.5 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Behaviored Classifier</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A classifier can have behavior specifications defined in its namespace. One of these may specify the behavior of the classifier itself. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/CallConcurrencyKind.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/CallConcurrencyKind.java
index 8b94eb6..5566cf7 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/CallConcurrencyKind.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/CallConcurrencyKind.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: CallConcurrencyKind.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: CallConcurrencyKind.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -23,6 +23,9 @@
  * A representation of the literals of the enumeration '<em><b>Call Concurrency Kind</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * CallConcurrencyKind is an enumeration with the following literals: • sequential No concurrency management mechanism is associated with the operation and, therefore, concurrency conflicts may occur. Instances that invoke a behavioral feature need to coordinate so that only one invocation to a target on any behavioral feature occurs at once. • guarded Multiple invocations of a behavioral feature may occur simultaneously to one instance, but only one is allowed to commence. The others are blocked until the performance of the first behavioral feature is complete. It is the responsibility of the system designer to ensure that deadlocks do not occur due to simultaneous blocks. • concurrent Multiple invocations of a behavioral feature may occur simultaneously to one instance and all of them may proceed concurrently. 
+ * <!-- end-model-doc -->
  * @see org.eclipse.uml2.UML2Package#getCallConcurrencyKind()
  * @model
  * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ChangeTrigger.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ChangeTrigger.java
index af0fe3f..af7dbba 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ChangeTrigger.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ChangeTrigger.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ChangeTrigger.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: ChangeTrigger.java,v 1.3 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Change Trigger</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A change trigger specifies an event that occurs when a Boolean-valued expression becomes true as a result of a change in 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Class.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Class.java
index 40c970a..86e477a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Class.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Class.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Class.java,v 1.8 2004/06/02 05:02:27 khussey Exp $
+ * $Id: Class.java,v 1.9 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -23,6 +23,10 @@
  * A representation of the model object '<em><b>Class</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * Class is a kind of classifier whose features are attributes and operations. Attributes of a class are represented by instances of Property that are owned by the class. Some of these attributes may represent the navigable ends of binary associations. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Classifier.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Classifier.java
index 601ca84..be202ca 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Classifier.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Classifier.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Classifier.java,v 1.9 2004/06/02 05:02:26 khussey Exp $
+ * $Id: Classifier.java,v 1.10 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -25,6 +25,10 @@
  * A representation of the model object '<em><b>Classifier</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A classifier is a namespace whose members can include features. Classifier is an abstract metaclass. A classifier is a type and can own generalizations, thereby making it possible to define generalization relationships to other classifiers. A classifier can specify a generalization hierarchy by referencing its general classifiers. A classifier is a redefinable element, meaning that it is possible to redefine nested classifiers. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ClassifierTemplateParameter.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ClassifierTemplateParameter.java
index 889e039..940c1de 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ClassifierTemplateParameter.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ClassifierTemplateParameter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ClassifierTemplateParameter.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: ClassifierTemplateParameter.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Classifier Template Parameter</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * ClassifierTemplateParameter is a template parameter where the parametered element is a Classifier in its capacity of being a kind of ParameterableElement. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Collaboration.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Collaboration.java
index b63de0c..31455b1 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Collaboration.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Collaboration.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Collaboration.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: Collaboration.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Collaboration</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A collaboration is represented as a kind of classifier and defines a set of cooperating entities to be played by instances (its roles), as well as a set of connectors that define communication paths between the participating instances. The cooperating entities are the properties of the collaboration (see “Property” on page 161). A collaboration specifies a view (or projection) of a set of cooperating classifiers. It describes the required links between instances that play the roles of the collaboration, as well as the features required of the classifiers that specify the participating instances. Several collaborations may describe different projections of the same set of classifiers. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/CollaborationOccurrence.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/CollaborationOccurrence.java
index 95cc41b..c888e45 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/CollaborationOccurrence.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/CollaborationOccurrence.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: CollaborationOccurrence.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: CollaborationOccurrence.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Collaboration Occurrence</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A collaboration occurrence represents one particular use of a collaboration to explain the relationships between the properties of a classifier. A collaboration occurrence indicates a set of roles and connectors that cooperate within the classifier according to a given collaboration, indicated by the type of the collaboration occurrence. There may be multiple occurrences of a given collaboration within a classifier, each involving a different set of roles and connectors. A given role or connector may be involved in multiple occurrences of the same or different collaborations. Associated dependencies map features of the collaboration type to features in the classifier. These dependencies indicate which role in the classifier plays which role in the collaboration. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Comment.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Comment.java
index b44144b..2a1c905 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Comment.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Comment.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Comment.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: Comment.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Comment</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A comment gives the ability to attach various remarks to elements. A comment carries no semantic force, but may contain information that is useful to a modeler. A comment can be owned by any element. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectableElement.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectableElement.java
index a49228a..dd7033a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectableElement.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectableElement.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ConnectableElement.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: ConnectableElement.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Connectable Element</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A ConnectableElement is an abstract metaclass representing a set of instances that are owned by a containing classifier instance. Connectable elements may be joined by attached connectors and specify configurations of linked instances to be created within an instance of the containing classifier. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectableElementTemplateParameter.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectableElementTemplateParameter.java
index d7619fe..3eb96a1 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectableElementTemplateParameter.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectableElementTemplateParameter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ConnectableElementTemplateParameter.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: ConnectableElementTemplateParameter.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Connectable Element Template Parameter</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * ConnectableElementTemplateParameter is a template parameter where the parametered element is a ConnectableElement. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getConnectableElementTemplateParameter()
  * @model 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectionPointReference.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectionPointReference.java
index 84f5995..ca9d5aa 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectionPointReference.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectionPointReference.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ConnectionPointReference.java,v 1.3 2004/05/11 15:24:01 khussey Exp $
+ * $Id: ConnectionPointReference.java,v 1.4 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Connection Point Reference</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * Connection point references of a submachine state can be used as sources/targets of transitions. They represent entries into or exits out of the submachine state machine referenced by the submachine state. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Connector.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Connector.java
index 0657377..1eb2010 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Connector.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Connector.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Connector.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: Connector.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Connector</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * Each connector may be attached to two or more connectable elements, each representing a set of instances. Each connector end 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectorEnd.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectorEnd.java
index a0f7da4..d321e67 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectorEnd.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ConnectorEnd.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ConnectorEnd.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: ConnectorEnd.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Connector End</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A connector end is an endpoint of a connector, which attaches the connector to a connectable element. Each connector end is part of one connector. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Constraint.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Constraint.java
index 8b62daf..8f9a660 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Constraint.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Constraint.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Constraint.java,v 1.3 2004/04/27 16:38:54 khussey Exp $
+ * $Id: Constraint.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -24,6 +24,10 @@
  * A representation of the model object '<em><b>Constraint</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * Constraint contains a ValueSpecification that specifies additional semantics for one or more elements. Certain kinds of constraints (such as an association “xor” constraint) are predefined in UML, others may be user-defined. A user-defined Constraint is described using a specified language, whose syntax and interpretation is a tool responsibility. One predefined language for writing constraints is OCL. In some situations, a programming language such as Java may be appropriate for expressing a constraint. In other situations natural language may be used. Constraint is a condition (a Boolean expression) that restricts the extension of the associated element beyond what is imposed by the other language constructs applied to that element. Constraint contains an optional name, although they are commonly unnamed. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DataType.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DataType.java
index 71d1200..10efcf4 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DataType.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DataType.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DataType.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: DataType.java,v 1.3 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -23,6 +23,10 @@
  * A representation of the model object '<em><b>Data Type</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * DataType defines a kind of classifier in which operations are all pure functions (i.e., they can return data values but they cannot change data values, because they have no identity). For example, an “add” operation on a number with another number as an argument yields a third number as a result; the target and argument are unchanged. A DataType may also contain attributes to support the modeling of structured data types. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Dependency.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Dependency.java
index 8214138..eef13ab 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Dependency.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Dependency.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Dependency.java,v 1.3 2004/05/11 15:24:01 khussey Exp $
+ * $Id: Dependency.java,v 1.4 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Dependency</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A dependency is a relationship that signifies that a single or a set of model elements requires other model elements for their specification or implementation. This means that the complete semantics of the depending elements is either semantically or structurally dependent on the definition of the supplier element(s). 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DirectedRelationship.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DirectedRelationship.java
index 47b65bd..3d8d88b 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DirectedRelationship.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DirectedRelationship.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DirectedRelationship.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: DirectedRelationship.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Directed Relationship</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A directed relationship references one or more source elements and one or more target elements. Directed relationship is an abstract metaclass. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Duration.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Duration.java
index 0e616dd..595250e 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Duration.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Duration.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Duration.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: Duration.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Duration</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A duration defines a value specification that specifies the temporal distance between two time expressions that specify time instants. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DurationConstraint.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DurationConstraint.java
index 26cb395..eba25e5 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DurationConstraint.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DurationConstraint.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DurationConstraint.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: DurationConstraint.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -17,6 +17,10 @@
  * A representation of the model object '<em><b>Duration Constraint</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A DurationConstraint defines a Constraint that refers to a DurationInterval. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getDurationConstraint()
  * @model 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DurationInterval.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DurationInterval.java
index 4f88a4d..a446f77 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DurationInterval.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DurationInterval.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DurationInterval.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: DurationInterval.java,v 1.3 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Duration Interval</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A DurationInterval defines the range between two Durations. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getDurationInterval()
  * @model 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DurationObservationAction.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DurationObservationAction.java
index c7804a6..c930137 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DurationObservationAction.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/DurationObservationAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: DurationObservationAction.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: DurationObservationAction.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Duration Observation Action</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A DurationObservationAction defines an action that observes duration in time. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Element.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Element.java
index db2e4db..8e9e0fa 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Element.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Element.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Element.java,v 1.6 2004/05/18 21:00:48 khussey Exp $
+ * $Id: Element.java,v 1.7 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -26,6 +26,10 @@
  * A representation of the model object '<em><b>Element</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * Element is an abstract metaclass with no superclass. It is used as the common superclass for all metaclasses in the infrastructure library. Element has a derived composition association to itself to support the general capability for elements to own other elements. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ElementImport.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ElementImport.java
index 8ada25c..03812c2 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ElementImport.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ElementImport.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ElementImport.java,v 1.3 2004/04/27 16:38:55 khussey Exp $
+ * $Id: ElementImport.java,v 1.4 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -22,6 +22,10 @@
  * A representation of the model object '<em><b>Element Import</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An element import is defined as a directed relationship between an importing namespace and a packageable element. The name of the packageable element or its alias is to be added to the namespace of the importing namespace. It is also possible to control whether the imported element can be further imported. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/EncapsulatedClassifier.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/EncapsulatedClassifier.java
index 48cde5a..8f0e4f9 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/EncapsulatedClassifier.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/EncapsulatedClassifier.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: EncapsulatedClassifier.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: EncapsulatedClassifier.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Encapsulated Classifier</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * Extends a classifier with the ability to own ports as specific and type checked interaction points. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Enumeration.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Enumeration.java
index 337749c..05515f4 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Enumeration.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Enumeration.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Enumeration.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: Enumeration.java,v 1.3 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Enumeration</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * Enumeration is a kind of data type, whose instances may be any of a number of user-defined enumeration literals. It is possible to extend the set of applicable enumeration literals in other packages or profiles. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/EnumerationLiteral.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/EnumerationLiteral.java
index a19e41f..a3f51f5 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/EnumerationLiteral.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/EnumerationLiteral.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: EnumerationLiteral.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: EnumerationLiteral.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Enumeration Literal</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An enumeration literal is a user-defined data value for an enumeration. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Expression.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Expression.java
index efb92ed..65fc0f6 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Expression.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Expression.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Expression.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: Expression.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Expression</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An expression represents a node in an expression tree, which may be non-terminal or terminal. It defines a symbol, and has a possibly empty sequence of operands which are value specifications. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Extend.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Extend.java
index 50019b0..0e77053 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Extend.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Extend.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Extend.java,v 1.2 2004/04/10 04:09:49 khussey Exp $
+ * $Id: Extend.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Extend</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * This relationship specifies that the behavior of a use case may be extended by the behavior of another (usually supplementary) use case. The extension takes place at one or more specific extension points defined in the extended use case. Note, however, that the extended use case is defined independently of the extending use case and is meaningful independently of the extending use case. On the other hand, the extending use case typically defines behavior that may not necessarily be meaningful by itself. Instead, the extending use case defines a set of modular behavior increments that augment an execution of the extended use case under specific conditions. Note that the same extending use case can extend more than one use case. Furthermore, an extending use case may itself be extended. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ExtensionPoint.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ExtensionPoint.java
index 710c7c5..7b8efc9 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ExtensionPoint.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ExtensionPoint.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ExtensionPoint.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: ExtensionPoint.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Extension Point</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An ExtensionPoint is a feature of a use case that identifies a point where the behavior of a use case can be augmented with elements of another (extending) use case. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Feature.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Feature.java
index 19e2fbf..5e93ffd 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Feature.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Feature.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Feature.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: Feature.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Feature</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A feature declares a behavioral or structural characteristic of instances of classifiers. Feature is an abstract metaclass. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Generalization.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Generalization.java
index 1269337..4cfdcd8 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Generalization.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Generalization.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Generalization.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: Generalization.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Generalization</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A generalization relates a specific classifier to a more general classifier, and is owned by the specific classifier. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/GeneralizationSet.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/GeneralizationSet.java
index 7a67008..2233c4a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/GeneralizationSet.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/GeneralizationSet.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: GeneralizationSet.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: GeneralizationSet.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Generalization Set</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * Each Generalization is a binary relationship that relates a specific Classifier to a more general Classifier (i.e., a subclass). Each GeneralizationSet defines a particular set of Generalization relationships that describe the way in which a specific Classifier 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Implementation.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Implementation.java
index 44d705e..b8831bf 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Implementation.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Implementation.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Implementation.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: Implementation.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Implementation</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An Implementation is a specialized Realization relationship between a Classifier and an Interface. The implementation relationship signifies that the realizing classifier conforms to the contract specified by the interface. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InstanceSpecification.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InstanceSpecification.java
index f9782fc..86ca9e1 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InstanceSpecification.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InstanceSpecification.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InstanceSpecification.java,v 1.4 2004/05/11 15:24:00 khussey Exp $
+ * $Id: InstanceSpecification.java,v 1.5 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -24,6 +24,10 @@
  * A representation of the model object '<em><b>Instance Specification</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * In the metamodel, InstanceSpecification is a specialization of DeploymentTarget and DeployedArtifact. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InstanceValue.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InstanceValue.java
index f4d7d16..100fb85 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InstanceValue.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InstanceValue.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InstanceValue.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: InstanceValue.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Instance Value</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An instance value specifies the value modeled by an instance specification. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InteractionOccurrence.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InteractionOccurrence.java
index 09f2b15..78855c8 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InteractionOccurrence.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/InteractionOccurrence.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: InteractionOccurrence.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: InteractionOccurrence.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -22,7 +22,7 @@
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
- * A reference to an interaction with actual values. The interpretation is that the sequence diagram replaces the reference (with actual parameters substituted)
+ * InteractionOccurrence is a specialization of InteractionFragment. An InteractionOccurrence has a set of actual gates that must match the formal gates of the referenced Interaction. 
  * <!-- end-model-doc -->
  *
  * <p>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Interface.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Interface.java
index 39fcd11..a8da5af 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Interface.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Interface.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Interface.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: Interface.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Interface</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An interface is a kind of classifier that represents a declaration of a set of coherent public features and obligations. In a sense, 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Interval.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Interval.java
index 28db8c9..c71543d 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Interval.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Interval.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Interval.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: Interval.java,v 1.3 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Interval</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An Interval defines the range between two value specifications. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/IntervalConstraint.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/IntervalConstraint.java
index b9fb72e..1196e52 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/IntervalConstraint.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/IntervalConstraint.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: IntervalConstraint.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: IntervalConstraint.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -17,6 +17,10 @@
  * A representation of the model object '<em><b>Interval Constraint</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A IntervalConstraint defines a Constraint that refers to an Interval. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getIntervalConstraint()
  * @model 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralBoolean.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralBoolean.java
index d0401b7..37fd23c 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralBoolean.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralBoolean.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LiteralBoolean.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: LiteralBoolean.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Literal Boolean</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A literal boolean contains a Boolean-valued attribute. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralInteger.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralInteger.java
index 191298b..e8cb666 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralInteger.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralInteger.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LiteralInteger.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: LiteralInteger.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Literal Integer</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A literal integer contains an Integer-valued attribute. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralNull.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralNull.java
index 0d6e5b9..12ddf76 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralNull.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralNull.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LiteralNull.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: LiteralNull.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Literal Null</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A literal null is used to represent null, i.e., the absence of a value. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getLiteralNull()
  * @model 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralSpecification.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralSpecification.java
index 7b9bc8b..a9bcb30 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralSpecification.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralSpecification.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LiteralSpecification.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: LiteralSpecification.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Literal Specification</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A literal specification is an abstract specialization of ValueSpecification that identifies a literal constant being modeled. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getLiteralSpecification()
  * @model abstract="true"
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralString.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralString.java
index 61557ca..120d1ae 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralString.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralString.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LiteralString.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: LiteralString.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Literal String</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A literal string contains a String-valued attribute. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralUnlimitedNatural.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralUnlimitedNatural.java
index 170637b..8281931 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralUnlimitedNatural.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/LiteralUnlimitedNatural.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: LiteralUnlimitedNatural.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: LiteralUnlimitedNatural.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Literal Unlimited Natural</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A literal unlimited natural contains a UnlimitedNatural-valued attribute. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/MessageTrigger.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/MessageTrigger.java
index c411312..b081d1d 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/MessageTrigger.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/MessageTrigger.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: MessageTrigger.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: MessageTrigger.java,v 1.3 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Message Trigger</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A message trigger specifies the an observable event caused by a either a call or a signal. MessageTrigger is an abstract metaclass. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getMessageTrigger()
  * @model abstract="true"
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Model.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Model.java
index 0541f93..17f22d1 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Model.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Model.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Model.java,v 1.3 2004/05/13 03:16:20 khussey Exp $
+ * $Id: Model.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Model</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * The Model construct is defined as a Package. It contains a (hierarchical) set of elements that together describe the physical system being modeled. A Model may also contain a set of elements that represents the environment of the system, typically Actors, together with their interrelationships, such as Associations and Dependencies 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/MultiplicityElement.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/MultiplicityElement.java
index 50a2f0a..c2cb668 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/MultiplicityElement.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/MultiplicityElement.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: MultiplicityElement.java,v 1.3 2004/04/27 16:38:55 khussey Exp $
+ * $Id: MultiplicityElement.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -24,6 +24,10 @@
  * A representation of the model object '<em><b>Multiplicity Element</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A MultiplicityElement is an abstract metaclass which includes optional attributes for defining the bounds of a multiplicity. A MultiplicityElement also includes specifications of whether the values in an instantiation of this element must be unique or ordered. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/NamedElement.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/NamedElement.java
index 3c0ab25..cc133c4 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/NamedElement.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/NamedElement.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: NamedElement.java,v 1.4 2004/05/11 15:24:00 khussey Exp $
+ * $Id: NamedElement.java,v 1.5 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -26,6 +26,10 @@
  * A representation of the model object '<em><b>Named Element</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A named element represents elements that may have a name. The name is used for identification of the named element within the namespace in which it is defined. A named element also has a qualified name that allows it to be unambiguously identified within a hierarchy of nested namespaces. NamedElement is an abstract metaclass. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Namespace.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Namespace.java
index 0396dd2..bc3f38a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Namespace.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Namespace.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Namespace.java,v 1.4 2004/05/11 15:24:00 khussey Exp $
+ * $Id: Namespace.java,v 1.5 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -25,6 +25,10 @@
  * A representation of the model object '<em><b>Namespace</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A namespace is a named element that can own other named elements. Each named element may be owned by at most one namespace. A namespace provides a means for identifying named elements by name. Named elements can be identified by name in a namespace either by being directly owned by the namespace or by being introduced into the namespace by other means e.g. importing or inheriting. Namespace is an abstract metaclass. A namespace can own constraints. The constraint does not necessarily apply to the namespace itself, but may also apply to elements in the namespace. A namespace has the ability to import either individial members or all members of a package, thereby making it possible to refer to those named elements without qualification in the importing namespace. In the case of conflicts, it is necessary to use qualified names or aliases to disambiguate the referenced elements. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/OpaqueExpression.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/OpaqueExpression.java
index 26ddc8b..6d23027 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/OpaqueExpression.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/OpaqueExpression.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: OpaqueExpression.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: OpaqueExpression.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Opaque Expression</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An expression contains a language-specific text string used to describe a value or values, and an optional specification of the language. One predefined language for specifying expressions is OCL. Natural language or programming languages may also be used. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Operation.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Operation.java
index 08d0118..0074fa8 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Operation.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Operation.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Operation.java,v 1.5 2004/05/20 03:20:04 khussey Exp $
+ * $Id: Operation.java,v 1.6 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -24,6 +24,10 @@
  * A representation of the model object '<em><b>Operation</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * An operation is a behavioral feature of a classifier that specifies the name, type, parameters, and constraints for invoking an associated behavior. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/OperationTemplateParameter.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/OperationTemplateParameter.java
index 6dd8e8e..2897572 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/OperationTemplateParameter.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/OperationTemplateParameter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: OperationTemplateParameter.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: OperationTemplateParameter.java,v 1.3 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Operation Template Parameter</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * OperationTemplateParameter is a template parameter where the parametered element is an Operation. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getOperationTemplateParameter()
  * @model 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Package.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Package.java
index 643ff77..4e9b48c 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Package.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Package.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Package.java,v 1.7 2004/06/02 05:02:27 khussey Exp $
+ * $Id: Package.java,v 1.8 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -25,6 +25,10 @@
  * A representation of the model object '<em><b>Package</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A package is a namespace for its members, and may contain other packages. Only packageable elements can be owned members of a package. By virtue of being a namespace, a package can import either individual members of other packages, or all the members of other packages. In addition a package can be merged with other packages. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageImport.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageImport.java
index f1e9494..d9339b8 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageImport.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageImport.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PackageImport.java,v 1.3 2004/04/27 16:38:55 khussey Exp $
+ * $Id: PackageImport.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -22,6 +22,10 @@
  * A representation of the model object '<em><b>Package Import</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A package import is defined as a directed relationship that identifies a package whose members are to be imported by a namespace. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageMerge.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageMerge.java
index 3dbadbd..4628a0d 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageMerge.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageMerge.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PackageMerge.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: PackageMerge.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Package Merge</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A package merge is a relationship between two packages, where the contents of the target package (the one pointed at) is merged with the contents of the source package through specialization and redefinition, where applicable. This is a mechanism that should be used when elements of the same name are intended to represent the same concept, regardless of the package in which they are defined. A merging package will take elements of the same kind with the same name from one or more packages and merge them together into a single element using generalization and redefinitions. It should be noted that a package merge can be viewed as a short-hand way of explicitly defining those generalizations and redefinitions. The merged packages are still available, and the elements in those packages can be separately qualified. From an XMI point of view, it is either possible to exchange a model with all PackageMerges retained or a model where all PackageMerges have been transformed away (in which case package imports, generalizations, and redefinitions are used instead). 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageableElement.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageableElement.java
index 315fb5f..34d4e5b 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageableElement.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PackageableElement.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PackageableElement.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: PackageableElement.java,v 1.3 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Packageable Element</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A packageable element indicates a named element that may be owned directly by a package. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Parameter.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Parameter.java
index bfee4aa..30a35be 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Parameter.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Parameter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Parameter.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: Parameter.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Parameter</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A parameter is a specification of an argument used to pass information into or out of an invocation of a behavioral feature. It has a type, and may have a multiplicity and an optional default value. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ParameterDirectionKind.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ParameterDirectionKind.java
index c579c1e..10c98fa 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ParameterDirectionKind.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ParameterDirectionKind.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ParameterDirectionKind.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: ParameterDirectionKind.java,v 1.3 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -23,6 +23,9 @@
  * A representation of the literals of the enumeration '<em><b>Parameter Direction Kind</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * ParameterDirectionKind is an enumeration of the following literal values: • in Indicates that parameter values are passed into the behavioral element by the caller. • inout Indicates that parameter values are passed into a behavioral element by the caller and then back out to the caller from the behavioral element. • out Indicates that parameter values are passed from a behavioral element out to the caller. • return Indicates that parameter values are passed as return values from a behavioral element back to the caller. 
+ * <!-- end-model-doc -->
  * @see org.eclipse.uml2.UML2Package#getParameterDirectionKind()
  * @model
  * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ParameterableElement.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ParameterableElement.java
index 92f6372..9b7fcda 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ParameterableElement.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ParameterableElement.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ParameterableElement.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: ParameterableElement.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Parameterable Element</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A ParameterableElement can be referenced by a TemplateParameter when defining a formal template parameter for a template. A ParameterableElement can be referenced by a TemplateParameterSubstitution when used as an actual parameter in a binding of a template. ParameterableElement is an abstract metaclass. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Permission.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Permission.java
index 66cd118..9596989 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Permission.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Permission.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Permission.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: Permission.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Permission</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A Permission signifies granting of access rights from the supplier model element to a client model element. Or to put it another way, it signifies that the client requires access to some or all of the constituent elements of the supplier. The supplier element gives the client permission to access some or all of its constituents elements. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getPermission()
  * @model 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Port.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Port.java
index 4ecd7b0..903c8e4 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Port.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Port.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Port.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: Port.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Port</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * Ports represent interaction points between a classifier and its environment. The interfaces associated with a port specify the nature of the interactions that may occur over a port. The required interfaces of a port characterize the requests which may be made from the classifier to its environment through this port. The provided interfaces of a port characterize requests to the classifier that its environment may make through this port. A port has the ability to specify that any requests arriving at this port are handled by the behavior of the instance of the owning classifier, rather than being forwarded to any contained instances, if any. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PrimitiveType.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PrimitiveType.java
index c4fe35b..7056a72 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PrimitiveType.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/PrimitiveType.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PrimitiveType.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: PrimitiveType.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Primitive Type</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * The instances of primitive type used in UML itself include Boolean, Integer, UnlimitedNatural, and String. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getPrimitiveType()
  * @model 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Property.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Property.java
index 5405f6f..366de80 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Property.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Property.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Property.java,v 1.4 2004/05/11 15:24:00 khussey Exp $
+ * $Id: Property.java,v 1.5 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -25,6 +25,10 @@
  * A representation of the model object '<em><b>Property</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * Property represents a declared state of one or more instances in terms of a named relationship to a value or values. When a property is an attribute of a classifier, the value or values are related to the instance of the classifier by being held in slots of the instance. When a property is an association end, the value or values are related to the instance or instances at the other end(s) of the association (see semantics of Association). Property is indirectly a subclass of Constructs::TypedElement. The range of valid values represented by the property can be controlled by setting the property’s type. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ProtocolTransition.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ProtocolTransition.java
index 387ab85..85641e5 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ProtocolTransition.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ProtocolTransition.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ProtocolTransition.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: ProtocolTransition.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Protocol Transition</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A protocol transition (transition as specialized in the ProtocolStateMachines package) specifies a legal transition for an operation. Transitions of protocol state machines have the following information: a pre condition (guard), on trigger, and a post condition. Every protocol transition is associated to zero or one operation (referred BehavioralFeature) that belongs to the context classifier of the protocol state machine. The protocol transition specifies that the associated (referred) operation can be called for an instance in the origin state under the initial condition (guard), and that at the end of the transition, the destination state will be reached under the final condition (post). 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Realization.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Realization.java
index 32ea019..911734a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Realization.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Realization.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Realization.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: Realization.java,v 1.3 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Realization</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * In the metamodel, a Realization is a subtype of Dependencies::Realization. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Reception.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Reception.java
index 990bb92..1dd659a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Reception.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Reception.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Reception.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: Reception.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Reception</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A reception is a declaration stating that a classifier is prepared to react to the receipt of a signal. A reception designates a signal and specifies the expected behavioral response. The details of handling a signal are specified by the behavior associated with the reception or the classifier itself. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/RedefinableElement.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/RedefinableElement.java
index 57b915b..3e1eb9a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/RedefinableElement.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/RedefinableElement.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: RedefinableElement.java,v 1.4 2004/05/11 15:24:00 khussey Exp $
+ * $Id: RedefinableElement.java,v 1.5 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -22,6 +22,10 @@
  * A representation of the model object '<em><b>Redefinable Element</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A redefinable element is a named element that can be redefined in the context of a generalization. RedefinableElement is an abstract metaclass. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/RedefinableTemplateSignature.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/RedefinableTemplateSignature.java
index c5147c4..8127bf3 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/RedefinableTemplateSignature.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/RedefinableTemplateSignature.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: RedefinableTemplateSignature.java,v 1.2 2004/04/10 04:09:49 khussey Exp $
+ * $Id: RedefinableTemplateSignature.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Redefinable Template Signature</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * RedefinableTemplateSignature specializes both TemplateSignature and RedefinableElement in order to allow the addition of new formal template parameters in the context of a specializing template Classifier. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getRedefinableTemplateSignature()
  * @model 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Relationship.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Relationship.java
index 19473c4..8d09ccb 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Relationship.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Relationship.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Relationship.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: Relationship.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Relationship</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A relationship references one or more related elements. Relationship is an abstract metaclass. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Signal.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Signal.java
index 259c54e..7c78b8c 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Signal.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Signal.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Signal.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: Signal.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Signal</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A signal is a specification of type of send request instances communicated between objects. The receiving object handles the signal instance as specified by its receptions. The data carried by a send request and passed to it by the occurrence of the send invocation event that caused the request is represented as attributes of the signal instance. A signal is defined independently of the classifiers handling the signal. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
@@ -32,7 +36,7 @@
  * @model 
  * @generated
  */
-public interface Signal extends Classifier {
+public interface Signal extends Classifier{
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Slot.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Slot.java
index 361bf01..f39c333 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Slot.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Slot.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Slot.java,v 1.2 2004/04/10 04:09:49 khussey Exp $
+ * $Id: Slot.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Slot</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A slot is owned by an instance specification. It specifies the value or values for its defining feature, which must be a structural feature of a classifier of the instance specification owning the slot. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/StructuralFeature.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/StructuralFeature.java
index 54504d9..f8403fd 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/StructuralFeature.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/StructuralFeature.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StructuralFeature.java,v 1.2 2004/04/10 04:09:49 khussey Exp $
+ * $Id: StructuralFeature.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Structural Feature</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A structural feature is a typed feature of a classifier that specify the structure of instances of the classifier. Structural feature is an abstract metaclass. By specializing multiplicity element, it supports a multiplicity that specifies valid cardinalities for the set of values associated with an instantiation of the structural feature. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/StructuredClassifier.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/StructuredClassifier.java
index 0eb9a37..c8b39fd 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/StructuredClassifier.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/StructuredClassifier.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StructuredClassifier.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: StructuredClassifier.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Structured Classifier</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A structured classifier is an abstract metaclass that represents any classifier whose behavior can be fully or partly described by the collaboration of owned or referenced instances. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Substitution.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Substitution.java
index 8e10b88..1e5ef34 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Substitution.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Substitution.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Substitution.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: Substitution.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Substitution</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A substitution is a relationship between two classifiers signifies that the substitutingClassifier complies with the contract specified by the contract classifier. This implies that instances of the substitutingClassifier are runtime substitutable where instances of the contract classifier are expected. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateBinding.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateBinding.java
index 7ebcff2..671c98a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateBinding.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateBinding.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TemplateBinding.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: TemplateBinding.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Template Binding</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * TemplateBinding is a directed relationship from a bound templateable element to the template signature of the target template. A TemplateBinding owns a set of template parameter substitutions. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateParameter.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateParameter.java
index 42647c0..a1cc04f 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateParameter.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateParameter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TemplateParameter.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: TemplateParameter.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Template Parameter</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * TemplateParameter references a ParameterableElement which is exposed as a formal template parameter in the containing template. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateParameterSubstitution.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateParameterSubstitution.java
index a32f838..b328ad4 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateParameterSubstitution.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateParameterSubstitution.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TemplateParameterSubstitution.java,v 1.4 2004/05/11 15:24:00 khussey Exp $
+ * $Id: TemplateParameterSubstitution.java,v 1.5 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Template Parameter Substitution</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * TemplateParameterSubstitution associates one or more actual parameters with a formal template parameter within the context of a TemplateBinding. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateSignature.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateSignature.java
index 63bf1cf..089a785 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateSignature.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateSignature.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TemplateSignature.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: TemplateSignature.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Template Signature</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A TemplateSignature is owned by a TemplateableElement and has one or more TemplateParameters that define the signature for binding this template. A TemplateSignature may reference a set of nested template signatures to reflect the hierarchical nature of a template. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateableElement.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateableElement.java
index 67e3f89..1653e5a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateableElement.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TemplateableElement.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TemplateableElement.java,v 1.3 2004/05/11 15:24:00 khussey Exp $
+ * $Id: TemplateableElement.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -23,6 +23,10 @@
  * A representation of the model object '<em><b>Templateable Element</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * TemplateableElement may contain a template signature which specifies the formal template parameters. A TemplateableElement that contains a template signature is often referred to as a template. TemplateableElement may contain bindings to templates that describe how the templateable element is constructed by replacing the formal template parameters with actual parameters. A TemplateableElement containing bindings is often referred to as a bound element. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeConstraint.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeConstraint.java
index ca2711a..e87e0bf 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeConstraint.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeConstraint.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TimeConstraint.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: TimeConstraint.java,v 1.3 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -17,6 +17,10 @@
  * A representation of the model object '<em><b>Time Constraint</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A TimeConstraint defines a Constraint that refers to a TimeInterval. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getTimeConstraint()
  * @model 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeExpression.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeExpression.java
index 8620b57..a25d9ab 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeExpression.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeExpression.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TimeExpression.java,v 1.2 2004/04/10 04:09:49 khussey Exp $
+ * $Id: TimeExpression.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Time Expression</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A TimeExpression defines a value specification that represent a time value. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeInterval.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeInterval.java
index 40b079d..46e23d5 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeInterval.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeInterval.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TimeInterval.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: TimeInterval.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Time Interval</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A TimeInterval defines the range between two TimeExpressions. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getTimeInterval()
  * @model 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeObservationAction.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeObservationAction.java
index 405e53e..186cfae 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeObservationAction.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeObservationAction.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TimeObservationAction.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: TimeObservationAction.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Time Observation Action</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A TimeObservationAction defines an action that observes the current point in time. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeTrigger.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeTrigger.java
index b1e7cec..8f6e0a2 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeTrigger.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TimeTrigger.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TimeTrigger.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: TimeTrigger.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Time Trigger</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A time trigger specifies a time event, which models the expiration of a specific deadline. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Trigger.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Trigger.java
index af3393c..23034e3 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Trigger.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Trigger.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Trigger.java,v 1.4 2004/05/20 03:20:04 khussey Exp $
+ * $Id: Trigger.java,v 1.5 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -19,6 +19,10 @@
  * A representation of the model object '<em><b>Trigger</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A trigger specifies the an event that may cause the execution of an associated behavior. An event is often ultimately caused by the execution of an action, but need not be. Trigger is an abstract metaclass. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
@@ -30,7 +34,7 @@
  * @model abstract="true"
  * @generated
  */
-public interface Trigger extends NamedElement {
+public interface Trigger extends NamedElement{
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Type.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Type.java
index 90a78d7..297d6e8 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Type.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Type.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Type.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: Type.java,v 1.3 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -17,6 +17,10 @@
  * A representation of the model object '<em><b>Type</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A type serves as a constraint on the range of values represented by a typed element. Type is an abstract metaclass. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TypedElement.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TypedElement.java
index 8b69b6b..d8714e9 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TypedElement.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/TypedElement.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: TypedElement.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: TypedElement.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Typed Element</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A typed element is an element that has a type that serves as a constraint on the range of values the element can represent. Typed element is an abstract metaclass. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UML2Package.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UML2Package.java
index 1ffb997..6bdff28 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UML2Package.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UML2Package.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: UML2Package.java,v 1.11 2004/06/02 05:02:26 khussey Exp $
+ * $Id: UML2Package.java,v 1.12 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -246,7 +246,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getTemplateableElement()
 	 * @generated
 	 */
-	int TEMPLATEABLE_ELEMENT = 95;
+	int TEMPLATEABLE_ELEMENT = 113;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.NamedElementImpl <em>Named Element</em>}' class.
@@ -256,7 +256,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getNamedElement()
 	 * @generated
 	 */
-	int NAMED_ELEMENT = 8;
+	int NAMED_ELEMENT = 2;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.NamespaceImpl <em>Namespace</em>}' class.
@@ -266,7 +266,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getNamespace()
 	 * @generated
 	 */
-	int NAMESPACE = 9;
+	int NAMESPACE = 3;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ClassifierImpl <em>Classifier</em>}' class.
@@ -296,7 +296,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getEncapsulatedClassifier()
 	 * @generated
 	 */
-	int ENCAPSULATED_CLASSIFIER = 109;
+	int ENCAPSULATED_CLASSIFIER = 105;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ClassImpl <em>Class</em>}' class.
@@ -456,7 +456,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getInstanceSpecification()
 	 * @generated
 	 */
-	int INSTANCE_SPECIFICATION = 34;
+	int INSTANCE_SPECIFICATION = 33;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.EnumerationLiteralImpl <em>Enumeration Literal</em>}' class.
@@ -486,7 +486,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getValueSpecification()
 	 * @generated
 	 */
-	int VALUE_SPECIFICATION = 5;
+	int VALUE_SPECIFICATION = 7;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.OpaqueExpressionImpl <em>Opaque Expression</em>}' class.
@@ -496,7 +496,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getOpaqueExpression()
 	 * @generated
 	 */
-	int OPAQUE_EXPRESSION = 4;
+	int OPAQUE_EXPRESSION = 6;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ExpressionImpl <em>Expression</em>}' class.
@@ -506,7 +506,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getExpression()
 	 * @generated
 	 */
-	int EXPRESSION = 6;
+	int EXPRESSION = 8;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.CommentImpl <em>Comment</em>}' class.
@@ -516,7 +516,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getComment()
 	 * @generated
 	 */
-	int COMMENT = 7;
+	int COMMENT = 9;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.RelationshipImpl <em>Relationship</em>}' class.
@@ -526,7 +526,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getRelationship()
 	 * @generated
 	 */
-	int RELATIONSHIP = 3;
+	int RELATIONSHIP = 5;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.DirectedRelationshipImpl <em>Directed Relationship</em>}' class.
@@ -536,7 +536,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getDirectedRelationship()
 	 * @generated
 	 */
-	int DIRECTED_RELATIONSHIP = 2;
+	int DIRECTED_RELATIONSHIP = 4;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.LiteralSpecificationImpl <em>Literal Specification</em>}' class.
@@ -616,7 +616,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getSlot()
 	 * @generated
 	 */
-	int SLOT = 35;
+	int SLOT = 34;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.InstanceValueImpl <em>Instance Value</em>}' class.
@@ -626,7 +626,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getInstanceValue()
 	 * @generated
 	 */
-	int INSTANCE_VALUE = 36;
+	int INSTANCE_VALUE = 35;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.GeneralizationImpl <em>Generalization</em>}' class.
@@ -636,7 +636,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getGeneralization()
 	 * @generated
 	 */
-	int GENERALIZATION = 33;
+	int GENERALIZATION = 36;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ElementImportImpl <em>Element Import</em>}' class.
@@ -875,132 +875,6 @@
 	 * @generated
 	 * @ordered
 	 */
-	int RELATIONSHIP__EANNOTATIONS = ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIP__OWNED_ELEMENT = ELEMENT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIP__OWNER = ELEMENT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIP__OWNED_COMMENT = ELEMENT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIP__RELATED_ELEMENT = ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Relationship</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RELATIONSHIP_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIRECTED_RELATIONSHIP__EANNOTATIONS = RELATIONSHIP__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIRECTED_RELATIONSHIP__OWNED_ELEMENT = RELATIONSHIP__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIRECTED_RELATIONSHIP__OWNER = RELATIONSHIP__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIRECTED_RELATIONSHIP__OWNED_COMMENT = RELATIONSHIP__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIRECTED_RELATIONSHIP__RELATED_ELEMENT = RELATIONSHIP__RELATED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIRECTED_RELATIONSHIP__SOURCE = RELATIONSHIP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIRECTED_RELATIONSHIP__TARGET = RELATIONSHIP_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Directed Relationship</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIRECTED_RELATIONSHIP_FEATURE_COUNT = RELATIONSHIP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
 	int TEMPLATEABLE_ELEMENT__EANNOTATIONS = ELEMENT__EANNOTATIONS;
 
 	/**
@@ -1172,6 +1046,285 @@
 	 * @generated
 	 * @ordered
 	 */
+	int NAMESPACE__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE__OWNER = NAMED_ELEMENT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE__NAME = NAMED_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE__MEMBER = NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE__OWNED_RULE = NAMED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE__IMPORTED_MEMBER = NAMED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE__ELEMENT_IMPORT = NAMED_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE__PACKAGE_IMPORT = NAMED_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of structural features of the the '<em>Namespace</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NAMESPACE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RELATIONSHIP__EANNOTATIONS = ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RELATIONSHIP__OWNED_ELEMENT = ELEMENT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RELATIONSHIP__OWNER = ELEMENT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RELATIONSHIP__OWNED_COMMENT = ELEMENT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RELATIONSHIP__RELATED_ELEMENT = ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the the '<em>Relationship</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RELATIONSHIP_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIRECTED_RELATIONSHIP__EANNOTATIONS = RELATIONSHIP__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIRECTED_RELATIONSHIP__OWNED_ELEMENT = RELATIONSHIP__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIRECTED_RELATIONSHIP__OWNER = RELATIONSHIP__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIRECTED_RELATIONSHIP__OWNED_COMMENT = RELATIONSHIP__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIRECTED_RELATIONSHIP__RELATED_ELEMENT = RELATIONSHIP__RELATED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Source</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIRECTED_RELATIONSHIP__SOURCE = RELATIONSHIP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIRECTED_RELATIONSHIP__TARGET = RELATIONSHIP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Directed Relationship</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIRECTED_RELATIONSHIP_FEATURE_COUNT = RELATIONSHIP_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
 	int TYPED_ELEMENT__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
 
 	/**
@@ -1874,159 +2027,6 @@
 	 * @generated
 	 * @ordered
 	 */
-	int NAMESPACE__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__OWNER = NAMED_ELEMENT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__NAME = NAMED_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__MEMBER = NAMED_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__OWNED_RULE = NAMED_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__IMPORTED_MEMBER = NAMED_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__ELEMENT_IMPORT = NAMED_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE__PACKAGE_IMPORT = NAMED_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the the '<em>Namespace</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NAMESPACE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
 	int CLASSIFIER__EANNOTATIONS = NAMESPACE__EANNOTATIONS;
 
 	/**
@@ -8075,114 +8075,6 @@
 	 * @generated
 	 * @ordered
 	 */
-	int GENERALIZATION__EANNOTATIONS = DIRECTED_RELATIONSHIP__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERALIZATION__OWNED_ELEMENT = DIRECTED_RELATIONSHIP__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERALIZATION__OWNER = DIRECTED_RELATIONSHIP__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERALIZATION__OWNED_COMMENT = DIRECTED_RELATIONSHIP__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERALIZATION__RELATED_ELEMENT = DIRECTED_RELATIONSHIP__RELATED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERALIZATION__SOURCE = DIRECTED_RELATIONSHIP__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERALIZATION__TARGET = DIRECTED_RELATIONSHIP__TARGET;
-
-	/**
-	 * The feature id for the '<em><b>Specific</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERALIZATION__SPECIFIC = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>General</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERALIZATION__GENERAL = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Is Substitutable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERALIZATION__IS_SUBSTITUTABLE = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Generalization Set</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERALIZATION__GENERALIZATION_SET = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the the '<em>Generalization</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERALIZATION_FEATURE_COUNT = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
 	int SLOT__EANNOTATIONS = ELEMENT__EANNOTATIONS;
 
 	/**
@@ -8399,6 +8291,114 @@
 	 * @generated
 	 * @ordered
 	 */
+	int GENERALIZATION__EANNOTATIONS = DIRECTED_RELATIONSHIP__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERALIZATION__OWNED_ELEMENT = DIRECTED_RELATIONSHIP__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERALIZATION__OWNER = DIRECTED_RELATIONSHIP__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERALIZATION__OWNED_COMMENT = DIRECTED_RELATIONSHIP__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERALIZATION__RELATED_ELEMENT = DIRECTED_RELATIONSHIP__RELATED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Source</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERALIZATION__SOURCE = DIRECTED_RELATIONSHIP__SOURCE;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERALIZATION__TARGET = DIRECTED_RELATIONSHIP__TARGET;
+
+	/**
+	 * The feature id for the '<em><b>Specific</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERALIZATION__SPECIFIC = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>General</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERALIZATION__GENERAL = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Is Substitutable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERALIZATION__IS_SUBSTITUTABLE = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Generalization Set</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERALIZATION__GENERALIZATION_SET = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the the '<em>Generalization</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GENERALIZATION_FEATURE_COUNT = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
 	int ELEMENT_IMPORT__EANNOTATIONS = DIRECTED_RELATIONSHIP__EANNOTATIONS;
 
 	/**
@@ -14502,7 +14502,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getArtifact()
 	 * @generated
 	 */
-	int ARTIFACT = 84;
+	int ARTIFACT = 67;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ManifestationImpl <em>Manifestation</em>}' class.
@@ -14512,7 +14512,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getManifestation()
 	 * @generated
 	 */
-	int MANIFESTATION = 85;
+	int MANIFESTATION = 68;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.InterfaceImpl <em>Interface</em>}' class.
@@ -14522,7 +14522,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getInterface()
 	 * @generated
 	 */
-	int INTERFACE = 86;
+	int INTERFACE = 65;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ImplementationImpl <em>Implementation</em>}' class.
@@ -14532,7 +14532,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getImplementation()
 	 * @generated
 	 */
-	int IMPLEMENTATION = 87;
+	int IMPLEMENTATION = 66;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ActorImpl <em>Actor</em>}' class.
@@ -14542,7 +14542,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getActor()
 	 * @generated
 	 */
-	int ACTOR = 88;
+	int ACTOR = 69;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ExtendImpl <em>Extend</em>}' class.
@@ -14552,7 +14552,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getExtend()
 	 * @generated
 	 */
-	int EXTEND = 89;
+	int EXTEND = 70;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.UseCaseImpl <em>Use Case</em>}' class.
@@ -14562,7 +14562,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getUseCase()
 	 * @generated
 	 */
-	int USE_CASE = 90;
+	int USE_CASE = 71;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ExtensionPointImpl <em>Extension Point</em>}' class.
@@ -14572,7 +14572,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getExtensionPoint()
 	 * @generated
 	 */
-	int EXTENSION_POINT = 91;
+	int EXTENSION_POINT = 72;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.IncludeImpl <em>Include</em>}' class.
@@ -14582,7 +14582,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getInclude()
 	 * @generated
 	 */
-	int INCLUDE = 92;
+	int INCLUDE = 73;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ActivityEdgeImpl <em>Activity Edge</em>}' class.
@@ -14592,7 +14592,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getActivityEdge()
 	 * @generated
 	 */
-	int ACTIVITY_EDGE = 65;
+	int ACTIVITY_EDGE = 74;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ActivityGroupImpl <em>Activity Group</em>}' class.
@@ -14602,7 +14602,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getActivityGroup()
 	 * @generated
 	 */
-	int ACTIVITY_GROUP = 66;
+	int ACTIVITY_GROUP = 75;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ActivityNodeImpl <em>Activity Node</em>}' class.
@@ -14612,7 +14612,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getActivityNode()
 	 * @generated
 	 */
-	int ACTIVITY_NODE = 67;
+	int ACTIVITY_NODE = 76;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ExecutableNodeImpl <em>Executable Node</em>}' class.
@@ -14622,7 +14622,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getExecutableNode()
 	 * @generated
 	 */
-	int EXECUTABLE_NODE = 78;
+	int EXECUTABLE_NODE = 87;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ActionImpl <em>Action</em>}' class.
@@ -14632,7 +14632,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getAction()
 	 * @generated
 	 */
-	int ACTION = 68;
+	int ACTION = 77;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ObjectNodeImpl <em>Object Node</em>}' class.
@@ -14642,7 +14642,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getObjectNode()
 	 * @generated
 	 */
-	int OBJECT_NODE = 69;
+	int OBJECT_NODE = 78;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ControlNodeImpl <em>Control Node</em>}' class.
@@ -14652,7 +14652,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getControlNode()
 	 * @generated
 	 */
-	int CONTROL_NODE = 70;
+	int CONTROL_NODE = 79;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ControlFlowImpl <em>Control Flow</em>}' class.
@@ -14662,7 +14662,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getControlFlow()
 	 * @generated
 	 */
-	int CONTROL_FLOW = 71;
+	int CONTROL_FLOW = 80;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ObjectFlowImpl <em>Object Flow</em>}' class.
@@ -14672,7 +14672,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getObjectFlow()
 	 * @generated
 	 */
-	int OBJECT_FLOW = 72;
+	int OBJECT_FLOW = 81;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.InitialNodeImpl <em>Initial Node</em>}' class.
@@ -14682,7 +14682,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getInitialNode()
 	 * @generated
 	 */
-	int INITIAL_NODE = 73;
+	int INITIAL_NODE = 82;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.FinalNodeImpl <em>Final Node</em>}' class.
@@ -14692,7 +14692,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getFinalNode()
 	 * @generated
 	 */
-	int FINAL_NODE = 74;
+	int FINAL_NODE = 83;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ActivityFinalNodeImpl <em>Activity Final Node</em>}' class.
@@ -14702,7 +14702,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getActivityFinalNode()
 	 * @generated
 	 */
-	int ACTIVITY_FINAL_NODE = 75;
+	int ACTIVITY_FINAL_NODE = 84;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.DecisionNodeImpl <em>Decision Node</em>}' class.
@@ -14712,7 +14712,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getDecisionNode()
 	 * @generated
 	 */
-	int DECISION_NODE = 76;
+	int DECISION_NODE = 85;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.MergeNodeImpl <em>Merge Node</em>}' class.
@@ -14722,7 +14722,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getMergeNode()
 	 * @generated
 	 */
-	int MERGE_NODE = 77;
+	int MERGE_NODE = 86;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.PinImpl <em>Pin</em>}' class.
@@ -14732,7 +14732,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getPin()
 	 * @generated
 	 */
-	int PIN = 81;
+	int PIN = 90;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.OutputPinImpl <em>Output Pin</em>}' class.
@@ -14742,7 +14742,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getOutputPin()
 	 * @generated
 	 */
-	int OUTPUT_PIN = 79;
+	int OUTPUT_PIN = 88;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.InputPinImpl <em>Input Pin</em>}' class.
@@ -14752,7 +14752,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getInputPin()
 	 * @generated
 	 */
-	int INPUT_PIN = 80;
+	int INPUT_PIN = 89;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ActivityParameterNodeImpl <em>Activity Parameter Node</em>}' class.
@@ -14762,7 +14762,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getActivityParameterNode()
 	 * @generated
 	 */
-	int ACTIVITY_PARAMETER_NODE = 82;
+	int ACTIVITY_PARAMETER_NODE = 91;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ValuePinImpl <em>Value Pin</em>}' class.
@@ -14772,7 +14772,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getValuePin()
 	 * @generated
 	 */
-	int VALUE_PIN = 83;
+	int VALUE_PIN = 92;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.VariableImpl <em>Variable</em>}' class.
@@ -14782,7 +14782,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getVariable()
 	 * @generated
 	 */
-	int VARIABLE = 120;
+	int VARIABLE = 106;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.StructuredActivityNodeImpl <em>Structured Activity Node</em>}' class.
@@ -14792,7 +14792,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getStructuredActivityNode()
 	 * @generated
 	 */
-	int STRUCTURED_ACTIVITY_NODE = 121;
+	int STRUCTURED_ACTIVITY_NODE = 107;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ConditionalNodeImpl <em>Conditional Node</em>}' class.
@@ -14802,7 +14802,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getConditionalNode()
 	 * @generated
 	 */
-	int CONDITIONAL_NODE = 122;
+	int CONDITIONAL_NODE = 108;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ClauseImpl <em>Clause</em>}' class.
@@ -14812,7 +14812,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getClause()
 	 * @generated
 	 */
-	int CLAUSE = 123;
+	int CLAUSE = 109;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.LoopNodeImpl <em>Loop Node</em>}' class.
@@ -14822,7 +14822,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getLoopNode()
 	 * @generated
 	 */
-	int LOOP_NODE = 124;
+	int LOOP_NODE = 110;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ConnectorEndImpl <em>Connector End</em>}' class.
@@ -14852,7 +14852,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getTrigger()
 	 * @generated
 	 */
-	int TRIGGER = 128;
+	int TRIGGER = 96;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.MessageTriggerImpl <em>Message Trigger</em>}' class.
@@ -14862,7 +14862,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getMessageTrigger()
 	 * @generated
 	 */
-	int MESSAGE_TRIGGER = 126;
+	int MESSAGE_TRIGGER = 94;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.CallTriggerImpl <em>Call Trigger</em>}' class.
@@ -14872,7 +14872,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getCallTrigger()
 	 * @generated
 	 */
-	int CALL_TRIGGER = 125;
+	int CALL_TRIGGER = 93;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ChangeTriggerImpl <em>Change Trigger</em>}' class.
@@ -14882,7 +14882,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getChangeTrigger()
 	 * @generated
 	 */
-	int CHANGE_TRIGGER = 127;
+	int CHANGE_TRIGGER = 95;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ReceptionImpl <em>Reception</em>}' class.
@@ -14892,7 +14892,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getReception()
 	 * @generated
 	 */
-	int RECEPTION = 129;
+	int RECEPTION = 97;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.SignalImpl <em>Signal</em>}' class.
@@ -14902,7 +14902,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getSignal()
 	 * @generated
 	 */
-	int SIGNAL = 130;
+	int SIGNAL = 98;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.SignalTriggerImpl <em>Signal Trigger</em>}' class.
@@ -14912,7 +14912,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getSignalTrigger()
 	 * @generated
 	 */
-	int SIGNAL_TRIGGER = 131;
+	int SIGNAL_TRIGGER = 99;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.TimeTriggerImpl <em>Time Trigger</em>}' class.
@@ -14922,7 +14922,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getTimeTrigger()
 	 * @generated
 	 */
-	int TIME_TRIGGER = 132;
+	int TIME_TRIGGER = 100;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.AnyTriggerImpl <em>Any Trigger</em>}' class.
@@ -14932,7 +14932,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getAnyTrigger()
 	 * @generated
 	 */
-	int ANY_TRIGGER = 133;
+	int ANY_TRIGGER = 101;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -15616,6 +15616,2364 @@
 	 * @generated
 	 * @ordered
 	 */
+	int INTERFACE__EANNOTATIONS = CLASSIFIER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__OWNED_ELEMENT = CLASSIFIER__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__OWNER = CLASSIFIER__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__OWNED_COMMENT = CLASSIFIER__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__TEMPLATE_BINDING = CLASSIFIER__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__OWNED_TEMPLATE_SIGNATURE = CLASSIFIER__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__NAME = CLASSIFIER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__QUALIFIED_NAME = CLASSIFIER__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__VISIBILITY = CLASSIFIER__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__CLIENT_DEPENDENCY = CLASSIFIER__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__NAME_EXPRESSION = CLASSIFIER__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__MEMBER = CLASSIFIER__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__OWNED_RULE = CLASSIFIER__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__IMPORTED_MEMBER = CLASSIFIER__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__ELEMENT_IMPORT = CLASSIFIER__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__PACKAGE_IMPORT = CLASSIFIER__PACKAGE_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__TEMPLATE_PARAMETER = CLASSIFIER__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__OWNING_PARAMETER = CLASSIFIER__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__PACKAGEABLE_ELEMENT_VISIBILITY = CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Package</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__PACKAGE = CLASSIFIER__PACKAGE;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__REDEFINITION_CONTEXT = CLASSIFIER__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__IS_LEAF = CLASSIFIER__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__FEATURE = CLASSIFIER__FEATURE;
+
+	/**
+	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__IS_ABSTRACT = CLASSIFIER__IS_ABSTRACT;
+
+	/**
+	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__INHERITED_MEMBER = CLASSIFIER__INHERITED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>General</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__GENERAL = CLASSIFIER__GENERAL;
+
+	/**
+	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__GENERALIZATION = CLASSIFIER__GENERALIZATION;
+
+	/**
+	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__ATTRIBUTE = CLASSIFIER__ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__REDEFINED_CLASSIFIER = CLASSIFIER__REDEFINED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__POWERTYPE_EXTENT = CLASSIFIER__POWERTYPE_EXTENT;
+
+	/**
+	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__SUBSTITUTION = CLASSIFIER__SUBSTITUTION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__OWNED_USE_CASE = CLASSIFIER__OWNED_USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__USE_CASE = CLASSIFIER__USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Representation</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__REPRESENTATION = CLASSIFIER__REPRESENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__OCCURRENCE = CLASSIFIER__OCCURRENCE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__OWNED_ATTRIBUTE = CLASSIFIER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__OWNED_OPERATION = CLASSIFIER_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Interface</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__REDEFINED_INTERFACE = CLASSIFIER_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Nested Classifier</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__NESTED_CLASSIFIER = CLASSIFIER_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Owned Reception</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__OWNED_RECEPTION = CLASSIFIER_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Protocol</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE__PROTOCOL = CLASSIFIER_FEATURE_COUNT + 5;
+
+	/**
+	 * The number of structural features of the the '<em>Interface</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERFACE_FEATURE_COUNT = CLASSIFIER_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__EANNOTATIONS = REALIZATION__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__OWNED_ELEMENT = REALIZATION__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__OWNER = REALIZATION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__OWNED_COMMENT = REALIZATION__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__TEMPLATE_BINDING = REALIZATION__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__OWNED_TEMPLATE_SIGNATURE = REALIZATION__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__NAME = REALIZATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__QUALIFIED_NAME = REALIZATION__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__VISIBILITY = REALIZATION__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__CLIENT_DEPENDENCY = REALIZATION__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__NAME_EXPRESSION = REALIZATION__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__TEMPLATE_PARAMETER = REALIZATION__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__OWNING_PARAMETER = REALIZATION__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__PACKAGEABLE_ELEMENT_VISIBILITY = REALIZATION__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__RELATED_ELEMENT = REALIZATION__RELATED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Source</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__SOURCE = REALIZATION__SOURCE;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__TARGET = REALIZATION__TARGET;
+
+	/**
+	 * The feature id for the '<em><b>Client</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__CLIENT = REALIZATION__CLIENT;
+
+	/**
+	 * The feature id for the '<em><b>Supplier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__SUPPLIER = REALIZATION__SUPPLIER;
+
+	/**
+	 * The feature id for the '<em><b>Mapping</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__MAPPING = REALIZATION__MAPPING;
+
+	/**
+	 * The feature id for the '<em><b>Abstraction</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__ABSTRACTION = REALIZATION__ABSTRACTION;
+
+	/**
+	 * The feature id for the '<em><b>Realizing Classifier</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__REALIZING_CLASSIFIER = REALIZATION__REALIZING_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Contract</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__CONTRACT = REALIZATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Implementing Classifier</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION__IMPLEMENTING_CLASSIFIER = REALIZATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Implementation</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPLEMENTATION_FEATURE_COUNT = REALIZATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__EANNOTATIONS = CLASSIFIER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__OWNED_ELEMENT = CLASSIFIER__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__OWNER = CLASSIFIER__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__OWNED_COMMENT = CLASSIFIER__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__TEMPLATE_BINDING = CLASSIFIER__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__OWNED_TEMPLATE_SIGNATURE = CLASSIFIER__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__NAME = CLASSIFIER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__QUALIFIED_NAME = CLASSIFIER__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__VISIBILITY = CLASSIFIER__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__CLIENT_DEPENDENCY = CLASSIFIER__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__NAME_EXPRESSION = CLASSIFIER__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__MEMBER = CLASSIFIER__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__OWNED_RULE = CLASSIFIER__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__IMPORTED_MEMBER = CLASSIFIER__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__ELEMENT_IMPORT = CLASSIFIER__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__PACKAGE_IMPORT = CLASSIFIER__PACKAGE_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__TEMPLATE_PARAMETER = CLASSIFIER__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__OWNING_PARAMETER = CLASSIFIER__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__PACKAGEABLE_ELEMENT_VISIBILITY = CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Package</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__PACKAGE = CLASSIFIER__PACKAGE;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__REDEFINITION_CONTEXT = CLASSIFIER__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__IS_LEAF = CLASSIFIER__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__FEATURE = CLASSIFIER__FEATURE;
+
+	/**
+	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__IS_ABSTRACT = CLASSIFIER__IS_ABSTRACT;
+
+	/**
+	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__INHERITED_MEMBER = CLASSIFIER__INHERITED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>General</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__GENERAL = CLASSIFIER__GENERAL;
+
+	/**
+	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__GENERALIZATION = CLASSIFIER__GENERALIZATION;
+
+	/**
+	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__ATTRIBUTE = CLASSIFIER__ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__REDEFINED_CLASSIFIER = CLASSIFIER__REDEFINED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__POWERTYPE_EXTENT = CLASSIFIER__POWERTYPE_EXTENT;
+
+	/**
+	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__SUBSTITUTION = CLASSIFIER__SUBSTITUTION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__OWNED_USE_CASE = CLASSIFIER__OWNED_USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__USE_CASE = CLASSIFIER__USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Representation</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__REPRESENTATION = CLASSIFIER__REPRESENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__OCCURRENCE = CLASSIFIER__OCCURRENCE;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__FILE_NAME = CLASSIFIER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Nested Artifact</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__NESTED_ARTIFACT = CLASSIFIER_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Manifestation</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__MANIFESTATION = CLASSIFIER_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__OWNED_OPERATION = CLASSIFIER_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT__OWNED_ATTRIBUTE = CLASSIFIER_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of structural features of the the '<em>Artifact</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ARTIFACT_FEATURE_COUNT = CLASSIFIER_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__EANNOTATIONS = ABSTRACTION__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__OWNED_ELEMENT = ABSTRACTION__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__OWNER = ABSTRACTION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__OWNED_COMMENT = ABSTRACTION__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__TEMPLATE_BINDING = ABSTRACTION__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__OWNED_TEMPLATE_SIGNATURE = ABSTRACTION__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__NAME = ABSTRACTION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__QUALIFIED_NAME = ABSTRACTION__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__VISIBILITY = ABSTRACTION__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__CLIENT_DEPENDENCY = ABSTRACTION__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__NAME_EXPRESSION = ABSTRACTION__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__TEMPLATE_PARAMETER = ABSTRACTION__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__OWNING_PARAMETER = ABSTRACTION__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__PACKAGEABLE_ELEMENT_VISIBILITY = ABSTRACTION__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__RELATED_ELEMENT = ABSTRACTION__RELATED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Source</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__SOURCE = ABSTRACTION__SOURCE;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__TARGET = ABSTRACTION__TARGET;
+
+	/**
+	 * The feature id for the '<em><b>Client</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__CLIENT = ABSTRACTION__CLIENT;
+
+	/**
+	 * The feature id for the '<em><b>Supplier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__SUPPLIER = ABSTRACTION__SUPPLIER;
+
+	/**
+	 * The feature id for the '<em><b>Mapping</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__MAPPING = ABSTRACTION__MAPPING;
+
+	/**
+	 * The feature id for the '<em><b>Utilized Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION__UTILIZED_ELEMENT = ABSTRACTION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the the '<em>Manifestation</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MANIFESTATION_FEATURE_COUNT = ABSTRACTION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__EANNOTATIONS = CLASSIFIER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__OWNED_ELEMENT = CLASSIFIER__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__OWNER = CLASSIFIER__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__OWNED_COMMENT = CLASSIFIER__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__TEMPLATE_BINDING = CLASSIFIER__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__OWNED_TEMPLATE_SIGNATURE = CLASSIFIER__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__NAME = CLASSIFIER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__QUALIFIED_NAME = CLASSIFIER__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__VISIBILITY = CLASSIFIER__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__CLIENT_DEPENDENCY = CLASSIFIER__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__NAME_EXPRESSION = CLASSIFIER__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__MEMBER = CLASSIFIER__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__OWNED_RULE = CLASSIFIER__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__IMPORTED_MEMBER = CLASSIFIER__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__ELEMENT_IMPORT = CLASSIFIER__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__PACKAGE_IMPORT = CLASSIFIER__PACKAGE_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__TEMPLATE_PARAMETER = CLASSIFIER__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__OWNING_PARAMETER = CLASSIFIER__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__PACKAGEABLE_ELEMENT_VISIBILITY = CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Package</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__PACKAGE = CLASSIFIER__PACKAGE;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__REDEFINITION_CONTEXT = CLASSIFIER__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__IS_LEAF = CLASSIFIER__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__FEATURE = CLASSIFIER__FEATURE;
+
+	/**
+	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__IS_ABSTRACT = CLASSIFIER__IS_ABSTRACT;
+
+	/**
+	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__INHERITED_MEMBER = CLASSIFIER__INHERITED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>General</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__GENERAL = CLASSIFIER__GENERAL;
+
+	/**
+	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__GENERALIZATION = CLASSIFIER__GENERALIZATION;
+
+	/**
+	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__ATTRIBUTE = CLASSIFIER__ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__REDEFINED_CLASSIFIER = CLASSIFIER__REDEFINED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__POWERTYPE_EXTENT = CLASSIFIER__POWERTYPE_EXTENT;
+
+	/**
+	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__SUBSTITUTION = CLASSIFIER__SUBSTITUTION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__OWNED_USE_CASE = CLASSIFIER__OWNED_USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__USE_CASE = CLASSIFIER__USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Representation</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__REPRESENTATION = CLASSIFIER__REPRESENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR__OCCURRENCE = CLASSIFIER__OCCURRENCE;
+
+	/**
+	 * The number of structural features of the the '<em>Actor</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTOR_FEATURE_COUNT = CLASSIFIER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__OWNER = NAMED_ELEMENT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__NAME = NAMED_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__RELATED_ELEMENT = NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Source</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__SOURCE = NAMED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__TARGET = NAMED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Extended Case</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__EXTENDED_CASE = NAMED_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Extension</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__EXTENSION = NAMED_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Condition</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__CONDITION = NAMED_ELEMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Extension Location</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND__EXTENSION_LOCATION = NAMED_ELEMENT_FEATURE_COUNT + 6;
+
+	/**
+	 * The number of structural features of the the '<em>Extend</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTEND_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__EANNOTATIONS = BEHAVIORED_CLASSIFIER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__OWNED_ELEMENT = BEHAVIORED_CLASSIFIER__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__OWNER = BEHAVIORED_CLASSIFIER__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__OWNED_COMMENT = BEHAVIORED_CLASSIFIER__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__TEMPLATE_BINDING = BEHAVIORED_CLASSIFIER__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__OWNED_TEMPLATE_SIGNATURE = BEHAVIORED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__NAME = BEHAVIORED_CLASSIFIER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__QUALIFIED_NAME = BEHAVIORED_CLASSIFIER__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__VISIBILITY = BEHAVIORED_CLASSIFIER__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__CLIENT_DEPENDENCY = BEHAVIORED_CLASSIFIER__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__NAME_EXPRESSION = BEHAVIORED_CLASSIFIER__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__MEMBER = BEHAVIORED_CLASSIFIER__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__OWNED_RULE = BEHAVIORED_CLASSIFIER__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__IMPORTED_MEMBER = BEHAVIORED_CLASSIFIER__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__ELEMENT_IMPORT = BEHAVIORED_CLASSIFIER__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__PACKAGE_IMPORT = BEHAVIORED_CLASSIFIER__PACKAGE_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__TEMPLATE_PARAMETER = BEHAVIORED_CLASSIFIER__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__OWNING_PARAMETER = BEHAVIORED_CLASSIFIER__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__PACKAGEABLE_ELEMENT_VISIBILITY = BEHAVIORED_CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Package</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__PACKAGE = BEHAVIORED_CLASSIFIER__PACKAGE;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__REDEFINITION_CONTEXT = BEHAVIORED_CLASSIFIER__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__IS_LEAF = BEHAVIORED_CLASSIFIER__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__FEATURE = BEHAVIORED_CLASSIFIER__FEATURE;
+
+	/**
+	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__IS_ABSTRACT = BEHAVIORED_CLASSIFIER__IS_ABSTRACT;
+
+	/**
+	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__INHERITED_MEMBER = BEHAVIORED_CLASSIFIER__INHERITED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>General</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__GENERAL = BEHAVIORED_CLASSIFIER__GENERAL;
+
+	/**
+	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__GENERALIZATION = BEHAVIORED_CLASSIFIER__GENERALIZATION;
+
+	/**
+	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__ATTRIBUTE = BEHAVIORED_CLASSIFIER__ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__REDEFINED_CLASSIFIER = BEHAVIORED_CLASSIFIER__REDEFINED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__POWERTYPE_EXTENT = BEHAVIORED_CLASSIFIER__POWERTYPE_EXTENT;
+
+	/**
+	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__SUBSTITUTION = BEHAVIORED_CLASSIFIER__SUBSTITUTION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__OWNED_USE_CASE = BEHAVIORED_CLASSIFIER__OWNED_USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__USE_CASE = BEHAVIORED_CLASSIFIER__USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Representation</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__REPRESENTATION = BEHAVIORED_CLASSIFIER__REPRESENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__OCCURRENCE = BEHAVIORED_CLASSIFIER__OCCURRENCE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__OWNED_BEHAVIOR = BEHAVIORED_CLASSIFIER__OWNED_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Classifier Behavior</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__CLASSIFIER_BEHAVIOR = BEHAVIORED_CLASSIFIER__CLASSIFIER_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Implementation</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__IMPLEMENTATION = BEHAVIORED_CLASSIFIER__IMPLEMENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__OWNED_TRIGGER = BEHAVIORED_CLASSIFIER__OWNED_TRIGGER;
+
+	/**
+	 * The feature id for the '<em><b>Owned State Machine</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__OWNED_STATE_MACHINE = BEHAVIORED_CLASSIFIER__OWNED_STATE_MACHINE;
+
+	/**
+	 * The feature id for the '<em><b>Include</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__INCLUDE = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Extend</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__EXTEND = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Extension Point</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__EXTENSION_POINT = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Subject</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE__SUBJECT = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the the '<em>Use Case</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE_CASE_FEATURE_COUNT = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_POINT__EANNOTATIONS = REDEFINABLE_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_POINT__OWNED_ELEMENT = REDEFINABLE_ELEMENT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_POINT__OWNER = REDEFINABLE_ELEMENT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_POINT__OWNED_COMMENT = REDEFINABLE_ELEMENT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_POINT__TEMPLATE_BINDING = REDEFINABLE_ELEMENT__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_POINT__OWNED_TEMPLATE_SIGNATURE = REDEFINABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_POINT__NAME = REDEFINABLE_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_POINT__QUALIFIED_NAME = REDEFINABLE_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_POINT__VISIBILITY = REDEFINABLE_ELEMENT__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_POINT__CLIENT_DEPENDENCY = REDEFINABLE_ELEMENT__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_POINT__NAME_EXPRESSION = REDEFINABLE_ELEMENT__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_POINT__REDEFINITION_CONTEXT = REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_POINT__IS_LEAF = REDEFINABLE_ELEMENT__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Use Case</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_POINT__USE_CASE = REDEFINABLE_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the the '<em>Extension Point</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_POINT_FEATURE_COUNT = REDEFINABLE_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__OWNER = NAMED_ELEMENT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__NAME = NAMED_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__RELATED_ELEMENT = NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Source</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__SOURCE = NAMED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__TARGET = NAMED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Including Case</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__INCLUDING_CASE = NAMED_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Addition</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE__ADDITION = NAMED_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of structural features of the the '<em>Include</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INCLUDE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
 	int ACTIVITY_EDGE__EANNOTATIONS = REDEFINABLE_ELEMENT__EANNOTATIONS;
 
 	/**
@@ -19912,2364 +22270,6 @@
 	int VALUE_PIN_FEATURE_COUNT = INPUT_PIN_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__EANNOTATIONS = CLASSIFIER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__OWNED_ELEMENT = CLASSIFIER__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__OWNER = CLASSIFIER__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__OWNED_COMMENT = CLASSIFIER__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__TEMPLATE_BINDING = CLASSIFIER__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__OWNED_TEMPLATE_SIGNATURE = CLASSIFIER__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__NAME = CLASSIFIER__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__QUALIFIED_NAME = CLASSIFIER__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__VISIBILITY = CLASSIFIER__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__CLIENT_DEPENDENCY = CLASSIFIER__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__NAME_EXPRESSION = CLASSIFIER__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__MEMBER = CLASSIFIER__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__OWNED_RULE = CLASSIFIER__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__IMPORTED_MEMBER = CLASSIFIER__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__ELEMENT_IMPORT = CLASSIFIER__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__PACKAGE_IMPORT = CLASSIFIER__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__TEMPLATE_PARAMETER = CLASSIFIER__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__OWNING_PARAMETER = CLASSIFIER__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__PACKAGEABLE_ELEMENT_VISIBILITY = CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__PACKAGE = CLASSIFIER__PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__REDEFINITION_CONTEXT = CLASSIFIER__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__IS_LEAF = CLASSIFIER__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__FEATURE = CLASSIFIER__FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__IS_ABSTRACT = CLASSIFIER__IS_ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__INHERITED_MEMBER = CLASSIFIER__INHERITED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>General</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__GENERAL = CLASSIFIER__GENERAL;
-
-	/**
-	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__GENERALIZATION = CLASSIFIER__GENERALIZATION;
-
-	/**
-	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__ATTRIBUTE = CLASSIFIER__ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__REDEFINED_CLASSIFIER = CLASSIFIER__REDEFINED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__POWERTYPE_EXTENT = CLASSIFIER__POWERTYPE_EXTENT;
-
-	/**
-	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__SUBSTITUTION = CLASSIFIER__SUBSTITUTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__OWNED_USE_CASE = CLASSIFIER__OWNED_USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__USE_CASE = CLASSIFIER__USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Representation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__REPRESENTATION = CLASSIFIER__REPRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__OCCURRENCE = CLASSIFIER__OCCURRENCE;
-
-	/**
-	 * The feature id for the '<em><b>File Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__FILE_NAME = CLASSIFIER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Nested Artifact</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__NESTED_ARTIFACT = CLASSIFIER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Manifestation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__MANIFESTATION = CLASSIFIER_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__OWNED_OPERATION = CLASSIFIER_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT__OWNED_ATTRIBUTE = CLASSIFIER_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the the '<em>Artifact</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ARTIFACT_FEATURE_COUNT = CLASSIFIER_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__EANNOTATIONS = ABSTRACTION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__OWNED_ELEMENT = ABSTRACTION__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__OWNER = ABSTRACTION__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__OWNED_COMMENT = ABSTRACTION__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__TEMPLATE_BINDING = ABSTRACTION__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__OWNED_TEMPLATE_SIGNATURE = ABSTRACTION__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__NAME = ABSTRACTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__QUALIFIED_NAME = ABSTRACTION__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__VISIBILITY = ABSTRACTION__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__CLIENT_DEPENDENCY = ABSTRACTION__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__NAME_EXPRESSION = ABSTRACTION__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__TEMPLATE_PARAMETER = ABSTRACTION__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__OWNING_PARAMETER = ABSTRACTION__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__PACKAGEABLE_ELEMENT_VISIBILITY = ABSTRACTION__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__RELATED_ELEMENT = ABSTRACTION__RELATED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__SOURCE = ABSTRACTION__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__TARGET = ABSTRACTION__TARGET;
-
-	/**
-	 * The feature id for the '<em><b>Client</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__CLIENT = ABSTRACTION__CLIENT;
-
-	/**
-	 * The feature id for the '<em><b>Supplier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__SUPPLIER = ABSTRACTION__SUPPLIER;
-
-	/**
-	 * The feature id for the '<em><b>Mapping</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__MAPPING = ABSTRACTION__MAPPING;
-
-	/**
-	 * The feature id for the '<em><b>Utilized Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION__UTILIZED_ELEMENT = ABSTRACTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Manifestation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MANIFESTATION_FEATURE_COUNT = ABSTRACTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__EANNOTATIONS = CLASSIFIER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__OWNED_ELEMENT = CLASSIFIER__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__OWNER = CLASSIFIER__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__OWNED_COMMENT = CLASSIFIER__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__TEMPLATE_BINDING = CLASSIFIER__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__OWNED_TEMPLATE_SIGNATURE = CLASSIFIER__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__NAME = CLASSIFIER__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__QUALIFIED_NAME = CLASSIFIER__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__VISIBILITY = CLASSIFIER__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__CLIENT_DEPENDENCY = CLASSIFIER__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__NAME_EXPRESSION = CLASSIFIER__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__MEMBER = CLASSIFIER__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__OWNED_RULE = CLASSIFIER__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__IMPORTED_MEMBER = CLASSIFIER__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__ELEMENT_IMPORT = CLASSIFIER__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__PACKAGE_IMPORT = CLASSIFIER__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__TEMPLATE_PARAMETER = CLASSIFIER__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__OWNING_PARAMETER = CLASSIFIER__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__PACKAGEABLE_ELEMENT_VISIBILITY = CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__PACKAGE = CLASSIFIER__PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__REDEFINITION_CONTEXT = CLASSIFIER__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__IS_LEAF = CLASSIFIER__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__FEATURE = CLASSIFIER__FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__IS_ABSTRACT = CLASSIFIER__IS_ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__INHERITED_MEMBER = CLASSIFIER__INHERITED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>General</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__GENERAL = CLASSIFIER__GENERAL;
-
-	/**
-	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__GENERALIZATION = CLASSIFIER__GENERALIZATION;
-
-	/**
-	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__ATTRIBUTE = CLASSIFIER__ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__REDEFINED_CLASSIFIER = CLASSIFIER__REDEFINED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__POWERTYPE_EXTENT = CLASSIFIER__POWERTYPE_EXTENT;
-
-	/**
-	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__SUBSTITUTION = CLASSIFIER__SUBSTITUTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__OWNED_USE_CASE = CLASSIFIER__OWNED_USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__USE_CASE = CLASSIFIER__USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Representation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__REPRESENTATION = CLASSIFIER__REPRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__OCCURRENCE = CLASSIFIER__OCCURRENCE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__OWNED_ATTRIBUTE = CLASSIFIER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__OWNED_OPERATION = CLASSIFIER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Interface</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__REDEFINED_INTERFACE = CLASSIFIER_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Nested Classifier</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__NESTED_CLASSIFIER = CLASSIFIER_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Owned Reception</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__OWNED_RECEPTION = CLASSIFIER_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Protocol</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE__PROTOCOL = CLASSIFIER_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the the '<em>Interface</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERFACE_FEATURE_COUNT = CLASSIFIER_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__EANNOTATIONS = REALIZATION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__OWNED_ELEMENT = REALIZATION__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__OWNER = REALIZATION__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__OWNED_COMMENT = REALIZATION__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__TEMPLATE_BINDING = REALIZATION__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__OWNED_TEMPLATE_SIGNATURE = REALIZATION__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__NAME = REALIZATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__QUALIFIED_NAME = REALIZATION__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__VISIBILITY = REALIZATION__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__CLIENT_DEPENDENCY = REALIZATION__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__NAME_EXPRESSION = REALIZATION__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__TEMPLATE_PARAMETER = REALIZATION__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__OWNING_PARAMETER = REALIZATION__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__PACKAGEABLE_ELEMENT_VISIBILITY = REALIZATION__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__RELATED_ELEMENT = REALIZATION__RELATED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__SOURCE = REALIZATION__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__TARGET = REALIZATION__TARGET;
-
-	/**
-	 * The feature id for the '<em><b>Client</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__CLIENT = REALIZATION__CLIENT;
-
-	/**
-	 * The feature id for the '<em><b>Supplier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__SUPPLIER = REALIZATION__SUPPLIER;
-
-	/**
-	 * The feature id for the '<em><b>Mapping</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__MAPPING = REALIZATION__MAPPING;
-
-	/**
-	 * The feature id for the '<em><b>Abstraction</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__ABSTRACTION = REALIZATION__ABSTRACTION;
-
-	/**
-	 * The feature id for the '<em><b>Realizing Classifier</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__REALIZING_CLASSIFIER = REALIZATION__REALIZING_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Contract</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__CONTRACT = REALIZATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Implementing Classifier</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION__IMPLEMENTING_CLASSIFIER = REALIZATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Implementation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMPLEMENTATION_FEATURE_COUNT = REALIZATION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__EANNOTATIONS = CLASSIFIER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__OWNED_ELEMENT = CLASSIFIER__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__OWNER = CLASSIFIER__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__OWNED_COMMENT = CLASSIFIER__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__TEMPLATE_BINDING = CLASSIFIER__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__OWNED_TEMPLATE_SIGNATURE = CLASSIFIER__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__NAME = CLASSIFIER__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__QUALIFIED_NAME = CLASSIFIER__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__VISIBILITY = CLASSIFIER__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__CLIENT_DEPENDENCY = CLASSIFIER__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__NAME_EXPRESSION = CLASSIFIER__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__MEMBER = CLASSIFIER__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__OWNED_RULE = CLASSIFIER__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__IMPORTED_MEMBER = CLASSIFIER__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__ELEMENT_IMPORT = CLASSIFIER__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__PACKAGE_IMPORT = CLASSIFIER__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__TEMPLATE_PARAMETER = CLASSIFIER__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__OWNING_PARAMETER = CLASSIFIER__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__PACKAGEABLE_ELEMENT_VISIBILITY = CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__PACKAGE = CLASSIFIER__PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__REDEFINITION_CONTEXT = CLASSIFIER__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__IS_LEAF = CLASSIFIER__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__FEATURE = CLASSIFIER__FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__IS_ABSTRACT = CLASSIFIER__IS_ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__INHERITED_MEMBER = CLASSIFIER__INHERITED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>General</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__GENERAL = CLASSIFIER__GENERAL;
-
-	/**
-	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__GENERALIZATION = CLASSIFIER__GENERALIZATION;
-
-	/**
-	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__ATTRIBUTE = CLASSIFIER__ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__REDEFINED_CLASSIFIER = CLASSIFIER__REDEFINED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__POWERTYPE_EXTENT = CLASSIFIER__POWERTYPE_EXTENT;
-
-	/**
-	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__SUBSTITUTION = CLASSIFIER__SUBSTITUTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__OWNED_USE_CASE = CLASSIFIER__OWNED_USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__USE_CASE = CLASSIFIER__USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Representation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__REPRESENTATION = CLASSIFIER__REPRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR__OCCURRENCE = CLASSIFIER__OCCURRENCE;
-
-	/**
-	 * The number of structural features of the the '<em>Actor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ACTOR_FEATURE_COUNT = CLASSIFIER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__OWNER = NAMED_ELEMENT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__NAME = NAMED_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__RELATED_ELEMENT = NAMED_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__SOURCE = NAMED_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__TARGET = NAMED_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Extended Case</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__EXTENDED_CASE = NAMED_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Extension</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__EXTENSION = NAMED_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Condition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__CONDITION = NAMED_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Extension Location</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND__EXTENSION_LOCATION = NAMED_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the the '<em>Extend</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTEND_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__EANNOTATIONS = BEHAVIORED_CLASSIFIER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__OWNED_ELEMENT = BEHAVIORED_CLASSIFIER__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__OWNER = BEHAVIORED_CLASSIFIER__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__OWNED_COMMENT = BEHAVIORED_CLASSIFIER__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__TEMPLATE_BINDING = BEHAVIORED_CLASSIFIER__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__OWNED_TEMPLATE_SIGNATURE = BEHAVIORED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__NAME = BEHAVIORED_CLASSIFIER__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__QUALIFIED_NAME = BEHAVIORED_CLASSIFIER__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__VISIBILITY = BEHAVIORED_CLASSIFIER__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__CLIENT_DEPENDENCY = BEHAVIORED_CLASSIFIER__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__NAME_EXPRESSION = BEHAVIORED_CLASSIFIER__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__MEMBER = BEHAVIORED_CLASSIFIER__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__OWNED_RULE = BEHAVIORED_CLASSIFIER__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__IMPORTED_MEMBER = BEHAVIORED_CLASSIFIER__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__ELEMENT_IMPORT = BEHAVIORED_CLASSIFIER__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__PACKAGE_IMPORT = BEHAVIORED_CLASSIFIER__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__TEMPLATE_PARAMETER = BEHAVIORED_CLASSIFIER__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__OWNING_PARAMETER = BEHAVIORED_CLASSIFIER__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__PACKAGEABLE_ELEMENT_VISIBILITY = BEHAVIORED_CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__PACKAGE = BEHAVIORED_CLASSIFIER__PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__REDEFINITION_CONTEXT = BEHAVIORED_CLASSIFIER__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__IS_LEAF = BEHAVIORED_CLASSIFIER__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__FEATURE = BEHAVIORED_CLASSIFIER__FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__IS_ABSTRACT = BEHAVIORED_CLASSIFIER__IS_ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__INHERITED_MEMBER = BEHAVIORED_CLASSIFIER__INHERITED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>General</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__GENERAL = BEHAVIORED_CLASSIFIER__GENERAL;
-
-	/**
-	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__GENERALIZATION = BEHAVIORED_CLASSIFIER__GENERALIZATION;
-
-	/**
-	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__ATTRIBUTE = BEHAVIORED_CLASSIFIER__ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__REDEFINED_CLASSIFIER = BEHAVIORED_CLASSIFIER__REDEFINED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__POWERTYPE_EXTENT = BEHAVIORED_CLASSIFIER__POWERTYPE_EXTENT;
-
-	/**
-	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__SUBSTITUTION = BEHAVIORED_CLASSIFIER__SUBSTITUTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__OWNED_USE_CASE = BEHAVIORED_CLASSIFIER__OWNED_USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__USE_CASE = BEHAVIORED_CLASSIFIER__USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Representation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__REPRESENTATION = BEHAVIORED_CLASSIFIER__REPRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__OCCURRENCE = BEHAVIORED_CLASSIFIER__OCCURRENCE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__OWNED_BEHAVIOR = BEHAVIORED_CLASSIFIER__OWNED_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Classifier Behavior</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__CLASSIFIER_BEHAVIOR = BEHAVIORED_CLASSIFIER__CLASSIFIER_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Implementation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__IMPLEMENTATION = BEHAVIORED_CLASSIFIER__IMPLEMENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__OWNED_TRIGGER = BEHAVIORED_CLASSIFIER__OWNED_TRIGGER;
-
-	/**
-	 * The feature id for the '<em><b>Owned State Machine</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__OWNED_STATE_MACHINE = BEHAVIORED_CLASSIFIER__OWNED_STATE_MACHINE;
-
-	/**
-	 * The feature id for the '<em><b>Include</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__INCLUDE = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Extend</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__EXTEND = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Extension Point</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__EXTENSION_POINT = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Subject</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE__SUBJECT = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the the '<em>Use Case</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_CASE_FEATURE_COUNT = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSION_POINT__EANNOTATIONS = REDEFINABLE_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSION_POINT__OWNED_ELEMENT = REDEFINABLE_ELEMENT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSION_POINT__OWNER = REDEFINABLE_ELEMENT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSION_POINT__OWNED_COMMENT = REDEFINABLE_ELEMENT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSION_POINT__TEMPLATE_BINDING = REDEFINABLE_ELEMENT__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSION_POINT__OWNED_TEMPLATE_SIGNATURE = REDEFINABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSION_POINT__NAME = REDEFINABLE_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSION_POINT__QUALIFIED_NAME = REDEFINABLE_ELEMENT__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSION_POINT__VISIBILITY = REDEFINABLE_ELEMENT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSION_POINT__CLIENT_DEPENDENCY = REDEFINABLE_ELEMENT__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSION_POINT__NAME_EXPRESSION = REDEFINABLE_ELEMENT__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSION_POINT__REDEFINITION_CONTEXT = REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSION_POINT__IS_LEAF = REDEFINABLE_ELEMENT__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Use Case</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSION_POINT__USE_CASE = REDEFINABLE_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Extension Point</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENSION_POINT_FEATURE_COUNT = REDEFINABLE_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__OWNER = NAMED_ELEMENT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__NAME = NAMED_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__RELATED_ELEMENT = NAMED_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__SOURCE = NAMED_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__TARGET = NAMED_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Including Case</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__INCLUDING_CASE = NAMED_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Addition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE__ADDITION = NAMED_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the the '<em>Include</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INCLUDE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.TemplateSignatureImpl <em>Template Signature</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -22277,7 +22277,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getTemplateSignature()
 	 * @generated
 	 */
-	int TEMPLATE_SIGNATURE = 93;
+	int TEMPLATE_SIGNATURE = 111;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.TemplateParameterImpl <em>Template Parameter</em>}' class.
@@ -22287,7 +22287,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getTemplateParameter()
 	 * @generated
 	 */
-	int TEMPLATE_PARAMETER = 94;
+	int TEMPLATE_PARAMETER = 112;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.StringExpressionImpl <em>String Expression</em>}' class.
@@ -22297,7 +22297,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getStringExpression()
 	 * @generated
 	 */
-	int STRING_EXPRESSION = 96;
+	int STRING_EXPRESSION = 114;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ParameterableElementImpl <em>Parameterable Element</em>}' class.
@@ -22307,7 +22307,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getParameterableElement()
 	 * @generated
 	 */
-	int PARAMETERABLE_ELEMENT = 97;
+	int PARAMETERABLE_ELEMENT = 115;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.TemplateBindingImpl <em>Template Binding</em>}' class.
@@ -22317,7 +22317,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getTemplateBinding()
 	 * @generated
 	 */
-	int TEMPLATE_BINDING = 98;
+	int TEMPLATE_BINDING = 116;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.TemplateParameterSubstitutionImpl <em>Template Parameter Substitution</em>}' class.
@@ -22327,7 +22327,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getTemplateParameterSubstitution()
 	 * @generated
 	 */
-	int TEMPLATE_PARAMETER_SUBSTITUTION = 99;
+	int TEMPLATE_PARAMETER_SUBSTITUTION = 117;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.CollaborationImpl <em>Collaboration</em>}' class.
@@ -22337,7 +22337,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getCollaboration()
 	 * @generated
 	 */
-	int COLLABORATION = 100;
+	int COLLABORATION = 103;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.OperationTemplateParameterImpl <em>Operation Template Parameter</em>}' class.
@@ -22347,7 +22347,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getOperationTemplateParameter()
 	 * @generated
 	 */
-	int OPERATION_TEMPLATE_PARAMETER = 101;
+	int OPERATION_TEMPLATE_PARAMETER = 118;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ClassifierTemplateParameterImpl <em>Classifier Template Parameter</em>}' class.
@@ -22357,7 +22357,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getClassifierTemplateParameter()
 	 * @generated
 	 */
-	int CLASSIFIER_TEMPLATE_PARAMETER = 102;
+	int CLASSIFIER_TEMPLATE_PARAMETER = 119;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ParameterableClassifierImpl <em>Parameterable Classifier</em>}' class.
@@ -22367,7 +22367,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getParameterableClassifier()
 	 * @generated
 	 */
-	int PARAMETERABLE_CLASSIFIER = 103;
+	int PARAMETERABLE_CLASSIFIER = 120;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.RedefinableTemplateSignatureImpl <em>Redefinable Template Signature</em>}' class.
@@ -22377,7 +22377,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getRedefinableTemplateSignature()
 	 * @generated
 	 */
-	int REDEFINABLE_TEMPLATE_SIGNATURE = 104;
+	int REDEFINABLE_TEMPLATE_SIGNATURE = 121;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.TemplateableClassifierImpl <em>Templateable Classifier</em>}' class.
@@ -22387,7 +22387,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getTemplateableClassifier()
 	 * @generated
 	 */
-	int TEMPLATEABLE_CLASSIFIER = 105;
+	int TEMPLATEABLE_CLASSIFIER = 122;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ConnectableElementTemplateParameterImpl <em>Connectable Element Template Parameter</em>}' class.
@@ -22397,7 +22397,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getConnectableElementTemplateParameter()
 	 * @generated
 	 */
-	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER = 106;
+	int CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER = 123;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ForkNodeImpl <em>Fork Node</em>}' class.
@@ -22407,7 +22407,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getForkNode()
 	 * @generated
 	 */
-	int FORK_NODE = 137;
+	int FORK_NODE = 175;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.JoinNodeImpl <em>Join Node</em>}' class.
@@ -22417,7 +22417,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getJoinNode()
 	 * @generated
 	 */
-	int JOIN_NODE = 138;
+	int JOIN_NODE = 176;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.FlowFinalNodeImpl <em>Flow Final Node</em>}' class.
@@ -22427,7 +22427,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getFlowFinalNode()
 	 * @generated
 	 */
-	int FLOW_FINAL_NODE = 139;
+	int FLOW_FINAL_NODE = 177;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.CentralBufferNodeImpl <em>Central Buffer Node</em>}' class.
@@ -22437,7 +22437,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getCentralBufferNode()
 	 * @generated
 	 */
-	int CENTRAL_BUFFER_NODE = 140;
+	int CENTRAL_BUFFER_NODE = 178;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ActivityPartitionImpl <em>Activity Partition</em>}' class.
@@ -22447,7 +22447,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getActivityPartition()
 	 * @generated
 	 */
-	int ACTIVITY_PARTITION = 141;
+	int ACTIVITY_PARTITION = 179;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.PortImpl <em>Port</em>}' class.
@@ -22457,7 +22457,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getPort()
 	 * @generated
 	 */
-	int PORT = 108;
+	int PORT = 104;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ExpansionNodeImpl <em>Expansion Node</em>}' class.
@@ -22467,7 +22467,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getExpansionNode()
 	 * @generated
 	 */
-	int EXPANSION_NODE = 134;
+	int EXPANSION_NODE = 180;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ExpansionRegionImpl <em>Expansion Region</em>}' class.
@@ -22477,7 +22477,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getExpansionRegion()
 	 * @generated
 	 */
-	int EXPANSION_REGION = 135;
+	int EXPANSION_REGION = 181;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ExceptionHandlerImpl <em>Exception Handler</em>}' class.
@@ -22487,7 +22487,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getExceptionHandler()
 	 * @generated
 	 */
-	int EXCEPTION_HANDLER = 136;
+	int EXCEPTION_HANDLER = 182;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.InteractionImpl <em>Interaction</em>}' class.
@@ -22497,7 +22497,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getInteraction()
 	 * @generated
 	 */
-	int INTERACTION = 110;
+	int INTERACTION = 124;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.InteractionFragmentImpl <em>Interaction Fragment</em>}' class.
@@ -22507,7 +22507,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getInteractionFragment()
 	 * @generated
 	 */
-	int INTERACTION_FRAGMENT = 111;
+	int INTERACTION_FRAGMENT = 125;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.LifelineImpl <em>Lifeline</em>}' class.
@@ -22517,7 +22517,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getLifeline()
 	 * @generated
 	 */
-	int LIFELINE = 112;
+	int LIFELINE = 126;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.MessageImpl <em>Message</em>}' class.
@@ -22527,7 +22527,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getMessage()
 	 * @generated
 	 */
-	int MESSAGE = 113;
+	int MESSAGE = 127;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.GeneralOrderingImpl <em>General Ordering</em>}' class.
@@ -22537,7 +22537,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getGeneralOrdering()
 	 * @generated
 	 */
-	int GENERAL_ORDERING = 114;
+	int GENERAL_ORDERING = 128;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.MessageEndImpl <em>Message End</em>}' class.
@@ -22547,7 +22547,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getMessageEnd()
 	 * @generated
 	 */
-	int MESSAGE_END = 115;
+	int MESSAGE_END = 129;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.EventOccurrenceImpl <em>Event Occurrence</em>}' class.
@@ -22557,7 +22557,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getEventOccurrence()
 	 * @generated
 	 */
-	int EVENT_OCCURRENCE = 116;
+	int EVENT_OCCURRENCE = 130;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ExecutionOccurrenceImpl <em>Execution Occurrence</em>}' class.
@@ -22567,7 +22567,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getExecutionOccurrence()
 	 * @generated
 	 */
-	int EXECUTION_OCCURRENCE = 117;
+	int EXECUTION_OCCURRENCE = 131;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.StateInvariantImpl <em>State Invariant</em>}' class.
@@ -22577,7 +22577,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getStateInvariant()
 	 * @generated
 	 */
-	int STATE_INVARIANT = 118;
+	int STATE_INVARIANT = 132;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.StopImpl <em>Stop</em>}' class.
@@ -22587,7 +22587,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getStop()
 	 * @generated
 	 */
-	int STOP = 119;
+	int STOP = 133;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.CollaborationOccurrenceImpl <em>Collaboration Occurrence</em>}' class.
@@ -22597,7 +22597,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getCollaborationOccurrence()
 	 * @generated
 	 */
-	int COLLABORATION_OCCURRENCE = 107;
+	int COLLABORATION_OCCURRENCE = 102;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.CreateObjectActionImpl <em>Create Object Action</em>}' class.
@@ -22937,7 +22937,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getStateMachine()
 	 * @generated
 	 */
-	int STATE_MACHINE = 175;
+	int STATE_MACHINE = 134;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.RegionImpl <em>Region</em>}' class.
@@ -22947,7 +22947,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getRegion()
 	 * @generated
 	 */
-	int REGION = 176;
+	int REGION = 135;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.VertexImpl <em>Vertex</em>}' class.
@@ -22957,7 +22957,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getVertex()
 	 * @generated
 	 */
-	int VERTEX = 179;
+	int VERTEX = 138;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.PseudostateImpl <em>Pseudostate</em>}' class.
@@ -22967,7 +22967,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getPseudostate()
 	 * @generated
 	 */
-	int PSEUDOSTATE = 177;
+	int PSEUDOSTATE = 136;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.StateImpl <em>State</em>}' class.
@@ -22977,7 +22977,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getState()
 	 * @generated
 	 */
-	int STATE = 178;
+	int STATE = 137;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ConnectionPointReferenceImpl <em>Connection Point Reference</em>}' class.
@@ -22987,7 +22987,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getConnectionPointReference()
 	 * @generated
 	 */
-	int CONNECTION_POINT_REFERENCE = 180;
+	int CONNECTION_POINT_REFERENCE = 139;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.TransitionImpl <em>Transition</em>}' class.
@@ -22997,7 +22997,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getTransition()
 	 * @generated
 	 */
-	int TRANSITION = 181;
+	int TRANSITION = 140;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.FinalStateImpl <em>Final State</em>}' class.
@@ -23007,7 +23007,4327 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getFinalState()
 	 * @generated
 	 */
-	int FINAL_STATE = 182;
+	int FINAL_STATE = 141;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRIGGER__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRIGGER__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRIGGER__OWNER = NAMED_ELEMENT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRIGGER__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRIGGER__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRIGGER__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRIGGER__NAME = NAMED_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRIGGER__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRIGGER__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRIGGER__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRIGGER__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Port</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRIGGER__PORT = NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the the '<em>Trigger</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRIGGER_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_TRIGGER__EANNOTATIONS = TRIGGER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_TRIGGER__OWNED_ELEMENT = TRIGGER__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_TRIGGER__OWNER = TRIGGER__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_TRIGGER__OWNED_COMMENT = TRIGGER__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_TRIGGER__TEMPLATE_BINDING = TRIGGER__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_TRIGGER__OWNED_TEMPLATE_SIGNATURE = TRIGGER__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_TRIGGER__NAME = TRIGGER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_TRIGGER__QUALIFIED_NAME = TRIGGER__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_TRIGGER__VISIBILITY = TRIGGER__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_TRIGGER__CLIENT_DEPENDENCY = TRIGGER__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_TRIGGER__NAME_EXPRESSION = TRIGGER__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Port</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_TRIGGER__PORT = TRIGGER__PORT;
+
+	/**
+	 * The number of structural features of the the '<em>Message Trigger</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MESSAGE_TRIGGER_FEATURE_COUNT = TRIGGER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CALL_TRIGGER__EANNOTATIONS = MESSAGE_TRIGGER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CALL_TRIGGER__OWNED_ELEMENT = MESSAGE_TRIGGER__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CALL_TRIGGER__OWNER = MESSAGE_TRIGGER__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CALL_TRIGGER__OWNED_COMMENT = MESSAGE_TRIGGER__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CALL_TRIGGER__TEMPLATE_BINDING = MESSAGE_TRIGGER__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CALL_TRIGGER__OWNED_TEMPLATE_SIGNATURE = MESSAGE_TRIGGER__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CALL_TRIGGER__NAME = MESSAGE_TRIGGER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CALL_TRIGGER__QUALIFIED_NAME = MESSAGE_TRIGGER__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CALL_TRIGGER__VISIBILITY = MESSAGE_TRIGGER__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CALL_TRIGGER__CLIENT_DEPENDENCY = MESSAGE_TRIGGER__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CALL_TRIGGER__NAME_EXPRESSION = MESSAGE_TRIGGER__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Port</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CALL_TRIGGER__PORT = MESSAGE_TRIGGER__PORT;
+
+	/**
+	 * The feature id for the '<em><b>Operation</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CALL_TRIGGER__OPERATION = MESSAGE_TRIGGER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the the '<em>Call Trigger</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CALL_TRIGGER_FEATURE_COUNT = MESSAGE_TRIGGER_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHANGE_TRIGGER__EANNOTATIONS = TRIGGER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHANGE_TRIGGER__OWNED_ELEMENT = TRIGGER__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHANGE_TRIGGER__OWNER = TRIGGER__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHANGE_TRIGGER__OWNED_COMMENT = TRIGGER__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHANGE_TRIGGER__TEMPLATE_BINDING = TRIGGER__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHANGE_TRIGGER__OWNED_TEMPLATE_SIGNATURE = TRIGGER__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHANGE_TRIGGER__NAME = TRIGGER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHANGE_TRIGGER__QUALIFIED_NAME = TRIGGER__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHANGE_TRIGGER__VISIBILITY = TRIGGER__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHANGE_TRIGGER__CLIENT_DEPENDENCY = TRIGGER__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHANGE_TRIGGER__NAME_EXPRESSION = TRIGGER__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Port</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHANGE_TRIGGER__PORT = TRIGGER__PORT;
+
+	/**
+	 * The feature id for the '<em><b>Change Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHANGE_TRIGGER__CHANGE_EXPRESSION = TRIGGER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the the '<em>Change Trigger</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHANGE_TRIGGER_FEATURE_COUNT = TRIGGER_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__EANNOTATIONS = BEHAVIORAL_FEATURE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__OWNED_ELEMENT = BEHAVIORAL_FEATURE__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__OWNER = BEHAVIORAL_FEATURE__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__OWNED_COMMENT = BEHAVIORAL_FEATURE__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__TEMPLATE_BINDING = BEHAVIORAL_FEATURE__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__OWNED_TEMPLATE_SIGNATURE = BEHAVIORAL_FEATURE__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__NAME = BEHAVIORAL_FEATURE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__QUALIFIED_NAME = BEHAVIORAL_FEATURE__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__VISIBILITY = BEHAVIORAL_FEATURE__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__CLIENT_DEPENDENCY = BEHAVIORAL_FEATURE__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__NAME_EXPRESSION = BEHAVIORAL_FEATURE__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__MEMBER = BEHAVIORAL_FEATURE__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__OWNED_RULE = BEHAVIORAL_FEATURE__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__IMPORTED_MEMBER = BEHAVIORAL_FEATURE__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__ELEMENT_IMPORT = BEHAVIORAL_FEATURE__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__PACKAGE_IMPORT = BEHAVIORAL_FEATURE__PACKAGE_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__REDEFINITION_CONTEXT = BEHAVIORAL_FEATURE__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__IS_LEAF = BEHAVIORAL_FEATURE__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Featuring Classifier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__FEATURING_CLASSIFIER = BEHAVIORAL_FEATURE__FEATURING_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Is Static</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__IS_STATIC = BEHAVIORAL_FEATURE__IS_STATIC;
+
+	/**
+	 * The feature id for the '<em><b>Parameter</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__PARAMETER = BEHAVIORAL_FEATURE__PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Formal Parameter</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__FORMAL_PARAMETER = BEHAVIORAL_FEATURE__FORMAL_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Return Result</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__RETURN_RESULT = BEHAVIORAL_FEATURE__RETURN_RESULT;
+
+	/**
+	 * The feature id for the '<em><b>Raised Exception</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__RAISED_EXCEPTION = BEHAVIORAL_FEATURE__RAISED_EXCEPTION;
+
+	/**
+	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__IS_ABSTRACT = BEHAVIORAL_FEATURE__IS_ABSTRACT;
+
+	/**
+	 * The feature id for the '<em><b>Method</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__METHOD = BEHAVIORAL_FEATURE__METHOD;
+
+	/**
+	 * The feature id for the '<em><b>Concurrency</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__CONCURRENCY = BEHAVIORAL_FEATURE__CONCURRENCY;
+
+	/**
+	 * The feature id for the '<em><b>Signal</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION__SIGNAL = BEHAVIORAL_FEATURE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the the '<em>Reception</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECEPTION_FEATURE_COUNT = BEHAVIORAL_FEATURE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__EANNOTATIONS = CLASSIFIER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__OWNED_ELEMENT = CLASSIFIER__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__OWNER = CLASSIFIER__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__OWNED_COMMENT = CLASSIFIER__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__TEMPLATE_BINDING = CLASSIFIER__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__OWNED_TEMPLATE_SIGNATURE = CLASSIFIER__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__NAME = CLASSIFIER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__QUALIFIED_NAME = CLASSIFIER__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__VISIBILITY = CLASSIFIER__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__CLIENT_DEPENDENCY = CLASSIFIER__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__NAME_EXPRESSION = CLASSIFIER__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__MEMBER = CLASSIFIER__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__OWNED_RULE = CLASSIFIER__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__IMPORTED_MEMBER = CLASSIFIER__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__ELEMENT_IMPORT = CLASSIFIER__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__PACKAGE_IMPORT = CLASSIFIER__PACKAGE_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__TEMPLATE_PARAMETER = CLASSIFIER__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__OWNING_PARAMETER = CLASSIFIER__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__PACKAGEABLE_ELEMENT_VISIBILITY = CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Package</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__PACKAGE = CLASSIFIER__PACKAGE;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__REDEFINITION_CONTEXT = CLASSIFIER__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__IS_LEAF = CLASSIFIER__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__FEATURE = CLASSIFIER__FEATURE;
+
+	/**
+	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__IS_ABSTRACT = CLASSIFIER__IS_ABSTRACT;
+
+	/**
+	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__INHERITED_MEMBER = CLASSIFIER__INHERITED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>General</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__GENERAL = CLASSIFIER__GENERAL;
+
+	/**
+	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__GENERALIZATION = CLASSIFIER__GENERALIZATION;
+
+	/**
+	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__ATTRIBUTE = CLASSIFIER__ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__REDEFINED_CLASSIFIER = CLASSIFIER__REDEFINED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__POWERTYPE_EXTENT = CLASSIFIER__POWERTYPE_EXTENT;
+
+	/**
+	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__SUBSTITUTION = CLASSIFIER__SUBSTITUTION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__OWNED_USE_CASE = CLASSIFIER__OWNED_USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__USE_CASE = CLASSIFIER__USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Representation</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__REPRESENTATION = CLASSIFIER__REPRESENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__OCCURRENCE = CLASSIFIER__OCCURRENCE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL__OWNED_ATTRIBUTE = CLASSIFIER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the the '<em>Signal</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL_FEATURE_COUNT = CLASSIFIER_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL_TRIGGER__EANNOTATIONS = MESSAGE_TRIGGER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL_TRIGGER__OWNED_ELEMENT = MESSAGE_TRIGGER__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL_TRIGGER__OWNER = MESSAGE_TRIGGER__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL_TRIGGER__OWNED_COMMENT = MESSAGE_TRIGGER__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL_TRIGGER__TEMPLATE_BINDING = MESSAGE_TRIGGER__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL_TRIGGER__OWNED_TEMPLATE_SIGNATURE = MESSAGE_TRIGGER__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL_TRIGGER__NAME = MESSAGE_TRIGGER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL_TRIGGER__QUALIFIED_NAME = MESSAGE_TRIGGER__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL_TRIGGER__VISIBILITY = MESSAGE_TRIGGER__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL_TRIGGER__CLIENT_DEPENDENCY = MESSAGE_TRIGGER__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL_TRIGGER__NAME_EXPRESSION = MESSAGE_TRIGGER__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Port</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL_TRIGGER__PORT = MESSAGE_TRIGGER__PORT;
+
+	/**
+	 * The feature id for the '<em><b>Signal</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL_TRIGGER__SIGNAL = MESSAGE_TRIGGER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the the '<em>Signal Trigger</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SIGNAL_TRIGGER_FEATURE_COUNT = MESSAGE_TRIGGER_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_TRIGGER__EANNOTATIONS = TRIGGER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_TRIGGER__OWNED_ELEMENT = TRIGGER__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_TRIGGER__OWNER = TRIGGER__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_TRIGGER__OWNED_COMMENT = TRIGGER__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_TRIGGER__TEMPLATE_BINDING = TRIGGER__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_TRIGGER__OWNED_TEMPLATE_SIGNATURE = TRIGGER__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_TRIGGER__NAME = TRIGGER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_TRIGGER__QUALIFIED_NAME = TRIGGER__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_TRIGGER__VISIBILITY = TRIGGER__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_TRIGGER__CLIENT_DEPENDENCY = TRIGGER__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_TRIGGER__NAME_EXPRESSION = TRIGGER__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Port</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_TRIGGER__PORT = TRIGGER__PORT;
+
+	/**
+	 * The feature id for the '<em><b>Is Relative</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_TRIGGER__IS_RELATIVE = TRIGGER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>When</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_TRIGGER__WHEN = TRIGGER_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Time Trigger</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_TRIGGER_FEATURE_COUNT = TRIGGER_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANY_TRIGGER__EANNOTATIONS = MESSAGE_TRIGGER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANY_TRIGGER__OWNED_ELEMENT = MESSAGE_TRIGGER__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANY_TRIGGER__OWNER = MESSAGE_TRIGGER__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANY_TRIGGER__OWNED_COMMENT = MESSAGE_TRIGGER__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANY_TRIGGER__TEMPLATE_BINDING = MESSAGE_TRIGGER__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANY_TRIGGER__OWNED_TEMPLATE_SIGNATURE = MESSAGE_TRIGGER__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANY_TRIGGER__NAME = MESSAGE_TRIGGER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANY_TRIGGER__QUALIFIED_NAME = MESSAGE_TRIGGER__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANY_TRIGGER__VISIBILITY = MESSAGE_TRIGGER__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANY_TRIGGER__CLIENT_DEPENDENCY = MESSAGE_TRIGGER__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANY_TRIGGER__NAME_EXPRESSION = MESSAGE_TRIGGER__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Port</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANY_TRIGGER__PORT = MESSAGE_TRIGGER__PORT;
+
+	/**
+	 * The number of structural features of the the '<em>Any Trigger</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ANY_TRIGGER_FEATURE_COUNT = MESSAGE_TRIGGER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION_OCCURRENCE__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION_OCCURRENCE__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION_OCCURRENCE__OWNER = NAMED_ELEMENT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION_OCCURRENCE__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION_OCCURRENCE__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION_OCCURRENCE__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION_OCCURRENCE__NAME = NAMED_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION_OCCURRENCE__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION_OCCURRENCE__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION_OCCURRENCE__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION_OCCURRENCE__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION_OCCURRENCE__TYPE = NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Role Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION_OCCURRENCE__ROLE_BINDING = NAMED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Collaboration Occurrence</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION_OCCURRENCE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__EANNOTATIONS = BEHAVIORED_CLASSIFIER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__OWNED_ELEMENT = BEHAVIORED_CLASSIFIER__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__OWNER = BEHAVIORED_CLASSIFIER__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__OWNED_COMMENT = BEHAVIORED_CLASSIFIER__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__TEMPLATE_BINDING = BEHAVIORED_CLASSIFIER__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__OWNED_TEMPLATE_SIGNATURE = BEHAVIORED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__NAME = BEHAVIORED_CLASSIFIER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__QUALIFIED_NAME = BEHAVIORED_CLASSIFIER__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__VISIBILITY = BEHAVIORED_CLASSIFIER__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__CLIENT_DEPENDENCY = BEHAVIORED_CLASSIFIER__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__NAME_EXPRESSION = BEHAVIORED_CLASSIFIER__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__MEMBER = BEHAVIORED_CLASSIFIER__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__OWNED_RULE = BEHAVIORED_CLASSIFIER__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__IMPORTED_MEMBER = BEHAVIORED_CLASSIFIER__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__ELEMENT_IMPORT = BEHAVIORED_CLASSIFIER__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__PACKAGE_IMPORT = BEHAVIORED_CLASSIFIER__PACKAGE_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__TEMPLATE_PARAMETER = BEHAVIORED_CLASSIFIER__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__OWNING_PARAMETER = BEHAVIORED_CLASSIFIER__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__PACKAGEABLE_ELEMENT_VISIBILITY = BEHAVIORED_CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Package</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__PACKAGE = BEHAVIORED_CLASSIFIER__PACKAGE;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__REDEFINITION_CONTEXT = BEHAVIORED_CLASSIFIER__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__IS_LEAF = BEHAVIORED_CLASSIFIER__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__FEATURE = BEHAVIORED_CLASSIFIER__FEATURE;
+
+	/**
+	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__IS_ABSTRACT = BEHAVIORED_CLASSIFIER__IS_ABSTRACT;
+
+	/**
+	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__INHERITED_MEMBER = BEHAVIORED_CLASSIFIER__INHERITED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>General</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__GENERAL = BEHAVIORED_CLASSIFIER__GENERAL;
+
+	/**
+	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__GENERALIZATION = BEHAVIORED_CLASSIFIER__GENERALIZATION;
+
+	/**
+	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__ATTRIBUTE = BEHAVIORED_CLASSIFIER__ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__REDEFINED_CLASSIFIER = BEHAVIORED_CLASSIFIER__REDEFINED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__POWERTYPE_EXTENT = BEHAVIORED_CLASSIFIER__POWERTYPE_EXTENT;
+
+	/**
+	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__SUBSTITUTION = BEHAVIORED_CLASSIFIER__SUBSTITUTION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__OWNED_USE_CASE = BEHAVIORED_CLASSIFIER__OWNED_USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__USE_CASE = BEHAVIORED_CLASSIFIER__USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Representation</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__REPRESENTATION = BEHAVIORED_CLASSIFIER__REPRESENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__OCCURRENCE = BEHAVIORED_CLASSIFIER__OCCURRENCE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__OWNED_BEHAVIOR = BEHAVIORED_CLASSIFIER__OWNED_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Classifier Behavior</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__CLASSIFIER_BEHAVIOR = BEHAVIORED_CLASSIFIER__CLASSIFIER_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Implementation</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__IMPLEMENTATION = BEHAVIORED_CLASSIFIER__IMPLEMENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__OWNED_TRIGGER = BEHAVIORED_CLASSIFIER__OWNED_TRIGGER;
+
+	/**
+	 * The feature id for the '<em><b>Owned State Machine</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__OWNED_STATE_MACHINE = BEHAVIORED_CLASSIFIER__OWNED_STATE_MACHINE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__OWNED_ATTRIBUTE = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Part</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__PART = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Role</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__ROLE = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__OWNED_CONNECTOR = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Collaboration Role</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION__COLLABORATION_ROLE = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of structural features of the the '<em>Collaboration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLABORATION_FEATURE_COUNT = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__EANNOTATIONS = PROPERTY__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__OWNED_ELEMENT = PROPERTY__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__OWNER = PROPERTY__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__OWNED_COMMENT = PROPERTY__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__TEMPLATE_BINDING = PROPERTY__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__OWNED_TEMPLATE_SIGNATURE = PROPERTY__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__NAME = PROPERTY__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__QUALIFIED_NAME = PROPERTY__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__VISIBILITY = PROPERTY__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__CLIENT_DEPENDENCY = PROPERTY__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__NAME_EXPRESSION = PROPERTY__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__REDEFINITION_CONTEXT = PROPERTY__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__IS_LEAF = PROPERTY__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Featuring Classifier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__FEATURING_CLASSIFIER = PROPERTY__FEATURING_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Is Static</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__IS_STATIC = PROPERTY__IS_STATIC;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__TYPE = PROPERTY__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Is Ordered</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__IS_ORDERED = PROPERTY__IS_ORDERED;
+
+	/**
+	 * The feature id for the '<em><b>Is Unique</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__IS_UNIQUE = PROPERTY__IS_UNIQUE;
+
+	/**
+	 * The feature id for the '<em><b>Lower</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__LOWER = PROPERTY__LOWER;
+
+	/**
+	 * The feature id for the '<em><b>Upper</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__UPPER = PROPERTY__UPPER;
+
+	/**
+	 * The feature id for the '<em><b>Upper Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__UPPER_VALUE = PROPERTY__UPPER_VALUE;
+
+	/**
+	 * The feature id for the '<em><b>Lower Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__LOWER_VALUE = PROPERTY__LOWER_VALUE;
+
+	/**
+	 * The feature id for the '<em><b>Is Read Only</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__IS_READ_ONLY = PROPERTY__IS_READ_ONLY;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__TEMPLATE_PARAMETER = PROPERTY__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__OWNING_PARAMETER = PROPERTY__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__END = PROPERTY__END;
+
+	/**
+	 * The feature id for the '<em><b>Deployment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__DEPLOYMENT = PROPERTY__DEPLOYMENT;
+
+	/**
+	 * The feature id for the '<em><b>Deployed Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__DEPLOYED_ELEMENT = PROPERTY__DEPLOYED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Default</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__DEFAULT = PROPERTY__DEFAULT;
+
+	/**
+	 * The feature id for the '<em><b>Is Composite</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__IS_COMPOSITE = PROPERTY__IS_COMPOSITE;
+
+	/**
+	 * The feature id for the '<em><b>Is Derived</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__IS_DERIVED = PROPERTY__IS_DERIVED;
+
+	/**
+	 * The feature id for the '<em><b>Class </b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__CLASS_ = PROPERTY__CLASS_;
+
+	/**
+	 * The feature id for the '<em><b>Opposite</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__OPPOSITE = PROPERTY__OPPOSITE;
+
+	/**
+	 * The feature id for the '<em><b>Is Derived Union</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__IS_DERIVED_UNION = PROPERTY__IS_DERIVED_UNION;
+
+	/**
+	 * The feature id for the '<em><b>Owning Association</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__OWNING_ASSOCIATION = PROPERTY__OWNING_ASSOCIATION;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Property</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__REDEFINED_PROPERTY = PROPERTY__REDEFINED_PROPERTY;
+
+	/**
+	 * The feature id for the '<em><b>Subsetted Property</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__SUBSETTED_PROPERTY = PROPERTY__SUBSETTED_PROPERTY;
+
+	/**
+	 * The feature id for the '<em><b>Datatype</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__DATATYPE = PROPERTY__DATATYPE;
+
+	/**
+	 * The feature id for the '<em><b>Association</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__ASSOCIATION = PROPERTY__ASSOCIATION;
+
+	/**
+	 * The feature id for the '<em><b>Aggregation</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__AGGREGATION = PROPERTY__AGGREGATION;
+
+	/**
+	 * The feature id for the '<em><b>Default Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__DEFAULT_VALUE = PROPERTY__DEFAULT_VALUE;
+
+	/**
+	 * The feature id for the '<em><b>Qualifier</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__QUALIFIER = PROPERTY__QUALIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Association End</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__ASSOCIATION_END = PROPERTY__ASSOCIATION_END;
+
+	/**
+	 * The feature id for the '<em><b>Is Behavior</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__IS_BEHAVIOR = PROPERTY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Is Service</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__IS_SERVICE = PROPERTY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Required</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__REQUIRED = PROPERTY_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Port</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__REDEFINED_PORT = PROPERTY_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Provided</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__PROVIDED = PROPERTY_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Protocol</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT__PROTOCOL = PROPERTY_FEATURE_COUNT + 5;
+
+	/**
+	 * The number of structural features of the the '<em>Port</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PORT_FEATURE_COUNT = PROPERTY_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__EANNOTATIONS = STRUCTURED_CLASSIFIER__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__OWNED_ELEMENT = STRUCTURED_CLASSIFIER__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__OWNER = STRUCTURED_CLASSIFIER__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__OWNED_COMMENT = STRUCTURED_CLASSIFIER__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__TEMPLATE_BINDING = STRUCTURED_CLASSIFIER__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE = STRUCTURED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__NAME = STRUCTURED_CLASSIFIER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__QUALIFIED_NAME = STRUCTURED_CLASSIFIER__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__VISIBILITY = STRUCTURED_CLASSIFIER__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__CLIENT_DEPENDENCY = STRUCTURED_CLASSIFIER__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__NAME_EXPRESSION = STRUCTURED_CLASSIFIER__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__MEMBER = STRUCTURED_CLASSIFIER__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__OWNED_RULE = STRUCTURED_CLASSIFIER__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__IMPORTED_MEMBER = STRUCTURED_CLASSIFIER__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__ELEMENT_IMPORT = STRUCTURED_CLASSIFIER__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__PACKAGE_IMPORT = STRUCTURED_CLASSIFIER__PACKAGE_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__TEMPLATE_PARAMETER = STRUCTURED_CLASSIFIER__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__OWNING_PARAMETER = STRUCTURED_CLASSIFIER__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY = STRUCTURED_CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Package</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__PACKAGE = STRUCTURED_CLASSIFIER__PACKAGE;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__REDEFINITION_CONTEXT = STRUCTURED_CLASSIFIER__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__IS_LEAF = STRUCTURED_CLASSIFIER__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__FEATURE = STRUCTURED_CLASSIFIER__FEATURE;
+
+	/**
+	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__IS_ABSTRACT = STRUCTURED_CLASSIFIER__IS_ABSTRACT;
+
+	/**
+	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__INHERITED_MEMBER = STRUCTURED_CLASSIFIER__INHERITED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>General</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__GENERAL = STRUCTURED_CLASSIFIER__GENERAL;
+
+	/**
+	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__GENERALIZATION = STRUCTURED_CLASSIFIER__GENERALIZATION;
+
+	/**
+	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__ATTRIBUTE = STRUCTURED_CLASSIFIER__ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__REDEFINED_CLASSIFIER = STRUCTURED_CLASSIFIER__REDEFINED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__POWERTYPE_EXTENT = STRUCTURED_CLASSIFIER__POWERTYPE_EXTENT;
+
+	/**
+	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__SUBSTITUTION = STRUCTURED_CLASSIFIER__SUBSTITUTION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__OWNED_USE_CASE = STRUCTURED_CLASSIFIER__OWNED_USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__USE_CASE = STRUCTURED_CLASSIFIER__USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Representation</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__REPRESENTATION = STRUCTURED_CLASSIFIER__REPRESENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__OCCURRENCE = STRUCTURED_CLASSIFIER__OCCURRENCE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__OWNED_ATTRIBUTE = STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Part</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__PART = STRUCTURED_CLASSIFIER__PART;
+
+	/**
+	 * The feature id for the '<em><b>Role</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__ROLE = STRUCTURED_CLASSIFIER__ROLE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__OWNED_CONNECTOR = STRUCTURED_CLASSIFIER__OWNED_CONNECTOR;
+
+	/**
+	 * The feature id for the '<em><b>Owned Port</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER__OWNED_PORT = STRUCTURED_CLASSIFIER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the the '<em>Encapsulated Classifier</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENCAPSULATED_CLASSIFIER_FEATURE_COUNT = STRUCTURED_CLASSIFIER_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__EANNOTATIONS = CONNECTABLE_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__OWNED_ELEMENT = CONNECTABLE_ELEMENT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__OWNER = CONNECTABLE_ELEMENT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__OWNED_COMMENT = CONNECTABLE_ELEMENT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__TEMPLATE_BINDING = CONNECTABLE_ELEMENT__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__OWNED_TEMPLATE_SIGNATURE = CONNECTABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__NAME = CONNECTABLE_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__QUALIFIED_NAME = CONNECTABLE_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__VISIBILITY = CONNECTABLE_ELEMENT__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__CLIENT_DEPENDENCY = CONNECTABLE_ELEMENT__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__NAME_EXPRESSION = CONNECTABLE_ELEMENT__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__TEMPLATE_PARAMETER = CONNECTABLE_ELEMENT__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__OWNING_PARAMETER = CONNECTABLE_ELEMENT__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__END = CONNECTABLE_ELEMENT__END;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__TYPE = CONNECTABLE_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Is Ordered</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__IS_ORDERED = CONNECTABLE_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Is Unique</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__IS_UNIQUE = CONNECTABLE_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Lower</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__LOWER = CONNECTABLE_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Upper</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__UPPER = CONNECTABLE_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Upper Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__UPPER_VALUE = CONNECTABLE_ELEMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Lower Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__LOWER_VALUE = CONNECTABLE_ELEMENT_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Scope</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE__SCOPE = CONNECTABLE_ELEMENT_FEATURE_COUNT + 7;
+
+	/**
+	 * The number of structural features of the the '<em>Variable</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VARIABLE_FEATURE_COUNT = CONNECTABLE_ELEMENT_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__EANNOTATIONS = ACTION__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__OWNED_ELEMENT = ACTION__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__OWNER = ACTION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__OWNED_COMMENT = ACTION__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__TEMPLATE_BINDING = ACTION__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__OWNED_TEMPLATE_SIGNATURE = ACTION__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__NAME = ACTION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__QUALIFIED_NAME = ACTION__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__VISIBILITY = ACTION__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__CLIENT_DEPENDENCY = ACTION__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__NAME_EXPRESSION = ACTION__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__REDEFINITION_CONTEXT = ACTION__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__IS_LEAF = ACTION__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__OUTGOING = ACTION__OUTGOING;
+
+	/**
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__INCOMING = ACTION__INCOMING;
+
+	/**
+	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__IN_GROUP = ACTION__IN_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__ACTIVITY = ACTION__ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__REDEFINED_ELEMENT = ACTION__REDEFINED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__IN_STRUCTURED_NODE = ACTION__IN_STRUCTURED_NODE;
+
+	/**
+	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__IN_PARTITION = ACTION__IN_PARTITION;
+
+	/**
+	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION = ACTION__IN_INTERRUPTIBLE_REGION;
+
+	/**
+	 * The feature id for the '<em><b>Handler</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__HANDLER = ACTION__HANDLER;
+
+	/**
+	 * The feature id for the '<em><b>Effect</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__EFFECT = ACTION__EFFECT;
+
+	/**
+	 * The feature id for the '<em><b>Output</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__OUTPUT = ACTION__OUTPUT;
+
+	/**
+	 * The feature id for the '<em><b>Input</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__INPUT = ACTION__INPUT;
+
+	/**
+	 * The feature id for the '<em><b>Context</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__CONTEXT = ACTION__CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Local Precondition</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__LOCAL_PRECONDITION = ACTION__LOCAL_PRECONDITION;
+
+	/**
+	 * The feature id for the '<em><b>Local Postcondition</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__LOCAL_POSTCONDITION = ACTION__LOCAL_POSTCONDITION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__MEMBER = ACTION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__OWNED_RULE = ACTION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__IMPORTED_MEMBER = ACTION_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__ELEMENT_IMPORT = ACTION_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__PACKAGE_IMPORT = ACTION_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Super Group</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__SUPER_GROUP = ACTION_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Activity Group activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__ACTIVITY_GROUP_ACTIVITY = ACTION_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Variable</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__VARIABLE = ACTION_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Contained Node</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__CONTAINED_NODE = ACTION_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Contained Edge</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__CONTAINED_EDGE = ACTION_FEATURE_COUNT + 9;
+
+	/**
+	 * The feature id for the '<em><b>Must Isolate</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE__MUST_ISOLATE = ACTION_FEATURE_COUNT + 10;
+
+	/**
+	 * The number of structural features of the the '<em>Structured Activity Node</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT = ACTION_FEATURE_COUNT + 11;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__EANNOTATIONS = STRUCTURED_ACTIVITY_NODE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__OWNED_ELEMENT = STRUCTURED_ACTIVITY_NODE__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__OWNER = STRUCTURED_ACTIVITY_NODE__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__OWNED_COMMENT = STRUCTURED_ACTIVITY_NODE__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__TEMPLATE_BINDING = STRUCTURED_ACTIVITY_NODE__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__OWNED_TEMPLATE_SIGNATURE = STRUCTURED_ACTIVITY_NODE__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__NAME = STRUCTURED_ACTIVITY_NODE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__QUALIFIED_NAME = STRUCTURED_ACTIVITY_NODE__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__VISIBILITY = STRUCTURED_ACTIVITY_NODE__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__CLIENT_DEPENDENCY = STRUCTURED_ACTIVITY_NODE__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__NAME_EXPRESSION = STRUCTURED_ACTIVITY_NODE__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__REDEFINITION_CONTEXT = STRUCTURED_ACTIVITY_NODE__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__IS_LEAF = STRUCTURED_ACTIVITY_NODE__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__OUTGOING = STRUCTURED_ACTIVITY_NODE__OUTGOING;
+
+	/**
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__INCOMING = STRUCTURED_ACTIVITY_NODE__INCOMING;
+
+	/**
+	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__IN_GROUP = STRUCTURED_ACTIVITY_NODE__IN_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__ACTIVITY = STRUCTURED_ACTIVITY_NODE__ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__REDEFINED_ELEMENT = STRUCTURED_ACTIVITY_NODE__REDEFINED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__IN_STRUCTURED_NODE = STRUCTURED_ACTIVITY_NODE__IN_STRUCTURED_NODE;
+
+	/**
+	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__IN_PARTITION = STRUCTURED_ACTIVITY_NODE__IN_PARTITION;
+
+	/**
+	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__IN_INTERRUPTIBLE_REGION = STRUCTURED_ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION;
+
+	/**
+	 * The feature id for the '<em><b>Handler</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__HANDLER = STRUCTURED_ACTIVITY_NODE__HANDLER;
+
+	/**
+	 * The feature id for the '<em><b>Effect</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__EFFECT = STRUCTURED_ACTIVITY_NODE__EFFECT;
+
+	/**
+	 * The feature id for the '<em><b>Output</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__OUTPUT = STRUCTURED_ACTIVITY_NODE__OUTPUT;
+
+	/**
+	 * The feature id for the '<em><b>Input</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__INPUT = STRUCTURED_ACTIVITY_NODE__INPUT;
+
+	/**
+	 * The feature id for the '<em><b>Context</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__CONTEXT = STRUCTURED_ACTIVITY_NODE__CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Local Precondition</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__LOCAL_PRECONDITION = STRUCTURED_ACTIVITY_NODE__LOCAL_PRECONDITION;
+
+	/**
+	 * The feature id for the '<em><b>Local Postcondition</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__LOCAL_POSTCONDITION = STRUCTURED_ACTIVITY_NODE__LOCAL_POSTCONDITION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__MEMBER = STRUCTURED_ACTIVITY_NODE__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__OWNED_RULE = STRUCTURED_ACTIVITY_NODE__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__IMPORTED_MEMBER = STRUCTURED_ACTIVITY_NODE__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__ELEMENT_IMPORT = STRUCTURED_ACTIVITY_NODE__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__PACKAGE_IMPORT = STRUCTURED_ACTIVITY_NODE__PACKAGE_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Super Group</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__SUPER_GROUP = STRUCTURED_ACTIVITY_NODE__SUPER_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Activity Group activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__ACTIVITY_GROUP_ACTIVITY = STRUCTURED_ACTIVITY_NODE__ACTIVITY_GROUP_ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>Variable</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__VARIABLE = STRUCTURED_ACTIVITY_NODE__VARIABLE;
+
+	/**
+	 * The feature id for the '<em><b>Contained Node</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__CONTAINED_NODE = STRUCTURED_ACTIVITY_NODE__CONTAINED_NODE;
+
+	/**
+	 * The feature id for the '<em><b>Contained Edge</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__CONTAINED_EDGE = STRUCTURED_ACTIVITY_NODE__CONTAINED_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Must Isolate</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__MUST_ISOLATE = STRUCTURED_ACTIVITY_NODE__MUST_ISOLATE;
+
+	/**
+	 * The feature id for the '<em><b>Is Determinate</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__IS_DETERMINATE = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Is Assured</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__IS_ASSURED = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Clause</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__CLAUSE = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Result</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE__RESULT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the the '<em>Conditional Node</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONDITIONAL_NODE_FEATURE_COUNT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLAUSE__EANNOTATIONS = ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLAUSE__OWNED_ELEMENT = ELEMENT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLAUSE__OWNER = ELEMENT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLAUSE__OWNED_COMMENT = ELEMENT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Test</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLAUSE__TEST = ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Body</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLAUSE__BODY = ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Predecessor Clause</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLAUSE__PREDECESSOR_CLAUSE = ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Successor Clause</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLAUSE__SUCCESSOR_CLAUSE = ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Decider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLAUSE__DECIDER = ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Body Output</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLAUSE__BODY_OUTPUT = ELEMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The number of structural features of the the '<em>Clause</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLAUSE_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__EANNOTATIONS = STRUCTURED_ACTIVITY_NODE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__OWNED_ELEMENT = STRUCTURED_ACTIVITY_NODE__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__OWNER = STRUCTURED_ACTIVITY_NODE__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__OWNED_COMMENT = STRUCTURED_ACTIVITY_NODE__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__TEMPLATE_BINDING = STRUCTURED_ACTIVITY_NODE__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__OWNED_TEMPLATE_SIGNATURE = STRUCTURED_ACTIVITY_NODE__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__NAME = STRUCTURED_ACTIVITY_NODE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__QUALIFIED_NAME = STRUCTURED_ACTIVITY_NODE__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__VISIBILITY = STRUCTURED_ACTIVITY_NODE__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__CLIENT_DEPENDENCY = STRUCTURED_ACTIVITY_NODE__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__NAME_EXPRESSION = STRUCTURED_ACTIVITY_NODE__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__REDEFINITION_CONTEXT = STRUCTURED_ACTIVITY_NODE__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__IS_LEAF = STRUCTURED_ACTIVITY_NODE__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__OUTGOING = STRUCTURED_ACTIVITY_NODE__OUTGOING;
+
+	/**
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__INCOMING = STRUCTURED_ACTIVITY_NODE__INCOMING;
+
+	/**
+	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__IN_GROUP = STRUCTURED_ACTIVITY_NODE__IN_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__ACTIVITY = STRUCTURED_ACTIVITY_NODE__ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__REDEFINED_ELEMENT = STRUCTURED_ACTIVITY_NODE__REDEFINED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__IN_STRUCTURED_NODE = STRUCTURED_ACTIVITY_NODE__IN_STRUCTURED_NODE;
+
+	/**
+	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__IN_PARTITION = STRUCTURED_ACTIVITY_NODE__IN_PARTITION;
+
+	/**
+	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__IN_INTERRUPTIBLE_REGION = STRUCTURED_ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION;
+
+	/**
+	 * The feature id for the '<em><b>Handler</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__HANDLER = STRUCTURED_ACTIVITY_NODE__HANDLER;
+
+	/**
+	 * The feature id for the '<em><b>Effect</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__EFFECT = STRUCTURED_ACTIVITY_NODE__EFFECT;
+
+	/**
+	 * The feature id for the '<em><b>Output</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__OUTPUT = STRUCTURED_ACTIVITY_NODE__OUTPUT;
+
+	/**
+	 * The feature id for the '<em><b>Input</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__INPUT = STRUCTURED_ACTIVITY_NODE__INPUT;
+
+	/**
+	 * The feature id for the '<em><b>Context</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__CONTEXT = STRUCTURED_ACTIVITY_NODE__CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Local Precondition</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__LOCAL_PRECONDITION = STRUCTURED_ACTIVITY_NODE__LOCAL_PRECONDITION;
+
+	/**
+	 * The feature id for the '<em><b>Local Postcondition</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__LOCAL_POSTCONDITION = STRUCTURED_ACTIVITY_NODE__LOCAL_POSTCONDITION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__MEMBER = STRUCTURED_ACTIVITY_NODE__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__OWNED_RULE = STRUCTURED_ACTIVITY_NODE__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__IMPORTED_MEMBER = STRUCTURED_ACTIVITY_NODE__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__ELEMENT_IMPORT = STRUCTURED_ACTIVITY_NODE__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__PACKAGE_IMPORT = STRUCTURED_ACTIVITY_NODE__PACKAGE_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Super Group</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__SUPER_GROUP = STRUCTURED_ACTIVITY_NODE__SUPER_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Activity Group activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__ACTIVITY_GROUP_ACTIVITY = STRUCTURED_ACTIVITY_NODE__ACTIVITY_GROUP_ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>Variable</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__VARIABLE = STRUCTURED_ACTIVITY_NODE__VARIABLE;
+
+	/**
+	 * The feature id for the '<em><b>Contained Node</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__CONTAINED_NODE = STRUCTURED_ACTIVITY_NODE__CONTAINED_NODE;
+
+	/**
+	 * The feature id for the '<em><b>Contained Edge</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__CONTAINED_EDGE = STRUCTURED_ACTIVITY_NODE__CONTAINED_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Must Isolate</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__MUST_ISOLATE = STRUCTURED_ACTIVITY_NODE__MUST_ISOLATE;
+
+	/**
+	 * The feature id for the '<em><b>Is Tested First</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__IS_TESTED_FIRST = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Body Part</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__BODY_PART = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Setup Part</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__SETUP_PART = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Decider</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__DECIDER = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Test</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__TEST = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Result</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__RESULT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Loop Variable</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__LOOP_VARIABLE = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Body Output</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__BODY_OUTPUT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Loop Variable Input</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE__LOOP_VARIABLE_INPUT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 8;
+
+	/**
+	 * The number of structural features of the the '<em>Loop Node</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LOOP_NODE_FEATURE_COUNT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 9;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -23520,420 +27840,6 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLABORATION__EANNOTATIONS = BEHAVIORED_CLASSIFIER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__OWNED_ELEMENT = BEHAVIORED_CLASSIFIER__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__OWNER = BEHAVIORED_CLASSIFIER__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__OWNED_COMMENT = BEHAVIORED_CLASSIFIER__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__TEMPLATE_BINDING = BEHAVIORED_CLASSIFIER__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__OWNED_TEMPLATE_SIGNATURE = BEHAVIORED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__NAME = BEHAVIORED_CLASSIFIER__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__QUALIFIED_NAME = BEHAVIORED_CLASSIFIER__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__VISIBILITY = BEHAVIORED_CLASSIFIER__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__CLIENT_DEPENDENCY = BEHAVIORED_CLASSIFIER__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__NAME_EXPRESSION = BEHAVIORED_CLASSIFIER__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__MEMBER = BEHAVIORED_CLASSIFIER__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__OWNED_RULE = BEHAVIORED_CLASSIFIER__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__IMPORTED_MEMBER = BEHAVIORED_CLASSIFIER__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__ELEMENT_IMPORT = BEHAVIORED_CLASSIFIER__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__PACKAGE_IMPORT = BEHAVIORED_CLASSIFIER__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__TEMPLATE_PARAMETER = BEHAVIORED_CLASSIFIER__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__OWNING_PARAMETER = BEHAVIORED_CLASSIFIER__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__PACKAGEABLE_ELEMENT_VISIBILITY = BEHAVIORED_CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__PACKAGE = BEHAVIORED_CLASSIFIER__PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__REDEFINITION_CONTEXT = BEHAVIORED_CLASSIFIER__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__IS_LEAF = BEHAVIORED_CLASSIFIER__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__FEATURE = BEHAVIORED_CLASSIFIER__FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__IS_ABSTRACT = BEHAVIORED_CLASSIFIER__IS_ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__INHERITED_MEMBER = BEHAVIORED_CLASSIFIER__INHERITED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>General</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__GENERAL = BEHAVIORED_CLASSIFIER__GENERAL;
-
-	/**
-	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__GENERALIZATION = BEHAVIORED_CLASSIFIER__GENERALIZATION;
-
-	/**
-	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__ATTRIBUTE = BEHAVIORED_CLASSIFIER__ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__REDEFINED_CLASSIFIER = BEHAVIORED_CLASSIFIER__REDEFINED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__POWERTYPE_EXTENT = BEHAVIORED_CLASSIFIER__POWERTYPE_EXTENT;
-
-	/**
-	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__SUBSTITUTION = BEHAVIORED_CLASSIFIER__SUBSTITUTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__OWNED_USE_CASE = BEHAVIORED_CLASSIFIER__OWNED_USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__USE_CASE = BEHAVIORED_CLASSIFIER__USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Representation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__REPRESENTATION = BEHAVIORED_CLASSIFIER__REPRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__OCCURRENCE = BEHAVIORED_CLASSIFIER__OCCURRENCE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__OWNED_BEHAVIOR = BEHAVIORED_CLASSIFIER__OWNED_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Classifier Behavior</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__CLASSIFIER_BEHAVIOR = BEHAVIORED_CLASSIFIER__CLASSIFIER_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Implementation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__IMPLEMENTATION = BEHAVIORED_CLASSIFIER__IMPLEMENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__OWNED_TRIGGER = BEHAVIORED_CLASSIFIER__OWNED_TRIGGER;
-
-	/**
-	 * The feature id for the '<em><b>Owned State Machine</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__OWNED_STATE_MACHINE = BEHAVIORED_CLASSIFIER__OWNED_STATE_MACHINE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__OWNED_ATTRIBUTE = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Part</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__PART = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Role</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__ROLE = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__OWNED_CONNECTOR = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Collaboration Role</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION__COLLABORATION_ROLE = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the the '<em>Collaboration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION_FEATURE_COUNT = BEHAVIORED_CLASSIFIER_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
 	int OPERATION_TEMPLATE_PARAMETER__EANNOTATIONS = TEMPLATE_PARAMETER__EANNOTATIONS;
 
 	/**
@@ -25032,951 +28938,6 @@
 	 * @generated
 	 * @ordered
 	 */
-	int COLLABORATION_OCCURRENCE__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION_OCCURRENCE__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION_OCCURRENCE__OWNER = NAMED_ELEMENT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION_OCCURRENCE__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION_OCCURRENCE__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION_OCCURRENCE__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION_OCCURRENCE__NAME = NAMED_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION_OCCURRENCE__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION_OCCURRENCE__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION_OCCURRENCE__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION_OCCURRENCE__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION_OCCURRENCE__TYPE = NAMED_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Role Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION_OCCURRENCE__ROLE_BINDING = NAMED_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Collaboration Occurrence</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLLABORATION_OCCURRENCE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__EANNOTATIONS = PROPERTY__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__OWNED_ELEMENT = PROPERTY__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__OWNER = PROPERTY__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__OWNED_COMMENT = PROPERTY__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__TEMPLATE_BINDING = PROPERTY__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__OWNED_TEMPLATE_SIGNATURE = PROPERTY__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__NAME = PROPERTY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__QUALIFIED_NAME = PROPERTY__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__VISIBILITY = PROPERTY__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__CLIENT_DEPENDENCY = PROPERTY__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__NAME_EXPRESSION = PROPERTY__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__REDEFINITION_CONTEXT = PROPERTY__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__IS_LEAF = PROPERTY__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Featuring Classifier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__FEATURING_CLASSIFIER = PROPERTY__FEATURING_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Is Static</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__IS_STATIC = PROPERTY__IS_STATIC;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__TYPE = PROPERTY__TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Is Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__IS_ORDERED = PROPERTY__IS_ORDERED;
-
-	/**
-	 * The feature id for the '<em><b>Is Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__IS_UNIQUE = PROPERTY__IS_UNIQUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__LOWER = PROPERTY__LOWER;
-
-	/**
-	 * The feature id for the '<em><b>Upper</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__UPPER = PROPERTY__UPPER;
-
-	/**
-	 * The feature id for the '<em><b>Upper Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__UPPER_VALUE = PROPERTY__UPPER_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Lower Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__LOWER_VALUE = PROPERTY__LOWER_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Is Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__IS_READ_ONLY = PROPERTY__IS_READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__TEMPLATE_PARAMETER = PROPERTY__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__OWNING_PARAMETER = PROPERTY__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>End</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__END = PROPERTY__END;
-
-	/**
-	 * The feature id for the '<em><b>Deployment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__DEPLOYMENT = PROPERTY__DEPLOYMENT;
-
-	/**
-	 * The feature id for the '<em><b>Deployed Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__DEPLOYED_ELEMENT = PROPERTY__DEPLOYED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Default</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__DEFAULT = PROPERTY__DEFAULT;
-
-	/**
-	 * The feature id for the '<em><b>Is Composite</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__IS_COMPOSITE = PROPERTY__IS_COMPOSITE;
-
-	/**
-	 * The feature id for the '<em><b>Is Derived</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__IS_DERIVED = PROPERTY__IS_DERIVED;
-
-	/**
-	 * The feature id for the '<em><b>Class </b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__CLASS_ = PROPERTY__CLASS_;
-
-	/**
-	 * The feature id for the '<em><b>Opposite</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__OPPOSITE = PROPERTY__OPPOSITE;
-
-	/**
-	 * The feature id for the '<em><b>Is Derived Union</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__IS_DERIVED_UNION = PROPERTY__IS_DERIVED_UNION;
-
-	/**
-	 * The feature id for the '<em><b>Owning Association</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__OWNING_ASSOCIATION = PROPERTY__OWNING_ASSOCIATION;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Property</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__REDEFINED_PROPERTY = PROPERTY__REDEFINED_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Subsetted Property</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__SUBSETTED_PROPERTY = PROPERTY__SUBSETTED_PROPERTY;
-
-	/**
-	 * The feature id for the '<em><b>Datatype</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__DATATYPE = PROPERTY__DATATYPE;
-
-	/**
-	 * The feature id for the '<em><b>Association</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__ASSOCIATION = PROPERTY__ASSOCIATION;
-
-	/**
-	 * The feature id for the '<em><b>Aggregation</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__AGGREGATION = PROPERTY__AGGREGATION;
-
-	/**
-	 * The feature id for the '<em><b>Default Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__DEFAULT_VALUE = PROPERTY__DEFAULT_VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Qualifier</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__QUALIFIER = PROPERTY__QUALIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Association End</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__ASSOCIATION_END = PROPERTY__ASSOCIATION_END;
-
-	/**
-	 * The feature id for the '<em><b>Is Behavior</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__IS_BEHAVIOR = PROPERTY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Is Service</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__IS_SERVICE = PROPERTY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Required</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__REQUIRED = PROPERTY_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Port</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__REDEFINED_PORT = PROPERTY_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Provided</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__PROVIDED = PROPERTY_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Protocol</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT__PROTOCOL = PROPERTY_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the the '<em>Port</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PORT_FEATURE_COUNT = PROPERTY_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__EANNOTATIONS = STRUCTURED_CLASSIFIER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__OWNED_ELEMENT = STRUCTURED_CLASSIFIER__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__OWNER = STRUCTURED_CLASSIFIER__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__OWNED_COMMENT = STRUCTURED_CLASSIFIER__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__TEMPLATE_BINDING = STRUCTURED_CLASSIFIER__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE = STRUCTURED_CLASSIFIER__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__NAME = STRUCTURED_CLASSIFIER__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__QUALIFIED_NAME = STRUCTURED_CLASSIFIER__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__VISIBILITY = STRUCTURED_CLASSIFIER__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__CLIENT_DEPENDENCY = STRUCTURED_CLASSIFIER__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__NAME_EXPRESSION = STRUCTURED_CLASSIFIER__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__MEMBER = STRUCTURED_CLASSIFIER__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__OWNED_RULE = STRUCTURED_CLASSIFIER__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__IMPORTED_MEMBER = STRUCTURED_CLASSIFIER__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__ELEMENT_IMPORT = STRUCTURED_CLASSIFIER__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__PACKAGE_IMPORT = STRUCTURED_CLASSIFIER__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__TEMPLATE_PARAMETER = STRUCTURED_CLASSIFIER__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__OWNING_PARAMETER = STRUCTURED_CLASSIFIER__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY = STRUCTURED_CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__PACKAGE = STRUCTURED_CLASSIFIER__PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__REDEFINITION_CONTEXT = STRUCTURED_CLASSIFIER__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__IS_LEAF = STRUCTURED_CLASSIFIER__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__FEATURE = STRUCTURED_CLASSIFIER__FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__IS_ABSTRACT = STRUCTURED_CLASSIFIER__IS_ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__INHERITED_MEMBER = STRUCTURED_CLASSIFIER__INHERITED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>General</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__GENERAL = STRUCTURED_CLASSIFIER__GENERAL;
-
-	/**
-	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__GENERALIZATION = STRUCTURED_CLASSIFIER__GENERALIZATION;
-
-	/**
-	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__ATTRIBUTE = STRUCTURED_CLASSIFIER__ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__REDEFINED_CLASSIFIER = STRUCTURED_CLASSIFIER__REDEFINED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__POWERTYPE_EXTENT = STRUCTURED_CLASSIFIER__POWERTYPE_EXTENT;
-
-	/**
-	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__SUBSTITUTION = STRUCTURED_CLASSIFIER__SUBSTITUTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__OWNED_USE_CASE = STRUCTURED_CLASSIFIER__OWNED_USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__USE_CASE = STRUCTURED_CLASSIFIER__USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Representation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__REPRESENTATION = STRUCTURED_CLASSIFIER__REPRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__OCCURRENCE = STRUCTURED_CLASSIFIER__OCCURRENCE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__OWNED_ATTRIBUTE = STRUCTURED_CLASSIFIER__OWNED_ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Part</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__PART = STRUCTURED_CLASSIFIER__PART;
-
-	/**
-	 * The feature id for the '<em><b>Role</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__ROLE = STRUCTURED_CLASSIFIER__ROLE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__OWNED_CONNECTOR = STRUCTURED_CLASSIFIER__OWNED_CONNECTOR;
-
-	/**
-	 * The feature id for the '<em><b>Owned Port</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER__OWNED_PORT = STRUCTURED_CLASSIFIER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Encapsulated Classifier</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENCAPSULATED_CLASSIFIER_FEATURE_COUNT = STRUCTURED_CLASSIFIER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
 	int INTERACTION__EANNOTATIONS = BEHAVIOR__EANNOTATIONS;
 
 	/**
@@ -28050,2967 +31011,6 @@
 	int STOP_FEATURE_COUNT = EVENT_OCCURRENCE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__EANNOTATIONS = CONNECTABLE_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__OWNED_ELEMENT = CONNECTABLE_ELEMENT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__OWNER = CONNECTABLE_ELEMENT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__OWNED_COMMENT = CONNECTABLE_ELEMENT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__TEMPLATE_BINDING = CONNECTABLE_ELEMENT__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__OWNED_TEMPLATE_SIGNATURE = CONNECTABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__NAME = CONNECTABLE_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__QUALIFIED_NAME = CONNECTABLE_ELEMENT__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__VISIBILITY = CONNECTABLE_ELEMENT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__CLIENT_DEPENDENCY = CONNECTABLE_ELEMENT__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__NAME_EXPRESSION = CONNECTABLE_ELEMENT__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__TEMPLATE_PARAMETER = CONNECTABLE_ELEMENT__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__OWNING_PARAMETER = CONNECTABLE_ELEMENT__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>End</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__END = CONNECTABLE_ELEMENT__END;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__TYPE = CONNECTABLE_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Is Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__IS_ORDERED = CONNECTABLE_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Is Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__IS_UNIQUE = CONNECTABLE_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Lower</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__LOWER = CONNECTABLE_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Upper</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__UPPER = CONNECTABLE_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Upper Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__UPPER_VALUE = CONNECTABLE_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Lower Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__LOWER_VALUE = CONNECTABLE_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Scope</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE__SCOPE = CONNECTABLE_ELEMENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the the '<em>Variable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VARIABLE_FEATURE_COUNT = CONNECTABLE_ELEMENT_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__EANNOTATIONS = ACTION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__OWNED_ELEMENT = ACTION__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__OWNER = ACTION__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__OWNED_COMMENT = ACTION__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__TEMPLATE_BINDING = ACTION__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__OWNED_TEMPLATE_SIGNATURE = ACTION__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__NAME = ACTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__QUALIFIED_NAME = ACTION__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__VISIBILITY = ACTION__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__CLIENT_DEPENDENCY = ACTION__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__NAME_EXPRESSION = ACTION__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__REDEFINITION_CONTEXT = ACTION__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__IS_LEAF = ACTION__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__OUTGOING = ACTION__OUTGOING;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__INCOMING = ACTION__INCOMING;
-
-	/**
-	 * The feature id for the '<em><b>In Group</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__IN_GROUP = ACTION__IN_GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Activity</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__ACTIVITY = ACTION__ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__REDEFINED_ELEMENT = ACTION__REDEFINED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__IN_STRUCTURED_NODE = ACTION__IN_STRUCTURED_NODE;
-
-	/**
-	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__IN_PARTITION = ACTION__IN_PARTITION;
-
-	/**
-	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION = ACTION__IN_INTERRUPTIBLE_REGION;
-
-	/**
-	 * The feature id for the '<em><b>Handler</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__HANDLER = ACTION__HANDLER;
-
-	/**
-	 * The feature id for the '<em><b>Effect</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__EFFECT = ACTION__EFFECT;
-
-	/**
-	 * The feature id for the '<em><b>Output</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__OUTPUT = ACTION__OUTPUT;
-
-	/**
-	 * The feature id for the '<em><b>Input</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__INPUT = ACTION__INPUT;
-
-	/**
-	 * The feature id for the '<em><b>Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__CONTEXT = ACTION__CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Local Precondition</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__LOCAL_PRECONDITION = ACTION__LOCAL_PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Local Postcondition</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__LOCAL_POSTCONDITION = ACTION__LOCAL_POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__MEMBER = ACTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__OWNED_RULE = ACTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__IMPORTED_MEMBER = ACTION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__ELEMENT_IMPORT = ACTION_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__PACKAGE_IMPORT = ACTION_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Super Group</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__SUPER_GROUP = ACTION_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Activity Group activity</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__ACTIVITY_GROUP_ACTIVITY = ACTION_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Variable</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__VARIABLE = ACTION_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Contained Node</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__CONTAINED_NODE = ACTION_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Contained Edge</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__CONTAINED_EDGE = ACTION_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>Must Isolate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE__MUST_ISOLATE = ACTION_FEATURE_COUNT + 10;
-
-	/**
-	 * The number of structural features of the the '<em>Structured Activity Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT = ACTION_FEATURE_COUNT + 11;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__EANNOTATIONS = STRUCTURED_ACTIVITY_NODE__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__OWNED_ELEMENT = STRUCTURED_ACTIVITY_NODE__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__OWNER = STRUCTURED_ACTIVITY_NODE__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__OWNED_COMMENT = STRUCTURED_ACTIVITY_NODE__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__TEMPLATE_BINDING = STRUCTURED_ACTIVITY_NODE__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__OWNED_TEMPLATE_SIGNATURE = STRUCTURED_ACTIVITY_NODE__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__NAME = STRUCTURED_ACTIVITY_NODE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__QUALIFIED_NAME = STRUCTURED_ACTIVITY_NODE__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__VISIBILITY = STRUCTURED_ACTIVITY_NODE__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__CLIENT_DEPENDENCY = STRUCTURED_ACTIVITY_NODE__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__NAME_EXPRESSION = STRUCTURED_ACTIVITY_NODE__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__REDEFINITION_CONTEXT = STRUCTURED_ACTIVITY_NODE__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__IS_LEAF = STRUCTURED_ACTIVITY_NODE__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__OUTGOING = STRUCTURED_ACTIVITY_NODE__OUTGOING;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__INCOMING = STRUCTURED_ACTIVITY_NODE__INCOMING;
-
-	/**
-	 * The feature id for the '<em><b>In Group</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__IN_GROUP = STRUCTURED_ACTIVITY_NODE__IN_GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Activity</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__ACTIVITY = STRUCTURED_ACTIVITY_NODE__ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__REDEFINED_ELEMENT = STRUCTURED_ACTIVITY_NODE__REDEFINED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__IN_STRUCTURED_NODE = STRUCTURED_ACTIVITY_NODE__IN_STRUCTURED_NODE;
-
-	/**
-	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__IN_PARTITION = STRUCTURED_ACTIVITY_NODE__IN_PARTITION;
-
-	/**
-	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__IN_INTERRUPTIBLE_REGION = STRUCTURED_ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION;
-
-	/**
-	 * The feature id for the '<em><b>Handler</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__HANDLER = STRUCTURED_ACTIVITY_NODE__HANDLER;
-
-	/**
-	 * The feature id for the '<em><b>Effect</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__EFFECT = STRUCTURED_ACTIVITY_NODE__EFFECT;
-
-	/**
-	 * The feature id for the '<em><b>Output</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__OUTPUT = STRUCTURED_ACTIVITY_NODE__OUTPUT;
-
-	/**
-	 * The feature id for the '<em><b>Input</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__INPUT = STRUCTURED_ACTIVITY_NODE__INPUT;
-
-	/**
-	 * The feature id for the '<em><b>Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__CONTEXT = STRUCTURED_ACTIVITY_NODE__CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Local Precondition</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__LOCAL_PRECONDITION = STRUCTURED_ACTIVITY_NODE__LOCAL_PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Local Postcondition</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__LOCAL_POSTCONDITION = STRUCTURED_ACTIVITY_NODE__LOCAL_POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__MEMBER = STRUCTURED_ACTIVITY_NODE__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__OWNED_RULE = STRUCTURED_ACTIVITY_NODE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__IMPORTED_MEMBER = STRUCTURED_ACTIVITY_NODE__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__ELEMENT_IMPORT = STRUCTURED_ACTIVITY_NODE__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__PACKAGE_IMPORT = STRUCTURED_ACTIVITY_NODE__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Super Group</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__SUPER_GROUP = STRUCTURED_ACTIVITY_NODE__SUPER_GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Activity Group activity</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__ACTIVITY_GROUP_ACTIVITY = STRUCTURED_ACTIVITY_NODE__ACTIVITY_GROUP_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Variable</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__VARIABLE = STRUCTURED_ACTIVITY_NODE__VARIABLE;
-
-	/**
-	 * The feature id for the '<em><b>Contained Node</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__CONTAINED_NODE = STRUCTURED_ACTIVITY_NODE__CONTAINED_NODE;
-
-	/**
-	 * The feature id for the '<em><b>Contained Edge</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__CONTAINED_EDGE = STRUCTURED_ACTIVITY_NODE__CONTAINED_EDGE;
-
-	/**
-	 * The feature id for the '<em><b>Must Isolate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__MUST_ISOLATE = STRUCTURED_ACTIVITY_NODE__MUST_ISOLATE;
-
-	/**
-	 * The feature id for the '<em><b>Is Determinate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__IS_DETERMINATE = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Is Assured</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__IS_ASSURED = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Clause</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__CLAUSE = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Result</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE__RESULT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the the '<em>Conditional Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONDITIONAL_NODE_FEATURE_COUNT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLAUSE__EANNOTATIONS = ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLAUSE__OWNED_ELEMENT = ELEMENT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLAUSE__OWNER = ELEMENT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLAUSE__OWNED_COMMENT = ELEMENT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Test</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLAUSE__TEST = ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Body</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLAUSE__BODY = ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Predecessor Clause</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLAUSE__PREDECESSOR_CLAUSE = ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Successor Clause</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLAUSE__SUCCESSOR_CLAUSE = ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Decider</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLAUSE__DECIDER = ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Body Output</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLAUSE__BODY_OUTPUT = ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the the '<em>Clause</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CLAUSE_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__EANNOTATIONS = STRUCTURED_ACTIVITY_NODE__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__OWNED_ELEMENT = STRUCTURED_ACTIVITY_NODE__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__OWNER = STRUCTURED_ACTIVITY_NODE__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__OWNED_COMMENT = STRUCTURED_ACTIVITY_NODE__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__TEMPLATE_BINDING = STRUCTURED_ACTIVITY_NODE__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__OWNED_TEMPLATE_SIGNATURE = STRUCTURED_ACTIVITY_NODE__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__NAME = STRUCTURED_ACTIVITY_NODE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__QUALIFIED_NAME = STRUCTURED_ACTIVITY_NODE__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__VISIBILITY = STRUCTURED_ACTIVITY_NODE__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__CLIENT_DEPENDENCY = STRUCTURED_ACTIVITY_NODE__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__NAME_EXPRESSION = STRUCTURED_ACTIVITY_NODE__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__REDEFINITION_CONTEXT = STRUCTURED_ACTIVITY_NODE__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__IS_LEAF = STRUCTURED_ACTIVITY_NODE__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__OUTGOING = STRUCTURED_ACTIVITY_NODE__OUTGOING;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__INCOMING = STRUCTURED_ACTIVITY_NODE__INCOMING;
-
-	/**
-	 * The feature id for the '<em><b>In Group</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__IN_GROUP = STRUCTURED_ACTIVITY_NODE__IN_GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Activity</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__ACTIVITY = STRUCTURED_ACTIVITY_NODE__ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__REDEFINED_ELEMENT = STRUCTURED_ACTIVITY_NODE__REDEFINED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__IN_STRUCTURED_NODE = STRUCTURED_ACTIVITY_NODE__IN_STRUCTURED_NODE;
-
-	/**
-	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__IN_PARTITION = STRUCTURED_ACTIVITY_NODE__IN_PARTITION;
-
-	/**
-	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__IN_INTERRUPTIBLE_REGION = STRUCTURED_ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION;
-
-	/**
-	 * The feature id for the '<em><b>Handler</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__HANDLER = STRUCTURED_ACTIVITY_NODE__HANDLER;
-
-	/**
-	 * The feature id for the '<em><b>Effect</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__EFFECT = STRUCTURED_ACTIVITY_NODE__EFFECT;
-
-	/**
-	 * The feature id for the '<em><b>Output</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__OUTPUT = STRUCTURED_ACTIVITY_NODE__OUTPUT;
-
-	/**
-	 * The feature id for the '<em><b>Input</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__INPUT = STRUCTURED_ACTIVITY_NODE__INPUT;
-
-	/**
-	 * The feature id for the '<em><b>Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__CONTEXT = STRUCTURED_ACTIVITY_NODE__CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Local Precondition</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__LOCAL_PRECONDITION = STRUCTURED_ACTIVITY_NODE__LOCAL_PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Local Postcondition</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__LOCAL_POSTCONDITION = STRUCTURED_ACTIVITY_NODE__LOCAL_POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__MEMBER = STRUCTURED_ACTIVITY_NODE__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__OWNED_RULE = STRUCTURED_ACTIVITY_NODE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__IMPORTED_MEMBER = STRUCTURED_ACTIVITY_NODE__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__ELEMENT_IMPORT = STRUCTURED_ACTIVITY_NODE__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__PACKAGE_IMPORT = STRUCTURED_ACTIVITY_NODE__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Super Group</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__SUPER_GROUP = STRUCTURED_ACTIVITY_NODE__SUPER_GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Activity Group activity</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__ACTIVITY_GROUP_ACTIVITY = STRUCTURED_ACTIVITY_NODE__ACTIVITY_GROUP_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Variable</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__VARIABLE = STRUCTURED_ACTIVITY_NODE__VARIABLE;
-
-	/**
-	 * The feature id for the '<em><b>Contained Node</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__CONTAINED_NODE = STRUCTURED_ACTIVITY_NODE__CONTAINED_NODE;
-
-	/**
-	 * The feature id for the '<em><b>Contained Edge</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__CONTAINED_EDGE = STRUCTURED_ACTIVITY_NODE__CONTAINED_EDGE;
-
-	/**
-	 * The feature id for the '<em><b>Must Isolate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__MUST_ISOLATE = STRUCTURED_ACTIVITY_NODE__MUST_ISOLATE;
-
-	/**
-	 * The feature id for the '<em><b>Is Tested First</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__IS_TESTED_FIRST = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Body Part</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__BODY_PART = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Setup Part</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__SETUP_PART = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Decider</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__DECIDER = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Test</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__TEST = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Result</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__RESULT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Loop Variable</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__LOOP_VARIABLE = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Body Output</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__BODY_OUTPUT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Loop Variable Input</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE__LOOP_VARIABLE_INPUT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 8;
-
-	/**
-	 * The number of structural features of the the '<em>Loop Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LOOP_NODE_FEATURE_COUNT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRIGGER__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRIGGER__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRIGGER__OWNER = NAMED_ELEMENT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRIGGER__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRIGGER__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRIGGER__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRIGGER__NAME = NAMED_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRIGGER__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRIGGER__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRIGGER__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRIGGER__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Port</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRIGGER__PORT = NAMED_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Trigger</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRIGGER_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_TRIGGER__EANNOTATIONS = TRIGGER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_TRIGGER__OWNED_ELEMENT = TRIGGER__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_TRIGGER__OWNER = TRIGGER__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_TRIGGER__OWNED_COMMENT = TRIGGER__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_TRIGGER__TEMPLATE_BINDING = TRIGGER__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_TRIGGER__OWNED_TEMPLATE_SIGNATURE = TRIGGER__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_TRIGGER__NAME = TRIGGER__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_TRIGGER__QUALIFIED_NAME = TRIGGER__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_TRIGGER__VISIBILITY = TRIGGER__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_TRIGGER__CLIENT_DEPENDENCY = TRIGGER__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_TRIGGER__NAME_EXPRESSION = TRIGGER__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Port</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_TRIGGER__PORT = TRIGGER__PORT;
-
-	/**
-	 * The number of structural features of the the '<em>Message Trigger</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MESSAGE_TRIGGER_FEATURE_COUNT = TRIGGER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_TRIGGER__EANNOTATIONS = MESSAGE_TRIGGER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_TRIGGER__OWNED_ELEMENT = MESSAGE_TRIGGER__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_TRIGGER__OWNER = MESSAGE_TRIGGER__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_TRIGGER__OWNED_COMMENT = MESSAGE_TRIGGER__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_TRIGGER__TEMPLATE_BINDING = MESSAGE_TRIGGER__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_TRIGGER__OWNED_TEMPLATE_SIGNATURE = MESSAGE_TRIGGER__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_TRIGGER__NAME = MESSAGE_TRIGGER__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_TRIGGER__QUALIFIED_NAME = MESSAGE_TRIGGER__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_TRIGGER__VISIBILITY = MESSAGE_TRIGGER__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_TRIGGER__CLIENT_DEPENDENCY = MESSAGE_TRIGGER__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_TRIGGER__NAME_EXPRESSION = MESSAGE_TRIGGER__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Port</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_TRIGGER__PORT = MESSAGE_TRIGGER__PORT;
-
-	/**
-	 * The feature id for the '<em><b>Operation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_TRIGGER__OPERATION = MESSAGE_TRIGGER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Call Trigger</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_TRIGGER_FEATURE_COUNT = MESSAGE_TRIGGER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHANGE_TRIGGER__EANNOTATIONS = TRIGGER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHANGE_TRIGGER__OWNED_ELEMENT = TRIGGER__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHANGE_TRIGGER__OWNER = TRIGGER__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHANGE_TRIGGER__OWNED_COMMENT = TRIGGER__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHANGE_TRIGGER__TEMPLATE_BINDING = TRIGGER__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHANGE_TRIGGER__OWNED_TEMPLATE_SIGNATURE = TRIGGER__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHANGE_TRIGGER__NAME = TRIGGER__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHANGE_TRIGGER__QUALIFIED_NAME = TRIGGER__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHANGE_TRIGGER__VISIBILITY = TRIGGER__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHANGE_TRIGGER__CLIENT_DEPENDENCY = TRIGGER__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHANGE_TRIGGER__NAME_EXPRESSION = TRIGGER__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Port</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHANGE_TRIGGER__PORT = TRIGGER__PORT;
-
-	/**
-	 * The feature id for the '<em><b>Change Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHANGE_TRIGGER__CHANGE_EXPRESSION = TRIGGER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Change Trigger</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHANGE_TRIGGER_FEATURE_COUNT = TRIGGER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__EANNOTATIONS = BEHAVIORAL_FEATURE__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__OWNED_ELEMENT = BEHAVIORAL_FEATURE__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__OWNER = BEHAVIORAL_FEATURE__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__OWNED_COMMENT = BEHAVIORAL_FEATURE__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__TEMPLATE_BINDING = BEHAVIORAL_FEATURE__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__OWNED_TEMPLATE_SIGNATURE = BEHAVIORAL_FEATURE__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__NAME = BEHAVIORAL_FEATURE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__QUALIFIED_NAME = BEHAVIORAL_FEATURE__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__VISIBILITY = BEHAVIORAL_FEATURE__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__CLIENT_DEPENDENCY = BEHAVIORAL_FEATURE__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__NAME_EXPRESSION = BEHAVIORAL_FEATURE__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__MEMBER = BEHAVIORAL_FEATURE__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__OWNED_RULE = BEHAVIORAL_FEATURE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__IMPORTED_MEMBER = BEHAVIORAL_FEATURE__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__ELEMENT_IMPORT = BEHAVIORAL_FEATURE__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__PACKAGE_IMPORT = BEHAVIORAL_FEATURE__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__REDEFINITION_CONTEXT = BEHAVIORAL_FEATURE__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__IS_LEAF = BEHAVIORAL_FEATURE__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Featuring Classifier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__FEATURING_CLASSIFIER = BEHAVIORAL_FEATURE__FEATURING_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Is Static</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__IS_STATIC = BEHAVIORAL_FEATURE__IS_STATIC;
-
-	/**
-	 * The feature id for the '<em><b>Parameter</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__PARAMETER = BEHAVIORAL_FEATURE__PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Formal Parameter</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__FORMAL_PARAMETER = BEHAVIORAL_FEATURE__FORMAL_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Return Result</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__RETURN_RESULT = BEHAVIORAL_FEATURE__RETURN_RESULT;
-
-	/**
-	 * The feature id for the '<em><b>Raised Exception</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__RAISED_EXCEPTION = BEHAVIORAL_FEATURE__RAISED_EXCEPTION;
-
-	/**
-	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__IS_ABSTRACT = BEHAVIORAL_FEATURE__IS_ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Method</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__METHOD = BEHAVIORAL_FEATURE__METHOD;
-
-	/**
-	 * The feature id for the '<em><b>Concurrency</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__CONCURRENCY = BEHAVIORAL_FEATURE__CONCURRENCY;
-
-	/**
-	 * The feature id for the '<em><b>Signal</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION__SIGNAL = BEHAVIORAL_FEATURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Reception</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECEPTION_FEATURE_COUNT = BEHAVIORAL_FEATURE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__EANNOTATIONS = CLASSIFIER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__OWNED_ELEMENT = CLASSIFIER__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__OWNER = CLASSIFIER__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__OWNED_COMMENT = CLASSIFIER__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__TEMPLATE_BINDING = CLASSIFIER__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__OWNED_TEMPLATE_SIGNATURE = CLASSIFIER__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__NAME = CLASSIFIER__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__QUALIFIED_NAME = CLASSIFIER__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__VISIBILITY = CLASSIFIER__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__CLIENT_DEPENDENCY = CLASSIFIER__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__NAME_EXPRESSION = CLASSIFIER__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__MEMBER = CLASSIFIER__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__OWNED_RULE = CLASSIFIER__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__IMPORTED_MEMBER = CLASSIFIER__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__ELEMENT_IMPORT = CLASSIFIER__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__PACKAGE_IMPORT = CLASSIFIER__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__TEMPLATE_PARAMETER = CLASSIFIER__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__OWNING_PARAMETER = CLASSIFIER__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__PACKAGEABLE_ELEMENT_VISIBILITY = CLASSIFIER__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__PACKAGE = CLASSIFIER__PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__REDEFINITION_CONTEXT = CLASSIFIER__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__IS_LEAF = CLASSIFIER__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__FEATURE = CLASSIFIER__FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__IS_ABSTRACT = CLASSIFIER__IS_ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__INHERITED_MEMBER = CLASSIFIER__INHERITED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>General</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__GENERAL = CLASSIFIER__GENERAL;
-
-	/**
-	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__GENERALIZATION = CLASSIFIER__GENERALIZATION;
-
-	/**
-	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__ATTRIBUTE = CLASSIFIER__ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__REDEFINED_CLASSIFIER = CLASSIFIER__REDEFINED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__POWERTYPE_EXTENT = CLASSIFIER__POWERTYPE_EXTENT;
-
-	/**
-	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__SUBSTITUTION = CLASSIFIER__SUBSTITUTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__OWNED_USE_CASE = CLASSIFIER__OWNED_USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__USE_CASE = CLASSIFIER__USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Representation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__REPRESENTATION = CLASSIFIER__REPRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__OCCURRENCE = CLASSIFIER__OCCURRENCE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL__OWNED_ATTRIBUTE = CLASSIFIER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Signal</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL_FEATURE_COUNT = CLASSIFIER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL_TRIGGER__EANNOTATIONS = MESSAGE_TRIGGER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL_TRIGGER__OWNED_ELEMENT = MESSAGE_TRIGGER__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL_TRIGGER__OWNER = MESSAGE_TRIGGER__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL_TRIGGER__OWNED_COMMENT = MESSAGE_TRIGGER__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL_TRIGGER__TEMPLATE_BINDING = MESSAGE_TRIGGER__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL_TRIGGER__OWNED_TEMPLATE_SIGNATURE = MESSAGE_TRIGGER__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL_TRIGGER__NAME = MESSAGE_TRIGGER__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL_TRIGGER__QUALIFIED_NAME = MESSAGE_TRIGGER__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL_TRIGGER__VISIBILITY = MESSAGE_TRIGGER__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL_TRIGGER__CLIENT_DEPENDENCY = MESSAGE_TRIGGER__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL_TRIGGER__NAME_EXPRESSION = MESSAGE_TRIGGER__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Port</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL_TRIGGER__PORT = MESSAGE_TRIGGER__PORT;
-
-	/**
-	 * The feature id for the '<em><b>Signal</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL_TRIGGER__SIGNAL = MESSAGE_TRIGGER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Signal Trigger</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SIGNAL_TRIGGER_FEATURE_COUNT = MESSAGE_TRIGGER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_TRIGGER__EANNOTATIONS = TRIGGER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_TRIGGER__OWNED_ELEMENT = TRIGGER__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_TRIGGER__OWNER = TRIGGER__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_TRIGGER__OWNED_COMMENT = TRIGGER__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_TRIGGER__TEMPLATE_BINDING = TRIGGER__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_TRIGGER__OWNED_TEMPLATE_SIGNATURE = TRIGGER__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_TRIGGER__NAME = TRIGGER__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_TRIGGER__QUALIFIED_NAME = TRIGGER__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_TRIGGER__VISIBILITY = TRIGGER__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_TRIGGER__CLIENT_DEPENDENCY = TRIGGER__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_TRIGGER__NAME_EXPRESSION = TRIGGER__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Port</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_TRIGGER__PORT = TRIGGER__PORT;
-
-	/**
-	 * The feature id for the '<em><b>Is Relative</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_TRIGGER__IS_RELATIVE = TRIGGER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>When</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_TRIGGER__WHEN = TRIGGER_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Time Trigger</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_TRIGGER_FEATURE_COUNT = TRIGGER_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANY_TRIGGER__EANNOTATIONS = MESSAGE_TRIGGER__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANY_TRIGGER__OWNED_ELEMENT = MESSAGE_TRIGGER__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANY_TRIGGER__OWNER = MESSAGE_TRIGGER__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANY_TRIGGER__OWNED_COMMENT = MESSAGE_TRIGGER__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANY_TRIGGER__TEMPLATE_BINDING = MESSAGE_TRIGGER__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANY_TRIGGER__OWNED_TEMPLATE_SIGNATURE = MESSAGE_TRIGGER__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANY_TRIGGER__NAME = MESSAGE_TRIGGER__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANY_TRIGGER__QUALIFIED_NAME = MESSAGE_TRIGGER__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANY_TRIGGER__VISIBILITY = MESSAGE_TRIGGER__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANY_TRIGGER__CLIENT_DEPENDENCY = MESSAGE_TRIGGER__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANY_TRIGGER__NAME_EXPRESSION = MESSAGE_TRIGGER__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Port</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANY_TRIGGER__PORT = MESSAGE_TRIGGER__PORT;
-
-	/**
-	 * The number of structural features of the the '<em>Any Trigger</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANY_TRIGGER_FEATURE_COUNT = MESSAGE_TRIGGER_FEATURE_COUNT + 0;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ReadExtentActionImpl <em>Read Extent Action</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -31018,7 +31018,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getReadExtentAction()
 	 * @generated
 	 */
-	int READ_EXTENT_ACTION = 214;
+	int READ_EXTENT_ACTION = 191;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ReclassifyObjectActionImpl <em>Reclassify Object Action</em>}' class.
@@ -31028,7 +31028,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getReclassifyObjectAction()
 	 * @generated
 	 */
-	int RECLASSIFY_OBJECT_ACTION = 215;
+	int RECLASSIFY_OBJECT_ACTION = 192;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ReadIsClassifiedObjectActionImpl <em>Read Is Classified Object Action</em>}' class.
@@ -31038,7 +31038,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getReadIsClassifiedObjectAction()
 	 * @generated
 	 */
-	int READ_IS_CLASSIFIED_OBJECT_ACTION = 216;
+	int READ_IS_CLASSIFIED_OBJECT_ACTION = 193;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.StartOwnedBehaviorActionImpl <em>Start Owned Behavior Action</em>}' class.
@@ -31048,7 +31048,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getStartOwnedBehaviorAction()
 	 * @generated
 	 */
-	int START_OWNED_BEHAVIOR_ACTION = 217;
+	int START_OWNED_BEHAVIOR_ACTION = 194;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.QualifierValueImpl <em>Qualifier Value</em>}' class.
@@ -31058,7 +31058,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getQualifierValue()
 	 * @generated
 	 */
-	int QUALIFIER_VALUE = 218;
+	int QUALIFIER_VALUE = 195;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ReadLinkObjectEndActionImpl <em>Read Link Object End Action</em>}' class.
@@ -31068,7 +31068,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getReadLinkObjectEndAction()
 	 * @generated
 	 */
-	int READ_LINK_OBJECT_END_ACTION = 219;
+	int READ_LINK_OBJECT_END_ACTION = 196;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ReadLinkObjectEndQualifierActionImpl <em>Read Link Object End Qualifier Action</em>}' class.
@@ -31078,7 +31078,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getReadLinkObjectEndQualifierAction()
 	 * @generated
 	 */
-	int READ_LINK_OBJECT_END_QUALIFIER_ACTION = 220;
+	int READ_LINK_OBJECT_END_QUALIFIER_ACTION = 197;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.CreateLinkObjectActionImpl <em>Create Link Object Action</em>}' class.
@@ -31088,7 +31088,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getCreateLinkObjectAction()
 	 * @generated
 	 */
-	int CREATE_LINK_OBJECT_ACTION = 221;
+	int CREATE_LINK_OBJECT_ACTION = 198;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.AcceptEventActionImpl <em>Accept Event Action</em>}' class.
@@ -31098,7 +31098,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getAcceptEventAction()
 	 * @generated
 	 */
-	int ACCEPT_EVENT_ACTION = 222;
+	int ACCEPT_EVENT_ACTION = 199;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.AcceptCallActionImpl <em>Accept Call Action</em>}' class.
@@ -31108,7 +31108,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getAcceptCallAction()
 	 * @generated
 	 */
-	int ACCEPT_CALL_ACTION = 223;
+	int ACCEPT_CALL_ACTION = 200;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ReplyActionImpl <em>Reply Action</em>}' class.
@@ -31118,7 +31118,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getReplyAction()
 	 * @generated
 	 */
-	int REPLY_ACTION = 224;
+	int REPLY_ACTION = 201;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.RaiseExceptionActionImpl <em>Raise Exception Action</em>}' class.
@@ -31128,7 +31128,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getRaiseExceptionAction()
 	 * @generated
 	 */
-	int RAISE_EXCEPTION_ACTION = 225;
+	int RAISE_EXCEPTION_ACTION = 202;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.DataStoreNodeImpl <em>Data Store Node</em>}' class.
@@ -31138,7 +31138,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getDataStoreNode()
 	 * @generated
 	 */
-	int DATA_STORE_NODE = 204;
+	int DATA_STORE_NODE = 203;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.InterruptibleActivityRegionImpl <em>Interruptible Activity Region</em>}' class.
@@ -31148,7 +31148,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getInterruptibleActivityRegion()
 	 * @generated
 	 */
-	int INTERRUPTIBLE_ACTIVITY_REGION = 205;
+	int INTERRUPTIBLE_ACTIVITY_REGION = 204;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ParameterSetImpl <em>Parameter Set</em>}' class.
@@ -31158,7 +31158,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getParameterSet()
 	 * @generated
 	 */
-	int PARAMETER_SET = 206;
+	int PARAMETER_SET = 205;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.InteractionOccurrenceImpl <em>Interaction Occurrence</em>}' class.
@@ -31238,7 +31238,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getTimeExpression()
 	 * @generated
 	 */
-	int TIME_EXPRESSION = 194;
+	int TIME_EXPRESSION = 206;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.DurationImpl <em>Duration</em>}' class.
@@ -31248,7 +31248,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getDuration()
 	 * @generated
 	 */
-	int DURATION = 195;
+	int DURATION = 207;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.TimeObservationActionImpl <em>Time Observation Action</em>}' class.
@@ -31258,7 +31258,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getTimeObservationAction()
 	 * @generated
 	 */
-	int TIME_OBSERVATION_ACTION = 196;
+	int TIME_OBSERVATION_ACTION = 208;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.IntervalImpl <em>Interval</em>}' class.
@@ -31268,7 +31268,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getInterval()
 	 * @generated
 	 */
-	int INTERVAL = 198;
+	int INTERVAL = 210;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.DurationIntervalImpl <em>Duration Interval</em>}' class.
@@ -31278,7 +31278,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getDurationInterval()
 	 * @generated
 	 */
-	int DURATION_INTERVAL = 197;
+	int DURATION_INTERVAL = 209;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.IntervalConstraintImpl <em>Interval Constraint</em>}' class.
@@ -31288,7 +31288,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getIntervalConstraint()
 	 * @generated
 	 */
-	int INTERVAL_CONSTRAINT = 200;
+	int INTERVAL_CONSTRAINT = 212;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.TimeConstraintImpl <em>Time Constraint</em>}' class.
@@ -31298,7 +31298,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getTimeConstraint()
 	 * @generated
 	 */
-	int TIME_CONSTRAINT = 199;
+	int TIME_CONSTRAINT = 211;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.TimeIntervalImpl <em>Time Interval</em>}' class.
@@ -31308,7 +31308,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getTimeInterval()
 	 * @generated
 	 */
-	int TIME_INTERVAL = 201;
+	int TIME_INTERVAL = 213;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.DurationObservationActionImpl <em>Duration Observation Action</em>}' class.
@@ -31318,7 +31318,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getDurationObservationAction()
 	 * @generated
 	 */
-	int DURATION_OBSERVATION_ACTION = 202;
+	int DURATION_OBSERVATION_ACTION = 214;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.DurationConstraintImpl <em>Duration Constraint</em>}' class.
@@ -31328,7 +31328,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getDurationConstraint()
 	 * @generated
 	 */
-	int DURATION_CONSTRAINT = 203;
+	int DURATION_CONSTRAINT = 215;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ProtocolConformanceImpl <em>Protocol Conformance</em>}' class.
@@ -31338,7 +31338,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getProtocolConformance()
 	 * @generated
 	 */
-	int PROTOCOL_CONFORMANCE = 191;
+	int PROTOCOL_CONFORMANCE = 223;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ProtocolStateMachineImpl <em>Protocol State Machine</em>}' class.
@@ -31348,7 +31348,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getProtocolStateMachine()
 	 * @generated
 	 */
-	int PROTOCOL_STATE_MACHINE = 192;
+	int PROTOCOL_STATE_MACHINE = 224;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ProtocolTransitionImpl <em>Protocol Transition</em>}' class.
@@ -31358,7 +31358,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getProtocolTransition()
 	 * @generated
 	 */
-	int PROTOCOL_TRANSITION = 193;
+	int PROTOCOL_TRANSITION = 225;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -31367,7 +31367,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_NODE__EANNOTATIONS = OBJECT_NODE__EANNOTATIONS;
+	int STATE_MACHINE__EANNOTATIONS = BEHAVIOR__EANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
@@ -31376,7 +31376,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_NODE__OWNED_ELEMENT = OBJECT_NODE__OWNED_ELEMENT;
+	int STATE_MACHINE__OWNED_ELEMENT = BEHAVIOR__OWNED_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -31385,7 +31385,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_NODE__OWNER = OBJECT_NODE__OWNER;
+	int STATE_MACHINE__OWNER = BEHAVIOR__OWNER;
 
 	/**
 	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
@@ -31394,7 +31394,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_NODE__OWNED_COMMENT = OBJECT_NODE__OWNED_COMMENT;
+	int STATE_MACHINE__OWNED_COMMENT = BEHAVIOR__OWNED_COMMENT;
 
 	/**
 	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
@@ -31403,7 +31403,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_NODE__TEMPLATE_BINDING = OBJECT_NODE__TEMPLATE_BINDING;
+	int STATE_MACHINE__TEMPLATE_BINDING = BEHAVIOR__TEMPLATE_BINDING;
 
 	/**
 	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
@@ -31412,7 +31412,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_NODE__OWNED_TEMPLATE_SIGNATURE = OBJECT_NODE__OWNED_TEMPLATE_SIGNATURE;
+	int STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE = BEHAVIOR__OWNED_TEMPLATE_SIGNATURE;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -31421,7 +31421,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_NODE__NAME = OBJECT_NODE__NAME;
+	int STATE_MACHINE__NAME = BEHAVIOR__NAME;
 
 	/**
 	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
@@ -31430,7 +31430,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_NODE__QUALIFIED_NAME = OBJECT_NODE__QUALIFIED_NAME;
+	int STATE_MACHINE__QUALIFIED_NAME = BEHAVIOR__QUALIFIED_NAME;
 
 	/**
 	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
@@ -31439,7 +31439,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_NODE__VISIBILITY = OBJECT_NODE__VISIBILITY;
+	int STATE_MACHINE__VISIBILITY = BEHAVIOR__VISIBILITY;
 
 	/**
 	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
@@ -31448,7 +31448,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_NODE__CLIENT_DEPENDENCY = OBJECT_NODE__CLIENT_DEPENDENCY;
+	int STATE_MACHINE__CLIENT_DEPENDENCY = BEHAVIOR__CLIENT_DEPENDENCY;
 
 	/**
 	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
@@ -31457,421 +31457,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_NODE__NAME_EXPRESSION = OBJECT_NODE__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__REDEFINITION_CONTEXT = OBJECT_NODE__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__IS_LEAF = OBJECT_NODE__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__OUTGOING = OBJECT_NODE__OUTGOING;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__INCOMING = OBJECT_NODE__INCOMING;
-
-	/**
-	 * The feature id for the '<em><b>In Group</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__IN_GROUP = OBJECT_NODE__IN_GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Activity</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__ACTIVITY = OBJECT_NODE__ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__REDEFINED_ELEMENT = OBJECT_NODE__REDEFINED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__IN_STRUCTURED_NODE = OBJECT_NODE__IN_STRUCTURED_NODE;
-
-	/**
-	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__IN_PARTITION = OBJECT_NODE__IN_PARTITION;
-
-	/**
-	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__IN_INTERRUPTIBLE_REGION = OBJECT_NODE__IN_INTERRUPTIBLE_REGION;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__TYPE = OBJECT_NODE__TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Ordering</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__ORDERING = OBJECT_NODE__ORDERING;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__UPPER_BOUND = OBJECT_NODE__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>In State</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__IN_STATE = OBJECT_NODE__IN_STATE;
-
-	/**
-	 * The feature id for the '<em><b>Selection</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__SELECTION = OBJECT_NODE__SELECTION;
-
-	/**
-	 * The feature id for the '<em><b>Region As Output</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__REGION_AS_OUTPUT = OBJECT_NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Region As Input</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE__REGION_AS_INPUT = OBJECT_NODE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Expansion Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_NODE_FEATURE_COUNT = OBJECT_NODE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__EANNOTATIONS = STRUCTURED_ACTIVITY_NODE__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__OWNED_ELEMENT = STRUCTURED_ACTIVITY_NODE__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__OWNER = STRUCTURED_ACTIVITY_NODE__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__OWNED_COMMENT = STRUCTURED_ACTIVITY_NODE__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__TEMPLATE_BINDING = STRUCTURED_ACTIVITY_NODE__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__OWNED_TEMPLATE_SIGNATURE = STRUCTURED_ACTIVITY_NODE__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__NAME = STRUCTURED_ACTIVITY_NODE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__QUALIFIED_NAME = STRUCTURED_ACTIVITY_NODE__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__VISIBILITY = STRUCTURED_ACTIVITY_NODE__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__CLIENT_DEPENDENCY = STRUCTURED_ACTIVITY_NODE__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__NAME_EXPRESSION = STRUCTURED_ACTIVITY_NODE__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__REDEFINITION_CONTEXT = STRUCTURED_ACTIVITY_NODE__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__IS_LEAF = STRUCTURED_ACTIVITY_NODE__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__OUTGOING = STRUCTURED_ACTIVITY_NODE__OUTGOING;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__INCOMING = STRUCTURED_ACTIVITY_NODE__INCOMING;
-
-	/**
-	 * The feature id for the '<em><b>In Group</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__IN_GROUP = STRUCTURED_ACTIVITY_NODE__IN_GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Activity</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__ACTIVITY = STRUCTURED_ACTIVITY_NODE__ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__REDEFINED_ELEMENT = STRUCTURED_ACTIVITY_NODE__REDEFINED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__IN_STRUCTURED_NODE = STRUCTURED_ACTIVITY_NODE__IN_STRUCTURED_NODE;
-
-	/**
-	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__IN_PARTITION = STRUCTURED_ACTIVITY_NODE__IN_PARTITION;
-
-	/**
-	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__IN_INTERRUPTIBLE_REGION = STRUCTURED_ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION;
-
-	/**
-	 * The feature id for the '<em><b>Handler</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__HANDLER = STRUCTURED_ACTIVITY_NODE__HANDLER;
-
-	/**
-	 * The feature id for the '<em><b>Effect</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__EFFECT = STRUCTURED_ACTIVITY_NODE__EFFECT;
-
-	/**
-	 * The feature id for the '<em><b>Output</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__OUTPUT = STRUCTURED_ACTIVITY_NODE__OUTPUT;
-
-	/**
-	 * The feature id for the '<em><b>Input</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__INPUT = STRUCTURED_ACTIVITY_NODE__INPUT;
-
-	/**
-	 * The feature id for the '<em><b>Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__CONTEXT = STRUCTURED_ACTIVITY_NODE__CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Local Precondition</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__LOCAL_PRECONDITION = STRUCTURED_ACTIVITY_NODE__LOCAL_PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Local Postcondition</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__LOCAL_POSTCONDITION = STRUCTURED_ACTIVITY_NODE__LOCAL_POSTCONDITION;
+	int STATE_MACHINE__NAME_EXPRESSION = BEHAVIOR__NAME_EXPRESSION;
 
 	/**
 	 * The feature id for the '<em><b>Member</b></em>' reference list.
@@ -31880,7 +31466,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_REGION__MEMBER = STRUCTURED_ACTIVITY_NODE__MEMBER;
+	int STATE_MACHINE__MEMBER = BEHAVIOR__MEMBER;
 
 	/**
 	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
@@ -31889,7 +31475,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_REGION__OWNED_RULE = STRUCTURED_ACTIVITY_NODE__OWNED_RULE;
+	int STATE_MACHINE__OWNED_RULE = BEHAVIOR__OWNED_RULE;
 
 	/**
 	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
@@ -31898,7 +31484,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_REGION__IMPORTED_MEMBER = STRUCTURED_ACTIVITY_NODE__IMPORTED_MEMBER;
+	int STATE_MACHINE__IMPORTED_MEMBER = BEHAVIOR__IMPORTED_MEMBER;
 
 	/**
 	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
@@ -31907,7 +31493,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_REGION__ELEMENT_IMPORT = STRUCTURED_ACTIVITY_NODE__ELEMENT_IMPORT;
+	int STATE_MACHINE__ELEMENT_IMPORT = BEHAVIOR__ELEMENT_IMPORT;
 
 	/**
 	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
@@ -31916,277 +31502,43 @@
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_REGION__PACKAGE_IMPORT = STRUCTURED_ACTIVITY_NODE__PACKAGE_IMPORT;
+	int STATE_MACHINE__PACKAGE_IMPORT = BEHAVIOR__PACKAGE_IMPORT;
 
 	/**
-	 * The feature id for the '<em><b>Super Group</b></em>' reference.
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_REGION__SUPER_GROUP = STRUCTURED_ACTIVITY_NODE__SUPER_GROUP;
+	int STATE_MACHINE__TEMPLATE_PARAMETER = BEHAVIOR__TEMPLATE_PARAMETER;
 
 	/**
-	 * The feature id for the '<em><b>Activity Group activity</b></em>' container reference.
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_REGION__ACTIVITY_GROUP_ACTIVITY = STRUCTURED_ACTIVITY_NODE__ACTIVITY_GROUP_ACTIVITY;
+	int STATE_MACHINE__OWNING_PARAMETER = BEHAVIOR__OWNING_PARAMETER;
 
 	/**
-	 * The feature id for the '<em><b>Variable</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_REGION__VARIABLE = STRUCTURED_ACTIVITY_NODE__VARIABLE;
+	int STATE_MACHINE__PACKAGEABLE_ELEMENT_VISIBILITY = BEHAVIOR__PACKAGEABLE_ELEMENT_VISIBILITY;
 
 	/**
-	 * The feature id for the '<em><b>Contained Node</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXPANSION_REGION__CONTAINED_NODE = STRUCTURED_ACTIVITY_NODE__CONTAINED_NODE;
-
-	/**
-	 * The feature id for the '<em><b>Contained Edge</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__CONTAINED_EDGE = STRUCTURED_ACTIVITY_NODE__CONTAINED_EDGE;
-
-	/**
-	 * The feature id for the '<em><b>Must Isolate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__MUST_ISOLATE = STRUCTURED_ACTIVITY_NODE__MUST_ISOLATE;
-
-	/**
-	 * The feature id for the '<em><b>Mode</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__MODE = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Output Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__OUTPUT_ELEMENT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Input Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION__INPUT_ELEMENT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the the '<em>Expansion Region</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPANSION_REGION_FEATURE_COUNT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCEPTION_HANDLER__EANNOTATIONS = ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCEPTION_HANDLER__OWNED_ELEMENT = ELEMENT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCEPTION_HANDLER__OWNER = ELEMENT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCEPTION_HANDLER__OWNED_COMMENT = ELEMENT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Protected Node</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCEPTION_HANDLER__PROTECTED_NODE = ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Handler Body</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCEPTION_HANDLER__HANDLER_BODY = ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Exception Input</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCEPTION_HANDLER__EXCEPTION_INPUT = ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Exception Type</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCEPTION_HANDLER__EXCEPTION_TYPE = ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the the '<em>Exception Handler</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXCEPTION_HANDLER_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORK_NODE__EANNOTATIONS = CONTROL_NODE__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORK_NODE__OWNED_ELEMENT = CONTROL_NODE__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORK_NODE__OWNER = CONTROL_NODE__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORK_NODE__OWNED_COMMENT = CONTROL_NODE__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORK_NODE__TEMPLATE_BINDING = CONTROL_NODE__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORK_NODE__OWNED_TEMPLATE_SIGNATURE = CONTROL_NODE__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORK_NODE__NAME = CONTROL_NODE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORK_NODE__QUALIFIED_NAME = CONTROL_NODE__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORK_NODE__VISIBILITY = CONTROL_NODE__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORK_NODE__CLIENT_DEPENDENCY = CONTROL_NODE__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORK_NODE__NAME_EXPRESSION = CONTROL_NODE__NAME_EXPRESSION;
+	int STATE_MACHINE__PACKAGE = BEHAVIOR__PACKAGE;
 
 	/**
 	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
@@ -32195,7 +31547,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FORK_NODE__REDEFINITION_CONTEXT = CONTROL_NODE__REDEFINITION_CONTEXT;
+	int STATE_MACHINE__REDEFINITION_CONTEXT = BEHAVIOR__REDEFINITION_CONTEXT;
 
 	/**
 	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
@@ -32204,88 +31556,403 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FORK_NODE__IS_LEAF = CONTROL_NODE__IS_LEAF;
+	int STATE_MACHINE__IS_LEAF = BEHAVIOR__IS_LEAF;
 
 	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * The feature id for the '<em><b>Feature</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FORK_NODE__OUTGOING = CONTROL_NODE__OUTGOING;
+	int STATE_MACHINE__FEATURE = BEHAVIOR__FEATURE;
 
 	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FORK_NODE__INCOMING = CONTROL_NODE__INCOMING;
+	int STATE_MACHINE__IS_ABSTRACT = BEHAVIOR__IS_ABSTRACT;
 
 	/**
-	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FORK_NODE__IN_GROUP = CONTROL_NODE__IN_GROUP;
+	int STATE_MACHINE__INHERITED_MEMBER = BEHAVIOR__INHERITED_MEMBER;
 
 	/**
-	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * The feature id for the '<em><b>General</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FORK_NODE__ACTIVITY = CONTROL_NODE__ACTIVITY;
+	int STATE_MACHINE__GENERAL = BEHAVIOR__GENERAL;
 
 	/**
-	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FORK_NODE__REDEFINED_ELEMENT = CONTROL_NODE__REDEFINED_ELEMENT;
+	int STATE_MACHINE__GENERALIZATION = BEHAVIOR__GENERALIZATION;
 
 	/**
-	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FORK_NODE__IN_STRUCTURED_NODE = CONTROL_NODE__IN_STRUCTURED_NODE;
+	int STATE_MACHINE__ATTRIBUTE = BEHAVIOR__ATTRIBUTE;
 
 	/**
-	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
+	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FORK_NODE__IN_PARTITION = CONTROL_NODE__IN_PARTITION;
+	int STATE_MACHINE__REDEFINED_CLASSIFIER = BEHAVIOR__REDEFINED_CLASSIFIER;
 
 	/**
-	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
+	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FORK_NODE__IN_INTERRUPTIBLE_REGION = CONTROL_NODE__IN_INTERRUPTIBLE_REGION;
+	int STATE_MACHINE__POWERTYPE_EXTENT = BEHAVIOR__POWERTYPE_EXTENT;
 
 	/**
-	 * The number of structural features of the the '<em>Fork Node</em>' class.
+	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FORK_NODE_FEATURE_COUNT = CONTROL_NODE_FEATURE_COUNT + 0;
+	int STATE_MACHINE__SUBSTITUTION = BEHAVIOR__SUBSTITUTION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__OWNED_USE_CASE = BEHAVIOR__OWNED_USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__USE_CASE = BEHAVIOR__USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Representation</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__REPRESENTATION = BEHAVIOR__REPRESENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__OCCURRENCE = BEHAVIOR__OCCURRENCE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__OWNED_BEHAVIOR = BEHAVIOR__OWNED_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Classifier Behavior</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__CLASSIFIER_BEHAVIOR = BEHAVIOR__CLASSIFIER_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Implementation</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__IMPLEMENTATION = BEHAVIOR__IMPLEMENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__OWNED_TRIGGER = BEHAVIOR__OWNED_TRIGGER;
+
+	/**
+	 * The feature id for the '<em><b>Owned State Machine</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__OWNED_STATE_MACHINE = BEHAVIOR__OWNED_STATE_MACHINE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__OWNED_ATTRIBUTE = BEHAVIOR__OWNED_ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Part</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__PART = BEHAVIOR__PART;
+
+	/**
+	 * The feature id for the '<em><b>Role</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__ROLE = BEHAVIOR__ROLE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__OWNED_CONNECTOR = BEHAVIOR__OWNED_CONNECTOR;
+
+	/**
+	 * The feature id for the '<em><b>Owned Port</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__OWNED_PORT = BEHAVIOR__OWNED_PORT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__OWNED_OPERATION = BEHAVIOR__OWNED_OPERATION;
+
+	/**
+	 * The feature id for the '<em><b>Super Class</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__SUPER_CLASS = BEHAVIOR__SUPER_CLASS;
+
+	/**
+	 * The feature id for the '<em><b>Nested Classifier</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__NESTED_CLASSIFIER = BEHAVIOR__NESTED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Extension</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__EXTENSION = BEHAVIOR__EXTENSION;
+
+	/**
+	 * The feature id for the '<em><b>Is Active</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__IS_ACTIVE = BEHAVIOR__IS_ACTIVE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Reception</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__OWNED_RECEPTION = BEHAVIOR__OWNED_RECEPTION;
+
+	/**
+	 * The feature id for the '<em><b>Is Reentrant</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__IS_REENTRANT = BEHAVIOR__IS_REENTRANT;
+
+	/**
+	 * The feature id for the '<em><b>Context</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__CONTEXT = BEHAVIOR__CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Behavior</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__REDEFINED_BEHAVIOR = BEHAVIOR__REDEFINED_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Specification</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__SPECIFICATION = BEHAVIOR__SPECIFICATION;
+
+	/**
+	 * The feature id for the '<em><b>Parameter</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__PARAMETER = BEHAVIOR__PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Formal Parameter</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__FORMAL_PARAMETER = BEHAVIOR__FORMAL_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Return Result</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__RETURN_RESULT = BEHAVIOR__RETURN_RESULT;
+
+	/**
+	 * The feature id for the '<em><b>Precondition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__PRECONDITION = BEHAVIOR__PRECONDITION;
+
+	/**
+	 * The feature id for the '<em><b>Postcondition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__POSTCONDITION = BEHAVIOR__POSTCONDITION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Parameter Set</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__OWNED_PARAMETER_SET = BEHAVIOR__OWNED_PARAMETER_SET;
+
+	/**
+	 * The feature id for the '<em><b>Region</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__REGION = BEHAVIOR_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Connection Point</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__CONNECTION_POINT = BEHAVIOR_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Extended State Machine</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__EXTENDED_STATE_MACHINE = BEHAVIOR_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>State Machine redefinition Context</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE__STATE_MACHINE_REDEFINITION_CONTEXT = BEHAVIOR_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the the '<em>State Machine</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_MACHINE_FEATURE_COUNT = BEHAVIOR_FEATURE_COUNT + 4;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -32294,7 +31961,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__EANNOTATIONS = CONTROL_NODE__EANNOTATIONS;
+	int REGION__EANNOTATIONS = NAMESPACE__EANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
@@ -32303,7 +31970,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__OWNED_ELEMENT = CONTROL_NODE__OWNED_ELEMENT;
+	int REGION__OWNED_ELEMENT = NAMESPACE__OWNED_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -32312,7 +31979,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__OWNER = CONTROL_NODE__OWNER;
+	int REGION__OWNER = NAMESPACE__OWNER;
 
 	/**
 	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
@@ -32321,7 +31988,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__OWNED_COMMENT = CONTROL_NODE__OWNED_COMMENT;
+	int REGION__OWNED_COMMENT = NAMESPACE__OWNED_COMMENT;
 
 	/**
 	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
@@ -32330,7 +31997,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__TEMPLATE_BINDING = CONTROL_NODE__TEMPLATE_BINDING;
+	int REGION__TEMPLATE_BINDING = NAMESPACE__TEMPLATE_BINDING;
 
 	/**
 	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
@@ -32339,7 +32006,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__OWNED_TEMPLATE_SIGNATURE = CONTROL_NODE__OWNED_TEMPLATE_SIGNATURE;
+	int REGION__OWNED_TEMPLATE_SIGNATURE = NAMESPACE__OWNED_TEMPLATE_SIGNATURE;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -32348,7 +32015,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__NAME = CONTROL_NODE__NAME;
+	int REGION__NAME = NAMESPACE__NAME;
 
 	/**
 	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
@@ -32357,7 +32024,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__QUALIFIED_NAME = CONTROL_NODE__QUALIFIED_NAME;
+	int REGION__QUALIFIED_NAME = NAMESPACE__QUALIFIED_NAME;
 
 	/**
 	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
@@ -32366,7 +32033,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__VISIBILITY = CONTROL_NODE__VISIBILITY;
+	int REGION__VISIBILITY = NAMESPACE__VISIBILITY;
 
 	/**
 	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
@@ -32375,7 +32042,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__CLIENT_DEPENDENCY = CONTROL_NODE__CLIENT_DEPENDENCY;
+	int REGION__CLIENT_DEPENDENCY = NAMESPACE__CLIENT_DEPENDENCY;
 
 	/**
 	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
@@ -32384,7 +32051,52 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__NAME_EXPRESSION = CONTROL_NODE__NAME_EXPRESSION;
+	int REGION__NAME_EXPRESSION = NAMESPACE__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REGION__MEMBER = NAMESPACE__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REGION__OWNED_RULE = NAMESPACE__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REGION__IMPORTED_MEMBER = NAMESPACE__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REGION__ELEMENT_IMPORT = NAMESPACE__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REGION__PACKAGE_IMPORT = NAMESPACE__PACKAGE_IMPORT;
 
 	/**
 	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
@@ -32393,7 +32105,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__REDEFINITION_CONTEXT = CONTROL_NODE__REDEFINITION_CONTEXT;
+	int REGION__REDEFINITION_CONTEXT = NAMESPACE_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
@@ -32402,106 +32114,61 @@
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__IS_LEAF = CONTROL_NODE__IS_LEAF;
+	int REGION__IS_LEAF = NAMESPACE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * The feature id for the '<em><b>Subvertex</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__OUTGOING = CONTROL_NODE__OUTGOING;
+	int REGION__SUBVERTEX = NAMESPACE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * The feature id for the '<em><b>Transition</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__INCOMING = CONTROL_NODE__INCOMING;
+	int REGION__TRANSITION = NAMESPACE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * The feature id for the '<em><b>State Machine</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__IN_GROUP = CONTROL_NODE__IN_GROUP;
+	int REGION__STATE_MACHINE = NAMESPACE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * The feature id for the '<em><b>State</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__ACTIVITY = CONTROL_NODE__ACTIVITY;
+	int REGION__STATE = NAMESPACE_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * The feature id for the '<em><b>Extended Region</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__REDEFINED_ELEMENT = CONTROL_NODE__REDEFINED_ELEMENT;
+	int REGION__EXTENDED_REGION = NAMESPACE_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * The number of structural features of the the '<em>Region</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int JOIN_NODE__IN_STRUCTURED_NODE = CONTROL_NODE__IN_STRUCTURED_NODE;
-
-	/**
-	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JOIN_NODE__IN_PARTITION = CONTROL_NODE__IN_PARTITION;
-
-	/**
-	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JOIN_NODE__IN_INTERRUPTIBLE_REGION = CONTROL_NODE__IN_INTERRUPTIBLE_REGION;
-
-	/**
-	 * The feature id for the '<em><b>Is Combine Duplicate</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JOIN_NODE__IS_COMBINE_DUPLICATE = CONTROL_NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Join Spec</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JOIN_NODE__JOIN_SPEC = CONTROL_NODE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Join Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int JOIN_NODE_FEATURE_COUNT = CONTROL_NODE_FEATURE_COUNT + 2;
+	int REGION_FEATURE_COUNT = NAMESPACE_FEATURE_COUNT + 7;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -32510,7 +32177,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__EANNOTATIONS = FINAL_NODE__EANNOTATIONS;
+	int VERTEX__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
@@ -32519,7 +32186,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__OWNED_ELEMENT = FINAL_NODE__OWNED_ELEMENT;
+	int VERTEX__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -32528,7 +32195,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__OWNER = FINAL_NODE__OWNER;
+	int VERTEX__OWNER = NAMED_ELEMENT__OWNER;
 
 	/**
 	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
@@ -32537,7 +32204,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__OWNED_COMMENT = FINAL_NODE__OWNED_COMMENT;
+	int VERTEX__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
 
 	/**
 	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
@@ -32546,7 +32213,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__TEMPLATE_BINDING = FINAL_NODE__TEMPLATE_BINDING;
+	int VERTEX__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
 
 	/**
 	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
@@ -32555,7 +32222,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__OWNED_TEMPLATE_SIGNATURE = FINAL_NODE__OWNED_TEMPLATE_SIGNATURE;
+	int VERTEX__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -32564,7 +32231,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__NAME = FINAL_NODE__NAME;
+	int VERTEX__NAME = NAMED_ELEMENT__NAME;
 
 	/**
 	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
@@ -32573,7 +32240,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__QUALIFIED_NAME = FINAL_NODE__QUALIFIED_NAME;
+	int VERTEX__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
 
 	/**
 	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
@@ -32582,7 +32249,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__VISIBILITY = FINAL_NODE__VISIBILITY;
+	int VERTEX__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
 
 	/**
 	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
@@ -32591,7 +32258,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__CLIENT_DEPENDENCY = FINAL_NODE__CLIENT_DEPENDENCY;
+	int VERTEX__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
 
 	/**
 	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
@@ -32600,7 +32267,331 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__NAME_EXPRESSION = FINAL_NODE__NAME_EXPRESSION;
+	int VERTEX__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Container</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERTEX__CONTAINER = NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERTEX__OUTGOING = NAMED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERTEX__INCOMING = NAMED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the the '<em>Vertex</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VERTEX_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__EANNOTATIONS = VERTEX__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__OWNED_ELEMENT = VERTEX__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__OWNER = VERTEX__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__OWNED_COMMENT = VERTEX__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__TEMPLATE_BINDING = VERTEX__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__OWNED_TEMPLATE_SIGNATURE = VERTEX__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__NAME = VERTEX__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__QUALIFIED_NAME = VERTEX__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__VISIBILITY = VERTEX__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__CLIENT_DEPENDENCY = VERTEX__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__NAME_EXPRESSION = VERTEX__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Container</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__CONTAINER = VERTEX__CONTAINER;
+
+	/**
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__OUTGOING = VERTEX__OUTGOING;
+
+	/**
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__INCOMING = VERTEX__INCOMING;
+
+	/**
+	 * The feature id for the '<em><b>Kind</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE__KIND = VERTEX_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the the '<em>Pseudostate</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PSEUDOSTATE_FEATURE_COUNT = VERTEX_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__EANNOTATIONS = NAMESPACE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__OWNED_ELEMENT = NAMESPACE__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__OWNER = NAMESPACE__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__OWNED_COMMENT = NAMESPACE__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__TEMPLATE_BINDING = NAMESPACE__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__OWNED_TEMPLATE_SIGNATURE = NAMESPACE__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__NAME = NAMESPACE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__QUALIFIED_NAME = NAMESPACE__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__VISIBILITY = NAMESPACE__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__CLIENT_DEPENDENCY = NAMESPACE__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__NAME_EXPRESSION = NAMESPACE__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__MEMBER = NAMESPACE__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__OWNED_RULE = NAMESPACE__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__IMPORTED_MEMBER = NAMESPACE__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__ELEMENT_IMPORT = NAMESPACE__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__PACKAGE_IMPORT = NAMESPACE__PACKAGE_IMPORT;
 
 	/**
 	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
@@ -32609,7 +32600,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__REDEFINITION_CONTEXT = FINAL_NODE__REDEFINITION_CONTEXT;
+	int STATE__REDEFINITION_CONTEXT = NAMESPACE_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
@@ -32618,7 +32609,16 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__IS_LEAF = FINAL_NODE__IS_LEAF;
+	int STATE__IS_LEAF = NAMESPACE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Container</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__CONTAINER = NAMESPACE_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
@@ -32627,7 +32627,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__OUTGOING = FINAL_NODE__OUTGOING;
+	int STATE__OUTGOING = NAMESPACE_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
@@ -32636,70 +32636,133 @@
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__INCOMING = FINAL_NODE__INCOMING;
+	int STATE__INCOMING = NAMESPACE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * The feature id for the '<em><b>Is Composite</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__IN_GROUP = FINAL_NODE__IN_GROUP;
+	int STATE__IS_COMPOSITE = NAMESPACE_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * The feature id for the '<em><b>Is Orthogonal</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__ACTIVITY = FINAL_NODE__ACTIVITY;
+	int STATE__IS_ORTHOGONAL = NAMESPACE_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * The feature id for the '<em><b>Is Simple</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__REDEFINED_ELEMENT = FINAL_NODE__REDEFINED_ELEMENT;
+	int STATE__IS_SIMPLE = NAMESPACE_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * The feature id for the '<em><b>Is Submachine State</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__IN_STRUCTURED_NODE = FINAL_NODE__IN_STRUCTURED_NODE;
+	int STATE__IS_SUBMACHINE_STATE = NAMESPACE_FEATURE_COUNT + 8;
 
 	/**
-	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
+	 * The feature id for the '<em><b>Submachine</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__IN_PARTITION = FINAL_NODE__IN_PARTITION;
+	int STATE__SUBMACHINE = NAMESPACE_FEATURE_COUNT + 9;
 
 	/**
-	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
+	 * The feature id for the '<em><b>Connection</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE__IN_INTERRUPTIBLE_REGION = FINAL_NODE__IN_INTERRUPTIBLE_REGION;
+	int STATE__CONNECTION = NAMESPACE_FEATURE_COUNT + 10;
 
 	/**
-	 * The number of structural features of the the '<em>Flow Final Node</em>' class.
+	 * The feature id for the '<em><b>Redefined State</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FLOW_FINAL_NODE_FEATURE_COUNT = FINAL_NODE_FEATURE_COUNT + 0;
+	int STATE__REDEFINED_STATE = NAMESPACE_FEATURE_COUNT + 11;
+
+	/**
+	 * The feature id for the '<em><b>Deferrable Trigger</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__DEFERRABLE_TRIGGER = NAMESPACE_FEATURE_COUNT + 12;
+
+	/**
+	 * The feature id for the '<em><b>Region</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__REGION = NAMESPACE_FEATURE_COUNT + 13;
+
+	/**
+	 * The feature id for the '<em><b>Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__ENTRY = NAMESPACE_FEATURE_COUNT + 14;
+
+	/**
+	 * The feature id for the '<em><b>Exit</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__EXIT = NAMESPACE_FEATURE_COUNT + 15;
+
+	/**
+	 * The feature id for the '<em><b>Do Activity</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__DO_ACTIVITY = NAMESPACE_FEATURE_COUNT + 16;
+
+	/**
+	 * The feature id for the '<em><b>State Invariant</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE__STATE_INVARIANT = NAMESPACE_FEATURE_COUNT + 17;
+
+	/**
+	 * The number of structural features of the the '<em>State</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STATE_FEATURE_COUNT = NAMESPACE_FEATURE_COUNT + 18;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -32708,7 +32771,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__EANNOTATIONS = OBJECT_NODE__EANNOTATIONS;
+	int CONNECTION_POINT_REFERENCE__EANNOTATIONS = VERTEX__EANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
@@ -32717,7 +32780,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__OWNED_ELEMENT = OBJECT_NODE__OWNED_ELEMENT;
+	int CONNECTION_POINT_REFERENCE__OWNED_ELEMENT = VERTEX__OWNED_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -32726,7 +32789,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__OWNER = OBJECT_NODE__OWNER;
+	int CONNECTION_POINT_REFERENCE__OWNER = VERTEX__OWNER;
 
 	/**
 	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
@@ -32735,7 +32798,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__OWNED_COMMENT = OBJECT_NODE__OWNED_COMMENT;
+	int CONNECTION_POINT_REFERENCE__OWNED_COMMENT = VERTEX__OWNED_COMMENT;
 
 	/**
 	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
@@ -32744,7 +32807,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__TEMPLATE_BINDING = OBJECT_NODE__TEMPLATE_BINDING;
+	int CONNECTION_POINT_REFERENCE__TEMPLATE_BINDING = VERTEX__TEMPLATE_BINDING;
 
 	/**
 	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
@@ -32753,7 +32816,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__OWNED_TEMPLATE_SIGNATURE = OBJECT_NODE__OWNED_TEMPLATE_SIGNATURE;
+	int CONNECTION_POINT_REFERENCE__OWNED_TEMPLATE_SIGNATURE = VERTEX__OWNED_TEMPLATE_SIGNATURE;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -32762,7 +32825,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__NAME = OBJECT_NODE__NAME;
+	int CONNECTION_POINT_REFERENCE__NAME = VERTEX__NAME;
 
 	/**
 	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
@@ -32771,7 +32834,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__QUALIFIED_NAME = OBJECT_NODE__QUALIFIED_NAME;
+	int CONNECTION_POINT_REFERENCE__QUALIFIED_NAME = VERTEX__QUALIFIED_NAME;
 
 	/**
 	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
@@ -32780,7 +32843,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__VISIBILITY = OBJECT_NODE__VISIBILITY;
+	int CONNECTION_POINT_REFERENCE__VISIBILITY = VERTEX__VISIBILITY;
 
 	/**
 	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
@@ -32789,7 +32852,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__CLIENT_DEPENDENCY = OBJECT_NODE__CLIENT_DEPENDENCY;
+	int CONNECTION_POINT_REFERENCE__CLIENT_DEPENDENCY = VERTEX__CLIENT_DEPENDENCY;
 
 	/**
 	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
@@ -32798,7 +32861,160 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__NAME_EXPRESSION = OBJECT_NODE__NAME_EXPRESSION;
+	int CONNECTION_POINT_REFERENCE__NAME_EXPRESSION = VERTEX__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Container</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION_POINT_REFERENCE__CONTAINER = VERTEX__CONTAINER;
+
+	/**
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION_POINT_REFERENCE__OUTGOING = VERTEX__OUTGOING;
+
+	/**
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION_POINT_REFERENCE__INCOMING = VERTEX__INCOMING;
+
+	/**
+	 * The feature id for the '<em><b>Entry</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION_POINT_REFERENCE__ENTRY = VERTEX_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Exit</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION_POINT_REFERENCE__EXIT = VERTEX_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Connection Point Reference</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONNECTION_POINT_REFERENCE_FEATURE_COUNT = VERTEX_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRANSITION__EANNOTATIONS = REDEFINABLE_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRANSITION__OWNED_ELEMENT = REDEFINABLE_ELEMENT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRANSITION__OWNER = REDEFINABLE_ELEMENT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRANSITION__OWNED_COMMENT = REDEFINABLE_ELEMENT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRANSITION__TEMPLATE_BINDING = REDEFINABLE_ELEMENT__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRANSITION__OWNED_TEMPLATE_SIGNATURE = REDEFINABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRANSITION__NAME = REDEFINABLE_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRANSITION__QUALIFIED_NAME = REDEFINABLE_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRANSITION__VISIBILITY = REDEFINABLE_ELEMENT__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRANSITION__CLIENT_DEPENDENCY = REDEFINABLE_ELEMENT__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TRANSITION__NAME_EXPRESSION = REDEFINABLE_ELEMENT__NAME_EXPRESSION;
 
 	/**
 	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
@@ -32807,7 +33023,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__REDEFINITION_CONTEXT = OBJECT_NODE__REDEFINITION_CONTEXT;
+	int TRANSITION__REDEFINITION_CONTEXT = REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT;
 
 	/**
 	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
@@ -32816,133 +33032,88 @@
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__IS_LEAF = OBJECT_NODE__IS_LEAF;
+	int TRANSITION__IS_LEAF = REDEFINABLE_ELEMENT__IS_LEAF;
 
 	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * The feature id for the '<em><b>Kind</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__OUTGOING = OBJECT_NODE__OUTGOING;
+	int TRANSITION__KIND = REDEFINABLE_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * The feature id for the '<em><b>Container</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__INCOMING = OBJECT_NODE__INCOMING;
+	int TRANSITION__CONTAINER = REDEFINABLE_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * The feature id for the '<em><b>Source</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__IN_GROUP = OBJECT_NODE__IN_GROUP;
+	int TRANSITION__SOURCE = REDEFINABLE_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * The feature id for the '<em><b>Target</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__ACTIVITY = OBJECT_NODE__ACTIVITY;
+	int TRANSITION__TARGET = REDEFINABLE_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * The feature id for the '<em><b>Redefined Transition</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__REDEFINED_ELEMENT = OBJECT_NODE__REDEFINED_ELEMENT;
+	int TRANSITION__REDEFINED_TRANSITION = REDEFINABLE_ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * The feature id for the '<em><b>Trigger</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__IN_STRUCTURED_NODE = OBJECT_NODE__IN_STRUCTURED_NODE;
+	int TRANSITION__TRIGGER = REDEFINABLE_ELEMENT_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
+	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__IN_PARTITION = OBJECT_NODE__IN_PARTITION;
+	int TRANSITION__GUARD = REDEFINABLE_ELEMENT_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
+	 * The feature id for the '<em><b>Effect</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__IN_INTERRUPTIBLE_REGION = OBJECT_NODE__IN_INTERRUPTIBLE_REGION;
+	int TRANSITION__EFFECT = REDEFINABLE_ELEMENT_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * The number of structural features of the the '<em>Transition</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CENTRAL_BUFFER_NODE__TYPE = OBJECT_NODE__TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Ordering</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CENTRAL_BUFFER_NODE__ORDERING = OBJECT_NODE__ORDERING;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CENTRAL_BUFFER_NODE__UPPER_BOUND = OBJECT_NODE__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>In State</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CENTRAL_BUFFER_NODE__IN_STATE = OBJECT_NODE__IN_STATE;
-
-	/**
-	 * The feature id for the '<em><b>Selection</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CENTRAL_BUFFER_NODE__SELECTION = OBJECT_NODE__SELECTION;
-
-	/**
-	 * The number of structural features of the the '<em>Central Buffer Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CENTRAL_BUFFER_NODE_FEATURE_COUNT = OBJECT_NODE_FEATURE_COUNT + 0;
+	int TRANSITION_FEATURE_COUNT = REDEFINABLE_ELEMENT_FEATURE_COUNT + 8;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -32951,7 +33122,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
+	int FINAL_STATE__EANNOTATIONS = STATE__EANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
@@ -32960,7 +33131,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
+	int FINAL_STATE__OWNED_ELEMENT = STATE__OWNED_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -32969,7 +33140,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__OWNER = NAMED_ELEMENT__OWNER;
+	int FINAL_STATE__OWNER = STATE__OWNER;
 
 	/**
 	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
@@ -32978,7 +33149,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
+	int FINAL_STATE__OWNED_COMMENT = STATE__OWNED_COMMENT;
 
 	/**
 	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
@@ -32987,7 +33158,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
+	int FINAL_STATE__TEMPLATE_BINDING = STATE__TEMPLATE_BINDING;
 
 	/**
 	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
@@ -32996,7 +33167,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
+	int FINAL_STATE__OWNED_TEMPLATE_SIGNATURE = STATE__OWNED_TEMPLATE_SIGNATURE;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -33005,7 +33176,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__NAME = NAMED_ELEMENT__NAME;
+	int FINAL_STATE__NAME = STATE__NAME;
 
 	/**
 	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
@@ -33014,7 +33185,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+	int FINAL_STATE__QUALIFIED_NAME = STATE__QUALIFIED_NAME;
 
 	/**
 	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
@@ -33023,7 +33194,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
+	int FINAL_STATE__VISIBILITY = STATE__VISIBILITY;
 
 	/**
 	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
@@ -33032,7 +33203,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
+	int FINAL_STATE__CLIENT_DEPENDENCY = STATE__CLIENT_DEPENDENCY;
 
 	/**
 	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
@@ -33041,97 +33212,223 @@
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
+	int FINAL_STATE__NAME_EXPRESSION = STATE__NAME_EXPRESSION;
 
 	/**
-	 * The feature id for the '<em><b>Super Group</b></em>' reference.
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__SUPER_GROUP = NAMED_ELEMENT_FEATURE_COUNT + 0;
+	int FINAL_STATE__MEMBER = STATE__MEMBER;
 
 	/**
-	 * The feature id for the '<em><b>Activity Group activity</b></em>' container reference.
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__ACTIVITY_GROUP_ACTIVITY = NAMED_ELEMENT_FEATURE_COUNT + 1;
+	int FINAL_STATE__OWNED_RULE = STATE__OWNED_RULE;
 
 	/**
-	 * The feature id for the '<em><b>Is Dimension</b></em>' attribute.
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__IS_DIMENSION = NAMED_ELEMENT_FEATURE_COUNT + 2;
+	int FINAL_STATE__IMPORTED_MEMBER = STATE__IMPORTED_MEMBER;
 
 	/**
-	 * The feature id for the '<em><b>Is External</b></em>' attribute.
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__IS_EXTERNAL = NAMED_ELEMENT_FEATURE_COUNT + 3;
+	int FINAL_STATE__ELEMENT_IMPORT = STATE__ELEMENT_IMPORT;
 
 	/**
-	 * The feature id for the '<em><b>Contained Edge</b></em>' reference list.
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__CONTAINED_EDGE = NAMED_ELEMENT_FEATURE_COUNT + 4;
+	int FINAL_STATE__PACKAGE_IMPORT = STATE__PACKAGE_IMPORT;
 
 	/**
-	 * The feature id for the '<em><b>Contained Node</b></em>' reference list.
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__CONTAINED_NODE = NAMED_ELEMENT_FEATURE_COUNT + 5;
+	int FINAL_STATE__REDEFINITION_CONTEXT = STATE__REDEFINITION_CONTEXT;
 
 	/**
-	 * The feature id for the '<em><b>Subgroup</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__SUBGROUP = NAMED_ELEMENT_FEATURE_COUNT + 6;
+	int FINAL_STATE__IS_LEAF = STATE__IS_LEAF;
 
 	/**
-	 * The feature id for the '<em><b>Super Partition</b></em>' container reference.
+	 * The feature id for the '<em><b>Container</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__SUPER_PARTITION = NAMED_ELEMENT_FEATURE_COUNT + 7;
+	int FINAL_STATE__CONTAINER = STATE__CONTAINER;
 
 	/**
-	 * The feature id for the '<em><b>Represents</b></em>' reference.
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION__REPRESENTS = NAMED_ELEMENT_FEATURE_COUNT + 8;
+	int FINAL_STATE__OUTGOING = STATE__OUTGOING;
 
 	/**
-	 * The number of structural features of the the '<em>Activity Partition</em>' class.
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ACTIVITY_PARTITION_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 9;
+	int FINAL_STATE__INCOMING = STATE__INCOMING;
+
+	/**
+	 * The feature id for the '<em><b>Is Composite</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FINAL_STATE__IS_COMPOSITE = STATE__IS_COMPOSITE;
+
+	/**
+	 * The feature id for the '<em><b>Is Orthogonal</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FINAL_STATE__IS_ORTHOGONAL = STATE__IS_ORTHOGONAL;
+
+	/**
+	 * The feature id for the '<em><b>Is Simple</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FINAL_STATE__IS_SIMPLE = STATE__IS_SIMPLE;
+
+	/**
+	 * The feature id for the '<em><b>Is Submachine State</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FINAL_STATE__IS_SUBMACHINE_STATE = STATE__IS_SUBMACHINE_STATE;
+
+	/**
+	 * The feature id for the '<em><b>Submachine</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FINAL_STATE__SUBMACHINE = STATE__SUBMACHINE;
+
+	/**
+	 * The feature id for the '<em><b>Connection</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FINAL_STATE__CONNECTION = STATE__CONNECTION;
+
+	/**
+	 * The feature id for the '<em><b>Redefined State</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FINAL_STATE__REDEFINED_STATE = STATE__REDEFINED_STATE;
+
+	/**
+	 * The feature id for the '<em><b>Deferrable Trigger</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FINAL_STATE__DEFERRABLE_TRIGGER = STATE__DEFERRABLE_TRIGGER;
+
+	/**
+	 * The feature id for the '<em><b>Region</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FINAL_STATE__REGION = STATE__REGION;
+
+	/**
+	 * The feature id for the '<em><b>Entry</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FINAL_STATE__ENTRY = STATE__ENTRY;
+
+	/**
+	 * The feature id for the '<em><b>Exit</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FINAL_STATE__EXIT = STATE__EXIT;
+
+	/**
+	 * The feature id for the '<em><b>Do Activity</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FINAL_STATE__DO_ACTIVITY = STATE__DO_ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>State Invariant</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FINAL_STATE__STATE_INVARIANT = STATE__STATE_INVARIANT;
+
+	/**
+	 * The number of structural features of the the '<em>Final State</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FINAL_STATE_FEATURE_COUNT = STATE_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -41987,7 +42284,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__EANNOTATIONS = BEHAVIOR__EANNOTATIONS;
+	int FORK_NODE__EANNOTATIONS = CONTROL_NODE__EANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
@@ -41996,7 +42293,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__OWNED_ELEMENT = BEHAVIOR__OWNED_ELEMENT;
+	int FORK_NODE__OWNED_ELEMENT = CONTROL_NODE__OWNED_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -42005,7 +42302,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__OWNER = BEHAVIOR__OWNER;
+	int FORK_NODE__OWNER = CONTROL_NODE__OWNER;
 
 	/**
 	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
@@ -42014,7 +42311,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__OWNED_COMMENT = BEHAVIOR__OWNED_COMMENT;
+	int FORK_NODE__OWNED_COMMENT = CONTROL_NODE__OWNED_COMMENT;
 
 	/**
 	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
@@ -42023,7 +42320,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__TEMPLATE_BINDING = BEHAVIOR__TEMPLATE_BINDING;
+	int FORK_NODE__TEMPLATE_BINDING = CONTROL_NODE__TEMPLATE_BINDING;
 
 	/**
 	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
@@ -42032,7 +42329,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE = BEHAVIOR__OWNED_TEMPLATE_SIGNATURE;
+	int FORK_NODE__OWNED_TEMPLATE_SIGNATURE = CONTROL_NODE__OWNED_TEMPLATE_SIGNATURE;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -42041,7 +42338,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__NAME = BEHAVIOR__NAME;
+	int FORK_NODE__NAME = CONTROL_NODE__NAME;
 
 	/**
 	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
@@ -42050,7 +42347,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__QUALIFIED_NAME = BEHAVIOR__QUALIFIED_NAME;
+	int FORK_NODE__QUALIFIED_NAME = CONTROL_NODE__QUALIFIED_NAME;
 
 	/**
 	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
@@ -42059,7 +42356,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__VISIBILITY = BEHAVIOR__VISIBILITY;
+	int FORK_NODE__VISIBILITY = CONTROL_NODE__VISIBILITY;
 
 	/**
 	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
@@ -42068,7 +42365,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__CLIENT_DEPENDENCY = BEHAVIOR__CLIENT_DEPENDENCY;
+	int FORK_NODE__CLIENT_DEPENDENCY = CONTROL_NODE__CLIENT_DEPENDENCY;
 
 	/**
 	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
@@ -42077,7 +42374,1465 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__NAME_EXPRESSION = BEHAVIOR__NAME_EXPRESSION;
+	int FORK_NODE__NAME_EXPRESSION = CONTROL_NODE__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FORK_NODE__REDEFINITION_CONTEXT = CONTROL_NODE__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FORK_NODE__IS_LEAF = CONTROL_NODE__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FORK_NODE__OUTGOING = CONTROL_NODE__OUTGOING;
+
+	/**
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FORK_NODE__INCOMING = CONTROL_NODE__INCOMING;
+
+	/**
+	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FORK_NODE__IN_GROUP = CONTROL_NODE__IN_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FORK_NODE__ACTIVITY = CONTROL_NODE__ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FORK_NODE__REDEFINED_ELEMENT = CONTROL_NODE__REDEFINED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FORK_NODE__IN_STRUCTURED_NODE = CONTROL_NODE__IN_STRUCTURED_NODE;
+
+	/**
+	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FORK_NODE__IN_PARTITION = CONTROL_NODE__IN_PARTITION;
+
+	/**
+	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FORK_NODE__IN_INTERRUPTIBLE_REGION = CONTROL_NODE__IN_INTERRUPTIBLE_REGION;
+
+	/**
+	 * The number of structural features of the the '<em>Fork Node</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FORK_NODE_FEATURE_COUNT = CONTROL_NODE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__EANNOTATIONS = CONTROL_NODE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__OWNED_ELEMENT = CONTROL_NODE__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__OWNER = CONTROL_NODE__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__OWNED_COMMENT = CONTROL_NODE__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__TEMPLATE_BINDING = CONTROL_NODE__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__OWNED_TEMPLATE_SIGNATURE = CONTROL_NODE__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__NAME = CONTROL_NODE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__QUALIFIED_NAME = CONTROL_NODE__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__VISIBILITY = CONTROL_NODE__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__CLIENT_DEPENDENCY = CONTROL_NODE__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__NAME_EXPRESSION = CONTROL_NODE__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__REDEFINITION_CONTEXT = CONTROL_NODE__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__IS_LEAF = CONTROL_NODE__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__OUTGOING = CONTROL_NODE__OUTGOING;
+
+	/**
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__INCOMING = CONTROL_NODE__INCOMING;
+
+	/**
+	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__IN_GROUP = CONTROL_NODE__IN_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__ACTIVITY = CONTROL_NODE__ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__REDEFINED_ELEMENT = CONTROL_NODE__REDEFINED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__IN_STRUCTURED_NODE = CONTROL_NODE__IN_STRUCTURED_NODE;
+
+	/**
+	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__IN_PARTITION = CONTROL_NODE__IN_PARTITION;
+
+	/**
+	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__IN_INTERRUPTIBLE_REGION = CONTROL_NODE__IN_INTERRUPTIBLE_REGION;
+
+	/**
+	 * The feature id for the '<em><b>Is Combine Duplicate</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__IS_COMBINE_DUPLICATE = CONTROL_NODE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Join Spec</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE__JOIN_SPEC = CONTROL_NODE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Join Node</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JOIN_NODE_FEATURE_COUNT = CONTROL_NODE_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__EANNOTATIONS = FINAL_NODE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__OWNED_ELEMENT = FINAL_NODE__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__OWNER = FINAL_NODE__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__OWNED_COMMENT = FINAL_NODE__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__TEMPLATE_BINDING = FINAL_NODE__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__OWNED_TEMPLATE_SIGNATURE = FINAL_NODE__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__NAME = FINAL_NODE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__QUALIFIED_NAME = FINAL_NODE__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__VISIBILITY = FINAL_NODE__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__CLIENT_DEPENDENCY = FINAL_NODE__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__NAME_EXPRESSION = FINAL_NODE__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__REDEFINITION_CONTEXT = FINAL_NODE__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__IS_LEAF = FINAL_NODE__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__OUTGOING = FINAL_NODE__OUTGOING;
+
+	/**
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__INCOMING = FINAL_NODE__INCOMING;
+
+	/**
+	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__IN_GROUP = FINAL_NODE__IN_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__ACTIVITY = FINAL_NODE__ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__REDEFINED_ELEMENT = FINAL_NODE__REDEFINED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__IN_STRUCTURED_NODE = FINAL_NODE__IN_STRUCTURED_NODE;
+
+	/**
+	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__IN_PARTITION = FINAL_NODE__IN_PARTITION;
+
+	/**
+	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE__IN_INTERRUPTIBLE_REGION = FINAL_NODE__IN_INTERRUPTIBLE_REGION;
+
+	/**
+	 * The number of structural features of the the '<em>Flow Final Node</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FLOW_FINAL_NODE_FEATURE_COUNT = FINAL_NODE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__EANNOTATIONS = OBJECT_NODE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__OWNED_ELEMENT = OBJECT_NODE__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__OWNER = OBJECT_NODE__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__OWNED_COMMENT = OBJECT_NODE__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__TEMPLATE_BINDING = OBJECT_NODE__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__OWNED_TEMPLATE_SIGNATURE = OBJECT_NODE__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__NAME = OBJECT_NODE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__QUALIFIED_NAME = OBJECT_NODE__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__VISIBILITY = OBJECT_NODE__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__CLIENT_DEPENDENCY = OBJECT_NODE__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__NAME_EXPRESSION = OBJECT_NODE__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__REDEFINITION_CONTEXT = OBJECT_NODE__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__IS_LEAF = OBJECT_NODE__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__OUTGOING = OBJECT_NODE__OUTGOING;
+
+	/**
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__INCOMING = OBJECT_NODE__INCOMING;
+
+	/**
+	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__IN_GROUP = OBJECT_NODE__IN_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__ACTIVITY = OBJECT_NODE__ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__REDEFINED_ELEMENT = OBJECT_NODE__REDEFINED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__IN_STRUCTURED_NODE = OBJECT_NODE__IN_STRUCTURED_NODE;
+
+	/**
+	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__IN_PARTITION = OBJECT_NODE__IN_PARTITION;
+
+	/**
+	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__IN_INTERRUPTIBLE_REGION = OBJECT_NODE__IN_INTERRUPTIBLE_REGION;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__TYPE = OBJECT_NODE__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Ordering</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__ORDERING = OBJECT_NODE__ORDERING;
+
+	/**
+	 * The feature id for the '<em><b>Upper Bound</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__UPPER_BOUND = OBJECT_NODE__UPPER_BOUND;
+
+	/**
+	 * The feature id for the '<em><b>In State</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__IN_STATE = OBJECT_NODE__IN_STATE;
+
+	/**
+	 * The feature id for the '<em><b>Selection</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE__SELECTION = OBJECT_NODE__SELECTION;
+
+	/**
+	 * The number of structural features of the the '<em>Central Buffer Node</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CENTRAL_BUFFER_NODE_FEATURE_COUNT = OBJECT_NODE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__OWNER = NAMED_ELEMENT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__NAME = NAMED_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Super Group</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__SUPER_GROUP = NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Activity Group activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__ACTIVITY_GROUP_ACTIVITY = NAMED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Is Dimension</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__IS_DIMENSION = NAMED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Is External</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__IS_EXTERNAL = NAMED_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Contained Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__CONTAINED_EDGE = NAMED_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Contained Node</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__CONTAINED_NODE = NAMED_ELEMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Subgroup</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__SUBGROUP = NAMED_ELEMENT_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Super Partition</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__SUPER_PARTITION = NAMED_ELEMENT_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Represents</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION__REPRESENTS = NAMED_ELEMENT_FEATURE_COUNT + 8;
+
+	/**
+	 * The number of structural features of the the '<em>Activity Partition</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ACTIVITY_PARTITION_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 9;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__EANNOTATIONS = OBJECT_NODE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__OWNED_ELEMENT = OBJECT_NODE__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__OWNER = OBJECT_NODE__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__OWNED_COMMENT = OBJECT_NODE__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__TEMPLATE_BINDING = OBJECT_NODE__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__OWNED_TEMPLATE_SIGNATURE = OBJECT_NODE__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__NAME = OBJECT_NODE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__QUALIFIED_NAME = OBJECT_NODE__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__VISIBILITY = OBJECT_NODE__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__CLIENT_DEPENDENCY = OBJECT_NODE__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__NAME_EXPRESSION = OBJECT_NODE__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__REDEFINITION_CONTEXT = OBJECT_NODE__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__IS_LEAF = OBJECT_NODE__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__OUTGOING = OBJECT_NODE__OUTGOING;
+
+	/**
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__INCOMING = OBJECT_NODE__INCOMING;
+
+	/**
+	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__IN_GROUP = OBJECT_NODE__IN_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__ACTIVITY = OBJECT_NODE__ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__REDEFINED_ELEMENT = OBJECT_NODE__REDEFINED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__IN_STRUCTURED_NODE = OBJECT_NODE__IN_STRUCTURED_NODE;
+
+	/**
+	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__IN_PARTITION = OBJECT_NODE__IN_PARTITION;
+
+	/**
+	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__IN_INTERRUPTIBLE_REGION = OBJECT_NODE__IN_INTERRUPTIBLE_REGION;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__TYPE = OBJECT_NODE__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Ordering</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__ORDERING = OBJECT_NODE__ORDERING;
+
+	/**
+	 * The feature id for the '<em><b>Upper Bound</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__UPPER_BOUND = OBJECT_NODE__UPPER_BOUND;
+
+	/**
+	 * The feature id for the '<em><b>In State</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__IN_STATE = OBJECT_NODE__IN_STATE;
+
+	/**
+	 * The feature id for the '<em><b>Selection</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__SELECTION = OBJECT_NODE__SELECTION;
+
+	/**
+	 * The feature id for the '<em><b>Region As Output</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__REGION_AS_OUTPUT = OBJECT_NODE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Region As Input</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE__REGION_AS_INPUT = OBJECT_NODE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Expansion Node</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_NODE_FEATURE_COUNT = OBJECT_NODE_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__EANNOTATIONS = STRUCTURED_ACTIVITY_NODE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__OWNED_ELEMENT = STRUCTURED_ACTIVITY_NODE__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__OWNER = STRUCTURED_ACTIVITY_NODE__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__OWNED_COMMENT = STRUCTURED_ACTIVITY_NODE__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__TEMPLATE_BINDING = STRUCTURED_ACTIVITY_NODE__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__OWNED_TEMPLATE_SIGNATURE = STRUCTURED_ACTIVITY_NODE__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__NAME = STRUCTURED_ACTIVITY_NODE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__QUALIFIED_NAME = STRUCTURED_ACTIVITY_NODE__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__VISIBILITY = STRUCTURED_ACTIVITY_NODE__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__CLIENT_DEPENDENCY = STRUCTURED_ACTIVITY_NODE__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__NAME_EXPRESSION = STRUCTURED_ACTIVITY_NODE__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__REDEFINITION_CONTEXT = STRUCTURED_ACTIVITY_NODE__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__IS_LEAF = STRUCTURED_ACTIVITY_NODE__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__OUTGOING = STRUCTURED_ACTIVITY_NODE__OUTGOING;
+
+	/**
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__INCOMING = STRUCTURED_ACTIVITY_NODE__INCOMING;
+
+	/**
+	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__IN_GROUP = STRUCTURED_ACTIVITY_NODE__IN_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__ACTIVITY = STRUCTURED_ACTIVITY_NODE__ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__REDEFINED_ELEMENT = STRUCTURED_ACTIVITY_NODE__REDEFINED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__IN_STRUCTURED_NODE = STRUCTURED_ACTIVITY_NODE__IN_STRUCTURED_NODE;
+
+	/**
+	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__IN_PARTITION = STRUCTURED_ACTIVITY_NODE__IN_PARTITION;
+
+	/**
+	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__IN_INTERRUPTIBLE_REGION = STRUCTURED_ACTIVITY_NODE__IN_INTERRUPTIBLE_REGION;
+
+	/**
+	 * The feature id for the '<em><b>Handler</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__HANDLER = STRUCTURED_ACTIVITY_NODE__HANDLER;
+
+	/**
+	 * The feature id for the '<em><b>Effect</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__EFFECT = STRUCTURED_ACTIVITY_NODE__EFFECT;
+
+	/**
+	 * The feature id for the '<em><b>Output</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__OUTPUT = STRUCTURED_ACTIVITY_NODE__OUTPUT;
+
+	/**
+	 * The feature id for the '<em><b>Input</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__INPUT = STRUCTURED_ACTIVITY_NODE__INPUT;
+
+	/**
+	 * The feature id for the '<em><b>Context</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__CONTEXT = STRUCTURED_ACTIVITY_NODE__CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Local Precondition</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__LOCAL_PRECONDITION = STRUCTURED_ACTIVITY_NODE__LOCAL_PRECONDITION;
+
+	/**
+	 * The feature id for the '<em><b>Local Postcondition</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPANSION_REGION__LOCAL_POSTCONDITION = STRUCTURED_ACTIVITY_NODE__LOCAL_POSTCONDITION;
 
 	/**
 	 * The feature id for the '<em><b>Member</b></em>' reference list.
@@ -42086,7 +43841,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__MEMBER = BEHAVIOR__MEMBER;
+	int EXPANSION_REGION__MEMBER = STRUCTURED_ACTIVITY_NODE__MEMBER;
 
 	/**
 	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
@@ -42095,7 +43850,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__OWNED_RULE = BEHAVIOR__OWNED_RULE;
+	int EXPANSION_REGION__OWNED_RULE = STRUCTURED_ACTIVITY_NODE__OWNED_RULE;
 
 	/**
 	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
@@ -42104,7 +43859,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__IMPORTED_MEMBER = BEHAVIOR__IMPORTED_MEMBER;
+	int EXPANSION_REGION__IMPORTED_MEMBER = STRUCTURED_ACTIVITY_NODE__IMPORTED_MEMBER;
 
 	/**
 	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
@@ -42113,7 +43868,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__ELEMENT_IMPORT = BEHAVIOR__ELEMENT_IMPORT;
+	int EXPANSION_REGION__ELEMENT_IMPORT = STRUCTURED_ACTIVITY_NODE__ELEMENT_IMPORT;
 
 	/**
 	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
@@ -42122,457 +43877,97 @@
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__PACKAGE_IMPORT = BEHAVIOR__PACKAGE_IMPORT;
+	int EXPANSION_REGION__PACKAGE_IMPORT = STRUCTURED_ACTIVITY_NODE__PACKAGE_IMPORT;
 
 	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * The feature id for the '<em><b>Super Group</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__TEMPLATE_PARAMETER = BEHAVIOR__TEMPLATE_PARAMETER;
+	int EXPANSION_REGION__SUPER_GROUP = STRUCTURED_ACTIVITY_NODE__SUPER_GROUP;
 
 	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * The feature id for the '<em><b>Activity Group activity</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__OWNING_PARAMETER = BEHAVIOR__OWNING_PARAMETER;
+	int EXPANSION_REGION__ACTIVITY_GROUP_ACTIVITY = STRUCTURED_ACTIVITY_NODE__ACTIVITY_GROUP_ACTIVITY;
 
 	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * The feature id for the '<em><b>Variable</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__PACKAGEABLE_ELEMENT_VISIBILITY = BEHAVIOR__PACKAGEABLE_ELEMENT_VISIBILITY;
+	int EXPANSION_REGION__VARIABLE = STRUCTURED_ACTIVITY_NODE__VARIABLE;
 
 	/**
-	 * The feature id for the '<em><b>Package</b></em>' reference.
+	 * The feature id for the '<em><b>Contained Node</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__PACKAGE = BEHAVIOR__PACKAGE;
+	int EXPANSION_REGION__CONTAINED_NODE = STRUCTURED_ACTIVITY_NODE__CONTAINED_NODE;
 
 	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * The feature id for the '<em><b>Contained Edge</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__REDEFINITION_CONTEXT = BEHAVIOR__REDEFINITION_CONTEXT;
+	int EXPANSION_REGION__CONTAINED_EDGE = STRUCTURED_ACTIVITY_NODE__CONTAINED_EDGE;
 
 	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * The feature id for the '<em><b>Must Isolate</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__IS_LEAF = BEHAVIOR__IS_LEAF;
+	int EXPANSION_REGION__MUST_ISOLATE = STRUCTURED_ACTIVITY_NODE__MUST_ISOLATE;
 
 	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference list.
+	 * The feature id for the '<em><b>Mode</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__FEATURE = BEHAVIOR__FEATURE;
+	int EXPANSION_REGION__MODE = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
+	 * The feature id for the '<em><b>Output Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__IS_ABSTRACT = BEHAVIOR__IS_ABSTRACT;
+	int EXPANSION_REGION__OUTPUT_ELEMENT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
+	 * The feature id for the '<em><b>Input Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__INHERITED_MEMBER = BEHAVIOR__INHERITED_MEMBER;
+	int EXPANSION_REGION__INPUT_ELEMENT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>General</b></em>' reference list.
+	 * The number of structural features of the the '<em>Expansion Region</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int STATE_MACHINE__GENERAL = BEHAVIOR__GENERAL;
-
-	/**
-	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__GENERALIZATION = BEHAVIOR__GENERALIZATION;
-
-	/**
-	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__ATTRIBUTE = BEHAVIOR__ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__REDEFINED_CLASSIFIER = BEHAVIOR__REDEFINED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__POWERTYPE_EXTENT = BEHAVIOR__POWERTYPE_EXTENT;
-
-	/**
-	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__SUBSTITUTION = BEHAVIOR__SUBSTITUTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__OWNED_USE_CASE = BEHAVIOR__OWNED_USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__USE_CASE = BEHAVIOR__USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Representation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__REPRESENTATION = BEHAVIOR__REPRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__OCCURRENCE = BEHAVIOR__OCCURRENCE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__OWNED_BEHAVIOR = BEHAVIOR__OWNED_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Classifier Behavior</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__CLASSIFIER_BEHAVIOR = BEHAVIOR__CLASSIFIER_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Implementation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__IMPLEMENTATION = BEHAVIOR__IMPLEMENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__OWNED_TRIGGER = BEHAVIOR__OWNED_TRIGGER;
-
-	/**
-	 * The feature id for the '<em><b>Owned State Machine</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__OWNED_STATE_MACHINE = BEHAVIOR__OWNED_STATE_MACHINE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__OWNED_ATTRIBUTE = BEHAVIOR__OWNED_ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Part</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__PART = BEHAVIOR__PART;
-
-	/**
-	 * The feature id for the '<em><b>Role</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__ROLE = BEHAVIOR__ROLE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__OWNED_CONNECTOR = BEHAVIOR__OWNED_CONNECTOR;
-
-	/**
-	 * The feature id for the '<em><b>Owned Port</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__OWNED_PORT = BEHAVIOR__OWNED_PORT;
-
-	/**
-	 * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__OWNED_OPERATION = BEHAVIOR__OWNED_OPERATION;
-
-	/**
-	 * The feature id for the '<em><b>Super Class</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__SUPER_CLASS = BEHAVIOR__SUPER_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>Nested Classifier</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__NESTED_CLASSIFIER = BEHAVIOR__NESTED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Extension</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__EXTENSION = BEHAVIOR__EXTENSION;
-
-	/**
-	 * The feature id for the '<em><b>Is Active</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__IS_ACTIVE = BEHAVIOR__IS_ACTIVE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Reception</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__OWNED_RECEPTION = BEHAVIOR__OWNED_RECEPTION;
-
-	/**
-	 * The feature id for the '<em><b>Is Reentrant</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__IS_REENTRANT = BEHAVIOR__IS_REENTRANT;
-
-	/**
-	 * The feature id for the '<em><b>Context</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__CONTEXT = BEHAVIOR__CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Behavior</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__REDEFINED_BEHAVIOR = BEHAVIOR__REDEFINED_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Specification</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__SPECIFICATION = BEHAVIOR__SPECIFICATION;
-
-	/**
-	 * The feature id for the '<em><b>Parameter</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__PARAMETER = BEHAVIOR__PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Formal Parameter</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__FORMAL_PARAMETER = BEHAVIOR__FORMAL_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Return Result</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__RETURN_RESULT = BEHAVIOR__RETURN_RESULT;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__PRECONDITION = BEHAVIOR__PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__POSTCONDITION = BEHAVIOR__POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Parameter Set</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__OWNED_PARAMETER_SET = BEHAVIOR__OWNED_PARAMETER_SET;
-
-	/**
-	 * The feature id for the '<em><b>Region</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__REGION = BEHAVIOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Connection Point</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__CONNECTION_POINT = BEHAVIOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Extended State Machine</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__EXTENDED_STATE_MACHINE = BEHAVIOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>State Machine redefinition Context</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE__STATE_MACHINE_REDEFINITION_CONTEXT = BEHAVIOR_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the the '<em>State Machine</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_MACHINE_FEATURE_COUNT = BEHAVIOR_FEATURE_COUNT + 4;
+	int EXPANSION_REGION_FEATURE_COUNT = STRUCTURED_ACTIVITY_NODE_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -42581,7 +43976,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REGION__EANNOTATIONS = NAMESPACE__EANNOTATIONS;
+	int EXCEPTION_HANDLER__EANNOTATIONS = ELEMENT__EANNOTATIONS;
 
 	/**
 	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
@@ -42590,7 +43985,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REGION__OWNED_ELEMENT = NAMESPACE__OWNED_ELEMENT;
+	int EXCEPTION_HANDLER__OWNED_ELEMENT = ELEMENT__OWNED_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Owner</b></em>' reference.
@@ -42599,7 +43994,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REGION__OWNER = NAMESPACE__OWNER;
+	int EXCEPTION_HANDLER__OWNER = ELEMENT__OWNER;
 
 	/**
 	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
@@ -42608,1447 +44003,52 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REGION__OWNED_COMMENT = NAMESPACE__OWNED_COMMENT;
+	int EXCEPTION_HANDLER__OWNED_COMMENT = ELEMENT__OWNED_COMMENT;
 
 	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * The feature id for the '<em><b>Protected Node</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int REGION__TEMPLATE_BINDING = NAMESPACE__TEMPLATE_BINDING;
+	int EXCEPTION_HANDLER__PROTECTED_NODE = ELEMENT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * The feature id for the '<em><b>Handler Body</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int REGION__OWNED_TEMPLATE_SIGNATURE = NAMESPACE__OWNED_TEMPLATE_SIGNATURE;
+	int EXCEPTION_HANDLER__HANDLER_BODY = ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Exception Input</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int REGION__NAME = NAMESPACE__NAME;
+	int EXCEPTION_HANDLER__EXCEPTION_INPUT = ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Exception Type</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int REGION__QUALIFIED_NAME = NAMESPACE__QUALIFIED_NAME;
+	int EXCEPTION_HANDLER__EXCEPTION_TYPE = ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * The number of structural features of the the '<em>Exception Handler</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int REGION__VISIBILITY = NAMESPACE__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__CLIENT_DEPENDENCY = NAMESPACE__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__NAME_EXPRESSION = NAMESPACE__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__MEMBER = NAMESPACE__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__OWNED_RULE = NAMESPACE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__IMPORTED_MEMBER = NAMESPACE__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__ELEMENT_IMPORT = NAMESPACE__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__PACKAGE_IMPORT = NAMESPACE__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__REDEFINITION_CONTEXT = NAMESPACE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__IS_LEAF = NAMESPACE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Subvertex</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__SUBVERTEX = NAMESPACE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Transition</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__TRANSITION = NAMESPACE_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>State Machine</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__STATE_MACHINE = NAMESPACE_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>State</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__STATE = NAMESPACE_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Extended Region</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION__EXTENDED_REGION = NAMESPACE_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the the '<em>Region</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REGION_FEATURE_COUNT = NAMESPACE_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__OWNER = NAMED_ELEMENT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__NAME = NAMED_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__CONTAINER = NAMED_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__OUTGOING = NAMED_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX__INCOMING = NAMED_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the the '<em>Vertex</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTEX_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE__EANNOTATIONS = VERTEX__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE__OWNED_ELEMENT = VERTEX__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE__OWNER = VERTEX__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE__OWNED_COMMENT = VERTEX__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE__TEMPLATE_BINDING = VERTEX__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE__OWNED_TEMPLATE_SIGNATURE = VERTEX__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE__NAME = VERTEX__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE__QUALIFIED_NAME = VERTEX__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE__VISIBILITY = VERTEX__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE__CLIENT_DEPENDENCY = VERTEX__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE__NAME_EXPRESSION = VERTEX__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE__CONTAINER = VERTEX__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE__OUTGOING = VERTEX__OUTGOING;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE__INCOMING = VERTEX__INCOMING;
-
-	/**
-	 * The feature id for the '<em><b>Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE__KIND = VERTEX_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Pseudostate</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PSEUDOSTATE_FEATURE_COUNT = VERTEX_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__EANNOTATIONS = NAMESPACE__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__OWNED_ELEMENT = NAMESPACE__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__OWNER = NAMESPACE__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__OWNED_COMMENT = NAMESPACE__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__TEMPLATE_BINDING = NAMESPACE__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__OWNED_TEMPLATE_SIGNATURE = NAMESPACE__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__NAME = NAMESPACE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__QUALIFIED_NAME = NAMESPACE__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__VISIBILITY = NAMESPACE__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__CLIENT_DEPENDENCY = NAMESPACE__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__NAME_EXPRESSION = NAMESPACE__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__MEMBER = NAMESPACE__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__OWNED_RULE = NAMESPACE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__IMPORTED_MEMBER = NAMESPACE__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__ELEMENT_IMPORT = NAMESPACE__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__PACKAGE_IMPORT = NAMESPACE__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__REDEFINITION_CONTEXT = NAMESPACE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__IS_LEAF = NAMESPACE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__CONTAINER = NAMESPACE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__OUTGOING = NAMESPACE_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__INCOMING = NAMESPACE_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Is Composite</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__IS_COMPOSITE = NAMESPACE_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Is Orthogonal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__IS_ORTHOGONAL = NAMESPACE_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Is Simple</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__IS_SIMPLE = NAMESPACE_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Is Submachine State</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__IS_SUBMACHINE_STATE = NAMESPACE_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Submachine</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__SUBMACHINE = NAMESPACE_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>Connection</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__CONNECTION = NAMESPACE_FEATURE_COUNT + 10;
-
-	/**
-	 * The feature id for the '<em><b>Redefined State</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__REDEFINED_STATE = NAMESPACE_FEATURE_COUNT + 11;
-
-	/**
-	 * The feature id for the '<em><b>Deferrable Trigger</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__DEFERRABLE_TRIGGER = NAMESPACE_FEATURE_COUNT + 12;
-
-	/**
-	 * The feature id for the '<em><b>Region</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__REGION = NAMESPACE_FEATURE_COUNT + 13;
-
-	/**
-	 * The feature id for the '<em><b>Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__ENTRY = NAMESPACE_FEATURE_COUNT + 14;
-
-	/**
-	 * The feature id for the '<em><b>Exit</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__EXIT = NAMESPACE_FEATURE_COUNT + 15;
-
-	/**
-	 * The feature id for the '<em><b>Do Activity</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__DO_ACTIVITY = NAMESPACE_FEATURE_COUNT + 16;
-
-	/**
-	 * The feature id for the '<em><b>State Invariant</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE__STATE_INVARIANT = NAMESPACE_FEATURE_COUNT + 17;
-
-	/**
-	 * The number of structural features of the the '<em>State</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATE_FEATURE_COUNT = NAMESPACE_FEATURE_COUNT + 18;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__EANNOTATIONS = VERTEX__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__OWNED_ELEMENT = VERTEX__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__OWNER = VERTEX__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__OWNED_COMMENT = VERTEX__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__TEMPLATE_BINDING = VERTEX__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__OWNED_TEMPLATE_SIGNATURE = VERTEX__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__NAME = VERTEX__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__QUALIFIED_NAME = VERTEX__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__VISIBILITY = VERTEX__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__CLIENT_DEPENDENCY = VERTEX__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__NAME_EXPRESSION = VERTEX__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__CONTAINER = VERTEX__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__OUTGOING = VERTEX__OUTGOING;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__INCOMING = VERTEX__INCOMING;
-
-	/**
-	 * The feature id for the '<em><b>Entry</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__ENTRY = VERTEX_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Exit</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE__EXIT = VERTEX_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Connection Point Reference</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_POINT_REFERENCE_FEATURE_COUNT = VERTEX_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__EANNOTATIONS = REDEFINABLE_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__OWNED_ELEMENT = REDEFINABLE_ELEMENT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__OWNER = REDEFINABLE_ELEMENT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__OWNED_COMMENT = REDEFINABLE_ELEMENT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__TEMPLATE_BINDING = REDEFINABLE_ELEMENT__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__OWNED_TEMPLATE_SIGNATURE = REDEFINABLE_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__NAME = REDEFINABLE_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__QUALIFIED_NAME = REDEFINABLE_ELEMENT__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__VISIBILITY = REDEFINABLE_ELEMENT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__CLIENT_DEPENDENCY = REDEFINABLE_ELEMENT__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__NAME_EXPRESSION = REDEFINABLE_ELEMENT__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__REDEFINITION_CONTEXT = REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__IS_LEAF = REDEFINABLE_ELEMENT__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__KIND = REDEFINABLE_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__CONTAINER = REDEFINABLE_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__SOURCE = REDEFINABLE_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__TARGET = REDEFINABLE_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Transition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__REDEFINED_TRANSITION = REDEFINABLE_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Trigger</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__TRIGGER = REDEFINABLE_ELEMENT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__GUARD = REDEFINABLE_ELEMENT_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Effect</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION__EFFECT = REDEFINABLE_ELEMENT_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the the '<em>Transition</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRANSITION_FEATURE_COUNT = REDEFINABLE_ELEMENT_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__EANNOTATIONS = STATE__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__OWNED_ELEMENT = STATE__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__OWNER = STATE__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__OWNED_COMMENT = STATE__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__TEMPLATE_BINDING = STATE__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__OWNED_TEMPLATE_SIGNATURE = STATE__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__NAME = STATE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__QUALIFIED_NAME = STATE__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__VISIBILITY = STATE__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__CLIENT_DEPENDENCY = STATE__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__NAME_EXPRESSION = STATE__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__MEMBER = STATE__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__OWNED_RULE = STATE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__IMPORTED_MEMBER = STATE__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__ELEMENT_IMPORT = STATE__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__PACKAGE_IMPORT = STATE__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__REDEFINITION_CONTEXT = STATE__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__IS_LEAF = STATE__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__CONTAINER = STATE__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__OUTGOING = STATE__OUTGOING;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__INCOMING = STATE__INCOMING;
-
-	/**
-	 * The feature id for the '<em><b>Is Composite</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__IS_COMPOSITE = STATE__IS_COMPOSITE;
-
-	/**
-	 * The feature id for the '<em><b>Is Orthogonal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__IS_ORTHOGONAL = STATE__IS_ORTHOGONAL;
-
-	/**
-	 * The feature id for the '<em><b>Is Simple</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__IS_SIMPLE = STATE__IS_SIMPLE;
-
-	/**
-	 * The feature id for the '<em><b>Is Submachine State</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__IS_SUBMACHINE_STATE = STATE__IS_SUBMACHINE_STATE;
-
-	/**
-	 * The feature id for the '<em><b>Submachine</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__SUBMACHINE = STATE__SUBMACHINE;
-
-	/**
-	 * The feature id for the '<em><b>Connection</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__CONNECTION = STATE__CONNECTION;
-
-	/**
-	 * The feature id for the '<em><b>Redefined State</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__REDEFINED_STATE = STATE__REDEFINED_STATE;
-
-	/**
-	 * The feature id for the '<em><b>Deferrable Trigger</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__DEFERRABLE_TRIGGER = STATE__DEFERRABLE_TRIGGER;
-
-	/**
-	 * The feature id for the '<em><b>Region</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__REGION = STATE__REGION;
-
-	/**
-	 * The feature id for the '<em><b>Entry</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__ENTRY = STATE__ENTRY;
-
-	/**
-	 * The feature id for the '<em><b>Exit</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__EXIT = STATE__EXIT;
-
-	/**
-	 * The feature id for the '<em><b>Do Activity</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__DO_ACTIVITY = STATE__DO_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>State Invariant</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE__STATE_INVARIANT = STATE__STATE_INVARIANT;
-
-	/**
-	 * The number of structural features of the the '<em>Final State</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FINAL_STATE_FEATURE_COUNT = STATE_FEATURE_COUNT + 0;
+	int EXCEPTION_HANDLER_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 4;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -45256,7 +45256,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getDeployment()
 	 * @generated
 	 */
-	int DEPLOYMENT = 207;
+	int DEPLOYMENT = 216;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.DeployedArtifactImpl <em>Deployed Artifact</em>}' class.
@@ -45266,7 +45266,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getDeployedArtifact()
 	 * @generated
 	 */
-	int DEPLOYED_ARTIFACT = 208;
+	int DEPLOYED_ARTIFACT = 217;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.DeploymentTargetImpl <em>Deployment Target</em>}' class.
@@ -45276,7 +45276,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getDeploymentTarget()
 	 * @generated
 	 */
-	int DEPLOYMENT_TARGET = 209;
+	int DEPLOYMENT_TARGET = 218;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.NodeImpl <em>Node</em>}' class.
@@ -45286,7 +45286,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getNode()
 	 * @generated
 	 */
-	int NODE = 210;
+	int NODE = 219;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.DeviceImpl <em>Device</em>}' class.
@@ -45296,7 +45296,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getDevice()
 	 * @generated
 	 */
-	int DEVICE = 211;
+	int DEVICE = 220;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.ExecutionEnvironmentImpl <em>Execution Environment</em>}' class.
@@ -45306,7 +45306,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getExecutionEnvironment()
 	 * @generated
 	 */
-	int EXECUTION_ENVIRONMENT = 212;
+	int EXECUTION_ENVIRONMENT = 221;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.CommunicationPathImpl <em>Communication Path</em>}' class.
@@ -45316,7 +45316,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getCommunicationPath()
 	 * @generated
 	 */
-	int COMMUNICATION_PATH = 213;
+	int COMMUNICATION_PATH = 222;
 
 	/**
 	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
@@ -45838,5541 +45838,6 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PROTOCOL_CONFORMANCE__EANNOTATIONS = DIRECTED_RELATIONSHIP__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_CONFORMANCE__OWNED_ELEMENT = DIRECTED_RELATIONSHIP__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_CONFORMANCE__OWNER = DIRECTED_RELATIONSHIP__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_CONFORMANCE__OWNED_COMMENT = DIRECTED_RELATIONSHIP__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_CONFORMANCE__RELATED_ELEMENT = DIRECTED_RELATIONSHIP__RELATED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_CONFORMANCE__SOURCE = DIRECTED_RELATIONSHIP__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_CONFORMANCE__TARGET = DIRECTED_RELATIONSHIP__TARGET;
-
-	/**
-	 * The feature id for the '<em><b>Specific Machine</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_CONFORMANCE__SPECIFIC_MACHINE = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>General Machine</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_CONFORMANCE__GENERAL_MACHINE = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Protocol Conformance</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_CONFORMANCE_FEATURE_COUNT = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__EANNOTATIONS = STATE_MACHINE__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNED_ELEMENT = STATE_MACHINE__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNER = STATE_MACHINE__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNED_COMMENT = STATE_MACHINE__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__TEMPLATE_BINDING = STATE_MACHINE__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE = STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__NAME = STATE_MACHINE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__QUALIFIED_NAME = STATE_MACHINE__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__VISIBILITY = STATE_MACHINE__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__CLIENT_DEPENDENCY = STATE_MACHINE__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__NAME_EXPRESSION = STATE_MACHINE__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__MEMBER = STATE_MACHINE__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNED_RULE = STATE_MACHINE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__IMPORTED_MEMBER = STATE_MACHINE__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__ELEMENT_IMPORT = STATE_MACHINE__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__PACKAGE_IMPORT = STATE_MACHINE__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__TEMPLATE_PARAMETER = STATE_MACHINE__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNING_PARAMETER = STATE_MACHINE__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__PACKAGEABLE_ELEMENT_VISIBILITY = STATE_MACHINE__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__PACKAGE = STATE_MACHINE__PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__REDEFINITION_CONTEXT = STATE_MACHINE__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__IS_LEAF = STATE_MACHINE__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__FEATURE = STATE_MACHINE__FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__IS_ABSTRACT = STATE_MACHINE__IS_ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__INHERITED_MEMBER = STATE_MACHINE__INHERITED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>General</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__GENERAL = STATE_MACHINE__GENERAL;
-
-	/**
-	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__GENERALIZATION = STATE_MACHINE__GENERALIZATION;
-
-	/**
-	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__ATTRIBUTE = STATE_MACHINE__ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__REDEFINED_CLASSIFIER = STATE_MACHINE__REDEFINED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__POWERTYPE_EXTENT = STATE_MACHINE__POWERTYPE_EXTENT;
-
-	/**
-	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__SUBSTITUTION = STATE_MACHINE__SUBSTITUTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNED_USE_CASE = STATE_MACHINE__OWNED_USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__USE_CASE = STATE_MACHINE__USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Representation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__REPRESENTATION = STATE_MACHINE__REPRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OCCURRENCE = STATE_MACHINE__OCCURRENCE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNED_BEHAVIOR = STATE_MACHINE__OWNED_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Classifier Behavior</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__CLASSIFIER_BEHAVIOR = STATE_MACHINE__CLASSIFIER_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Implementation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__IMPLEMENTATION = STATE_MACHINE__IMPLEMENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNED_TRIGGER = STATE_MACHINE__OWNED_TRIGGER;
-
-	/**
-	 * The feature id for the '<em><b>Owned State Machine</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNED_STATE_MACHINE = STATE_MACHINE__OWNED_STATE_MACHINE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNED_ATTRIBUTE = STATE_MACHINE__OWNED_ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Part</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__PART = STATE_MACHINE__PART;
-
-	/**
-	 * The feature id for the '<em><b>Role</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__ROLE = STATE_MACHINE__ROLE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNED_CONNECTOR = STATE_MACHINE__OWNED_CONNECTOR;
-
-	/**
-	 * The feature id for the '<em><b>Owned Port</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNED_PORT = STATE_MACHINE__OWNED_PORT;
-
-	/**
-	 * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNED_OPERATION = STATE_MACHINE__OWNED_OPERATION;
-
-	/**
-	 * The feature id for the '<em><b>Super Class</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__SUPER_CLASS = STATE_MACHINE__SUPER_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>Nested Classifier</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__NESTED_CLASSIFIER = STATE_MACHINE__NESTED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Extension</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__EXTENSION = STATE_MACHINE__EXTENSION;
-
-	/**
-	 * The feature id for the '<em><b>Is Active</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__IS_ACTIVE = STATE_MACHINE__IS_ACTIVE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Reception</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNED_RECEPTION = STATE_MACHINE__OWNED_RECEPTION;
-
-	/**
-	 * The feature id for the '<em><b>Is Reentrant</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__IS_REENTRANT = STATE_MACHINE__IS_REENTRANT;
-
-	/**
-	 * The feature id for the '<em><b>Context</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__CONTEXT = STATE_MACHINE__CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Behavior</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__REDEFINED_BEHAVIOR = STATE_MACHINE__REDEFINED_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Specification</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__SPECIFICATION = STATE_MACHINE__SPECIFICATION;
-
-	/**
-	 * The feature id for the '<em><b>Parameter</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__PARAMETER = STATE_MACHINE__PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Formal Parameter</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__FORMAL_PARAMETER = STATE_MACHINE__FORMAL_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Return Result</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__RETURN_RESULT = STATE_MACHINE__RETURN_RESULT;
-
-	/**
-	 * The feature id for the '<em><b>Precondition</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__PRECONDITION = STATE_MACHINE__PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Postcondition</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__POSTCONDITION = STATE_MACHINE__POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Parameter Set</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__OWNED_PARAMETER_SET = STATE_MACHINE__OWNED_PARAMETER_SET;
-
-	/**
-	 * The feature id for the '<em><b>Region</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__REGION = STATE_MACHINE__REGION;
-
-	/**
-	 * The feature id for the '<em><b>Connection Point</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__CONNECTION_POINT = STATE_MACHINE__CONNECTION_POINT;
-
-	/**
-	 * The feature id for the '<em><b>Extended State Machine</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__EXTENDED_STATE_MACHINE = STATE_MACHINE__EXTENDED_STATE_MACHINE;
-
-	/**
-	 * The feature id for the '<em><b>State Machine redefinition Context</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__STATE_MACHINE_REDEFINITION_CONTEXT = STATE_MACHINE__STATE_MACHINE_REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Conformance</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE__CONFORMANCE = STATE_MACHINE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Protocol State Machine</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_STATE_MACHINE_FEATURE_COUNT = STATE_MACHINE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__EANNOTATIONS = TRANSITION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__OWNED_ELEMENT = TRANSITION__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__OWNER = TRANSITION__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__OWNED_COMMENT = TRANSITION__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__TEMPLATE_BINDING = TRANSITION__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__OWNED_TEMPLATE_SIGNATURE = TRANSITION__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__NAME = TRANSITION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__QUALIFIED_NAME = TRANSITION__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__VISIBILITY = TRANSITION__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__CLIENT_DEPENDENCY = TRANSITION__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__NAME_EXPRESSION = TRANSITION__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__REDEFINITION_CONTEXT = TRANSITION__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__IS_LEAF = TRANSITION__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__KIND = TRANSITION__KIND;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__CONTAINER = TRANSITION__CONTAINER;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__SOURCE = TRANSITION__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__TARGET = TRANSITION__TARGET;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Transition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__REDEFINED_TRANSITION = TRANSITION__REDEFINED_TRANSITION;
-
-	/**
-	 * The feature id for the '<em><b>Trigger</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__TRIGGER = TRANSITION__TRIGGER;
-
-	/**
-	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__GUARD = TRANSITION__GUARD;
-
-	/**
-	 * The feature id for the '<em><b>Effect</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__EFFECT = TRANSITION__EFFECT;
-
-	/**
-	 * The feature id for the '<em><b>Post Condition</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__POST_CONDITION = TRANSITION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Referred</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__REFERRED = TRANSITION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Pre Condition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION__PRE_CONDITION = TRANSITION_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the the '<em>Protocol Transition</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PROTOCOL_TRANSITION_FEATURE_COUNT = TRANSITION_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__EANNOTATIONS = VALUE_SPECIFICATION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__OWNED_ELEMENT = VALUE_SPECIFICATION__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__OWNER = VALUE_SPECIFICATION__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__OWNED_COMMENT = VALUE_SPECIFICATION__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__TEMPLATE_BINDING = VALUE_SPECIFICATION__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__OWNED_TEMPLATE_SIGNATURE = VALUE_SPECIFICATION__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__NAME = VALUE_SPECIFICATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__QUALIFIED_NAME = VALUE_SPECIFICATION__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__VISIBILITY = VALUE_SPECIFICATION__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__CLIENT_DEPENDENCY = VALUE_SPECIFICATION__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__NAME_EXPRESSION = VALUE_SPECIFICATION__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__TYPE = VALUE_SPECIFICATION__TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__TEMPLATE_PARAMETER = VALUE_SPECIFICATION__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__OWNING_PARAMETER = VALUE_SPECIFICATION__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>First Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__FIRST_TIME = VALUE_SPECIFICATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Event</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION__EVENT = VALUE_SPECIFICATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Time Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_EXPRESSION_FEATURE_COUNT = VALUE_SPECIFICATION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__EANNOTATIONS = VALUE_SPECIFICATION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__OWNED_ELEMENT = VALUE_SPECIFICATION__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__OWNER = VALUE_SPECIFICATION__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__OWNED_COMMENT = VALUE_SPECIFICATION__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__TEMPLATE_BINDING = VALUE_SPECIFICATION__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__OWNED_TEMPLATE_SIGNATURE = VALUE_SPECIFICATION__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__NAME = VALUE_SPECIFICATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__QUALIFIED_NAME = VALUE_SPECIFICATION__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__VISIBILITY = VALUE_SPECIFICATION__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__CLIENT_DEPENDENCY = VALUE_SPECIFICATION__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__NAME_EXPRESSION = VALUE_SPECIFICATION__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__TYPE = VALUE_SPECIFICATION__TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__TEMPLATE_PARAMETER = VALUE_SPECIFICATION__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__OWNING_PARAMETER = VALUE_SPECIFICATION__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>First Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__FIRST_TIME = VALUE_SPECIFICATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Event</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION__EVENT = VALUE_SPECIFICATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Duration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_FEATURE_COUNT = VALUE_SPECIFICATION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__EANNOTATIONS = WRITE_STRUCTURAL_FEATURE_ACTION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__OWNED_ELEMENT = WRITE_STRUCTURAL_FEATURE_ACTION__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__OWNER = WRITE_STRUCTURAL_FEATURE_ACTION__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__OWNED_COMMENT = WRITE_STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__TEMPLATE_BINDING = WRITE_STRUCTURAL_FEATURE_ACTION__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__OWNED_TEMPLATE_SIGNATURE = WRITE_STRUCTURAL_FEATURE_ACTION__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__NAME = WRITE_STRUCTURAL_FEATURE_ACTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__QUALIFIED_NAME = WRITE_STRUCTURAL_FEATURE_ACTION__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__VISIBILITY = WRITE_STRUCTURAL_FEATURE_ACTION__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__CLIENT_DEPENDENCY = WRITE_STRUCTURAL_FEATURE_ACTION__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__NAME_EXPRESSION = WRITE_STRUCTURAL_FEATURE_ACTION__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__REDEFINITION_CONTEXT = WRITE_STRUCTURAL_FEATURE_ACTION__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__IS_LEAF = WRITE_STRUCTURAL_FEATURE_ACTION__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__OUTGOING = WRITE_STRUCTURAL_FEATURE_ACTION__OUTGOING;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__INCOMING = WRITE_STRUCTURAL_FEATURE_ACTION__INCOMING;
-
-	/**
-	 * The feature id for the '<em><b>In Group</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__IN_GROUP = WRITE_STRUCTURAL_FEATURE_ACTION__IN_GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Activity</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__ACTIVITY = WRITE_STRUCTURAL_FEATURE_ACTION__ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__REDEFINED_ELEMENT = WRITE_STRUCTURAL_FEATURE_ACTION__REDEFINED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__IN_STRUCTURED_NODE = WRITE_STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE;
-
-	/**
-	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__IN_PARTITION = WRITE_STRUCTURAL_FEATURE_ACTION__IN_PARTITION;
-
-	/**
-	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__IN_INTERRUPTIBLE_REGION = WRITE_STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION;
-
-	/**
-	 * The feature id for the '<em><b>Handler</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__HANDLER = WRITE_STRUCTURAL_FEATURE_ACTION__HANDLER;
-
-	/**
-	 * The feature id for the '<em><b>Effect</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__EFFECT = WRITE_STRUCTURAL_FEATURE_ACTION__EFFECT;
-
-	/**
-	 * The feature id for the '<em><b>Output</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__OUTPUT = WRITE_STRUCTURAL_FEATURE_ACTION__OUTPUT;
-
-	/**
-	 * The feature id for the '<em><b>Input</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__INPUT = WRITE_STRUCTURAL_FEATURE_ACTION__INPUT;
-
-	/**
-	 * The feature id for the '<em><b>Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__CONTEXT = WRITE_STRUCTURAL_FEATURE_ACTION__CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Local Precondition</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__LOCAL_PRECONDITION = WRITE_STRUCTURAL_FEATURE_ACTION__LOCAL_PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Local Postcondition</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__LOCAL_POSTCONDITION = WRITE_STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Structural Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__STRUCTURAL_FEATURE = WRITE_STRUCTURAL_FEATURE_ACTION__STRUCTURAL_FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__OBJECT = WRITE_STRUCTURAL_FEATURE_ACTION__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__VALUE = WRITE_STRUCTURAL_FEATURE_ACTION__VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Now</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION__NOW = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Time Observation Action</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_OBSERVATION_ACTION_FEATURE_COUNT = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__EANNOTATIONS = VALUE_SPECIFICATION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__OWNED_ELEMENT = VALUE_SPECIFICATION__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__OWNER = VALUE_SPECIFICATION__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__OWNED_COMMENT = VALUE_SPECIFICATION__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__TEMPLATE_BINDING = VALUE_SPECIFICATION__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__OWNED_TEMPLATE_SIGNATURE = VALUE_SPECIFICATION__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__NAME = VALUE_SPECIFICATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__QUALIFIED_NAME = VALUE_SPECIFICATION__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__VISIBILITY = VALUE_SPECIFICATION__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__CLIENT_DEPENDENCY = VALUE_SPECIFICATION__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__NAME_EXPRESSION = VALUE_SPECIFICATION__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__TYPE = VALUE_SPECIFICATION__TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__TEMPLATE_PARAMETER = VALUE_SPECIFICATION__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__OWNING_PARAMETER = VALUE_SPECIFICATION__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Min</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__MIN = VALUE_SPECIFICATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Max</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL__MAX = VALUE_SPECIFICATION_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Interval</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_FEATURE_COUNT = VALUE_SPECIFICATION_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__EANNOTATIONS = INTERVAL__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__OWNED_ELEMENT = INTERVAL__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__OWNER = INTERVAL__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__OWNED_COMMENT = INTERVAL__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__TEMPLATE_BINDING = INTERVAL__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__OWNED_TEMPLATE_SIGNATURE = INTERVAL__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__NAME = INTERVAL__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__QUALIFIED_NAME = INTERVAL__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__VISIBILITY = INTERVAL__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__CLIENT_DEPENDENCY = INTERVAL__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__NAME_EXPRESSION = INTERVAL__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__TYPE = INTERVAL__TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__TEMPLATE_PARAMETER = INTERVAL__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__OWNING_PARAMETER = INTERVAL__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Min</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__MIN = INTERVAL__MIN;
-
-	/**
-	 * The feature id for the '<em><b>Max</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL__MAX = INTERVAL__MAX;
-
-	/**
-	 * The number of structural features of the the '<em>Duration Interval</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_INTERVAL_FEATURE_COUNT = INTERVAL_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__EANNOTATIONS = CONSTRAINT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__OWNED_ELEMENT = CONSTRAINT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__OWNER = CONSTRAINT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__OWNED_COMMENT = CONSTRAINT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__TEMPLATE_BINDING = CONSTRAINT__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__OWNED_TEMPLATE_SIGNATURE = CONSTRAINT__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__NAME = CONSTRAINT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__QUALIFIED_NAME = CONSTRAINT__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__VISIBILITY = CONSTRAINT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__CLIENT_DEPENDENCY = CONSTRAINT__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__NAME_EXPRESSION = CONSTRAINT__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__TEMPLATE_PARAMETER = CONSTRAINT__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__OWNING_PARAMETER = CONSTRAINT__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__PACKAGEABLE_ELEMENT_VISIBILITY = CONSTRAINT__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__CONTEXT = CONSTRAINT__CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Namespace</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__NAMESPACE = CONSTRAINT__NAMESPACE;
-
-	/**
-	 * The feature id for the '<em><b>Specification</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__SPECIFICATION = CONSTRAINT__SPECIFICATION;
-
-	/**
-	 * The feature id for the '<em><b>Constrained Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT__CONSTRAINED_ELEMENT = CONSTRAINT__CONSTRAINED_ELEMENT;
-
-	/**
-	 * The number of structural features of the the '<em>Interval Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERVAL_CONSTRAINT_FEATURE_COUNT = CONSTRAINT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__EANNOTATIONS = INTERVAL_CONSTRAINT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__OWNED_ELEMENT = INTERVAL_CONSTRAINT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__OWNER = INTERVAL_CONSTRAINT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__OWNED_COMMENT = INTERVAL_CONSTRAINT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__TEMPLATE_BINDING = INTERVAL_CONSTRAINT__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__OWNED_TEMPLATE_SIGNATURE = INTERVAL_CONSTRAINT__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__NAME = INTERVAL_CONSTRAINT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__QUALIFIED_NAME = INTERVAL_CONSTRAINT__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__VISIBILITY = INTERVAL_CONSTRAINT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__CLIENT_DEPENDENCY = INTERVAL_CONSTRAINT__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__NAME_EXPRESSION = INTERVAL_CONSTRAINT__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__TEMPLATE_PARAMETER = INTERVAL_CONSTRAINT__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__OWNING_PARAMETER = INTERVAL_CONSTRAINT__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__PACKAGEABLE_ELEMENT_VISIBILITY = INTERVAL_CONSTRAINT__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__CONTEXT = INTERVAL_CONSTRAINT__CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Namespace</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__NAMESPACE = INTERVAL_CONSTRAINT__NAMESPACE;
-
-	/**
-	 * The feature id for the '<em><b>Specification</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__SPECIFICATION = INTERVAL_CONSTRAINT__SPECIFICATION;
-
-	/**
-	 * The feature id for the '<em><b>Constrained Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT__CONSTRAINED_ELEMENT = INTERVAL_CONSTRAINT__CONSTRAINED_ELEMENT;
-
-	/**
-	 * The number of structural features of the the '<em>Time Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_CONSTRAINT_FEATURE_COUNT = INTERVAL_CONSTRAINT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__EANNOTATIONS = INTERVAL__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__OWNED_ELEMENT = INTERVAL__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__OWNER = INTERVAL__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__OWNED_COMMENT = INTERVAL__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__TEMPLATE_BINDING = INTERVAL__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__OWNED_TEMPLATE_SIGNATURE = INTERVAL__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__NAME = INTERVAL__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__QUALIFIED_NAME = INTERVAL__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__VISIBILITY = INTERVAL__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__CLIENT_DEPENDENCY = INTERVAL__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__NAME_EXPRESSION = INTERVAL__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__TYPE = INTERVAL__TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__TEMPLATE_PARAMETER = INTERVAL__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__OWNING_PARAMETER = INTERVAL__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Min</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__MIN = INTERVAL__MIN;
-
-	/**
-	 * The feature id for the '<em><b>Max</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL__MAX = INTERVAL__MAX;
-
-	/**
-	 * The number of structural features of the the '<em>Time Interval</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TIME_INTERVAL_FEATURE_COUNT = INTERVAL_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__EANNOTATIONS = WRITE_STRUCTURAL_FEATURE_ACTION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__OWNED_ELEMENT = WRITE_STRUCTURAL_FEATURE_ACTION__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__OWNER = WRITE_STRUCTURAL_FEATURE_ACTION__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__OWNED_COMMENT = WRITE_STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__TEMPLATE_BINDING = WRITE_STRUCTURAL_FEATURE_ACTION__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__OWNED_TEMPLATE_SIGNATURE = WRITE_STRUCTURAL_FEATURE_ACTION__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__NAME = WRITE_STRUCTURAL_FEATURE_ACTION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__QUALIFIED_NAME = WRITE_STRUCTURAL_FEATURE_ACTION__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__VISIBILITY = WRITE_STRUCTURAL_FEATURE_ACTION__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__CLIENT_DEPENDENCY = WRITE_STRUCTURAL_FEATURE_ACTION__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__NAME_EXPRESSION = WRITE_STRUCTURAL_FEATURE_ACTION__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__REDEFINITION_CONTEXT = WRITE_STRUCTURAL_FEATURE_ACTION__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__IS_LEAF = WRITE_STRUCTURAL_FEATURE_ACTION__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__OUTGOING = WRITE_STRUCTURAL_FEATURE_ACTION__OUTGOING;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__INCOMING = WRITE_STRUCTURAL_FEATURE_ACTION__INCOMING;
-
-	/**
-	 * The feature id for the '<em><b>In Group</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__IN_GROUP = WRITE_STRUCTURAL_FEATURE_ACTION__IN_GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Activity</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__ACTIVITY = WRITE_STRUCTURAL_FEATURE_ACTION__ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__REDEFINED_ELEMENT = WRITE_STRUCTURAL_FEATURE_ACTION__REDEFINED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__IN_STRUCTURED_NODE = WRITE_STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE;
-
-	/**
-	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__IN_PARTITION = WRITE_STRUCTURAL_FEATURE_ACTION__IN_PARTITION;
-
-	/**
-	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__IN_INTERRUPTIBLE_REGION = WRITE_STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION;
-
-	/**
-	 * The feature id for the '<em><b>Handler</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__HANDLER = WRITE_STRUCTURAL_FEATURE_ACTION__HANDLER;
-
-	/**
-	 * The feature id for the '<em><b>Effect</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__EFFECT = WRITE_STRUCTURAL_FEATURE_ACTION__EFFECT;
-
-	/**
-	 * The feature id for the '<em><b>Output</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__OUTPUT = WRITE_STRUCTURAL_FEATURE_ACTION__OUTPUT;
-
-	/**
-	 * The feature id for the '<em><b>Input</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__INPUT = WRITE_STRUCTURAL_FEATURE_ACTION__INPUT;
-
-	/**
-	 * The feature id for the '<em><b>Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__CONTEXT = WRITE_STRUCTURAL_FEATURE_ACTION__CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Local Precondition</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__LOCAL_PRECONDITION = WRITE_STRUCTURAL_FEATURE_ACTION__LOCAL_PRECONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Local Postcondition</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__LOCAL_POSTCONDITION = WRITE_STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION;
-
-	/**
-	 * The feature id for the '<em><b>Structural Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__STRUCTURAL_FEATURE = WRITE_STRUCTURAL_FEATURE_ACTION__STRUCTURAL_FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Object</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__OBJECT = WRITE_STRUCTURAL_FEATURE_ACTION__OBJECT;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__VALUE = WRITE_STRUCTURAL_FEATURE_ACTION__VALUE;
-
-	/**
-	 * The feature id for the '<em><b>Duration</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION__DURATION = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the the '<em>Duration Observation Action</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_OBSERVATION_ACTION_FEATURE_COUNT = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__EANNOTATIONS = INTERVAL_CONSTRAINT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__OWNED_ELEMENT = INTERVAL_CONSTRAINT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__OWNER = INTERVAL_CONSTRAINT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__OWNED_COMMENT = INTERVAL_CONSTRAINT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__TEMPLATE_BINDING = INTERVAL_CONSTRAINT__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__OWNED_TEMPLATE_SIGNATURE = INTERVAL_CONSTRAINT__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__NAME = INTERVAL_CONSTRAINT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__QUALIFIED_NAME = INTERVAL_CONSTRAINT__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__VISIBILITY = INTERVAL_CONSTRAINT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__CLIENT_DEPENDENCY = INTERVAL_CONSTRAINT__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__NAME_EXPRESSION = INTERVAL_CONSTRAINT__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__TEMPLATE_PARAMETER = INTERVAL_CONSTRAINT__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__OWNING_PARAMETER = INTERVAL_CONSTRAINT__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__PACKAGEABLE_ELEMENT_VISIBILITY = INTERVAL_CONSTRAINT__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Context</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__CONTEXT = INTERVAL_CONSTRAINT__CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Namespace</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__NAMESPACE = INTERVAL_CONSTRAINT__NAMESPACE;
-
-	/**
-	 * The feature id for the '<em><b>Specification</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__SPECIFICATION = INTERVAL_CONSTRAINT__SPECIFICATION;
-
-	/**
-	 * The feature id for the '<em><b>Constrained Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT__CONSTRAINED_ELEMENT = INTERVAL_CONSTRAINT__CONSTRAINED_ELEMENT;
-
-	/**
-	 * The number of structural features of the the '<em>Duration Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DURATION_CONSTRAINT_FEATURE_COUNT = INTERVAL_CONSTRAINT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__EANNOTATIONS = CENTRAL_BUFFER_NODE__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__OWNED_ELEMENT = CENTRAL_BUFFER_NODE__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__OWNER = CENTRAL_BUFFER_NODE__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__OWNED_COMMENT = CENTRAL_BUFFER_NODE__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__TEMPLATE_BINDING = CENTRAL_BUFFER_NODE__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__OWNED_TEMPLATE_SIGNATURE = CENTRAL_BUFFER_NODE__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__NAME = CENTRAL_BUFFER_NODE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__QUALIFIED_NAME = CENTRAL_BUFFER_NODE__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__VISIBILITY = CENTRAL_BUFFER_NODE__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__CLIENT_DEPENDENCY = CENTRAL_BUFFER_NODE__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__NAME_EXPRESSION = CENTRAL_BUFFER_NODE__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__REDEFINITION_CONTEXT = CENTRAL_BUFFER_NODE__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__IS_LEAF = CENTRAL_BUFFER_NODE__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__OUTGOING = CENTRAL_BUFFER_NODE__OUTGOING;
-
-	/**
-	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__INCOMING = CENTRAL_BUFFER_NODE__INCOMING;
-
-	/**
-	 * The feature id for the '<em><b>In Group</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__IN_GROUP = CENTRAL_BUFFER_NODE__IN_GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Activity</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__ACTIVITY = CENTRAL_BUFFER_NODE__ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__REDEFINED_ELEMENT = CENTRAL_BUFFER_NODE__REDEFINED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__IN_STRUCTURED_NODE = CENTRAL_BUFFER_NODE__IN_STRUCTURED_NODE;
-
-	/**
-	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__IN_PARTITION = CENTRAL_BUFFER_NODE__IN_PARTITION;
-
-	/**
-	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__IN_INTERRUPTIBLE_REGION = CENTRAL_BUFFER_NODE__IN_INTERRUPTIBLE_REGION;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__TYPE = CENTRAL_BUFFER_NODE__TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Ordering</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__ORDERING = CENTRAL_BUFFER_NODE__ORDERING;
-
-	/**
-	 * The feature id for the '<em><b>Upper Bound</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__UPPER_BOUND = CENTRAL_BUFFER_NODE__UPPER_BOUND;
-
-	/**
-	 * The feature id for the '<em><b>In State</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__IN_STATE = CENTRAL_BUFFER_NODE__IN_STATE;
-
-	/**
-	 * The feature id for the '<em><b>Selection</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE__SELECTION = CENTRAL_BUFFER_NODE__SELECTION;
-
-	/**
-	 * The number of structural features of the the '<em>Data Store Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DATA_STORE_NODE_FEATURE_COUNT = CENTRAL_BUFFER_NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERRUPTIBLE_ACTIVITY_REGION__EANNOTATIONS = ACTIVITY_GROUP__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERRUPTIBLE_ACTIVITY_REGION__OWNED_ELEMENT = ACTIVITY_GROUP__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERRUPTIBLE_ACTIVITY_REGION__OWNER = ACTIVITY_GROUP__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERRUPTIBLE_ACTIVITY_REGION__OWNED_COMMENT = ACTIVITY_GROUP__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Super Group</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERRUPTIBLE_ACTIVITY_REGION__SUPER_GROUP = ACTIVITY_GROUP__SUPER_GROUP;
-
-	/**
-	 * The feature id for the '<em><b>Activity Group activity</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERRUPTIBLE_ACTIVITY_REGION__ACTIVITY_GROUP_ACTIVITY = ACTIVITY_GROUP__ACTIVITY_GROUP_ACTIVITY;
-
-	/**
-	 * The feature id for the '<em><b>Interrupting Edge</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGE = ACTIVITY_GROUP_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Contained Node</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERRUPTIBLE_ACTIVITY_REGION__CONTAINED_NODE = ACTIVITY_GROUP_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Interruptible Activity Region</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INTERRUPTIBLE_ACTIVITY_REGION_FEATURE_COUNT = ACTIVITY_GROUP_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_SET__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_SET__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_SET__OWNER = NAMED_ELEMENT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_SET__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_SET__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_SET__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_SET__NAME = NAMED_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_SET__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_SET__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_SET__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_SET__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Parameter</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_SET__PARAMETER = NAMED_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Condition</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_SET__CONDITION = NAMED_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Parameter Set</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARAMETER_SET_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__EANNOTATIONS = DEPENDENCY__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__OWNED_ELEMENT = DEPENDENCY__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__OWNER = DEPENDENCY__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__OWNED_COMMENT = DEPENDENCY__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__TEMPLATE_BINDING = DEPENDENCY__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__OWNED_TEMPLATE_SIGNATURE = DEPENDENCY__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__NAME = DEPENDENCY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__QUALIFIED_NAME = DEPENDENCY__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__VISIBILITY = DEPENDENCY__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__CLIENT_DEPENDENCY = DEPENDENCY__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__NAME_EXPRESSION = DEPENDENCY__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__TEMPLATE_PARAMETER = DEPENDENCY__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__OWNING_PARAMETER = DEPENDENCY__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__PACKAGEABLE_ELEMENT_VISIBILITY = DEPENDENCY__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__RELATED_ELEMENT = DEPENDENCY__RELATED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__SOURCE = DEPENDENCY__SOURCE;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__TARGET = DEPENDENCY__TARGET;
-
-	/**
-	 * The feature id for the '<em><b>Client</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__CLIENT = DEPENDENCY__CLIENT;
-
-	/**
-	 * The feature id for the '<em><b>Supplier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__SUPPLIER = DEPENDENCY__SUPPLIER;
-
-	/**
-	 * The feature id for the '<em><b>Deployed Artifact</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__DEPLOYED_ARTIFACT = DEPENDENCY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__LOCATION = DEPENDENCY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Configuration</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT__CONFIGURATION = DEPENDENCY_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the the '<em>Deployment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT_FEATURE_COUNT = DEPENDENCY_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYED_ARTIFACT__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYED_ARTIFACT__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYED_ARTIFACT__OWNER = NAMED_ELEMENT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYED_ARTIFACT__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYED_ARTIFACT__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYED_ARTIFACT__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYED_ARTIFACT__NAME = NAMED_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYED_ARTIFACT__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYED_ARTIFACT__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYED_ARTIFACT__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYED_ARTIFACT__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
-
-	/**
-	 * The number of structural features of the the '<em>Deployed Artifact</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYED_ARTIFACT_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT_TARGET__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT_TARGET__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT_TARGET__OWNER = NAMED_ELEMENT__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT_TARGET__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT_TARGET__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT_TARGET__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT_TARGET__NAME = NAMED_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT_TARGET__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT_TARGET__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT_TARGET__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT_TARGET__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Deployment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT_TARGET__DEPLOYMENT = NAMED_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Deployed Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT_TARGET__DEPLOYED_ELEMENT = NAMED_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the the '<em>Deployment Target</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEPLOYMENT_TARGET_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__EANNOTATIONS = CLASS__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OWNED_ELEMENT = CLASS__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OWNER = CLASS__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OWNED_COMMENT = CLASS__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__TEMPLATE_BINDING = CLASS__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OWNED_TEMPLATE_SIGNATURE = CLASS__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__NAME = CLASS__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__QUALIFIED_NAME = CLASS__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__VISIBILITY = CLASS__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__CLIENT_DEPENDENCY = CLASS__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__NAME_EXPRESSION = CLASS__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__MEMBER = CLASS__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OWNED_RULE = CLASS__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__IMPORTED_MEMBER = CLASS__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__ELEMENT_IMPORT = CLASS__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__PACKAGE_IMPORT = CLASS__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__TEMPLATE_PARAMETER = CLASS__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OWNING_PARAMETER = CLASS__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__PACKAGEABLE_ELEMENT_VISIBILITY = CLASS__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__PACKAGE = CLASS__PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__REDEFINITION_CONTEXT = CLASS__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__IS_LEAF = CLASS__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__FEATURE = CLASS__FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__IS_ABSTRACT = CLASS__IS_ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__INHERITED_MEMBER = CLASS__INHERITED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>General</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__GENERAL = CLASS__GENERAL;
-
-	/**
-	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__GENERALIZATION = CLASS__GENERALIZATION;
-
-	/**
-	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__ATTRIBUTE = CLASS__ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__REDEFINED_CLASSIFIER = CLASS__REDEFINED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__POWERTYPE_EXTENT = CLASS__POWERTYPE_EXTENT;
-
-	/**
-	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__SUBSTITUTION = CLASS__SUBSTITUTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OWNED_USE_CASE = CLASS__OWNED_USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__USE_CASE = CLASS__USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Representation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__REPRESENTATION = CLASS__REPRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OCCURRENCE = CLASS__OCCURRENCE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OWNED_BEHAVIOR = CLASS__OWNED_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Classifier Behavior</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__CLASSIFIER_BEHAVIOR = CLASS__CLASSIFIER_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Implementation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__IMPLEMENTATION = CLASS__IMPLEMENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OWNED_TRIGGER = CLASS__OWNED_TRIGGER;
-
-	/**
-	 * The feature id for the '<em><b>Owned State Machine</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OWNED_STATE_MACHINE = CLASS__OWNED_STATE_MACHINE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OWNED_ATTRIBUTE = CLASS__OWNED_ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Part</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__PART = CLASS__PART;
-
-	/**
-	 * The feature id for the '<em><b>Role</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__ROLE = CLASS__ROLE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OWNED_CONNECTOR = CLASS__OWNED_CONNECTOR;
-
-	/**
-	 * The feature id for the '<em><b>Owned Port</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OWNED_PORT = CLASS__OWNED_PORT;
-
-	/**
-	 * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OWNED_OPERATION = CLASS__OWNED_OPERATION;
-
-	/**
-	 * The feature id for the '<em><b>Super Class</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__SUPER_CLASS = CLASS__SUPER_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>Nested Classifier</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__NESTED_CLASSIFIER = CLASS__NESTED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Extension</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__EXTENSION = CLASS__EXTENSION;
-
-	/**
-	 * The feature id for the '<em><b>Is Active</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__IS_ACTIVE = CLASS__IS_ACTIVE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Reception</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__OWNED_RECEPTION = CLASS__OWNED_RECEPTION;
-
-	/**
-	 * The feature id for the '<em><b>Deployment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__DEPLOYMENT = CLASS_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Deployed Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__DEPLOYED_ELEMENT = CLASS_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Nested Node</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__NESTED_NODE = CLASS_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the the '<em>Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_FEATURE_COUNT = CLASS_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__EANNOTATIONS = NODE__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OWNED_ELEMENT = NODE__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OWNER = NODE__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OWNED_COMMENT = NODE__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__TEMPLATE_BINDING = NODE__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OWNED_TEMPLATE_SIGNATURE = NODE__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__NAME = NODE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__QUALIFIED_NAME = NODE__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__VISIBILITY = NODE__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__CLIENT_DEPENDENCY = NODE__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__NAME_EXPRESSION = NODE__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__MEMBER = NODE__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OWNED_RULE = NODE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__IMPORTED_MEMBER = NODE__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__ELEMENT_IMPORT = NODE__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__PACKAGE_IMPORT = NODE__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__TEMPLATE_PARAMETER = NODE__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OWNING_PARAMETER = NODE__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__PACKAGEABLE_ELEMENT_VISIBILITY = NODE__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__PACKAGE = NODE__PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__REDEFINITION_CONTEXT = NODE__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__IS_LEAF = NODE__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__FEATURE = NODE__FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__IS_ABSTRACT = NODE__IS_ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__INHERITED_MEMBER = NODE__INHERITED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>General</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__GENERAL = NODE__GENERAL;
-
-	/**
-	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__GENERALIZATION = NODE__GENERALIZATION;
-
-	/**
-	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__ATTRIBUTE = NODE__ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__REDEFINED_CLASSIFIER = NODE__REDEFINED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__POWERTYPE_EXTENT = NODE__POWERTYPE_EXTENT;
-
-	/**
-	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__SUBSTITUTION = NODE__SUBSTITUTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OWNED_USE_CASE = NODE__OWNED_USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__USE_CASE = NODE__USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Representation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__REPRESENTATION = NODE__REPRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OCCURRENCE = NODE__OCCURRENCE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OWNED_BEHAVIOR = NODE__OWNED_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Classifier Behavior</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__CLASSIFIER_BEHAVIOR = NODE__CLASSIFIER_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Implementation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__IMPLEMENTATION = NODE__IMPLEMENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OWNED_TRIGGER = NODE__OWNED_TRIGGER;
-
-	/**
-	 * The feature id for the '<em><b>Owned State Machine</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OWNED_STATE_MACHINE = NODE__OWNED_STATE_MACHINE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OWNED_ATTRIBUTE = NODE__OWNED_ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Part</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__PART = NODE__PART;
-
-	/**
-	 * The feature id for the '<em><b>Role</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__ROLE = NODE__ROLE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OWNED_CONNECTOR = NODE__OWNED_CONNECTOR;
-
-	/**
-	 * The feature id for the '<em><b>Owned Port</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OWNED_PORT = NODE__OWNED_PORT;
-
-	/**
-	 * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OWNED_OPERATION = NODE__OWNED_OPERATION;
-
-	/**
-	 * The feature id for the '<em><b>Super Class</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__SUPER_CLASS = NODE__SUPER_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>Nested Classifier</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__NESTED_CLASSIFIER = NODE__NESTED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Extension</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__EXTENSION = NODE__EXTENSION;
-
-	/**
-	 * The feature id for the '<em><b>Is Active</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__IS_ACTIVE = NODE__IS_ACTIVE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Reception</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__OWNED_RECEPTION = NODE__OWNED_RECEPTION;
-
-	/**
-	 * The feature id for the '<em><b>Deployment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__DEPLOYMENT = NODE__DEPLOYMENT;
-
-	/**
-	 * The feature id for the '<em><b>Deployed Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__DEPLOYED_ELEMENT = NODE__DEPLOYED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Nested Node</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE__NESTED_NODE = NODE__NESTED_NODE;
-
-	/**
-	 * The number of structural features of the the '<em>Device</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEVICE_FEATURE_COUNT = NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__EANNOTATIONS = NODE__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OWNED_ELEMENT = NODE__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OWNER = NODE__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OWNED_COMMENT = NODE__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__TEMPLATE_BINDING = NODE__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OWNED_TEMPLATE_SIGNATURE = NODE__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__NAME = NODE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__QUALIFIED_NAME = NODE__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__VISIBILITY = NODE__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__CLIENT_DEPENDENCY = NODE__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__NAME_EXPRESSION = NODE__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__MEMBER = NODE__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OWNED_RULE = NODE__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__IMPORTED_MEMBER = NODE__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__ELEMENT_IMPORT = NODE__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__PACKAGE_IMPORT = NODE__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__TEMPLATE_PARAMETER = NODE__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OWNING_PARAMETER = NODE__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__PACKAGEABLE_ELEMENT_VISIBILITY = NODE__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__PACKAGE = NODE__PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__REDEFINITION_CONTEXT = NODE__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__IS_LEAF = NODE__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__FEATURE = NODE__FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__IS_ABSTRACT = NODE__IS_ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__INHERITED_MEMBER = NODE__INHERITED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>General</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__GENERAL = NODE__GENERAL;
-
-	/**
-	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__GENERALIZATION = NODE__GENERALIZATION;
-
-	/**
-	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__ATTRIBUTE = NODE__ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__REDEFINED_CLASSIFIER = NODE__REDEFINED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__POWERTYPE_EXTENT = NODE__POWERTYPE_EXTENT;
-
-	/**
-	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__SUBSTITUTION = NODE__SUBSTITUTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OWNED_USE_CASE = NODE__OWNED_USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__USE_CASE = NODE__USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Representation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__REPRESENTATION = NODE__REPRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OCCURRENCE = NODE__OCCURRENCE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OWNED_BEHAVIOR = NODE__OWNED_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Classifier Behavior</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__CLASSIFIER_BEHAVIOR = NODE__CLASSIFIER_BEHAVIOR;
-
-	/**
-	 * The feature id for the '<em><b>Implementation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__IMPLEMENTATION = NODE__IMPLEMENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OWNED_TRIGGER = NODE__OWNED_TRIGGER;
-
-	/**
-	 * The feature id for the '<em><b>Owned State Machine</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OWNED_STATE_MACHINE = NODE__OWNED_STATE_MACHINE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OWNED_ATTRIBUTE = NODE__OWNED_ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Part</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__PART = NODE__PART;
-
-	/**
-	 * The feature id for the '<em><b>Role</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__ROLE = NODE__ROLE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OWNED_CONNECTOR = NODE__OWNED_CONNECTOR;
-
-	/**
-	 * The feature id for the '<em><b>Owned Port</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OWNED_PORT = NODE__OWNED_PORT;
-
-	/**
-	 * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OWNED_OPERATION = NODE__OWNED_OPERATION;
-
-	/**
-	 * The feature id for the '<em><b>Super Class</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__SUPER_CLASS = NODE__SUPER_CLASS;
-
-	/**
-	 * The feature id for the '<em><b>Nested Classifier</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__NESTED_CLASSIFIER = NODE__NESTED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Extension</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__EXTENSION = NODE__EXTENSION;
-
-	/**
-	 * The feature id for the '<em><b>Is Active</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__IS_ACTIVE = NODE__IS_ACTIVE;
-
-	/**
-	 * The feature id for the '<em><b>Owned Reception</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__OWNED_RECEPTION = NODE__OWNED_RECEPTION;
-
-	/**
-	 * The feature id for the '<em><b>Deployment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__DEPLOYMENT = NODE__DEPLOYMENT;
-
-	/**
-	 * The feature id for the '<em><b>Deployed Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__DEPLOYED_ELEMENT = NODE__DEPLOYED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Nested Node</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT__NESTED_NODE = NODE__NESTED_NODE;
-
-	/**
-	 * The number of structural features of the the '<em>Execution Environment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXECUTION_ENVIRONMENT_FEATURE_COUNT = NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__EANNOTATIONS = ASSOCIATION__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__OWNED_ELEMENT = ASSOCIATION__OWNED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__OWNER = ASSOCIATION__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__OWNED_COMMENT = ASSOCIATION__OWNED_COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__TEMPLATE_BINDING = ASSOCIATION__TEMPLATE_BINDING;
-
-	/**
-	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__OWNED_TEMPLATE_SIGNATURE = ASSOCIATION__OWNED_TEMPLATE_SIGNATURE;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__NAME = ASSOCIATION__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__QUALIFIED_NAME = ASSOCIATION__QUALIFIED_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__VISIBILITY = ASSOCIATION__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__CLIENT_DEPENDENCY = ASSOCIATION__CLIENT_DEPENDENCY;
-
-	/**
-	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__NAME_EXPRESSION = ASSOCIATION__NAME_EXPRESSION;
-
-	/**
-	 * The feature id for the '<em><b>Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__MEMBER = ASSOCIATION__MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__OWNED_RULE = ASSOCIATION__OWNED_RULE;
-
-	/**
-	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__IMPORTED_MEMBER = ASSOCIATION__IMPORTED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__ELEMENT_IMPORT = ASSOCIATION__ELEMENT_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__PACKAGE_IMPORT = ASSOCIATION__PACKAGE_IMPORT;
-
-	/**
-	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__TEMPLATE_PARAMETER = ASSOCIATION__TEMPLATE_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__OWNING_PARAMETER = ASSOCIATION__OWNING_PARAMETER;
-
-	/**
-	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__PACKAGEABLE_ELEMENT_VISIBILITY = ASSOCIATION__PACKAGEABLE_ELEMENT_VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Package</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__PACKAGE = ASSOCIATION__PACKAGE;
-
-	/**
-	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__REDEFINITION_CONTEXT = ASSOCIATION__REDEFINITION_CONTEXT;
-
-	/**
-	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__IS_LEAF = ASSOCIATION__IS_LEAF;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__FEATURE = ASSOCIATION__FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__IS_ABSTRACT = ASSOCIATION__IS_ABSTRACT;
-
-	/**
-	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__INHERITED_MEMBER = ASSOCIATION__INHERITED_MEMBER;
-
-	/**
-	 * The feature id for the '<em><b>General</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__GENERAL = ASSOCIATION__GENERAL;
-
-	/**
-	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__GENERALIZATION = ASSOCIATION__GENERALIZATION;
-
-	/**
-	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__ATTRIBUTE = ASSOCIATION__ATTRIBUTE;
-
-	/**
-	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__REDEFINED_CLASSIFIER = ASSOCIATION__REDEFINED_CLASSIFIER;
-
-	/**
-	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__POWERTYPE_EXTENT = ASSOCIATION__POWERTYPE_EXTENT;
-
-	/**
-	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__SUBSTITUTION = ASSOCIATION__SUBSTITUTION;
-
-	/**
-	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__OWNED_USE_CASE = ASSOCIATION__OWNED_USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__USE_CASE = ASSOCIATION__USE_CASE;
-
-	/**
-	 * The feature id for the '<em><b>Representation</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__REPRESENTATION = ASSOCIATION__REPRESENTATION;
-
-	/**
-	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__OCCURRENCE = ASSOCIATION__OCCURRENCE;
-
-	/**
-	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__RELATED_ELEMENT = ASSOCIATION__RELATED_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Is Derived</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__IS_DERIVED = ASSOCIATION__IS_DERIVED;
-
-	/**
-	 * The feature id for the '<em><b>Owned End</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__OWNED_END = ASSOCIATION__OWNED_END;
-
-	/**
-	 * The feature id for the '<em><b>End Type</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__END_TYPE = ASSOCIATION__END_TYPE;
-
-	/**
-	 * The feature id for the '<em><b>Member End</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH__MEMBER_END = ASSOCIATION__MEMBER_END;
-
-	/**
-	 * The number of structural features of the the '<em>Communication Path</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMMUNICATION_PATH_FEATURE_COUNT = ASSOCIATION_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
 	int READ_EXTENT_ACTION__EANNOTATIONS = ACTION__EANNOTATIONS;
 
 	/**
@@ -54553,6 +49018,5541 @@
 	int RAISE_EXCEPTION_ACTION_FEATURE_COUNT = ACTION_FEATURE_COUNT + 1;
 
 	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__EANNOTATIONS = CENTRAL_BUFFER_NODE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__OWNED_ELEMENT = CENTRAL_BUFFER_NODE__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__OWNER = CENTRAL_BUFFER_NODE__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__OWNED_COMMENT = CENTRAL_BUFFER_NODE__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__TEMPLATE_BINDING = CENTRAL_BUFFER_NODE__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__OWNED_TEMPLATE_SIGNATURE = CENTRAL_BUFFER_NODE__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__NAME = CENTRAL_BUFFER_NODE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__QUALIFIED_NAME = CENTRAL_BUFFER_NODE__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__VISIBILITY = CENTRAL_BUFFER_NODE__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__CLIENT_DEPENDENCY = CENTRAL_BUFFER_NODE__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__NAME_EXPRESSION = CENTRAL_BUFFER_NODE__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__REDEFINITION_CONTEXT = CENTRAL_BUFFER_NODE__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__IS_LEAF = CENTRAL_BUFFER_NODE__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__OUTGOING = CENTRAL_BUFFER_NODE__OUTGOING;
+
+	/**
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__INCOMING = CENTRAL_BUFFER_NODE__INCOMING;
+
+	/**
+	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__IN_GROUP = CENTRAL_BUFFER_NODE__IN_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__ACTIVITY = CENTRAL_BUFFER_NODE__ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__REDEFINED_ELEMENT = CENTRAL_BUFFER_NODE__REDEFINED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__IN_STRUCTURED_NODE = CENTRAL_BUFFER_NODE__IN_STRUCTURED_NODE;
+
+	/**
+	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__IN_PARTITION = CENTRAL_BUFFER_NODE__IN_PARTITION;
+
+	/**
+	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__IN_INTERRUPTIBLE_REGION = CENTRAL_BUFFER_NODE__IN_INTERRUPTIBLE_REGION;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__TYPE = CENTRAL_BUFFER_NODE__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Ordering</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__ORDERING = CENTRAL_BUFFER_NODE__ORDERING;
+
+	/**
+	 * The feature id for the '<em><b>Upper Bound</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__UPPER_BOUND = CENTRAL_BUFFER_NODE__UPPER_BOUND;
+
+	/**
+	 * The feature id for the '<em><b>In State</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__IN_STATE = CENTRAL_BUFFER_NODE__IN_STATE;
+
+	/**
+	 * The feature id for the '<em><b>Selection</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE__SELECTION = CENTRAL_BUFFER_NODE__SELECTION;
+
+	/**
+	 * The number of structural features of the the '<em>Data Store Node</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DATA_STORE_NODE_FEATURE_COUNT = CENTRAL_BUFFER_NODE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERRUPTIBLE_ACTIVITY_REGION__EANNOTATIONS = ACTIVITY_GROUP__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERRUPTIBLE_ACTIVITY_REGION__OWNED_ELEMENT = ACTIVITY_GROUP__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERRUPTIBLE_ACTIVITY_REGION__OWNER = ACTIVITY_GROUP__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERRUPTIBLE_ACTIVITY_REGION__OWNED_COMMENT = ACTIVITY_GROUP__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Super Group</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERRUPTIBLE_ACTIVITY_REGION__SUPER_GROUP = ACTIVITY_GROUP__SUPER_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Activity Group activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERRUPTIBLE_ACTIVITY_REGION__ACTIVITY_GROUP_ACTIVITY = ACTIVITY_GROUP__ACTIVITY_GROUP_ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>Interrupting Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGE = ACTIVITY_GROUP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Contained Node</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERRUPTIBLE_ACTIVITY_REGION__CONTAINED_NODE = ACTIVITY_GROUP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Interruptible Activity Region</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERRUPTIBLE_ACTIVITY_REGION_FEATURE_COUNT = ACTIVITY_GROUP_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_SET__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_SET__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_SET__OWNER = NAMED_ELEMENT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_SET__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_SET__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_SET__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_SET__NAME = NAMED_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_SET__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_SET__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_SET__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_SET__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Parameter</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_SET__PARAMETER = NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Condition</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_SET__CONDITION = NAMED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Parameter Set</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PARAMETER_SET_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__EANNOTATIONS = VALUE_SPECIFICATION__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__OWNED_ELEMENT = VALUE_SPECIFICATION__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__OWNER = VALUE_SPECIFICATION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__OWNED_COMMENT = VALUE_SPECIFICATION__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__TEMPLATE_BINDING = VALUE_SPECIFICATION__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__OWNED_TEMPLATE_SIGNATURE = VALUE_SPECIFICATION__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__NAME = VALUE_SPECIFICATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__QUALIFIED_NAME = VALUE_SPECIFICATION__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__VISIBILITY = VALUE_SPECIFICATION__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__CLIENT_DEPENDENCY = VALUE_SPECIFICATION__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__NAME_EXPRESSION = VALUE_SPECIFICATION__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__TYPE = VALUE_SPECIFICATION__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__TEMPLATE_PARAMETER = VALUE_SPECIFICATION__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__OWNING_PARAMETER = VALUE_SPECIFICATION__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>First Time</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__FIRST_TIME = VALUE_SPECIFICATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Event</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION__EVENT = VALUE_SPECIFICATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Time Expression</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_EXPRESSION_FEATURE_COUNT = VALUE_SPECIFICATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__EANNOTATIONS = VALUE_SPECIFICATION__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__OWNED_ELEMENT = VALUE_SPECIFICATION__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__OWNER = VALUE_SPECIFICATION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__OWNED_COMMENT = VALUE_SPECIFICATION__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__TEMPLATE_BINDING = VALUE_SPECIFICATION__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__OWNED_TEMPLATE_SIGNATURE = VALUE_SPECIFICATION__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__NAME = VALUE_SPECIFICATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__QUALIFIED_NAME = VALUE_SPECIFICATION__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__VISIBILITY = VALUE_SPECIFICATION__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__CLIENT_DEPENDENCY = VALUE_SPECIFICATION__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__NAME_EXPRESSION = VALUE_SPECIFICATION__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__TYPE = VALUE_SPECIFICATION__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__TEMPLATE_PARAMETER = VALUE_SPECIFICATION__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__OWNING_PARAMETER = VALUE_SPECIFICATION__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>First Time</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__FIRST_TIME = VALUE_SPECIFICATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Event</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION__EVENT = VALUE_SPECIFICATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Duration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_FEATURE_COUNT = VALUE_SPECIFICATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__EANNOTATIONS = WRITE_STRUCTURAL_FEATURE_ACTION__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__OWNED_ELEMENT = WRITE_STRUCTURAL_FEATURE_ACTION__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__OWNER = WRITE_STRUCTURAL_FEATURE_ACTION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__OWNED_COMMENT = WRITE_STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__TEMPLATE_BINDING = WRITE_STRUCTURAL_FEATURE_ACTION__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__OWNED_TEMPLATE_SIGNATURE = WRITE_STRUCTURAL_FEATURE_ACTION__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__NAME = WRITE_STRUCTURAL_FEATURE_ACTION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__QUALIFIED_NAME = WRITE_STRUCTURAL_FEATURE_ACTION__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__VISIBILITY = WRITE_STRUCTURAL_FEATURE_ACTION__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__CLIENT_DEPENDENCY = WRITE_STRUCTURAL_FEATURE_ACTION__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__NAME_EXPRESSION = WRITE_STRUCTURAL_FEATURE_ACTION__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__REDEFINITION_CONTEXT = WRITE_STRUCTURAL_FEATURE_ACTION__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__IS_LEAF = WRITE_STRUCTURAL_FEATURE_ACTION__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__OUTGOING = WRITE_STRUCTURAL_FEATURE_ACTION__OUTGOING;
+
+	/**
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__INCOMING = WRITE_STRUCTURAL_FEATURE_ACTION__INCOMING;
+
+	/**
+	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__IN_GROUP = WRITE_STRUCTURAL_FEATURE_ACTION__IN_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__ACTIVITY = WRITE_STRUCTURAL_FEATURE_ACTION__ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__REDEFINED_ELEMENT = WRITE_STRUCTURAL_FEATURE_ACTION__REDEFINED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__IN_STRUCTURED_NODE = WRITE_STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE;
+
+	/**
+	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__IN_PARTITION = WRITE_STRUCTURAL_FEATURE_ACTION__IN_PARTITION;
+
+	/**
+	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__IN_INTERRUPTIBLE_REGION = WRITE_STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION;
+
+	/**
+	 * The feature id for the '<em><b>Handler</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__HANDLER = WRITE_STRUCTURAL_FEATURE_ACTION__HANDLER;
+
+	/**
+	 * The feature id for the '<em><b>Effect</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__EFFECT = WRITE_STRUCTURAL_FEATURE_ACTION__EFFECT;
+
+	/**
+	 * The feature id for the '<em><b>Output</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__OUTPUT = WRITE_STRUCTURAL_FEATURE_ACTION__OUTPUT;
+
+	/**
+	 * The feature id for the '<em><b>Input</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__INPUT = WRITE_STRUCTURAL_FEATURE_ACTION__INPUT;
+
+	/**
+	 * The feature id for the '<em><b>Context</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__CONTEXT = WRITE_STRUCTURAL_FEATURE_ACTION__CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Local Precondition</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__LOCAL_PRECONDITION = WRITE_STRUCTURAL_FEATURE_ACTION__LOCAL_PRECONDITION;
+
+	/**
+	 * The feature id for the '<em><b>Local Postcondition</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__LOCAL_POSTCONDITION = WRITE_STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION;
+
+	/**
+	 * The feature id for the '<em><b>Structural Feature</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__STRUCTURAL_FEATURE = WRITE_STRUCTURAL_FEATURE_ACTION__STRUCTURAL_FEATURE;
+
+	/**
+	 * The feature id for the '<em><b>Object</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__OBJECT = WRITE_STRUCTURAL_FEATURE_ACTION__OBJECT;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__VALUE = WRITE_STRUCTURAL_FEATURE_ACTION__VALUE;
+
+	/**
+	 * The feature id for the '<em><b>Now</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION__NOW = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the the '<em>Time Observation Action</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_OBSERVATION_ACTION_FEATURE_COUNT = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__EANNOTATIONS = VALUE_SPECIFICATION__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__OWNED_ELEMENT = VALUE_SPECIFICATION__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__OWNER = VALUE_SPECIFICATION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__OWNED_COMMENT = VALUE_SPECIFICATION__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__TEMPLATE_BINDING = VALUE_SPECIFICATION__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__OWNED_TEMPLATE_SIGNATURE = VALUE_SPECIFICATION__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__NAME = VALUE_SPECIFICATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__QUALIFIED_NAME = VALUE_SPECIFICATION__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__VISIBILITY = VALUE_SPECIFICATION__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__CLIENT_DEPENDENCY = VALUE_SPECIFICATION__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__NAME_EXPRESSION = VALUE_SPECIFICATION__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__TYPE = VALUE_SPECIFICATION__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__TEMPLATE_PARAMETER = VALUE_SPECIFICATION__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__OWNING_PARAMETER = VALUE_SPECIFICATION__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Min</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__MIN = VALUE_SPECIFICATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Max</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL__MAX = VALUE_SPECIFICATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Interval</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_FEATURE_COUNT = VALUE_SPECIFICATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__EANNOTATIONS = INTERVAL__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__OWNED_ELEMENT = INTERVAL__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__OWNER = INTERVAL__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__OWNED_COMMENT = INTERVAL__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__TEMPLATE_BINDING = INTERVAL__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__OWNED_TEMPLATE_SIGNATURE = INTERVAL__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__NAME = INTERVAL__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__QUALIFIED_NAME = INTERVAL__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__VISIBILITY = INTERVAL__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__CLIENT_DEPENDENCY = INTERVAL__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__NAME_EXPRESSION = INTERVAL__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__TYPE = INTERVAL__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__TEMPLATE_PARAMETER = INTERVAL__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__OWNING_PARAMETER = INTERVAL__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Min</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__MIN = INTERVAL__MIN;
+
+	/**
+	 * The feature id for the '<em><b>Max</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL__MAX = INTERVAL__MAX;
+
+	/**
+	 * The number of structural features of the the '<em>Duration Interval</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_INTERVAL_FEATURE_COUNT = INTERVAL_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__EANNOTATIONS = CONSTRAINT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__OWNED_ELEMENT = CONSTRAINT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__OWNER = CONSTRAINT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__OWNED_COMMENT = CONSTRAINT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__TEMPLATE_BINDING = CONSTRAINT__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__OWNED_TEMPLATE_SIGNATURE = CONSTRAINT__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__NAME = CONSTRAINT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__QUALIFIED_NAME = CONSTRAINT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__VISIBILITY = CONSTRAINT__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__CLIENT_DEPENDENCY = CONSTRAINT__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__NAME_EXPRESSION = CONSTRAINT__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__TEMPLATE_PARAMETER = CONSTRAINT__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__OWNING_PARAMETER = CONSTRAINT__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__PACKAGEABLE_ELEMENT_VISIBILITY = CONSTRAINT__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Context</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__CONTEXT = CONSTRAINT__CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Namespace</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__NAMESPACE = CONSTRAINT__NAMESPACE;
+
+	/**
+	 * The feature id for the '<em><b>Specification</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__SPECIFICATION = CONSTRAINT__SPECIFICATION;
+
+	/**
+	 * The feature id for the '<em><b>Constrained Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT__CONSTRAINED_ELEMENT = CONSTRAINT__CONSTRAINED_ELEMENT;
+
+	/**
+	 * The number of structural features of the the '<em>Interval Constraint</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTERVAL_CONSTRAINT_FEATURE_COUNT = CONSTRAINT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__EANNOTATIONS = INTERVAL_CONSTRAINT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__OWNED_ELEMENT = INTERVAL_CONSTRAINT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__OWNER = INTERVAL_CONSTRAINT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__OWNED_COMMENT = INTERVAL_CONSTRAINT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__TEMPLATE_BINDING = INTERVAL_CONSTRAINT__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__OWNED_TEMPLATE_SIGNATURE = INTERVAL_CONSTRAINT__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__NAME = INTERVAL_CONSTRAINT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__QUALIFIED_NAME = INTERVAL_CONSTRAINT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__VISIBILITY = INTERVAL_CONSTRAINT__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__CLIENT_DEPENDENCY = INTERVAL_CONSTRAINT__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__NAME_EXPRESSION = INTERVAL_CONSTRAINT__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__TEMPLATE_PARAMETER = INTERVAL_CONSTRAINT__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__OWNING_PARAMETER = INTERVAL_CONSTRAINT__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__PACKAGEABLE_ELEMENT_VISIBILITY = INTERVAL_CONSTRAINT__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Context</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__CONTEXT = INTERVAL_CONSTRAINT__CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Namespace</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__NAMESPACE = INTERVAL_CONSTRAINT__NAMESPACE;
+
+	/**
+	 * The feature id for the '<em><b>Specification</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__SPECIFICATION = INTERVAL_CONSTRAINT__SPECIFICATION;
+
+	/**
+	 * The feature id for the '<em><b>Constrained Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT__CONSTRAINED_ELEMENT = INTERVAL_CONSTRAINT__CONSTRAINED_ELEMENT;
+
+	/**
+	 * The number of structural features of the the '<em>Time Constraint</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_CONSTRAINT_FEATURE_COUNT = INTERVAL_CONSTRAINT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__EANNOTATIONS = INTERVAL__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__OWNED_ELEMENT = INTERVAL__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__OWNER = INTERVAL__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__OWNED_COMMENT = INTERVAL__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__TEMPLATE_BINDING = INTERVAL__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__OWNED_TEMPLATE_SIGNATURE = INTERVAL__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__NAME = INTERVAL__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__QUALIFIED_NAME = INTERVAL__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__VISIBILITY = INTERVAL__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__CLIENT_DEPENDENCY = INTERVAL__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__NAME_EXPRESSION = INTERVAL__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__TYPE = INTERVAL__TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__TEMPLATE_PARAMETER = INTERVAL__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__OWNING_PARAMETER = INTERVAL__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Min</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__MIN = INTERVAL__MIN;
+
+	/**
+	 * The feature id for the '<em><b>Max</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL__MAX = INTERVAL__MAX;
+
+	/**
+	 * The number of structural features of the the '<em>Time Interval</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TIME_INTERVAL_FEATURE_COUNT = INTERVAL_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__EANNOTATIONS = WRITE_STRUCTURAL_FEATURE_ACTION__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__OWNED_ELEMENT = WRITE_STRUCTURAL_FEATURE_ACTION__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__OWNER = WRITE_STRUCTURAL_FEATURE_ACTION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__OWNED_COMMENT = WRITE_STRUCTURAL_FEATURE_ACTION__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__TEMPLATE_BINDING = WRITE_STRUCTURAL_FEATURE_ACTION__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__OWNED_TEMPLATE_SIGNATURE = WRITE_STRUCTURAL_FEATURE_ACTION__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__NAME = WRITE_STRUCTURAL_FEATURE_ACTION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__QUALIFIED_NAME = WRITE_STRUCTURAL_FEATURE_ACTION__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__VISIBILITY = WRITE_STRUCTURAL_FEATURE_ACTION__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__CLIENT_DEPENDENCY = WRITE_STRUCTURAL_FEATURE_ACTION__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__NAME_EXPRESSION = WRITE_STRUCTURAL_FEATURE_ACTION__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__REDEFINITION_CONTEXT = WRITE_STRUCTURAL_FEATURE_ACTION__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__IS_LEAF = WRITE_STRUCTURAL_FEATURE_ACTION__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Outgoing</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__OUTGOING = WRITE_STRUCTURAL_FEATURE_ACTION__OUTGOING;
+
+	/**
+	 * The feature id for the '<em><b>Incoming</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__INCOMING = WRITE_STRUCTURAL_FEATURE_ACTION__INCOMING;
+
+	/**
+	 * The feature id for the '<em><b>In Group</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__IN_GROUP = WRITE_STRUCTURAL_FEATURE_ACTION__IN_GROUP;
+
+	/**
+	 * The feature id for the '<em><b>Activity</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__ACTIVITY = WRITE_STRUCTURAL_FEATURE_ACTION__ACTIVITY;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__REDEFINED_ELEMENT = WRITE_STRUCTURAL_FEATURE_ACTION__REDEFINED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>In Structured Node</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__IN_STRUCTURED_NODE = WRITE_STRUCTURAL_FEATURE_ACTION__IN_STRUCTURED_NODE;
+
+	/**
+	 * The feature id for the '<em><b>In Partition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__IN_PARTITION = WRITE_STRUCTURAL_FEATURE_ACTION__IN_PARTITION;
+
+	/**
+	 * The feature id for the '<em><b>In Interruptible Region</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__IN_INTERRUPTIBLE_REGION = WRITE_STRUCTURAL_FEATURE_ACTION__IN_INTERRUPTIBLE_REGION;
+
+	/**
+	 * The feature id for the '<em><b>Handler</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__HANDLER = WRITE_STRUCTURAL_FEATURE_ACTION__HANDLER;
+
+	/**
+	 * The feature id for the '<em><b>Effect</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__EFFECT = WRITE_STRUCTURAL_FEATURE_ACTION__EFFECT;
+
+	/**
+	 * The feature id for the '<em><b>Output</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__OUTPUT = WRITE_STRUCTURAL_FEATURE_ACTION__OUTPUT;
+
+	/**
+	 * The feature id for the '<em><b>Input</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__INPUT = WRITE_STRUCTURAL_FEATURE_ACTION__INPUT;
+
+	/**
+	 * The feature id for the '<em><b>Context</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__CONTEXT = WRITE_STRUCTURAL_FEATURE_ACTION__CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Local Precondition</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__LOCAL_PRECONDITION = WRITE_STRUCTURAL_FEATURE_ACTION__LOCAL_PRECONDITION;
+
+	/**
+	 * The feature id for the '<em><b>Local Postcondition</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__LOCAL_POSTCONDITION = WRITE_STRUCTURAL_FEATURE_ACTION__LOCAL_POSTCONDITION;
+
+	/**
+	 * The feature id for the '<em><b>Structural Feature</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__STRUCTURAL_FEATURE = WRITE_STRUCTURAL_FEATURE_ACTION__STRUCTURAL_FEATURE;
+
+	/**
+	 * The feature id for the '<em><b>Object</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__OBJECT = WRITE_STRUCTURAL_FEATURE_ACTION__OBJECT;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__VALUE = WRITE_STRUCTURAL_FEATURE_ACTION__VALUE;
+
+	/**
+	 * The feature id for the '<em><b>Duration</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION__DURATION = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the the '<em>Duration Observation Action</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_OBSERVATION_ACTION_FEATURE_COUNT = WRITE_STRUCTURAL_FEATURE_ACTION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__EANNOTATIONS = INTERVAL_CONSTRAINT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__OWNED_ELEMENT = INTERVAL_CONSTRAINT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__OWNER = INTERVAL_CONSTRAINT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__OWNED_COMMENT = INTERVAL_CONSTRAINT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__TEMPLATE_BINDING = INTERVAL_CONSTRAINT__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__OWNED_TEMPLATE_SIGNATURE = INTERVAL_CONSTRAINT__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__NAME = INTERVAL_CONSTRAINT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__QUALIFIED_NAME = INTERVAL_CONSTRAINT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__VISIBILITY = INTERVAL_CONSTRAINT__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__CLIENT_DEPENDENCY = INTERVAL_CONSTRAINT__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__NAME_EXPRESSION = INTERVAL_CONSTRAINT__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__TEMPLATE_PARAMETER = INTERVAL_CONSTRAINT__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__OWNING_PARAMETER = INTERVAL_CONSTRAINT__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__PACKAGEABLE_ELEMENT_VISIBILITY = INTERVAL_CONSTRAINT__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Context</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__CONTEXT = INTERVAL_CONSTRAINT__CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Namespace</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__NAMESPACE = INTERVAL_CONSTRAINT__NAMESPACE;
+
+	/**
+	 * The feature id for the '<em><b>Specification</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__SPECIFICATION = INTERVAL_CONSTRAINT__SPECIFICATION;
+
+	/**
+	 * The feature id for the '<em><b>Constrained Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT__CONSTRAINED_ELEMENT = INTERVAL_CONSTRAINT__CONSTRAINED_ELEMENT;
+
+	/**
+	 * The number of structural features of the the '<em>Duration Constraint</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DURATION_CONSTRAINT_FEATURE_COUNT = INTERVAL_CONSTRAINT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__EANNOTATIONS = DEPENDENCY__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__OWNED_ELEMENT = DEPENDENCY__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__OWNER = DEPENDENCY__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__OWNED_COMMENT = DEPENDENCY__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__TEMPLATE_BINDING = DEPENDENCY__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__OWNED_TEMPLATE_SIGNATURE = DEPENDENCY__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__NAME = DEPENDENCY__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__QUALIFIED_NAME = DEPENDENCY__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__VISIBILITY = DEPENDENCY__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__CLIENT_DEPENDENCY = DEPENDENCY__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__NAME_EXPRESSION = DEPENDENCY__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__TEMPLATE_PARAMETER = DEPENDENCY__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__OWNING_PARAMETER = DEPENDENCY__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__PACKAGEABLE_ELEMENT_VISIBILITY = DEPENDENCY__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__RELATED_ELEMENT = DEPENDENCY__RELATED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Source</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__SOURCE = DEPENDENCY__SOURCE;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__TARGET = DEPENDENCY__TARGET;
+
+	/**
+	 * The feature id for the '<em><b>Client</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__CLIENT = DEPENDENCY__CLIENT;
+
+	/**
+	 * The feature id for the '<em><b>Supplier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__SUPPLIER = DEPENDENCY__SUPPLIER;
+
+	/**
+	 * The feature id for the '<em><b>Deployed Artifact</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__DEPLOYED_ARTIFACT = DEPENDENCY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Location</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__LOCATION = DEPENDENCY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Configuration</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT__CONFIGURATION = DEPENDENCY_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the the '<em>Deployment</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT_FEATURE_COUNT = DEPENDENCY_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYED_ARTIFACT__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYED_ARTIFACT__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYED_ARTIFACT__OWNER = NAMED_ELEMENT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYED_ARTIFACT__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYED_ARTIFACT__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYED_ARTIFACT__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYED_ARTIFACT__NAME = NAMED_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYED_ARTIFACT__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYED_ARTIFACT__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYED_ARTIFACT__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYED_ARTIFACT__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
+
+	/**
+	 * The number of structural features of the the '<em>Deployed Artifact</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYED_ARTIFACT_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT_TARGET__EANNOTATIONS = NAMED_ELEMENT__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT_TARGET__OWNED_ELEMENT = NAMED_ELEMENT__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT_TARGET__OWNER = NAMED_ELEMENT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT_TARGET__OWNED_COMMENT = NAMED_ELEMENT__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT_TARGET__TEMPLATE_BINDING = NAMED_ELEMENT__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT_TARGET__OWNED_TEMPLATE_SIGNATURE = NAMED_ELEMENT__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT_TARGET__NAME = NAMED_ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT_TARGET__QUALIFIED_NAME = NAMED_ELEMENT__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT_TARGET__VISIBILITY = NAMED_ELEMENT__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT_TARGET__CLIENT_DEPENDENCY = NAMED_ELEMENT__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT_TARGET__NAME_EXPRESSION = NAMED_ELEMENT__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Deployment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT_TARGET__DEPLOYMENT = NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Deployed Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT_TARGET__DEPLOYED_ELEMENT = NAMED_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Deployment Target</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEPLOYMENT_TARGET_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__EANNOTATIONS = CLASS__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OWNED_ELEMENT = CLASS__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OWNER = CLASS__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OWNED_COMMENT = CLASS__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__TEMPLATE_BINDING = CLASS__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OWNED_TEMPLATE_SIGNATURE = CLASS__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__NAME = CLASS__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__QUALIFIED_NAME = CLASS__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__VISIBILITY = CLASS__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__CLIENT_DEPENDENCY = CLASS__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__NAME_EXPRESSION = CLASS__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__MEMBER = CLASS__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OWNED_RULE = CLASS__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__IMPORTED_MEMBER = CLASS__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__ELEMENT_IMPORT = CLASS__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__PACKAGE_IMPORT = CLASS__PACKAGE_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__TEMPLATE_PARAMETER = CLASS__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OWNING_PARAMETER = CLASS__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__PACKAGEABLE_ELEMENT_VISIBILITY = CLASS__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Package</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__PACKAGE = CLASS__PACKAGE;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__REDEFINITION_CONTEXT = CLASS__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__IS_LEAF = CLASS__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__FEATURE = CLASS__FEATURE;
+
+	/**
+	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__IS_ABSTRACT = CLASS__IS_ABSTRACT;
+
+	/**
+	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__INHERITED_MEMBER = CLASS__INHERITED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>General</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__GENERAL = CLASS__GENERAL;
+
+	/**
+	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__GENERALIZATION = CLASS__GENERALIZATION;
+
+	/**
+	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__ATTRIBUTE = CLASS__ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__REDEFINED_CLASSIFIER = CLASS__REDEFINED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__POWERTYPE_EXTENT = CLASS__POWERTYPE_EXTENT;
+
+	/**
+	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__SUBSTITUTION = CLASS__SUBSTITUTION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OWNED_USE_CASE = CLASS__OWNED_USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__USE_CASE = CLASS__USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Representation</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__REPRESENTATION = CLASS__REPRESENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OCCURRENCE = CLASS__OCCURRENCE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OWNED_BEHAVIOR = CLASS__OWNED_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Classifier Behavior</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__CLASSIFIER_BEHAVIOR = CLASS__CLASSIFIER_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Implementation</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__IMPLEMENTATION = CLASS__IMPLEMENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OWNED_TRIGGER = CLASS__OWNED_TRIGGER;
+
+	/**
+	 * The feature id for the '<em><b>Owned State Machine</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OWNED_STATE_MACHINE = CLASS__OWNED_STATE_MACHINE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OWNED_ATTRIBUTE = CLASS__OWNED_ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Part</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__PART = CLASS__PART;
+
+	/**
+	 * The feature id for the '<em><b>Role</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__ROLE = CLASS__ROLE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OWNED_CONNECTOR = CLASS__OWNED_CONNECTOR;
+
+	/**
+	 * The feature id for the '<em><b>Owned Port</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OWNED_PORT = CLASS__OWNED_PORT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OWNED_OPERATION = CLASS__OWNED_OPERATION;
+
+	/**
+	 * The feature id for the '<em><b>Super Class</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__SUPER_CLASS = CLASS__SUPER_CLASS;
+
+	/**
+	 * The feature id for the '<em><b>Nested Classifier</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__NESTED_CLASSIFIER = CLASS__NESTED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Extension</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__EXTENSION = CLASS__EXTENSION;
+
+	/**
+	 * The feature id for the '<em><b>Is Active</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__IS_ACTIVE = CLASS__IS_ACTIVE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Reception</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__OWNED_RECEPTION = CLASS__OWNED_RECEPTION;
+
+	/**
+	 * The feature id for the '<em><b>Deployment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__DEPLOYMENT = CLASS_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Deployed Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__DEPLOYED_ELEMENT = CLASS_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Nested Node</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE__NESTED_NODE = CLASS_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the the '<em>Node</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NODE_FEATURE_COUNT = CLASS_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__EANNOTATIONS = NODE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OWNED_ELEMENT = NODE__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OWNER = NODE__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OWNED_COMMENT = NODE__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__TEMPLATE_BINDING = NODE__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OWNED_TEMPLATE_SIGNATURE = NODE__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__NAME = NODE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__QUALIFIED_NAME = NODE__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__VISIBILITY = NODE__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__CLIENT_DEPENDENCY = NODE__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__NAME_EXPRESSION = NODE__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__MEMBER = NODE__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OWNED_RULE = NODE__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__IMPORTED_MEMBER = NODE__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__ELEMENT_IMPORT = NODE__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__PACKAGE_IMPORT = NODE__PACKAGE_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__TEMPLATE_PARAMETER = NODE__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OWNING_PARAMETER = NODE__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__PACKAGEABLE_ELEMENT_VISIBILITY = NODE__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Package</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__PACKAGE = NODE__PACKAGE;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__REDEFINITION_CONTEXT = NODE__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__IS_LEAF = NODE__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__FEATURE = NODE__FEATURE;
+
+	/**
+	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__IS_ABSTRACT = NODE__IS_ABSTRACT;
+
+	/**
+	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__INHERITED_MEMBER = NODE__INHERITED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>General</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__GENERAL = NODE__GENERAL;
+
+	/**
+	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__GENERALIZATION = NODE__GENERALIZATION;
+
+	/**
+	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__ATTRIBUTE = NODE__ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__REDEFINED_CLASSIFIER = NODE__REDEFINED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__POWERTYPE_EXTENT = NODE__POWERTYPE_EXTENT;
+
+	/**
+	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__SUBSTITUTION = NODE__SUBSTITUTION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OWNED_USE_CASE = NODE__OWNED_USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__USE_CASE = NODE__USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Representation</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__REPRESENTATION = NODE__REPRESENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OCCURRENCE = NODE__OCCURRENCE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OWNED_BEHAVIOR = NODE__OWNED_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Classifier Behavior</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__CLASSIFIER_BEHAVIOR = NODE__CLASSIFIER_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Implementation</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__IMPLEMENTATION = NODE__IMPLEMENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OWNED_TRIGGER = NODE__OWNED_TRIGGER;
+
+	/**
+	 * The feature id for the '<em><b>Owned State Machine</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OWNED_STATE_MACHINE = NODE__OWNED_STATE_MACHINE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OWNED_ATTRIBUTE = NODE__OWNED_ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Part</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__PART = NODE__PART;
+
+	/**
+	 * The feature id for the '<em><b>Role</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__ROLE = NODE__ROLE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OWNED_CONNECTOR = NODE__OWNED_CONNECTOR;
+
+	/**
+	 * The feature id for the '<em><b>Owned Port</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OWNED_PORT = NODE__OWNED_PORT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OWNED_OPERATION = NODE__OWNED_OPERATION;
+
+	/**
+	 * The feature id for the '<em><b>Super Class</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__SUPER_CLASS = NODE__SUPER_CLASS;
+
+	/**
+	 * The feature id for the '<em><b>Nested Classifier</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__NESTED_CLASSIFIER = NODE__NESTED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Extension</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__EXTENSION = NODE__EXTENSION;
+
+	/**
+	 * The feature id for the '<em><b>Is Active</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__IS_ACTIVE = NODE__IS_ACTIVE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Reception</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__OWNED_RECEPTION = NODE__OWNED_RECEPTION;
+
+	/**
+	 * The feature id for the '<em><b>Deployment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__DEPLOYMENT = NODE__DEPLOYMENT;
+
+	/**
+	 * The feature id for the '<em><b>Deployed Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__DEPLOYED_ELEMENT = NODE__DEPLOYED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Nested Node</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE__NESTED_NODE = NODE__NESTED_NODE;
+
+	/**
+	 * The number of structural features of the the '<em>Device</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEVICE_FEATURE_COUNT = NODE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__EANNOTATIONS = NODE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OWNED_ELEMENT = NODE__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OWNER = NODE__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OWNED_COMMENT = NODE__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__TEMPLATE_BINDING = NODE__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OWNED_TEMPLATE_SIGNATURE = NODE__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__NAME = NODE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__QUALIFIED_NAME = NODE__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__VISIBILITY = NODE__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__CLIENT_DEPENDENCY = NODE__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__NAME_EXPRESSION = NODE__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__MEMBER = NODE__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OWNED_RULE = NODE__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__IMPORTED_MEMBER = NODE__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__ELEMENT_IMPORT = NODE__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__PACKAGE_IMPORT = NODE__PACKAGE_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__TEMPLATE_PARAMETER = NODE__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OWNING_PARAMETER = NODE__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__PACKAGEABLE_ELEMENT_VISIBILITY = NODE__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Package</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__PACKAGE = NODE__PACKAGE;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__REDEFINITION_CONTEXT = NODE__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__IS_LEAF = NODE__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__FEATURE = NODE__FEATURE;
+
+	/**
+	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__IS_ABSTRACT = NODE__IS_ABSTRACT;
+
+	/**
+	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__INHERITED_MEMBER = NODE__INHERITED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>General</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__GENERAL = NODE__GENERAL;
+
+	/**
+	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__GENERALIZATION = NODE__GENERALIZATION;
+
+	/**
+	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__ATTRIBUTE = NODE__ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__REDEFINED_CLASSIFIER = NODE__REDEFINED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__POWERTYPE_EXTENT = NODE__POWERTYPE_EXTENT;
+
+	/**
+	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__SUBSTITUTION = NODE__SUBSTITUTION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OWNED_USE_CASE = NODE__OWNED_USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__USE_CASE = NODE__USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Representation</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__REPRESENTATION = NODE__REPRESENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OCCURRENCE = NODE__OCCURRENCE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OWNED_BEHAVIOR = NODE__OWNED_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Classifier Behavior</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__CLASSIFIER_BEHAVIOR = NODE__CLASSIFIER_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Implementation</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__IMPLEMENTATION = NODE__IMPLEMENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OWNED_TRIGGER = NODE__OWNED_TRIGGER;
+
+	/**
+	 * The feature id for the '<em><b>Owned State Machine</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OWNED_STATE_MACHINE = NODE__OWNED_STATE_MACHINE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OWNED_ATTRIBUTE = NODE__OWNED_ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Part</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__PART = NODE__PART;
+
+	/**
+	 * The feature id for the '<em><b>Role</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__ROLE = NODE__ROLE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OWNED_CONNECTOR = NODE__OWNED_CONNECTOR;
+
+	/**
+	 * The feature id for the '<em><b>Owned Port</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OWNED_PORT = NODE__OWNED_PORT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OWNED_OPERATION = NODE__OWNED_OPERATION;
+
+	/**
+	 * The feature id for the '<em><b>Super Class</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__SUPER_CLASS = NODE__SUPER_CLASS;
+
+	/**
+	 * The feature id for the '<em><b>Nested Classifier</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__NESTED_CLASSIFIER = NODE__NESTED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Extension</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__EXTENSION = NODE__EXTENSION;
+
+	/**
+	 * The feature id for the '<em><b>Is Active</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__IS_ACTIVE = NODE__IS_ACTIVE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Reception</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__OWNED_RECEPTION = NODE__OWNED_RECEPTION;
+
+	/**
+	 * The feature id for the '<em><b>Deployment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__DEPLOYMENT = NODE__DEPLOYMENT;
+
+	/**
+	 * The feature id for the '<em><b>Deployed Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__DEPLOYED_ELEMENT = NODE__DEPLOYED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Nested Node</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT__NESTED_NODE = NODE__NESTED_NODE;
+
+	/**
+	 * The number of structural features of the the '<em>Execution Environment</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXECUTION_ENVIRONMENT_FEATURE_COUNT = NODE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__EANNOTATIONS = ASSOCIATION__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__OWNED_ELEMENT = ASSOCIATION__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__OWNER = ASSOCIATION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__OWNED_COMMENT = ASSOCIATION__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__TEMPLATE_BINDING = ASSOCIATION__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__OWNED_TEMPLATE_SIGNATURE = ASSOCIATION__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__NAME = ASSOCIATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__QUALIFIED_NAME = ASSOCIATION__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__VISIBILITY = ASSOCIATION__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__CLIENT_DEPENDENCY = ASSOCIATION__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__NAME_EXPRESSION = ASSOCIATION__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__MEMBER = ASSOCIATION__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__OWNED_RULE = ASSOCIATION__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__IMPORTED_MEMBER = ASSOCIATION__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__ELEMENT_IMPORT = ASSOCIATION__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__PACKAGE_IMPORT = ASSOCIATION__PACKAGE_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__TEMPLATE_PARAMETER = ASSOCIATION__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__OWNING_PARAMETER = ASSOCIATION__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__PACKAGEABLE_ELEMENT_VISIBILITY = ASSOCIATION__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Package</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__PACKAGE = ASSOCIATION__PACKAGE;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__REDEFINITION_CONTEXT = ASSOCIATION__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__IS_LEAF = ASSOCIATION__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__FEATURE = ASSOCIATION__FEATURE;
+
+	/**
+	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__IS_ABSTRACT = ASSOCIATION__IS_ABSTRACT;
+
+	/**
+	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__INHERITED_MEMBER = ASSOCIATION__INHERITED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>General</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__GENERAL = ASSOCIATION__GENERAL;
+
+	/**
+	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__GENERALIZATION = ASSOCIATION__GENERALIZATION;
+
+	/**
+	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__ATTRIBUTE = ASSOCIATION__ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__REDEFINED_CLASSIFIER = ASSOCIATION__REDEFINED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__POWERTYPE_EXTENT = ASSOCIATION__POWERTYPE_EXTENT;
+
+	/**
+	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__SUBSTITUTION = ASSOCIATION__SUBSTITUTION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__OWNED_USE_CASE = ASSOCIATION__OWNED_USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__USE_CASE = ASSOCIATION__USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Representation</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__REPRESENTATION = ASSOCIATION__REPRESENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__OCCURRENCE = ASSOCIATION__OCCURRENCE;
+
+	/**
+	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__RELATED_ELEMENT = ASSOCIATION__RELATED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Is Derived</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__IS_DERIVED = ASSOCIATION__IS_DERIVED;
+
+	/**
+	 * The feature id for the '<em><b>Owned End</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__OWNED_END = ASSOCIATION__OWNED_END;
+
+	/**
+	 * The feature id for the '<em><b>End Type</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__END_TYPE = ASSOCIATION__END_TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Member End</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH__MEMBER_END = ASSOCIATION__MEMBER_END;
+
+	/**
+	 * The number of structural features of the the '<em>Communication Path</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COMMUNICATION_PATH_FEATURE_COUNT = ASSOCIATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_CONFORMANCE__EANNOTATIONS = DIRECTED_RELATIONSHIP__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_CONFORMANCE__OWNED_ELEMENT = DIRECTED_RELATIONSHIP__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_CONFORMANCE__OWNER = DIRECTED_RELATIONSHIP__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_CONFORMANCE__OWNED_COMMENT = DIRECTED_RELATIONSHIP__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Related Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_CONFORMANCE__RELATED_ELEMENT = DIRECTED_RELATIONSHIP__RELATED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Source</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_CONFORMANCE__SOURCE = DIRECTED_RELATIONSHIP__SOURCE;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_CONFORMANCE__TARGET = DIRECTED_RELATIONSHIP__TARGET;
+
+	/**
+	 * The feature id for the '<em><b>Specific Machine</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_CONFORMANCE__SPECIFIC_MACHINE = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>General Machine</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_CONFORMANCE__GENERAL_MACHINE = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the the '<em>Protocol Conformance</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_CONFORMANCE_FEATURE_COUNT = DIRECTED_RELATIONSHIP_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__EANNOTATIONS = STATE_MACHINE__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNED_ELEMENT = STATE_MACHINE__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNER = STATE_MACHINE__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNED_COMMENT = STATE_MACHINE__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__TEMPLATE_BINDING = STATE_MACHINE__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE = STATE_MACHINE__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__NAME = STATE_MACHINE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__QUALIFIED_NAME = STATE_MACHINE__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__VISIBILITY = STATE_MACHINE__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__CLIENT_DEPENDENCY = STATE_MACHINE__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__NAME_EXPRESSION = STATE_MACHINE__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__MEMBER = STATE_MACHINE__MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Rule</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNED_RULE = STATE_MACHINE__OWNED_RULE;
+
+	/**
+	 * The feature id for the '<em><b>Imported Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__IMPORTED_MEMBER = STATE_MACHINE__IMPORTED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>Element Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__ELEMENT_IMPORT = STATE_MACHINE__ELEMENT_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Package Import</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__PACKAGE_IMPORT = STATE_MACHINE__PACKAGE_IMPORT;
+
+	/**
+	 * The feature id for the '<em><b>Template Parameter</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__TEMPLATE_PARAMETER = STATE_MACHINE__TEMPLATE_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Owning Parameter</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNING_PARAMETER = STATE_MACHINE__OWNING_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Packageable Element visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__PACKAGEABLE_ELEMENT_VISIBILITY = STATE_MACHINE__PACKAGEABLE_ELEMENT_VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Package</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__PACKAGE = STATE_MACHINE__PACKAGE;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__REDEFINITION_CONTEXT = STATE_MACHINE__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__IS_LEAF = STATE_MACHINE__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__FEATURE = STATE_MACHINE__FEATURE;
+
+	/**
+	 * The feature id for the '<em><b>Is Abstract</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__IS_ABSTRACT = STATE_MACHINE__IS_ABSTRACT;
+
+	/**
+	 * The feature id for the '<em><b>Inherited Member</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__INHERITED_MEMBER = STATE_MACHINE__INHERITED_MEMBER;
+
+	/**
+	 * The feature id for the '<em><b>General</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__GENERAL = STATE_MACHINE__GENERAL;
+
+	/**
+	 * The feature id for the '<em><b>Generalization</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__GENERALIZATION = STATE_MACHINE__GENERALIZATION;
+
+	/**
+	 * The feature id for the '<em><b>Attribute</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__ATTRIBUTE = STATE_MACHINE__ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Classifier</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__REDEFINED_CLASSIFIER = STATE_MACHINE__REDEFINED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Powertype Extent</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__POWERTYPE_EXTENT = STATE_MACHINE__POWERTYPE_EXTENT;
+
+	/**
+	 * The feature id for the '<em><b>Substitution</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__SUBSTITUTION = STATE_MACHINE__SUBSTITUTION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Use Case</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNED_USE_CASE = STATE_MACHINE__OWNED_USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Use Case</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__USE_CASE = STATE_MACHINE__USE_CASE;
+
+	/**
+	 * The feature id for the '<em><b>Representation</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__REPRESENTATION = STATE_MACHINE__REPRESENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Occurrence</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OCCURRENCE = STATE_MACHINE__OCCURRENCE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Behavior</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNED_BEHAVIOR = STATE_MACHINE__OWNED_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Classifier Behavior</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__CLASSIFIER_BEHAVIOR = STATE_MACHINE__CLASSIFIER_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Implementation</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__IMPLEMENTATION = STATE_MACHINE__IMPLEMENTATION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Trigger</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNED_TRIGGER = STATE_MACHINE__OWNED_TRIGGER;
+
+	/**
+	 * The feature id for the '<em><b>Owned State Machine</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNED_STATE_MACHINE = STATE_MACHINE__OWNED_STATE_MACHINE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Attribute</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNED_ATTRIBUTE = STATE_MACHINE__OWNED_ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Part</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__PART = STATE_MACHINE__PART;
+
+	/**
+	 * The feature id for the '<em><b>Role</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__ROLE = STATE_MACHINE__ROLE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Connector</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNED_CONNECTOR = STATE_MACHINE__OWNED_CONNECTOR;
+
+	/**
+	 * The feature id for the '<em><b>Owned Port</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNED_PORT = STATE_MACHINE__OWNED_PORT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Operation</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNED_OPERATION = STATE_MACHINE__OWNED_OPERATION;
+
+	/**
+	 * The feature id for the '<em><b>Super Class</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__SUPER_CLASS = STATE_MACHINE__SUPER_CLASS;
+
+	/**
+	 * The feature id for the '<em><b>Nested Classifier</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__NESTED_CLASSIFIER = STATE_MACHINE__NESTED_CLASSIFIER;
+
+	/**
+	 * The feature id for the '<em><b>Extension</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__EXTENSION = STATE_MACHINE__EXTENSION;
+
+	/**
+	 * The feature id for the '<em><b>Is Active</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__IS_ACTIVE = STATE_MACHINE__IS_ACTIVE;
+
+	/**
+	 * The feature id for the '<em><b>Owned Reception</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNED_RECEPTION = STATE_MACHINE__OWNED_RECEPTION;
+
+	/**
+	 * The feature id for the '<em><b>Is Reentrant</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__IS_REENTRANT = STATE_MACHINE__IS_REENTRANT;
+
+	/**
+	 * The feature id for the '<em><b>Context</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__CONTEXT = STATE_MACHINE__CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Behavior</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__REDEFINED_BEHAVIOR = STATE_MACHINE__REDEFINED_BEHAVIOR;
+
+	/**
+	 * The feature id for the '<em><b>Specification</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__SPECIFICATION = STATE_MACHINE__SPECIFICATION;
+
+	/**
+	 * The feature id for the '<em><b>Parameter</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__PARAMETER = STATE_MACHINE__PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Formal Parameter</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__FORMAL_PARAMETER = STATE_MACHINE__FORMAL_PARAMETER;
+
+	/**
+	 * The feature id for the '<em><b>Return Result</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__RETURN_RESULT = STATE_MACHINE__RETURN_RESULT;
+
+	/**
+	 * The feature id for the '<em><b>Precondition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__PRECONDITION = STATE_MACHINE__PRECONDITION;
+
+	/**
+	 * The feature id for the '<em><b>Postcondition</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__POSTCONDITION = STATE_MACHINE__POSTCONDITION;
+
+	/**
+	 * The feature id for the '<em><b>Owned Parameter Set</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__OWNED_PARAMETER_SET = STATE_MACHINE__OWNED_PARAMETER_SET;
+
+	/**
+	 * The feature id for the '<em><b>Region</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__REGION = STATE_MACHINE__REGION;
+
+	/**
+	 * The feature id for the '<em><b>Connection Point</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__CONNECTION_POINT = STATE_MACHINE__CONNECTION_POINT;
+
+	/**
+	 * The feature id for the '<em><b>Extended State Machine</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__EXTENDED_STATE_MACHINE = STATE_MACHINE__EXTENDED_STATE_MACHINE;
+
+	/**
+	 * The feature id for the '<em><b>State Machine redefinition Context</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__STATE_MACHINE_REDEFINITION_CONTEXT = STATE_MACHINE__STATE_MACHINE_REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Conformance</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE__CONFORMANCE = STATE_MACHINE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the the '<em>Protocol State Machine</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_STATE_MACHINE_FEATURE_COUNT = STATE_MACHINE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__EANNOTATIONS = TRANSITION__EANNOTATIONS;
+
+	/**
+	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__OWNED_ELEMENT = TRANSITION__OWNED_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__OWNER = TRANSITION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Owned Comment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__OWNED_COMMENT = TRANSITION__OWNED_COMMENT;
+
+	/**
+	 * The feature id for the '<em><b>Template Binding</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__TEMPLATE_BINDING = TRANSITION__TEMPLATE_BINDING;
+
+	/**
+	 * The feature id for the '<em><b>Owned Template Signature</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__OWNED_TEMPLATE_SIGNATURE = TRANSITION__OWNED_TEMPLATE_SIGNATURE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__NAME = TRANSITION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Qualified Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__QUALIFIED_NAME = TRANSITION__QUALIFIED_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__VISIBILITY = TRANSITION__VISIBILITY;
+
+	/**
+	 * The feature id for the '<em><b>Client Dependency</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__CLIENT_DEPENDENCY = TRANSITION__CLIENT_DEPENDENCY;
+
+	/**
+	 * The feature id for the '<em><b>Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__NAME_EXPRESSION = TRANSITION__NAME_EXPRESSION;
+
+	/**
+	 * The feature id for the '<em><b>Redefinition Context</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__REDEFINITION_CONTEXT = TRANSITION__REDEFINITION_CONTEXT;
+
+	/**
+	 * The feature id for the '<em><b>Is Leaf</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__IS_LEAF = TRANSITION__IS_LEAF;
+
+	/**
+	 * The feature id for the '<em><b>Kind</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__KIND = TRANSITION__KIND;
+
+	/**
+	 * The feature id for the '<em><b>Container</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__CONTAINER = TRANSITION__CONTAINER;
+
+	/**
+	 * The feature id for the '<em><b>Source</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__SOURCE = TRANSITION__SOURCE;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__TARGET = TRANSITION__TARGET;
+
+	/**
+	 * The feature id for the '<em><b>Redefined Transition</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__REDEFINED_TRANSITION = TRANSITION__REDEFINED_TRANSITION;
+
+	/**
+	 * The feature id for the '<em><b>Trigger</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__TRIGGER = TRANSITION__TRIGGER;
+
+	/**
+	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__GUARD = TRANSITION__GUARD;
+
+	/**
+	 * The feature id for the '<em><b>Effect</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__EFFECT = TRANSITION__EFFECT;
+
+	/**
+	 * The feature id for the '<em><b>Post Condition</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__POST_CONDITION = TRANSITION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Referred</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__REFERRED = TRANSITION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Pre Condition</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION__PRE_CONDITION = TRANSITION_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the the '<em>Protocol Transition</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTOCOL_TRANSITION_FEATURE_COUNT = TRANSITION_FEATURE_COUNT + 3;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.impl.DeploymentSpecificationImpl <em>Deployment Specification</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -54987,7 +54987,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getCallConcurrencyKind()
 	 * @generated
 	 */
-	int CALL_CONCURRENCY_KIND = 232;
+	int CALL_CONCURRENCY_KIND = 230;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.ExpansionKind <em>Expansion Kind</em>}' enum.
@@ -54997,7 +54997,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getExpansionKind()
 	 * @generated
 	 */
-	int EXPANSION_KIND = 233;
+	int EXPANSION_KIND = 235;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.MessageKind <em>Message Kind</em>}' enum.
@@ -55007,7 +55007,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getMessageKind()
 	 * @generated
 	 */
-	int MESSAGE_KIND = 230;
+	int MESSAGE_KIND = 231;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.MessageSort <em>Message Sort</em>}' enum.
@@ -55017,7 +55017,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getMessageSort()
 	 * @generated
 	 */
-	int MESSAGE_SORT = 231;
+	int MESSAGE_SORT = 232;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.TransitionKind <em>Transition Kind</em>}' enum.
@@ -55027,7 +55027,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getTransitionKind()
 	 * @generated
 	 */
-	int TRANSITION_KIND = 234;
+	int TRANSITION_KIND = 233;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.PseudostateKind <em>Pseudostate Kind</em>}' enum.
@@ -55037,7 +55037,7 @@
 	 * @see org.eclipse.uml2.impl.UML2PackageImpl#getPseudostateKind()
 	 * @generated
 	 */
-	int PSEUDOSTATE_KIND = 235;
+	int PSEUDOSTATE_KIND = 234;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.uml2.ObjectNodeOrderingKind <em>Object Node Ordering Kind</em>}' enum.
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Usage.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Usage.java
index 9dd63b8..408fcfb 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Usage.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Usage.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Usage.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: Usage.java,v 1.3 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Usage</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A usage is a relationship in which one element requires another element (or set of elements) for its full implementation or operation. In the metamodel, a Usage is a Dependency in which the client requires the presence of the supplier. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getUsage()
  * @model 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UseCase.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UseCase.java
index 02fa09b..45e1e6a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UseCase.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/UseCase.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: UseCase.java,v 1.4 2004/05/20 03:20:04 khussey Exp $
+ * $Id: UseCase.java,v 1.5 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -21,6 +21,10 @@
  * A representation of the model object '<em><b>Use Case</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A UseCase is a kind of behaviored classifier that represents a declaration of an offered behavior. Each use case specifies some behavior, possibly including variants, that the subject can perform in collaboration with one or more actors. Use cases define the offered behavior of the subject without reference to its internal structure. These behaviors, involving interactions between the actor and the subject, may result in changes to the state of the subject and communications with its environment. A use case can include possible variations of its basic behavior, including exceptional behavior and error handling. The subject of a use case could be a physical system or any other element that may have behavior, such as a component, subsystem or class. Each use case specifies a unit of useful functionality that the subject provides to its users, i.e., a specific way of interacting with the subject. This functionality, which is initiated by an actor, must always be completed for the use case to complete. It is deemed complete if, after its execution, the subject will be in a state in which no further inputs or actions are expected and the use case can be initiated again or in an error state. Use cases can be used both for specification of the (external) requirements on a subject and for the specification of the functionality offered by a subject. Moreover, the use cases also state the requirements the specified subject poses on its environment by defining how they should interact with the subject so that it will be able to perform its services. The behavior of a use case can be described by a specification that is some kind of Behavior (through its ownedBehavior relationship), such as interactions, activities, and state machines, or by pre-conditions and post-conditions as well as by natural language text where appropriate. It may also be described indirectly through a Collaboration that uses the use case and its actors as the classifiers that type its parts. Which of these techniques to use depends on the nature of the use case behavior as well as on the intended reader. These descriptions can be combined. An example of a use case with an associated state machine description is shown in Figure 405. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ValueSpecification.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ValueSpecification.java
index 069bd2d..fb7725a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ValueSpecification.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/ValueSpecification.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ValueSpecification.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: ValueSpecification.java,v 1.3 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Value Specification</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * ValueSpecification is an abstract metaclass used to identify a value or values in a model. It may reference an instance or it may be an expression denoting an instance or instances when evaluated. 
+ * <!-- end-model-doc -->
+ *
  *
  * @see org.eclipse.uml2.UML2Package#getValueSpecification()
  * @model abstract="true"
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Variable.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Variable.java
index c0a9cd6..203abb6 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Variable.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/Variable.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: Variable.java,v 1.3 2004/05/20 03:20:04 khussey Exp $
+ * $Id: Variable.java,v 1.4 2004/06/03 02:59:17 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -18,6 +18,10 @@
  * A representation of the model object '<em><b>Variable</b></em>'.
  * <!-- end-user-doc -->
  *
+ * <!-- begin-model-doc -->
+ * A variable is considered a connectable element. 
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
@@ -29,7 +33,7 @@
  * @model 
  * @generated
  */
-public interface Variable extends ConnectableElement, TypedElement, MultiplicityElement {
+public interface Variable extends ConnectableElement, TypedElement, MultiplicityElement{
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/VisibilityKind.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/VisibilityKind.java
index 261f8fa..fe5c777 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/VisibilityKind.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/VisibilityKind.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: VisibilityKind.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: VisibilityKind.java,v 1.3 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2;
 
@@ -23,6 +23,9 @@
  * A representation of the literals of the enumeration '<em><b>Visibility Kind</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * VisibilityKind is an enumeration of the following literal values: • public • private • protected • package 
+ * <!-- end-model-doc -->
  * @see org.eclipse.uml2.UML2Package#getVisibilityKind()
  * @model
  * @generated
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ElementImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ElementImpl.java
index d3ae600..e580887 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ElementImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ElementImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ElementImpl.java,v 1.14 2004/06/02 19:52:53 khussey Exp $
+ * $Id: ElementImpl.java,v 1.15 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2.impl;
 
@@ -391,7 +391,7 @@
 			GET_APPLICABLE_STEREOTYPES_METHOD = ElementImpl.class.getMethod(
 				"getApplicableStereotypes", null); //$NON-NLS-1$
 		} catch (Exception e) {
-			// do nothing
+			// ignore
 		}
 	}
 	
@@ -431,7 +431,7 @@
 			GET_APPLIED_STEREOTYPES_METHOD = ElementImpl.class.getMethod(
 				"getAppliedStereotypes", null); //$NON-NLS-1$
 		} catch (Exception e) {
-			// do nothing
+			// ignore
 		}
 	}
 	
@@ -554,7 +554,7 @@
 			GET_KEYWORDS_METHOD = ElementImpl.class.getMethod(
 				"getKeywords", null); //$NON-NLS-1$
 		} catch (Exception e) {
-			// do nothing
+			// ignore
 		}
 	}
 	
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/NamespaceImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/NamespaceImpl.java
index d268930..be79a60 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/NamespaceImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/NamespaceImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: NamespaceImpl.java,v 1.11 2004/06/02 19:52:53 khussey Exp $
+ * $Id: NamespaceImpl.java,v 1.12 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2.impl;
 
@@ -661,7 +661,7 @@
 			GET_IMPORTED_PACKAGES_METHOD = NamespaceImpl.class.getMethod(
 				"getImportedPackages", null); //$NON-NLS-1$
 		} catch (Exception e) {
-			// do nothing
+			// ignore
 		}
 	}
 	
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PackageImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PackageImpl.java
index 60c5bd9..90d57ff 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PackageImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/PackageImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: PackageImpl.java,v 1.14 2004/06/02 19:52:53 khussey Exp $
+ * $Id: PackageImpl.java,v 1.15 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2.impl;
 
@@ -1099,7 +1099,7 @@
 			GET_ALL_APPLIED_PROFILES_METHOD = PackageImpl.class.getMethod(
 				"getAllAppliedProfiles", null); //$NON-NLS-1$
 		} catch (Exception e) {
-			// do nothing
+			// ignore
 		}
 	}
 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ProfileImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ProfileImpl.java
index a7b739b..2c060ea 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ProfileImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/ProfileImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ProfileImpl.java,v 1.9 2004/06/02 19:52:53 khussey Exp $
+ * $Id: ProfileImpl.java,v 1.10 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2.impl;
 
@@ -622,7 +622,7 @@
 			GET_REFERENCED_METACLASSES_METHOD = ProfileImpl.class.getMethod(
 				"getReferencedMetaclasses", null); //$NON-NLS-1$
 		} catch (Exception e) {
-			// do nothing
+			// ignore
 		}
 	}
 
@@ -652,7 +652,7 @@
 			GET_REFERENCED_METAMODELS_METHOD = ProfileImpl.class.getMethod(
 				"getReferencedMetamodels", null); //$NON-NLS-1$
 		} catch (Exception e) {
-			// do nothing
+			// ignore
 		}
 	}
 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/StereotypeImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/StereotypeImpl.java
index 8b02ed7..80754b2 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/StereotypeImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/StereotypeImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StereotypeImpl.java,v 1.17 2004/06/02 19:52:53 khussey Exp $
+ * $Id: StereotypeImpl.java,v 1.18 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2.impl;
 
@@ -712,7 +712,7 @@
 			GET_ALL_EXTENDED_E_CLASSES_METHOD = StereotypeImpl.class.getMethod(
 				"getAllExtendedEClasses", null); //$NON-NLS-1$
 		} catch (Exception e) {
-			// do nothing
+			// ignore
 		}
 	}
 
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/StructuredActivityNodeImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/StructuredActivityNodeImpl.java
index 7e92d8d..8831016 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/StructuredActivityNodeImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/StructuredActivityNodeImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StructuredActivityNodeImpl.java,v 1.11 2004/06/02 19:52:53 khussey Exp $
+ * $Id: StructuredActivityNodeImpl.java,v 1.12 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2.impl;
 
@@ -1327,7 +1327,7 @@
 			GET_IMPORTED_PACKAGES_METHOD = StructuredActivityNodeImpl.class
 				.getMethod("getImportedPackages", null); //$NON-NLS-1$
 		} catch (Exception e) {
-			// do nothing
+			// ignore
 		}
 	}
 	
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/UML2FactoryImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/UML2FactoryImpl.java
index 80ee8e7..2eadea6 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/UML2FactoryImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/UML2FactoryImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: UML2FactoryImpl.java,v 1.11 2004/06/02 05:02:25 khussey Exp $
+ * $Id: UML2FactoryImpl.java,v 1.12 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2.impl;
 
@@ -262,10 +262,10 @@
 			case UML2Package.LITERAL_INTEGER: return createLiteralInteger();
 			case UML2Package.LITERAL_UNLIMITED_NATURAL: return createLiteralUnlimitedNatural();
 			case UML2Package.CONSTRAINT: return createConstraint();
-			case UML2Package.GENERALIZATION: return createGeneralization();
 			case UML2Package.INSTANCE_SPECIFICATION: return createInstanceSpecification();
 			case UML2Package.SLOT: return createSlot();
 			case UML2Package.INSTANCE_VALUE: return createInstanceValue();
+			case UML2Package.GENERALIZATION: return createGeneralization();
 			case UML2Package.ELEMENT_IMPORT: return createElementImport();
 			case UML2Package.PACKAGE_IMPORT: return createPackageImport();
 			case UML2Package.ASSOCIATION: return createAssociation();
@@ -289,6 +289,15 @@
 			case UML2Package.SUBSTITUTION: return createSubstitution();
 			case UML2Package.CONNECTOR_END: return createConnectorEnd();
 			case UML2Package.CONNECTOR: return createConnector();
+			case UML2Package.INTERFACE: return createInterface();
+			case UML2Package.IMPLEMENTATION: return createImplementation();
+			case UML2Package.ARTIFACT: return createArtifact();
+			case UML2Package.MANIFESTATION: return createManifestation();
+			case UML2Package.ACTOR: return createActor();
+			case UML2Package.EXTEND: return createExtend();
+			case UML2Package.USE_CASE: return createUseCase();
+			case UML2Package.EXTENSION_POINT: return createExtensionPoint();
+			case UML2Package.INCLUDE: return createInclude();
 			case UML2Package.ACTION: return createAction();
 			case UML2Package.CONTROL_FLOW: return createControlFlow();
 			case UML2Package.OBJECT_FLOW: return createObjectFlow();
@@ -300,27 +309,30 @@
 			case UML2Package.INPUT_PIN: return createInputPin();
 			case UML2Package.ACTIVITY_PARAMETER_NODE: return createActivityParameterNode();
 			case UML2Package.VALUE_PIN: return createValuePin();
-			case UML2Package.ARTIFACT: return createArtifact();
-			case UML2Package.MANIFESTATION: return createManifestation();
-			case UML2Package.INTERFACE: return createInterface();
-			case UML2Package.IMPLEMENTATION: return createImplementation();
-			case UML2Package.ACTOR: return createActor();
-			case UML2Package.EXTEND: return createExtend();
-			case UML2Package.USE_CASE: return createUseCase();
-			case UML2Package.EXTENSION_POINT: return createExtensionPoint();
-			case UML2Package.INCLUDE: return createInclude();
+			case UML2Package.CALL_TRIGGER: return createCallTrigger();
+			case UML2Package.CHANGE_TRIGGER: return createChangeTrigger();
+			case UML2Package.RECEPTION: return createReception();
+			case UML2Package.SIGNAL: return createSignal();
+			case UML2Package.SIGNAL_TRIGGER: return createSignalTrigger();
+			case UML2Package.TIME_TRIGGER: return createTimeTrigger();
+			case UML2Package.ANY_TRIGGER: return createAnyTrigger();
+			case UML2Package.COLLABORATION_OCCURRENCE: return createCollaborationOccurrence();
+			case UML2Package.COLLABORATION: return createCollaboration();
+			case UML2Package.PORT: return createPort();
+			case UML2Package.VARIABLE: return createVariable();
+			case UML2Package.STRUCTURED_ACTIVITY_NODE: return createStructuredActivityNode();
+			case UML2Package.CONDITIONAL_NODE: return createConditionalNode();
+			case UML2Package.CLAUSE: return createClause();
+			case UML2Package.LOOP_NODE: return createLoopNode();
 			case UML2Package.TEMPLATE_SIGNATURE: return createTemplateSignature();
 			case UML2Package.TEMPLATE_PARAMETER: return createTemplateParameter();
 			case UML2Package.STRING_EXPRESSION: return createStringExpression();
 			case UML2Package.TEMPLATE_BINDING: return createTemplateBinding();
 			case UML2Package.TEMPLATE_PARAMETER_SUBSTITUTION: return createTemplateParameterSubstitution();
-			case UML2Package.COLLABORATION: return createCollaboration();
 			case UML2Package.OPERATION_TEMPLATE_PARAMETER: return createOperationTemplateParameter();
 			case UML2Package.CLASSIFIER_TEMPLATE_PARAMETER: return createClassifierTemplateParameter();
 			case UML2Package.REDEFINABLE_TEMPLATE_SIGNATURE: return createRedefinableTemplateSignature();
 			case UML2Package.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER: return createConnectableElementTemplateParameter();
-			case UML2Package.COLLABORATION_OCCURRENCE: return createCollaborationOccurrence();
-			case UML2Package.PORT: return createPort();
 			case UML2Package.INTERACTION: return createInteraction();
 			case UML2Package.LIFELINE: return createLifeline();
 			case UML2Package.MESSAGE: return createMessage();
@@ -329,26 +341,13 @@
 			case UML2Package.EXECUTION_OCCURRENCE: return createExecutionOccurrence();
 			case UML2Package.STATE_INVARIANT: return createStateInvariant();
 			case UML2Package.STOP: return createStop();
-			case UML2Package.VARIABLE: return createVariable();
-			case UML2Package.STRUCTURED_ACTIVITY_NODE: return createStructuredActivityNode();
-			case UML2Package.CONDITIONAL_NODE: return createConditionalNode();
-			case UML2Package.CLAUSE: return createClause();
-			case UML2Package.LOOP_NODE: return createLoopNode();
-			case UML2Package.CALL_TRIGGER: return createCallTrigger();
-			case UML2Package.CHANGE_TRIGGER: return createChangeTrigger();
-			case UML2Package.RECEPTION: return createReception();
-			case UML2Package.SIGNAL: return createSignal();
-			case UML2Package.SIGNAL_TRIGGER: return createSignalTrigger();
-			case UML2Package.TIME_TRIGGER: return createTimeTrigger();
-			case UML2Package.ANY_TRIGGER: return createAnyTrigger();
-			case UML2Package.EXPANSION_NODE: return createExpansionNode();
-			case UML2Package.EXPANSION_REGION: return createExpansionRegion();
-			case UML2Package.EXCEPTION_HANDLER: return createExceptionHandler();
-			case UML2Package.FORK_NODE: return createForkNode();
-			case UML2Package.JOIN_NODE: return createJoinNode();
-			case UML2Package.FLOW_FINAL_NODE: return createFlowFinalNode();
-			case UML2Package.CENTRAL_BUFFER_NODE: return createCentralBufferNode();
-			case UML2Package.ACTIVITY_PARTITION: return createActivityPartition();
+			case UML2Package.STATE_MACHINE: return createStateMachine();
+			case UML2Package.REGION: return createRegion();
+			case UML2Package.PSEUDOSTATE: return createPseudostate();
+			case UML2Package.STATE: return createState();
+			case UML2Package.CONNECTION_POINT_REFERENCE: return createConnectionPointReference();
+			case UML2Package.TRANSITION: return createTransition();
+			case UML2Package.FINAL_STATE: return createFinalState();
 			case UML2Package.CREATE_OBJECT_ACTION: return createCreateObjectAction();
 			case UML2Package.DESTROY_OBJECT_ACTION: return createDestroyObjectAction();
 			case UML2Package.TEST_IDENTITY_ACTION: return createTestIdentityAction();
@@ -374,13 +373,14 @@
 			case UML2Package.SEND_OBJECT_ACTION: return createSendObjectAction();
 			case UML2Package.CALL_OPERATION_ACTION: return createCallOperationAction();
 			case UML2Package.CALL_BEHAVIOR_ACTION: return createCallBehaviorAction();
-			case UML2Package.STATE_MACHINE: return createStateMachine();
-			case UML2Package.REGION: return createRegion();
-			case UML2Package.PSEUDOSTATE: return createPseudostate();
-			case UML2Package.STATE: return createState();
-			case UML2Package.CONNECTION_POINT_REFERENCE: return createConnectionPointReference();
-			case UML2Package.TRANSITION: return createTransition();
-			case UML2Package.FINAL_STATE: return createFinalState();
+			case UML2Package.FORK_NODE: return createForkNode();
+			case UML2Package.JOIN_NODE: return createJoinNode();
+			case UML2Package.FLOW_FINAL_NODE: return createFlowFinalNode();
+			case UML2Package.CENTRAL_BUFFER_NODE: return createCentralBufferNode();
+			case UML2Package.ACTIVITY_PARTITION: return createActivityPartition();
+			case UML2Package.EXPANSION_NODE: return createExpansionNode();
+			case UML2Package.EXPANSION_REGION: return createExpansionRegion();
+			case UML2Package.EXCEPTION_HANDLER: return createExceptionHandler();
 			case UML2Package.INTERACTION_OCCURRENCE: return createInteractionOccurrence();
 			case UML2Package.GATE: return createGate();
 			case UML2Package.PART_DECOMPOSITION: return createPartDecomposition();
@@ -389,27 +389,6 @@
 			case UML2Package.COMBINED_FRAGMENT: return createCombinedFragment();
 			case UML2Package.CONTINUATION: return createContinuation();
 			case UML2Package.COMPONENT: return createComponent();
-			case UML2Package.PROTOCOL_CONFORMANCE: return createProtocolConformance();
-			case UML2Package.PROTOCOL_STATE_MACHINE: return createProtocolStateMachine();
-			case UML2Package.PROTOCOL_TRANSITION: return createProtocolTransition();
-			case UML2Package.TIME_EXPRESSION: return createTimeExpression();
-			case UML2Package.DURATION: return createDuration();
-			case UML2Package.TIME_OBSERVATION_ACTION: return createTimeObservationAction();
-			case UML2Package.DURATION_INTERVAL: return createDurationInterval();
-			case UML2Package.INTERVAL: return createInterval();
-			case UML2Package.TIME_CONSTRAINT: return createTimeConstraint();
-			case UML2Package.INTERVAL_CONSTRAINT: return createIntervalConstraint();
-			case UML2Package.TIME_INTERVAL: return createTimeInterval();
-			case UML2Package.DURATION_OBSERVATION_ACTION: return createDurationObservationAction();
-			case UML2Package.DURATION_CONSTRAINT: return createDurationConstraint();
-			case UML2Package.DATA_STORE_NODE: return createDataStoreNode();
-			case UML2Package.INTERRUPTIBLE_ACTIVITY_REGION: return createInterruptibleActivityRegion();
-			case UML2Package.PARAMETER_SET: return createParameterSet();
-			case UML2Package.DEPLOYMENT: return createDeployment();
-			case UML2Package.NODE: return createNode();
-			case UML2Package.DEVICE: return createDevice();
-			case UML2Package.EXECUTION_ENVIRONMENT: return createExecutionEnvironment();
-			case UML2Package.COMMUNICATION_PATH: return createCommunicationPath();
 			case UML2Package.READ_EXTENT_ACTION: return createReadExtentAction();
 			case UML2Package.RECLASSIFY_OBJECT_ACTION: return createReclassifyObjectAction();
 			case UML2Package.READ_IS_CLASSIFIED_OBJECT_ACTION: return createReadIsClassifiedObjectAction();
@@ -422,6 +401,27 @@
 			case UML2Package.ACCEPT_CALL_ACTION: return createAcceptCallAction();
 			case UML2Package.REPLY_ACTION: return createReplyAction();
 			case UML2Package.RAISE_EXCEPTION_ACTION: return createRaiseExceptionAction();
+			case UML2Package.DATA_STORE_NODE: return createDataStoreNode();
+			case UML2Package.INTERRUPTIBLE_ACTIVITY_REGION: return createInterruptibleActivityRegion();
+			case UML2Package.PARAMETER_SET: return createParameterSet();
+			case UML2Package.TIME_EXPRESSION: return createTimeExpression();
+			case UML2Package.DURATION: return createDuration();
+			case UML2Package.TIME_OBSERVATION_ACTION: return createTimeObservationAction();
+			case UML2Package.DURATION_INTERVAL: return createDurationInterval();
+			case UML2Package.INTERVAL: return createInterval();
+			case UML2Package.TIME_CONSTRAINT: return createTimeConstraint();
+			case UML2Package.INTERVAL_CONSTRAINT: return createIntervalConstraint();
+			case UML2Package.TIME_INTERVAL: return createTimeInterval();
+			case UML2Package.DURATION_OBSERVATION_ACTION: return createDurationObservationAction();
+			case UML2Package.DURATION_CONSTRAINT: return createDurationConstraint();
+			case UML2Package.DEPLOYMENT: return createDeployment();
+			case UML2Package.NODE: return createNode();
+			case UML2Package.DEVICE: return createDevice();
+			case UML2Package.EXECUTION_ENVIRONMENT: return createExecutionEnvironment();
+			case UML2Package.COMMUNICATION_PATH: return createCommunicationPath();
+			case UML2Package.PROTOCOL_CONFORMANCE: return createProtocolConformance();
+			case UML2Package.PROTOCOL_STATE_MACHINE: return createProtocolStateMachine();
+			case UML2Package.PROTOCOL_TRANSITION: return createProtocolTransition();
 			case UML2Package.DEPLOYMENT_SPECIFICATION: return createDeploymentSpecification();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -450,6 +450,11 @@
 				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 				return result;
 			}
+			case UML2Package.CALL_CONCURRENCY_KIND: {
+				CallConcurrencyKind result = CallConcurrencyKind.get(initialValue);
+				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				return result;
+			}
 			case UML2Package.MESSAGE_KIND: {
 				MessageKind result = MessageKind.get(initialValue);
 				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -460,16 +465,6 @@
 				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 				return result;
 			}
-			case UML2Package.CALL_CONCURRENCY_KIND: {
-				CallConcurrencyKind result = CallConcurrencyKind.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				return result;
-			}
-			case UML2Package.EXPANSION_KIND: {
-				ExpansionKind result = ExpansionKind.get(initialValue);
-				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				return result;
-			}
 			case UML2Package.TRANSITION_KIND: {
 				TransitionKind result = TransitionKind.get(initialValue);
 				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -480,6 +475,11 @@
 				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 				return result;
 			}
+			case UML2Package.EXPANSION_KIND: {
+				ExpansionKind result = ExpansionKind.get(initialValue);
+				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				return result;
+			}
 			case UML2Package.INTERACTION_OPERATOR: {
 				InteractionOperator result = InteractionOperator.get(initialValue);
 				if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -530,18 +530,18 @@
 				return instanceValue == null ? null : instanceValue.toString();
 			case UML2Package.AGGREGATION_KIND:
 				return instanceValue == null ? null : instanceValue.toString();
+			case UML2Package.CALL_CONCURRENCY_KIND:
+				return instanceValue == null ? null : instanceValue.toString();
 			case UML2Package.MESSAGE_KIND:
 				return instanceValue == null ? null : instanceValue.toString();
 			case UML2Package.MESSAGE_SORT:
 				return instanceValue == null ? null : instanceValue.toString();
-			case UML2Package.CALL_CONCURRENCY_KIND:
-				return instanceValue == null ? null : instanceValue.toString();
-			case UML2Package.EXPANSION_KIND:
-				return instanceValue == null ? null : instanceValue.toString();
 			case UML2Package.TRANSITION_KIND:
 				return instanceValue == null ? null : instanceValue.toString();
 			case UML2Package.PSEUDOSTATE_KIND:
 				return instanceValue == null ? null : instanceValue.toString();
+			case UML2Package.EXPANSION_KIND:
+				return instanceValue == null ? null : instanceValue.toString();
 			case UML2Package.INTERACTION_OPERATOR:
 				return instanceValue == null ? null : instanceValue.toString();
 			case UML2Package.CONNECTOR_KIND:
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/UML2PackageImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/UML2PackageImpl.java
index 5e3460a..209c00a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/UML2PackageImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/UML2PackageImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: UML2PackageImpl.java,v 1.11 2004/06/02 05:02:26 khussey Exp $
+ * $Id: UML2PackageImpl.java,v 1.12 2004/06/03 02:59:18 khussey Exp $
  */
 package org.eclipse.uml2.impl;
 
@@ -9086,6 +9086,20 @@
 		createEReference(multiplicityElementEClass, MULTIPLICITY_ELEMENT__UPPER_VALUE);
 		createEReference(multiplicityElementEClass, MULTIPLICITY_ELEMENT__LOWER_VALUE);
 
+		namedElementEClass = createEClass(NAMED_ELEMENT);
+		createEAttribute(namedElementEClass, NAMED_ELEMENT__NAME);
+		createEAttribute(namedElementEClass, NAMED_ELEMENT__QUALIFIED_NAME);
+		createEAttribute(namedElementEClass, NAMED_ELEMENT__VISIBILITY);
+		createEReference(namedElementEClass, NAMED_ELEMENT__CLIENT_DEPENDENCY);
+		createEReference(namedElementEClass, NAMED_ELEMENT__NAME_EXPRESSION);
+
+		namespaceEClass = createEClass(NAMESPACE);
+		createEReference(namespaceEClass, NAMESPACE__MEMBER);
+		createEReference(namespaceEClass, NAMESPACE__OWNED_RULE);
+		createEReference(namespaceEClass, NAMESPACE__IMPORTED_MEMBER);
+		createEReference(namespaceEClass, NAMESPACE__ELEMENT_IMPORT);
+		createEReference(namespaceEClass, NAMESPACE__PACKAGE_IMPORT);
+
 		directedRelationshipEClass = createEClass(DIRECTED_RELATIONSHIP);
 		createEReference(directedRelationshipEClass, DIRECTED_RELATIONSHIP__SOURCE);
 		createEReference(directedRelationshipEClass, DIRECTED_RELATIONSHIP__TARGET);
@@ -9110,20 +9124,6 @@
 		createEReference(commentEClass, COMMENT__ANNOTATED_ELEMENT);
 		createEReference(commentEClass, COMMENT__BODY_EXPRESSION);
 
-		namedElementEClass = createEClass(NAMED_ELEMENT);
-		createEAttribute(namedElementEClass, NAMED_ELEMENT__NAME);
-		createEAttribute(namedElementEClass, NAMED_ELEMENT__QUALIFIED_NAME);
-		createEAttribute(namedElementEClass, NAMED_ELEMENT__VISIBILITY);
-		createEReference(namedElementEClass, NAMED_ELEMENT__CLIENT_DEPENDENCY);
-		createEReference(namedElementEClass, NAMED_ELEMENT__NAME_EXPRESSION);
-
-		namespaceEClass = createEClass(NAMESPACE);
-		createEReference(namespaceEClass, NAMESPACE__MEMBER);
-		createEReference(namespaceEClass, NAMESPACE__OWNED_RULE);
-		createEReference(namespaceEClass, NAMESPACE__IMPORTED_MEMBER);
-		createEReference(namespaceEClass, NAMESPACE__ELEMENT_IMPORT);
-		createEReference(namespaceEClass, NAMESPACE__PACKAGE_IMPORT);
-
 		classEClass = createEClass(CLASS);
 		createEReference(classEClass, CLASS__OWNED_OPERATION);
 		createEReference(classEClass, CLASS__SUPER_CLASS);
@@ -9253,12 +9253,6 @@
 		createEReference(redefinableElementEClass, REDEFINABLE_ELEMENT__REDEFINITION_CONTEXT);
 		createEAttribute(redefinableElementEClass, REDEFINABLE_ELEMENT__IS_LEAF);
 
-		generalizationEClass = createEClass(GENERALIZATION);
-		createEReference(generalizationEClass, GENERALIZATION__SPECIFIC);
-		createEReference(generalizationEClass, GENERALIZATION__GENERAL);
-		createEAttribute(generalizationEClass, GENERALIZATION__IS_SUBSTITUTABLE);
-		createEReference(generalizationEClass, GENERALIZATION__GENERALIZATION_SET);
-
 		instanceSpecificationEClass = createEClass(INSTANCE_SPECIFICATION);
 		createEReference(instanceSpecificationEClass, INSTANCE_SPECIFICATION__SLOT);
 		createEReference(instanceSpecificationEClass, INSTANCE_SPECIFICATION__CLASSIFIER);
@@ -9272,6 +9266,12 @@
 		instanceValueEClass = createEClass(INSTANCE_VALUE);
 		createEReference(instanceValueEClass, INSTANCE_VALUE__INSTANCE);
 
+		generalizationEClass = createEClass(GENERALIZATION);
+		createEReference(generalizationEClass, GENERALIZATION__SPECIFIC);
+		createEReference(generalizationEClass, GENERALIZATION__GENERAL);
+		createEAttribute(generalizationEClass, GENERALIZATION__IS_SUBSTITUTABLE);
+		createEReference(generalizationEClass, GENERALIZATION__GENERALIZATION_SET);
+
 		packageableElementEClass = createEClass(PACKAGEABLE_ELEMENT);
 		createEAttribute(packageableElementEClass, PACKAGEABLE_ELEMENT__PACKAGEABLE_ELEMENT_VISIBILITY);
 
@@ -9400,6 +9400,49 @@
 		createEReference(structuredClassifierEClass, STRUCTURED_CLASSIFIER__ROLE);
 		createEReference(structuredClassifierEClass, STRUCTURED_CLASSIFIER__OWNED_CONNECTOR);
 
+		interfaceEClass = createEClass(INTERFACE);
+		createEReference(interfaceEClass, INTERFACE__OWNED_ATTRIBUTE);
+		createEReference(interfaceEClass, INTERFACE__OWNED_OPERATION);
+		createEReference(interfaceEClass, INTERFACE__REDEFINED_INTERFACE);
+		createEReference(interfaceEClass, INTERFACE__NESTED_CLASSIFIER);
+		createEReference(interfaceEClass, INTERFACE__OWNED_RECEPTION);
+		createEReference(interfaceEClass, INTERFACE__PROTOCOL);
+
+		implementationEClass = createEClass(IMPLEMENTATION);
+		createEReference(implementationEClass, IMPLEMENTATION__CONTRACT);
+		createEReference(implementationEClass, IMPLEMENTATION__IMPLEMENTING_CLASSIFIER);
+
+		artifactEClass = createEClass(ARTIFACT);
+		createEAttribute(artifactEClass, ARTIFACT__FILE_NAME);
+		createEReference(artifactEClass, ARTIFACT__NESTED_ARTIFACT);
+		createEReference(artifactEClass, ARTIFACT__MANIFESTATION);
+		createEReference(artifactEClass, ARTIFACT__OWNED_OPERATION);
+		createEReference(artifactEClass, ARTIFACT__OWNED_ATTRIBUTE);
+
+		manifestationEClass = createEClass(MANIFESTATION);
+		createEReference(manifestationEClass, MANIFESTATION__UTILIZED_ELEMENT);
+
+		actorEClass = createEClass(ACTOR);
+
+		extendEClass = createEClass(EXTEND);
+		createEReference(extendEClass, EXTEND__EXTENDED_CASE);
+		createEReference(extendEClass, EXTEND__EXTENSION);
+		createEReference(extendEClass, EXTEND__CONDITION);
+		createEReference(extendEClass, EXTEND__EXTENSION_LOCATION);
+
+		useCaseEClass = createEClass(USE_CASE);
+		createEReference(useCaseEClass, USE_CASE__INCLUDE);
+		createEReference(useCaseEClass, USE_CASE__EXTEND);
+		createEReference(useCaseEClass, USE_CASE__EXTENSION_POINT);
+		createEReference(useCaseEClass, USE_CASE__SUBJECT);
+
+		extensionPointEClass = createEClass(EXTENSION_POINT);
+		createEReference(extensionPointEClass, EXTENSION_POINT__USE_CASE);
+
+		includeEClass = createEClass(INCLUDE);
+		createEReference(includeEClass, INCLUDE__INCLUDING_CASE);
+		createEReference(includeEClass, INCLUDE__ADDITION);
+
 		activityEdgeEClass = createEClass(ACTIVITY_EDGE);
 		createEReference(activityEdgeEClass, ACTIVITY_EDGE__ACTIVITY);
 		createEReference(activityEdgeEClass, ACTIVITY_EDGE__SOURCE);
@@ -9476,48 +9519,83 @@
 		valuePinEClass = createEClass(VALUE_PIN);
 		createEReference(valuePinEClass, VALUE_PIN__VALUE);
 
-		artifactEClass = createEClass(ARTIFACT);
-		createEAttribute(artifactEClass, ARTIFACT__FILE_NAME);
-		createEReference(artifactEClass, ARTIFACT__NESTED_ARTIFACT);
-		createEReference(artifactEClass, ARTIFACT__MANIFESTATION);
-		createEReference(artifactEClass, ARTIFACT__OWNED_OPERATION);
-		createEReference(artifactEClass, ARTIFACT__OWNED_ATTRIBUTE);
+		callTriggerEClass = createEClass(CALL_TRIGGER);
+		createEReference(callTriggerEClass, CALL_TRIGGER__OPERATION);
 
-		manifestationEClass = createEClass(MANIFESTATION);
-		createEReference(manifestationEClass, MANIFESTATION__UTILIZED_ELEMENT);
+		messageTriggerEClass = createEClass(MESSAGE_TRIGGER);
 
-		interfaceEClass = createEClass(INTERFACE);
-		createEReference(interfaceEClass, INTERFACE__OWNED_ATTRIBUTE);
-		createEReference(interfaceEClass, INTERFACE__OWNED_OPERATION);
-		createEReference(interfaceEClass, INTERFACE__REDEFINED_INTERFACE);
-		createEReference(interfaceEClass, INTERFACE__NESTED_CLASSIFIER);
-		createEReference(interfaceEClass, INTERFACE__OWNED_RECEPTION);
-		createEReference(interfaceEClass, INTERFACE__PROTOCOL);
+		changeTriggerEClass = createEClass(CHANGE_TRIGGER);
+		createEReference(changeTriggerEClass, CHANGE_TRIGGER__CHANGE_EXPRESSION);
 
-		implementationEClass = createEClass(IMPLEMENTATION);
-		createEReference(implementationEClass, IMPLEMENTATION__CONTRACT);
-		createEReference(implementationEClass, IMPLEMENTATION__IMPLEMENTING_CLASSIFIER);
+		triggerEClass = createEClass(TRIGGER);
+		createEReference(triggerEClass, TRIGGER__PORT);
 
-		actorEClass = createEClass(ACTOR);
+		receptionEClass = createEClass(RECEPTION);
+		createEReference(receptionEClass, RECEPTION__SIGNAL);
 
-		extendEClass = createEClass(EXTEND);
-		createEReference(extendEClass, EXTEND__EXTENDED_CASE);
-		createEReference(extendEClass, EXTEND__EXTENSION);
-		createEReference(extendEClass, EXTEND__CONDITION);
-		createEReference(extendEClass, EXTEND__EXTENSION_LOCATION);
+		signalEClass = createEClass(SIGNAL);
+		createEReference(signalEClass, SIGNAL__OWNED_ATTRIBUTE);
 
-		useCaseEClass = createEClass(USE_CASE);
-		createEReference(useCaseEClass, USE_CASE__INCLUDE);
-		createEReference(useCaseEClass, USE_CASE__EXTEND);
-		createEReference(useCaseEClass, USE_CASE__EXTENSION_POINT);
-		createEReference(useCaseEClass, USE_CASE__SUBJECT);
+		signalTriggerEClass = createEClass(SIGNAL_TRIGGER);
+		createEReference(signalTriggerEClass, SIGNAL_TRIGGER__SIGNAL);
 
-		extensionPointEClass = createEClass(EXTENSION_POINT);
-		createEReference(extensionPointEClass, EXTENSION_POINT__USE_CASE);
+		timeTriggerEClass = createEClass(TIME_TRIGGER);
+		createEAttribute(timeTriggerEClass, TIME_TRIGGER__IS_RELATIVE);
+		createEReference(timeTriggerEClass, TIME_TRIGGER__WHEN);
 
-		includeEClass = createEClass(INCLUDE);
-		createEReference(includeEClass, INCLUDE__INCLUDING_CASE);
-		createEReference(includeEClass, INCLUDE__ADDITION);
+		anyTriggerEClass = createEClass(ANY_TRIGGER);
+
+		collaborationOccurrenceEClass = createEClass(COLLABORATION_OCCURRENCE);
+		createEReference(collaborationOccurrenceEClass, COLLABORATION_OCCURRENCE__TYPE);
+		createEReference(collaborationOccurrenceEClass, COLLABORATION_OCCURRENCE__ROLE_BINDING);
+
+		collaborationEClass = createEClass(COLLABORATION);
+		createEReference(collaborationEClass, COLLABORATION__COLLABORATION_ROLE);
+
+		portEClass = createEClass(PORT);
+		createEAttribute(portEClass, PORT__IS_BEHAVIOR);
+		createEAttribute(portEClass, PORT__IS_SERVICE);
+		createEReference(portEClass, PORT__REQUIRED);
+		createEReference(portEClass, PORT__REDEFINED_PORT);
+		createEReference(portEClass, PORT__PROVIDED);
+		createEReference(portEClass, PORT__PROTOCOL);
+
+		encapsulatedClassifierEClass = createEClass(ENCAPSULATED_CLASSIFIER);
+		createEReference(encapsulatedClassifierEClass, ENCAPSULATED_CLASSIFIER__OWNED_PORT);
+
+		variableEClass = createEClass(VARIABLE);
+		createEReference(variableEClass, VARIABLE__SCOPE);
+
+		structuredActivityNodeEClass = createEClass(STRUCTURED_ACTIVITY_NODE);
+		createEReference(structuredActivityNodeEClass, STRUCTURED_ACTIVITY_NODE__VARIABLE);
+		createEReference(structuredActivityNodeEClass, STRUCTURED_ACTIVITY_NODE__CONTAINED_NODE);
+		createEReference(structuredActivityNodeEClass, STRUCTURED_ACTIVITY_NODE__CONTAINED_EDGE);
+		createEAttribute(structuredActivityNodeEClass, STRUCTURED_ACTIVITY_NODE__MUST_ISOLATE);
+
+		conditionalNodeEClass = createEClass(CONDITIONAL_NODE);
+		createEAttribute(conditionalNodeEClass, CONDITIONAL_NODE__IS_DETERMINATE);
+		createEAttribute(conditionalNodeEClass, CONDITIONAL_NODE__IS_ASSURED);
+		createEReference(conditionalNodeEClass, CONDITIONAL_NODE__CLAUSE);
+		createEReference(conditionalNodeEClass, CONDITIONAL_NODE__RESULT);
+
+		clauseEClass = createEClass(CLAUSE);
+		createEReference(clauseEClass, CLAUSE__TEST);
+		createEReference(clauseEClass, CLAUSE__BODY);
+		createEReference(clauseEClass, CLAUSE__PREDECESSOR_CLAUSE);
+		createEReference(clauseEClass, CLAUSE__SUCCESSOR_CLAUSE);
+		createEReference(clauseEClass, CLAUSE__DECIDER);
+		createEReference(clauseEClass, CLAUSE__BODY_OUTPUT);
+
+		loopNodeEClass = createEClass(LOOP_NODE);
+		createEAttribute(loopNodeEClass, LOOP_NODE__IS_TESTED_FIRST);
+		createEReference(loopNodeEClass, LOOP_NODE__BODY_PART);
+		createEReference(loopNodeEClass, LOOP_NODE__SETUP_PART);
+		createEReference(loopNodeEClass, LOOP_NODE__DECIDER);
+		createEReference(loopNodeEClass, LOOP_NODE__TEST);
+		createEReference(loopNodeEClass, LOOP_NODE__RESULT);
+		createEReference(loopNodeEClass, LOOP_NODE__LOOP_VARIABLE);
+		createEReference(loopNodeEClass, LOOP_NODE__BODY_OUTPUT);
+		createEReference(loopNodeEClass, LOOP_NODE__LOOP_VARIABLE_INPUT);
 
 		templateSignatureEClass = createEClass(TEMPLATE_SIGNATURE);
 		createEReference(templateSignatureEClass, TEMPLATE_SIGNATURE__PARAMETER);
@@ -9556,9 +9634,6 @@
 		createEReference(templateParameterSubstitutionEClass, TEMPLATE_PARAMETER_SUBSTITUTION__ACTUAL);
 		createEReference(templateParameterSubstitutionEClass, TEMPLATE_PARAMETER_SUBSTITUTION__OWNED_ACTUAL);
 
-		collaborationEClass = createEClass(COLLABORATION);
-		createEReference(collaborationEClass, COLLABORATION__COLLABORATION_ROLE);
-
 		operationTemplateParameterEClass = createEClass(OPERATION_TEMPLATE_PARAMETER);
 
 		classifierTemplateParameterEClass = createEClass(CLASSIFIER_TEMPLATE_PARAMETER);
@@ -9572,21 +9647,6 @@
 
 		connectableElementTemplateParameterEClass = createEClass(CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER);
 
-		collaborationOccurrenceEClass = createEClass(COLLABORATION_OCCURRENCE);
-		createEReference(collaborationOccurrenceEClass, COLLABORATION_OCCURRENCE__TYPE);
-		createEReference(collaborationOccurrenceEClass, COLLABORATION_OCCURRENCE__ROLE_BINDING);
-
-		portEClass = createEClass(PORT);
-		createEAttribute(portEClass, PORT__IS_BEHAVIOR);
-		createEAttribute(portEClass, PORT__IS_SERVICE);
-		createEReference(portEClass, PORT__REQUIRED);
-		createEReference(portEClass, PORT__REDEFINED_PORT);
-		createEReference(portEClass, PORT__PROVIDED);
-		createEReference(portEClass, PORT__PROTOCOL);
-
-		encapsulatedClassifierEClass = createEClass(ENCAPSULATED_CLASSIFIER);
-		createEReference(encapsulatedClassifierEClass, ENCAPSULATED_CLASSIFIER__OWNED_PORT);
-
 		interactionEClass = createEClass(INTERACTION);
 		createEReference(interactionEClass, INTERACTION__LIFELINE);
 		createEReference(interactionEClass, INTERACTION__MESSAGE);
@@ -9640,99 +9700,57 @@
 
 		stopEClass = createEClass(STOP);
 
-		variableEClass = createEClass(VARIABLE);
-		createEReference(variableEClass, VARIABLE__SCOPE);
+		stateMachineEClass = createEClass(STATE_MACHINE);
+		createEReference(stateMachineEClass, STATE_MACHINE__REGION);
+		createEReference(stateMachineEClass, STATE_MACHINE__CONNECTION_POINT);
+		createEReference(stateMachineEClass, STATE_MACHINE__EXTENDED_STATE_MACHINE);
+		createEReference(stateMachineEClass, STATE_MACHINE__STATE_MACHINE_REDEFINITION_CONTEXT);
 
-		structuredActivityNodeEClass = createEClass(STRUCTURED_ACTIVITY_NODE);
-		createEReference(structuredActivityNodeEClass, STRUCTURED_ACTIVITY_NODE__VARIABLE);
-		createEReference(structuredActivityNodeEClass, STRUCTURED_ACTIVITY_NODE__CONTAINED_NODE);
-		createEReference(structuredActivityNodeEClass, STRUCTURED_ACTIVITY_NODE__CONTAINED_EDGE);
-		createEAttribute(structuredActivityNodeEClass, STRUCTURED_ACTIVITY_NODE__MUST_ISOLATE);
+		regionEClass = createEClass(REGION);
+		createEReference(regionEClass, REGION__SUBVERTEX);
+		createEReference(regionEClass, REGION__TRANSITION);
+		createEReference(regionEClass, REGION__STATE_MACHINE);
+		createEReference(regionEClass, REGION__STATE);
+		createEReference(regionEClass, REGION__EXTENDED_REGION);
 
-		conditionalNodeEClass = createEClass(CONDITIONAL_NODE);
-		createEAttribute(conditionalNodeEClass, CONDITIONAL_NODE__IS_DETERMINATE);
-		createEAttribute(conditionalNodeEClass, CONDITIONAL_NODE__IS_ASSURED);
-		createEReference(conditionalNodeEClass, CONDITIONAL_NODE__CLAUSE);
-		createEReference(conditionalNodeEClass, CONDITIONAL_NODE__RESULT);
+		pseudostateEClass = createEClass(PSEUDOSTATE);
+		createEAttribute(pseudostateEClass, PSEUDOSTATE__KIND);
 
-		clauseEClass = createEClass(CLAUSE);
-		createEReference(clauseEClass, CLAUSE__TEST);
-		createEReference(clauseEClass, CLAUSE__BODY);
-		createEReference(clauseEClass, CLAUSE__PREDECESSOR_CLAUSE);
-		createEReference(clauseEClass, CLAUSE__SUCCESSOR_CLAUSE);
-		createEReference(clauseEClass, CLAUSE__DECIDER);
-		createEReference(clauseEClass, CLAUSE__BODY_OUTPUT);
+		stateEClass = createEClass(STATE);
+		createEAttribute(stateEClass, STATE__IS_COMPOSITE);
+		createEAttribute(stateEClass, STATE__IS_ORTHOGONAL);
+		createEAttribute(stateEClass, STATE__IS_SIMPLE);
+		createEAttribute(stateEClass, STATE__IS_SUBMACHINE_STATE);
+		createEReference(stateEClass, STATE__SUBMACHINE);
+		createEReference(stateEClass, STATE__CONNECTION);
+		createEReference(stateEClass, STATE__REDEFINED_STATE);
+		createEReference(stateEClass, STATE__DEFERRABLE_TRIGGER);
+		createEReference(stateEClass, STATE__REGION);
+		createEReference(stateEClass, STATE__ENTRY);
+		createEReference(stateEClass, STATE__EXIT);
+		createEReference(stateEClass, STATE__DO_ACTIVITY);
+		createEReference(stateEClass, STATE__STATE_INVARIANT);
 
-		loopNodeEClass = createEClass(LOOP_NODE);
-		createEAttribute(loopNodeEClass, LOOP_NODE__IS_TESTED_FIRST);
-		createEReference(loopNodeEClass, LOOP_NODE__BODY_PART);
-		createEReference(loopNodeEClass, LOOP_NODE__SETUP_PART);
-		createEReference(loopNodeEClass, LOOP_NODE__DECIDER);
-		createEReference(loopNodeEClass, LOOP_NODE__TEST);
-		createEReference(loopNodeEClass, LOOP_NODE__RESULT);
-		createEReference(loopNodeEClass, LOOP_NODE__LOOP_VARIABLE);
-		createEReference(loopNodeEClass, LOOP_NODE__BODY_OUTPUT);
-		createEReference(loopNodeEClass, LOOP_NODE__LOOP_VARIABLE_INPUT);
+		vertexEClass = createEClass(VERTEX);
+		createEReference(vertexEClass, VERTEX__CONTAINER);
+		createEReference(vertexEClass, VERTEX__OUTGOING);
+		createEReference(vertexEClass, VERTEX__INCOMING);
 
-		callTriggerEClass = createEClass(CALL_TRIGGER);
-		createEReference(callTriggerEClass, CALL_TRIGGER__OPERATION);
+		connectionPointReferenceEClass = createEClass(CONNECTION_POINT_REFERENCE);
+		createEReference(connectionPointReferenceEClass, CONNECTION_POINT_REFERENCE__ENTRY);
+		createEReference(connectionPointReferenceEClass, CONNECTION_POINT_REFERENCE__EXIT);
 
-		messageTriggerEClass = createEClass(MESSAGE_TRIGGER);
+		transitionEClass = createEClass(TRANSITION);
+		createEAttribute(transitionEClass, TRANSITION__KIND);
+		createEReference(transitionEClass, TRANSITION__CONTAINER);
+		createEReference(transitionEClass, TRANSITION__SOURCE);
+		createEReference(transitionEClass, TRANSITION__TARGET);
+		createEReference(transitionEClass, TRANSITION__REDEFINED_TRANSITION);
+		createEReference(transitionEClass, TRANSITION__TRIGGER);
+		createEReference(transitionEClass, TRANSITION__GUARD);
+		createEReference(transitionEClass, TRANSITION__EFFECT);
 
-		changeTriggerEClass = createEClass(CHANGE_TRIGGER);
-		createEReference(changeTriggerEClass, CHANGE_TRIGGER__CHANGE_EXPRESSION);
-
-		triggerEClass = createEClass(TRIGGER);
-		createEReference(triggerEClass, TRIGGER__PORT);
-
-		receptionEClass = createEClass(RECEPTION);
-		createEReference(receptionEClass, RECEPTION__SIGNAL);
-
-		signalEClass = createEClass(SIGNAL);
-		createEReference(signalEClass, SIGNAL__OWNED_ATTRIBUTE);
-
-		signalTriggerEClass = createEClass(SIGNAL_TRIGGER);
-		createEReference(signalTriggerEClass, SIGNAL_TRIGGER__SIGNAL);
-
-		timeTriggerEClass = createEClass(TIME_TRIGGER);
-		createEAttribute(timeTriggerEClass, TIME_TRIGGER__IS_RELATIVE);
-		createEReference(timeTriggerEClass, TIME_TRIGGER__WHEN);
-
-		anyTriggerEClass = createEClass(ANY_TRIGGER);
-
-		expansionNodeEClass = createEClass(EXPANSION_NODE);
-		createEReference(expansionNodeEClass, EXPANSION_NODE__REGION_AS_OUTPUT);
-		createEReference(expansionNodeEClass, EXPANSION_NODE__REGION_AS_INPUT);
-
-		expansionRegionEClass = createEClass(EXPANSION_REGION);
-		createEAttribute(expansionRegionEClass, EXPANSION_REGION__MODE);
-		createEReference(expansionRegionEClass, EXPANSION_REGION__OUTPUT_ELEMENT);
-		createEReference(expansionRegionEClass, EXPANSION_REGION__INPUT_ELEMENT);
-
-		exceptionHandlerEClass = createEClass(EXCEPTION_HANDLER);
-		createEReference(exceptionHandlerEClass, EXCEPTION_HANDLER__PROTECTED_NODE);
-		createEReference(exceptionHandlerEClass, EXCEPTION_HANDLER__HANDLER_BODY);
-		createEReference(exceptionHandlerEClass, EXCEPTION_HANDLER__EXCEPTION_INPUT);
-		createEReference(exceptionHandlerEClass, EXCEPTION_HANDLER__EXCEPTION_TYPE);
-
-		forkNodeEClass = createEClass(FORK_NODE);
-
-		joinNodeEClass = createEClass(JOIN_NODE);
-		createEAttribute(joinNodeEClass, JOIN_NODE__IS_COMBINE_DUPLICATE);
-		createEReference(joinNodeEClass, JOIN_NODE__JOIN_SPEC);
-
-		flowFinalNodeEClass = createEClass(FLOW_FINAL_NODE);
-
-		centralBufferNodeEClass = createEClass(CENTRAL_BUFFER_NODE);
-
-		activityPartitionEClass = createEClass(ACTIVITY_PARTITION);
-		createEAttribute(activityPartitionEClass, ACTIVITY_PARTITION__IS_DIMENSION);
-		createEAttribute(activityPartitionEClass, ACTIVITY_PARTITION__IS_EXTERNAL);
-		createEReference(activityPartitionEClass, ACTIVITY_PARTITION__CONTAINED_EDGE);
-		createEReference(activityPartitionEClass, ACTIVITY_PARTITION__CONTAINED_NODE);
-		createEReference(activityPartitionEClass, ACTIVITY_PARTITION__SUBGROUP);
-		createEReference(activityPartitionEClass, ACTIVITY_PARTITION__SUPER_PARTITION);
-		createEReference(activityPartitionEClass, ACTIVITY_PARTITION__REPRESENTS);
+		finalStateEClass = createEClass(FINAL_STATE);
 
 		createObjectActionEClass = createEClass(CREATE_OBJECT_ACTION);
 		createEReference(createObjectActionEClass, CREATE_OBJECT_ACTION__CLASSIFIER);
@@ -9846,57 +9864,39 @@
 		callBehaviorActionEClass = createEClass(CALL_BEHAVIOR_ACTION);
 		createEReference(callBehaviorActionEClass, CALL_BEHAVIOR_ACTION__BEHAVIOR);
 
-		stateMachineEClass = createEClass(STATE_MACHINE);
-		createEReference(stateMachineEClass, STATE_MACHINE__REGION);
-		createEReference(stateMachineEClass, STATE_MACHINE__CONNECTION_POINT);
-		createEReference(stateMachineEClass, STATE_MACHINE__EXTENDED_STATE_MACHINE);
-		createEReference(stateMachineEClass, STATE_MACHINE__STATE_MACHINE_REDEFINITION_CONTEXT);
+		forkNodeEClass = createEClass(FORK_NODE);
 
-		regionEClass = createEClass(REGION);
-		createEReference(regionEClass, REGION__SUBVERTEX);
-		createEReference(regionEClass, REGION__TRANSITION);
-		createEReference(regionEClass, REGION__STATE_MACHINE);
-		createEReference(regionEClass, REGION__STATE);
-		createEReference(regionEClass, REGION__EXTENDED_REGION);
+		joinNodeEClass = createEClass(JOIN_NODE);
+		createEAttribute(joinNodeEClass, JOIN_NODE__IS_COMBINE_DUPLICATE);
+		createEReference(joinNodeEClass, JOIN_NODE__JOIN_SPEC);
 
-		pseudostateEClass = createEClass(PSEUDOSTATE);
-		createEAttribute(pseudostateEClass, PSEUDOSTATE__KIND);
+		flowFinalNodeEClass = createEClass(FLOW_FINAL_NODE);
 
-		stateEClass = createEClass(STATE);
-		createEAttribute(stateEClass, STATE__IS_COMPOSITE);
-		createEAttribute(stateEClass, STATE__IS_ORTHOGONAL);
-		createEAttribute(stateEClass, STATE__IS_SIMPLE);
-		createEAttribute(stateEClass, STATE__IS_SUBMACHINE_STATE);
-		createEReference(stateEClass, STATE__SUBMACHINE);
-		createEReference(stateEClass, STATE__CONNECTION);
-		createEReference(stateEClass, STATE__REDEFINED_STATE);
-		createEReference(stateEClass, STATE__DEFERRABLE_TRIGGER);
-		createEReference(stateEClass, STATE__REGION);
-		createEReference(stateEClass, STATE__ENTRY);
-		createEReference(stateEClass, STATE__EXIT);
-		createEReference(stateEClass, STATE__DO_ACTIVITY);
-		createEReference(stateEClass, STATE__STATE_INVARIANT);
+		centralBufferNodeEClass = createEClass(CENTRAL_BUFFER_NODE);
 
-		vertexEClass = createEClass(VERTEX);
-		createEReference(vertexEClass, VERTEX__CONTAINER);
-		createEReference(vertexEClass, VERTEX__OUTGOING);
-		createEReference(vertexEClass, VERTEX__INCOMING);
+		activityPartitionEClass = createEClass(ACTIVITY_PARTITION);
+		createEAttribute(activityPartitionEClass, ACTIVITY_PARTITION__IS_DIMENSION);
+		createEAttribute(activityPartitionEClass, ACTIVITY_PARTITION__IS_EXTERNAL);
+		createEReference(activityPartitionEClass, ACTIVITY_PARTITION__CONTAINED_EDGE);
+		createEReference(activityPartitionEClass, ACTIVITY_PARTITION__CONTAINED_NODE);
+		createEReference(activityPartitionEClass, ACTIVITY_PARTITION__SUBGROUP);
+		createEReference(activityPartitionEClass, ACTIVITY_PARTITION__SUPER_PARTITION);
+		createEReference(activityPartitionEClass, ACTIVITY_PARTITION__REPRESENTS);
 
-		connectionPointReferenceEClass = createEClass(CONNECTION_POINT_REFERENCE);
-		createEReference(connectionPointReferenceEClass, CONNECTION_POINT_REFERENCE__ENTRY);
-		createEReference(connectionPointReferenceEClass, CONNECTION_POINT_REFERENCE__EXIT);
+		expansionNodeEClass = createEClass(EXPANSION_NODE);
+		createEReference(expansionNodeEClass, EXPANSION_NODE__REGION_AS_OUTPUT);
+		createEReference(expansionNodeEClass, EXPANSION_NODE__REGION_AS_INPUT);
 
-		transitionEClass = createEClass(TRANSITION);
-		createEAttribute(transitionEClass, TRANSITION__KIND);
-		createEReference(transitionEClass, TRANSITION__CONTAINER);
-		createEReference(transitionEClass, TRANSITION__SOURCE);
-		createEReference(transitionEClass, TRANSITION__TARGET);
-		createEReference(transitionEClass, TRANSITION__REDEFINED_TRANSITION);
-		createEReference(transitionEClass, TRANSITION__TRIGGER);
-		createEReference(transitionEClass, TRANSITION__GUARD);
-		createEReference(transitionEClass, TRANSITION__EFFECT);
+		expansionRegionEClass = createEClass(EXPANSION_REGION);
+		createEAttribute(expansionRegionEClass, EXPANSION_REGION__MODE);
+		createEReference(expansionRegionEClass, EXPANSION_REGION__OUTPUT_ELEMENT);
+		createEReference(expansionRegionEClass, EXPANSION_REGION__INPUT_ELEMENT);
 
-		finalStateEClass = createEClass(FINAL_STATE);
+		exceptionHandlerEClass = createEClass(EXCEPTION_HANDLER);
+		createEReference(exceptionHandlerEClass, EXCEPTION_HANDLER__PROTECTED_NODE);
+		createEReference(exceptionHandlerEClass, EXCEPTION_HANDLER__HANDLER_BODY);
+		createEReference(exceptionHandlerEClass, EXCEPTION_HANDLER__EXCEPTION_INPUT);
+		createEReference(exceptionHandlerEClass, EXCEPTION_HANDLER__EXCEPTION_TYPE);
 
 		interactionOccurrenceEClass = createEClass(INTERACTION_OCCURRENCE);
 		createEReference(interactionOccurrenceEClass, INTERACTION_OCCURRENCE__REFERS_TO);
@@ -9930,76 +9930,6 @@
 		createEReference(componentEClass, COMPONENT__REALIZATION);
 		createEReference(componentEClass, COMPONENT__OWNED_MEMBER);
 
-		protocolConformanceEClass = createEClass(PROTOCOL_CONFORMANCE);
-		createEReference(protocolConformanceEClass, PROTOCOL_CONFORMANCE__SPECIFIC_MACHINE);
-		createEReference(protocolConformanceEClass, PROTOCOL_CONFORMANCE__GENERAL_MACHINE);
-
-		protocolStateMachineEClass = createEClass(PROTOCOL_STATE_MACHINE);
-		createEReference(protocolStateMachineEClass, PROTOCOL_STATE_MACHINE__CONFORMANCE);
-
-		protocolTransitionEClass = createEClass(PROTOCOL_TRANSITION);
-		createEReference(protocolTransitionEClass, PROTOCOL_TRANSITION__POST_CONDITION);
-		createEReference(protocolTransitionEClass, PROTOCOL_TRANSITION__REFERRED);
-		createEReference(protocolTransitionEClass, PROTOCOL_TRANSITION__PRE_CONDITION);
-
-		timeExpressionEClass = createEClass(TIME_EXPRESSION);
-		createEAttribute(timeExpressionEClass, TIME_EXPRESSION__FIRST_TIME);
-		createEReference(timeExpressionEClass, TIME_EXPRESSION__EVENT);
-
-		durationEClass = createEClass(DURATION);
-		createEAttribute(durationEClass, DURATION__FIRST_TIME);
-		createEReference(durationEClass, DURATION__EVENT);
-
-		timeObservationActionEClass = createEClass(TIME_OBSERVATION_ACTION);
-		createEReference(timeObservationActionEClass, TIME_OBSERVATION_ACTION__NOW);
-
-		durationIntervalEClass = createEClass(DURATION_INTERVAL);
-
-		intervalEClass = createEClass(INTERVAL);
-		createEReference(intervalEClass, INTERVAL__MIN);
-		createEReference(intervalEClass, INTERVAL__MAX);
-
-		timeConstraintEClass = createEClass(TIME_CONSTRAINT);
-
-		intervalConstraintEClass = createEClass(INTERVAL_CONSTRAINT);
-
-		timeIntervalEClass = createEClass(TIME_INTERVAL);
-
-		durationObservationActionEClass = createEClass(DURATION_OBSERVATION_ACTION);
-		createEReference(durationObservationActionEClass, DURATION_OBSERVATION_ACTION__DURATION);
-
-		durationConstraintEClass = createEClass(DURATION_CONSTRAINT);
-
-		dataStoreNodeEClass = createEClass(DATA_STORE_NODE);
-
-		interruptibleActivityRegionEClass = createEClass(INTERRUPTIBLE_ACTIVITY_REGION);
-		createEReference(interruptibleActivityRegionEClass, INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGE);
-		createEReference(interruptibleActivityRegionEClass, INTERRUPTIBLE_ACTIVITY_REGION__CONTAINED_NODE);
-
-		parameterSetEClass = createEClass(PARAMETER_SET);
-		createEReference(parameterSetEClass, PARAMETER_SET__PARAMETER);
-		createEReference(parameterSetEClass, PARAMETER_SET__CONDITION);
-
-		deploymentEClass = createEClass(DEPLOYMENT);
-		createEReference(deploymentEClass, DEPLOYMENT__DEPLOYED_ARTIFACT);
-		createEReference(deploymentEClass, DEPLOYMENT__LOCATION);
-		createEReference(deploymentEClass, DEPLOYMENT__CONFIGURATION);
-
-		deployedArtifactEClass = createEClass(DEPLOYED_ARTIFACT);
-
-		deploymentTargetEClass = createEClass(DEPLOYMENT_TARGET);
-		createEReference(deploymentTargetEClass, DEPLOYMENT_TARGET__DEPLOYMENT);
-		createEReference(deploymentTargetEClass, DEPLOYMENT_TARGET__DEPLOYED_ELEMENT);
-
-		nodeEClass = createEClass(NODE);
-		createEReference(nodeEClass, NODE__NESTED_NODE);
-
-		deviceEClass = createEClass(DEVICE);
-
-		executionEnvironmentEClass = createEClass(EXECUTION_ENVIRONMENT);
-
-		communicationPathEClass = createEClass(COMMUNICATION_PATH);
-
 		readExtentActionEClass = createEClass(READ_EXTENT_ACTION);
 		createEReference(readExtentActionEClass, READ_EXTENT_ACTION__RESULT);
 		createEReference(readExtentActionEClass, READ_EXTENT_ACTION__CLASSIFIER);
@@ -10051,6 +9981,76 @@
 		raiseExceptionActionEClass = createEClass(RAISE_EXCEPTION_ACTION);
 		createEReference(raiseExceptionActionEClass, RAISE_EXCEPTION_ACTION__EXCEPTION);
 
+		dataStoreNodeEClass = createEClass(DATA_STORE_NODE);
+
+		interruptibleActivityRegionEClass = createEClass(INTERRUPTIBLE_ACTIVITY_REGION);
+		createEReference(interruptibleActivityRegionEClass, INTERRUPTIBLE_ACTIVITY_REGION__INTERRUPTING_EDGE);
+		createEReference(interruptibleActivityRegionEClass, INTERRUPTIBLE_ACTIVITY_REGION__CONTAINED_NODE);
+
+		parameterSetEClass = createEClass(PARAMETER_SET);
+		createEReference(parameterSetEClass, PARAMETER_SET__PARAMETER);
+		createEReference(parameterSetEClass, PARAMETER_SET__CONDITION);
+
+		timeExpressionEClass = createEClass(TIME_EXPRESSION);
+		createEAttribute(timeExpressionEClass, TIME_EXPRESSION__FIRST_TIME);
+		createEReference(timeExpressionEClass, TIME_EXPRESSION__EVENT);
+
+		durationEClass = createEClass(DURATION);
+		createEAttribute(durationEClass, DURATION__FIRST_TIME);
+		createEReference(durationEClass, DURATION__EVENT);
+
+		timeObservationActionEClass = createEClass(TIME_OBSERVATION_ACTION);
+		createEReference(timeObservationActionEClass, TIME_OBSERVATION_ACTION__NOW);
+
+		durationIntervalEClass = createEClass(DURATION_INTERVAL);
+
+		intervalEClass = createEClass(INTERVAL);
+		createEReference(intervalEClass, INTERVAL__MIN);
+		createEReference(intervalEClass, INTERVAL__MAX);
+
+		timeConstraintEClass = createEClass(TIME_CONSTRAINT);
+
+		intervalConstraintEClass = createEClass(INTERVAL_CONSTRAINT);
+
+		timeIntervalEClass = createEClass(TIME_INTERVAL);
+
+		durationObservationActionEClass = createEClass(DURATION_OBSERVATION_ACTION);
+		createEReference(durationObservationActionEClass, DURATION_OBSERVATION_ACTION__DURATION);
+
+		durationConstraintEClass = createEClass(DURATION_CONSTRAINT);
+
+		deploymentEClass = createEClass(DEPLOYMENT);
+		createEReference(deploymentEClass, DEPLOYMENT__DEPLOYED_ARTIFACT);
+		createEReference(deploymentEClass, DEPLOYMENT__LOCATION);
+		createEReference(deploymentEClass, DEPLOYMENT__CONFIGURATION);
+
+		deployedArtifactEClass = createEClass(DEPLOYED_ARTIFACT);
+
+		deploymentTargetEClass = createEClass(DEPLOYMENT_TARGET);
+		createEReference(deploymentTargetEClass, DEPLOYMENT_TARGET__DEPLOYMENT);
+		createEReference(deploymentTargetEClass, DEPLOYMENT_TARGET__DEPLOYED_ELEMENT);
+
+		nodeEClass = createEClass(NODE);
+		createEReference(nodeEClass, NODE__NESTED_NODE);
+
+		deviceEClass = createEClass(DEVICE);
+
+		executionEnvironmentEClass = createEClass(EXECUTION_ENVIRONMENT);
+
+		communicationPathEClass = createEClass(COMMUNICATION_PATH);
+
+		protocolConformanceEClass = createEClass(PROTOCOL_CONFORMANCE);
+		createEReference(protocolConformanceEClass, PROTOCOL_CONFORMANCE__SPECIFIC_MACHINE);
+		createEReference(protocolConformanceEClass, PROTOCOL_CONFORMANCE__GENERAL_MACHINE);
+
+		protocolStateMachineEClass = createEClass(PROTOCOL_STATE_MACHINE);
+		createEReference(protocolStateMachineEClass, PROTOCOL_STATE_MACHINE__CONFORMANCE);
+
+		protocolTransitionEClass = createEClass(PROTOCOL_TRANSITION);
+		createEReference(protocolTransitionEClass, PROTOCOL_TRANSITION__POST_CONDITION);
+		createEReference(protocolTransitionEClass, PROTOCOL_TRANSITION__REFERRED);
+		createEReference(protocolTransitionEClass, PROTOCOL_TRANSITION__PRE_CONDITION);
+
 		deploymentSpecificationEClass = createEClass(DEPLOYMENT_SPECIFICATION);
 		createEAttribute(deploymentSpecificationEClass, DEPLOYMENT_SPECIFICATION__DEPLOYMENT_LOCATION);
 		createEAttribute(deploymentSpecificationEClass, DEPLOYMENT_SPECIFICATION__EXECUTION_LOCATION);
@@ -10059,12 +10059,12 @@
 		visibilityKindEEnum = createEEnum(VISIBILITY_KIND);
 		parameterDirectionKindEEnum = createEEnum(PARAMETER_DIRECTION_KIND);
 		aggregationKindEEnum = createEEnum(AGGREGATION_KIND);
+		callConcurrencyKindEEnum = createEEnum(CALL_CONCURRENCY_KIND);
 		messageKindEEnum = createEEnum(MESSAGE_KIND);
 		messageSortEEnum = createEEnum(MESSAGE_SORT);
-		callConcurrencyKindEEnum = createEEnum(CALL_CONCURRENCY_KIND);
-		expansionKindEEnum = createEEnum(EXPANSION_KIND);
 		transitionKindEEnum = createEEnum(TRANSITION_KIND);
 		pseudostateKindEEnum = createEEnum(PSEUDOSTATE_KIND);
+		expansionKindEEnum = createEEnum(EXPANSION_KIND);
 		interactionOperatorEEnum = createEEnum(INTERACTION_OPERATOR);
 		connectorKindEEnum = createEEnum(CONNECTOR_KIND);
 		parameterEffectKindEEnum = createEEnum(PARAMETER_EFFECT_KIND);
@@ -10108,6 +10108,8 @@
 		// Add supertypes to classes
 		elementEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
 		multiplicityElementEClass.getESuperTypes().add(this.getElement());
+		namedElementEClass.getESuperTypes().add(this.getTemplateableElement());
+		namespaceEClass.getESuperTypes().add(this.getNamedElement());
 		directedRelationshipEClass.getESuperTypes().add(this.getRelationship());
 		relationshipEClass.getESuperTypes().add(this.getElement());
 		opaqueExpressionEClass.getESuperTypes().add(this.getValueSpecification());
@@ -10115,8 +10117,6 @@
 		valueSpecificationEClass.getESuperTypes().add(this.getParameterableElement());
 		expressionEClass.getESuperTypes().add(this.getOpaqueExpression());
 		commentEClass.getESuperTypes().add(this.getTemplateableElement());
-		namedElementEClass.getESuperTypes().add(this.getTemplateableElement());
-		namespaceEClass.getESuperTypes().add(this.getNamedElement());
 		classEClass.getESuperTypes().add(this.getBehavioredClassifier());
 		classEClass.getESuperTypes().add(this.getEncapsulatedClassifier());
 		typeEClass.getESuperTypes().add(this.getPackageableElement());
@@ -10154,12 +10154,12 @@
 		structuralFeatureEClass.getESuperTypes().add(this.getTypedElement());
 		structuralFeatureEClass.getESuperTypes().add(this.getMultiplicityElement());
 		redefinableElementEClass.getESuperTypes().add(this.getNamedElement());
-		generalizationEClass.getESuperTypes().add(this.getDirectedRelationship());
 		instanceSpecificationEClass.getESuperTypes().add(this.getPackageableElement());
 		instanceSpecificationEClass.getESuperTypes().add(this.getDeploymentTarget());
 		instanceSpecificationEClass.getESuperTypes().add(this.getDeployedArtifact());
 		slotEClass.getESuperTypes().add(this.getElement());
 		instanceValueEClass.getESuperTypes().add(this.getValueSpecification());
+		generalizationEClass.getESuperTypes().add(this.getDirectedRelationship());
 		packageableElementEClass.getESuperTypes().add(this.getNamedElement());
 		packageableElementEClass.getESuperTypes().add(this.getParameterableElement());
 		elementImportEClass.getESuperTypes().add(this.getDirectedRelationship());
@@ -10194,6 +10194,18 @@
 		connectableElementEClass.getESuperTypes().add(this.getParameterableElement());
 		connectorEClass.getESuperTypes().add(this.getFeature());
 		structuredClassifierEClass.getESuperTypes().add(this.getClassifier());
+		interfaceEClass.getESuperTypes().add(this.getClassifier());
+		implementationEClass.getESuperTypes().add(this.getRealization());
+		artifactEClass.getESuperTypes().add(this.getClassifier());
+		artifactEClass.getESuperTypes().add(this.getDeployedArtifact());
+		manifestationEClass.getESuperTypes().add(this.getAbstraction());
+		actorEClass.getESuperTypes().add(this.getClassifier());
+		extendEClass.getESuperTypes().add(this.getNamedElement());
+		extendEClass.getESuperTypes().add(this.getDirectedRelationship());
+		useCaseEClass.getESuperTypes().add(this.getBehavioredClassifier());
+		extensionPointEClass.getESuperTypes().add(this.getRedefinableElement());
+		includeEClass.getESuperTypes().add(this.getNamedElement());
+		includeEClass.getESuperTypes().add(this.getDirectedRelationship());
 		activityEdgeEClass.getESuperTypes().add(this.getRedefinableElement());
 		activityGroupEClass.getESuperTypes().add(this.getElement());
 		activityNodeEClass.getESuperTypes().add(this.getRedefinableElement());
@@ -10215,18 +10227,29 @@
 		pinEClass.getESuperTypes().add(this.getMultiplicityElement());
 		activityParameterNodeEClass.getESuperTypes().add(this.getObjectNode());
 		valuePinEClass.getESuperTypes().add(this.getInputPin());
-		artifactEClass.getESuperTypes().add(this.getClassifier());
-		artifactEClass.getESuperTypes().add(this.getDeployedArtifact());
-		manifestationEClass.getESuperTypes().add(this.getAbstraction());
-		interfaceEClass.getESuperTypes().add(this.getClassifier());
-		implementationEClass.getESuperTypes().add(this.getRealization());
-		actorEClass.getESuperTypes().add(this.getClassifier());
-		extendEClass.getESuperTypes().add(this.getNamedElement());
-		extendEClass.getESuperTypes().add(this.getDirectedRelationship());
-		useCaseEClass.getESuperTypes().add(this.getBehavioredClassifier());
-		extensionPointEClass.getESuperTypes().add(this.getRedefinableElement());
-		includeEClass.getESuperTypes().add(this.getNamedElement());
-		includeEClass.getESuperTypes().add(this.getDirectedRelationship());
+		callTriggerEClass.getESuperTypes().add(this.getMessageTrigger());
+		messageTriggerEClass.getESuperTypes().add(this.getTrigger());
+		changeTriggerEClass.getESuperTypes().add(this.getTrigger());
+		triggerEClass.getESuperTypes().add(this.getNamedElement());
+		receptionEClass.getESuperTypes().add(this.getBehavioralFeature());
+		signalEClass.getESuperTypes().add(this.getClassifier());
+		signalTriggerEClass.getESuperTypes().add(this.getMessageTrigger());
+		timeTriggerEClass.getESuperTypes().add(this.getTrigger());
+		anyTriggerEClass.getESuperTypes().add(this.getMessageTrigger());
+		collaborationOccurrenceEClass.getESuperTypes().add(this.getNamedElement());
+		collaborationEClass.getESuperTypes().add(this.getBehavioredClassifier());
+		collaborationEClass.getESuperTypes().add(this.getStructuredClassifier());
+		portEClass.getESuperTypes().add(this.getProperty());
+		encapsulatedClassifierEClass.getESuperTypes().add(this.getStructuredClassifier());
+		variableEClass.getESuperTypes().add(this.getConnectableElement());
+		variableEClass.getESuperTypes().add(this.getTypedElement());
+		variableEClass.getESuperTypes().add(this.getMultiplicityElement());
+		structuredActivityNodeEClass.getESuperTypes().add(this.getAction());
+		structuredActivityNodeEClass.getESuperTypes().add(this.getNamespace());
+		structuredActivityNodeEClass.getESuperTypes().add(this.getActivityGroup());
+		conditionalNodeEClass.getESuperTypes().add(this.getStructuredActivityNode());
+		clauseEClass.getESuperTypes().add(this.getElement());
+		loopNodeEClass.getESuperTypes().add(this.getStructuredActivityNode());
 		templateSignatureEClass.getESuperTypes().add(this.getElement());
 		templateParameterEClass.getESuperTypes().add(this.getElement());
 		templateableElementEClass.getESuperTypes().add(this.getElement());
@@ -10234,8 +10257,6 @@
 		parameterableElementEClass.getESuperTypes().add(this.getElement());
 		templateBindingEClass.getESuperTypes().add(this.getDirectedRelationship());
 		templateParameterSubstitutionEClass.getESuperTypes().add(this.getElement());
-		collaborationEClass.getESuperTypes().add(this.getBehavioredClassifier());
-		collaborationEClass.getESuperTypes().add(this.getStructuredClassifier());
 		operationTemplateParameterEClass.getESuperTypes().add(this.getTemplateParameter());
 		classifierTemplateParameterEClass.getESuperTypes().add(this.getTemplateParameter());
 		parameterableClassifierEClass.getESuperTypes().add(this.getClassifier());
@@ -10243,9 +10264,6 @@
 		redefinableTemplateSignatureEClass.getESuperTypes().add(this.getTemplateSignature());
 		templateableClassifierEClass.getESuperTypes().add(this.getClassifier());
 		connectableElementTemplateParameterEClass.getESuperTypes().add(this.getTemplateParameter());
-		collaborationOccurrenceEClass.getESuperTypes().add(this.getNamedElement());
-		portEClass.getESuperTypes().add(this.getProperty());
-		encapsulatedClassifierEClass.getESuperTypes().add(this.getStructuredClassifier());
 		interactionEClass.getESuperTypes().add(this.getBehavior());
 		interactionEClass.getESuperTypes().add(this.getInteractionFragment());
 		interactionFragmentEClass.getESuperTypes().add(this.getNamedElement());
@@ -10258,33 +10276,17 @@
 		executionOccurrenceEClass.getESuperTypes().add(this.getInteractionFragment());
 		stateInvariantEClass.getESuperTypes().add(this.getInteractionFragment());
 		stopEClass.getESuperTypes().add(this.getEventOccurrence());
-		variableEClass.getESuperTypes().add(this.getConnectableElement());
-		variableEClass.getESuperTypes().add(this.getTypedElement());
-		variableEClass.getESuperTypes().add(this.getMultiplicityElement());
-		structuredActivityNodeEClass.getESuperTypes().add(this.getAction());
-		structuredActivityNodeEClass.getESuperTypes().add(this.getNamespace());
-		structuredActivityNodeEClass.getESuperTypes().add(this.getActivityGroup());
-		conditionalNodeEClass.getESuperTypes().add(this.getStructuredActivityNode());
-		clauseEClass.getESuperTypes().add(this.getElement());
-		loopNodeEClass.getESuperTypes().add(this.getStructuredActivityNode());
-		callTriggerEClass.getESuperTypes().add(this.getMessageTrigger());
-		messageTriggerEClass.getESuperTypes().add(this.getTrigger());
-		changeTriggerEClass.getESuperTypes().add(this.getTrigger());
-		triggerEClass.getESuperTypes().add(this.getNamedElement());
-		receptionEClass.getESuperTypes().add(this.getBehavioralFeature());
-		signalEClass.getESuperTypes().add(this.getClassifier());
-		signalTriggerEClass.getESuperTypes().add(this.getMessageTrigger());
-		timeTriggerEClass.getESuperTypes().add(this.getTrigger());
-		anyTriggerEClass.getESuperTypes().add(this.getMessageTrigger());
-		expansionNodeEClass.getESuperTypes().add(this.getObjectNode());
-		expansionRegionEClass.getESuperTypes().add(this.getStructuredActivityNode());
-		exceptionHandlerEClass.getESuperTypes().add(this.getElement());
-		forkNodeEClass.getESuperTypes().add(this.getControlNode());
-		joinNodeEClass.getESuperTypes().add(this.getControlNode());
-		flowFinalNodeEClass.getESuperTypes().add(this.getFinalNode());
-		centralBufferNodeEClass.getESuperTypes().add(this.getObjectNode());
-		activityPartitionEClass.getESuperTypes().add(this.getNamedElement());
-		activityPartitionEClass.getESuperTypes().add(this.getActivityGroup());
+		stateMachineEClass.getESuperTypes().add(this.getBehavior());
+		regionEClass.getESuperTypes().add(this.getNamespace());
+		regionEClass.getESuperTypes().add(this.getRedefinableElement());
+		pseudostateEClass.getESuperTypes().add(this.getVertex());
+		stateEClass.getESuperTypes().add(this.getNamespace());
+		stateEClass.getESuperTypes().add(this.getRedefinableElement());
+		stateEClass.getESuperTypes().add(this.getVertex());
+		vertexEClass.getESuperTypes().add(this.getNamedElement());
+		connectionPointReferenceEClass.getESuperTypes().add(this.getVertex());
+		transitionEClass.getESuperTypes().add(this.getRedefinableElement());
+		finalStateEClass.getESuperTypes().add(this.getState());
 		createObjectActionEClass.getESuperTypes().add(this.getAction());
 		destroyObjectActionEClass.getESuperTypes().add(this.getAction());
 		testIdentityActionEClass.getESuperTypes().add(this.getAction());
@@ -10318,17 +10320,15 @@
 		sendObjectActionEClass.getESuperTypes().add(this.getInvocationAction());
 		callOperationActionEClass.getESuperTypes().add(this.getCallAction());
 		callBehaviorActionEClass.getESuperTypes().add(this.getCallAction());
-		stateMachineEClass.getESuperTypes().add(this.getBehavior());
-		regionEClass.getESuperTypes().add(this.getNamespace());
-		regionEClass.getESuperTypes().add(this.getRedefinableElement());
-		pseudostateEClass.getESuperTypes().add(this.getVertex());
-		stateEClass.getESuperTypes().add(this.getNamespace());
-		stateEClass.getESuperTypes().add(this.getRedefinableElement());
-		stateEClass.getESuperTypes().add(this.getVertex());
-		vertexEClass.getESuperTypes().add(this.getNamedElement());
-		connectionPointReferenceEClass.getESuperTypes().add(this.getVertex());
-		transitionEClass.getESuperTypes().add(this.getRedefinableElement());
-		finalStateEClass.getESuperTypes().add(this.getState());
+		forkNodeEClass.getESuperTypes().add(this.getControlNode());
+		joinNodeEClass.getESuperTypes().add(this.getControlNode());
+		flowFinalNodeEClass.getESuperTypes().add(this.getFinalNode());
+		centralBufferNodeEClass.getESuperTypes().add(this.getObjectNode());
+		activityPartitionEClass.getESuperTypes().add(this.getNamedElement());
+		activityPartitionEClass.getESuperTypes().add(this.getActivityGroup());
+		expansionNodeEClass.getESuperTypes().add(this.getObjectNode());
+		expansionRegionEClass.getESuperTypes().add(this.getStructuredActivityNode());
+		exceptionHandlerEClass.getESuperTypes().add(this.getElement());
 		interactionOccurrenceEClass.getESuperTypes().add(this.getInteractionFragment());
 		gateEClass.getESuperTypes().add(this.getMessageEnd());
 		partDecompositionEClass.getESuperTypes().add(this.getInteractionOccurrence());
@@ -10338,30 +10338,6 @@
 		combinedFragmentEClass.getESuperTypes().add(this.getInteractionFragment());
 		continuationEClass.getESuperTypes().add(this.getInteractionFragment());
 		componentEClass.getESuperTypes().add(this.getClass_());
-		protocolConformanceEClass.getESuperTypes().add(this.getDirectedRelationship());
-		protocolStateMachineEClass.getESuperTypes().add(this.getStateMachine());
-		protocolTransitionEClass.getESuperTypes().add(this.getTransition());
-		timeExpressionEClass.getESuperTypes().add(this.getValueSpecification());
-		durationEClass.getESuperTypes().add(this.getValueSpecification());
-		timeObservationActionEClass.getESuperTypes().add(this.getWriteStructuralFeatureAction());
-		durationIntervalEClass.getESuperTypes().add(this.getInterval());
-		intervalEClass.getESuperTypes().add(this.getValueSpecification());
-		timeConstraintEClass.getESuperTypes().add(this.getIntervalConstraint());
-		intervalConstraintEClass.getESuperTypes().add(this.getConstraint());
-		timeIntervalEClass.getESuperTypes().add(this.getInterval());
-		durationObservationActionEClass.getESuperTypes().add(this.getWriteStructuralFeatureAction());
-		durationConstraintEClass.getESuperTypes().add(this.getIntervalConstraint());
-		dataStoreNodeEClass.getESuperTypes().add(this.getCentralBufferNode());
-		interruptibleActivityRegionEClass.getESuperTypes().add(this.getActivityGroup());
-		parameterSetEClass.getESuperTypes().add(this.getNamedElement());
-		deploymentEClass.getESuperTypes().add(this.getDependency());
-		deployedArtifactEClass.getESuperTypes().add(this.getNamedElement());
-		deploymentTargetEClass.getESuperTypes().add(this.getNamedElement());
-		nodeEClass.getESuperTypes().add(this.getClass_());
-		nodeEClass.getESuperTypes().add(this.getDeploymentTarget());
-		deviceEClass.getESuperTypes().add(this.getNode());
-		executionEnvironmentEClass.getESuperTypes().add(this.getNode());
-		communicationPathEClass.getESuperTypes().add(this.getAssociation());
 		readExtentActionEClass.getESuperTypes().add(this.getAction());
 		reclassifyObjectActionEClass.getESuperTypes().add(this.getAction());
 		readIsClassifiedObjectActionEClass.getESuperTypes().add(this.getAction());
@@ -10374,6 +10350,30 @@
 		acceptCallActionEClass.getESuperTypes().add(this.getAcceptEventAction());
 		replyActionEClass.getESuperTypes().add(this.getAction());
 		raiseExceptionActionEClass.getESuperTypes().add(this.getAction());
+		dataStoreNodeEClass.getESuperTypes().add(this.getCentralBufferNode());
+		interruptibleActivityRegionEClass.getESuperTypes().add(this.getActivityGroup());
+		parameterSetEClass.getESuperTypes().add(this.getNamedElement());
+		timeExpressionEClass.getESuperTypes().add(this.getValueSpecification());
+		durationEClass.getESuperTypes().add(this.getValueSpecification());
+		timeObservationActionEClass.getESuperTypes().add(this.getWriteStructuralFeatureAction());
+		durationIntervalEClass.getESuperTypes().add(this.getInterval());
+		intervalEClass.getESuperTypes().add(this.getValueSpecification());
+		timeConstraintEClass.getESuperTypes().add(this.getIntervalConstraint());
+		intervalConstraintEClass.getESuperTypes().add(this.getConstraint());
+		timeIntervalEClass.getESuperTypes().add(this.getInterval());
+		durationObservationActionEClass.getESuperTypes().add(this.getWriteStructuralFeatureAction());
+		durationConstraintEClass.getESuperTypes().add(this.getIntervalConstraint());
+		deploymentEClass.getESuperTypes().add(this.getDependency());
+		deployedArtifactEClass.getESuperTypes().add(this.getNamedElement());
+		deploymentTargetEClass.getESuperTypes().add(this.getNamedElement());
+		nodeEClass.getESuperTypes().add(this.getClass_());
+		nodeEClass.getESuperTypes().add(this.getDeploymentTarget());
+		deviceEClass.getESuperTypes().add(this.getNode());
+		executionEnvironmentEClass.getESuperTypes().add(this.getNode());
+		communicationPathEClass.getESuperTypes().add(this.getAssociation());
+		protocolConformanceEClass.getESuperTypes().add(this.getDirectedRelationship());
+		protocolStateMachineEClass.getESuperTypes().add(this.getStateMachine());
+		protocolTransitionEClass.getESuperTypes().add(this.getTransition());
 		deploymentSpecificationEClass.getESuperTypes().add(this.getArtifact());
 
 		// Initialize classes and features; add operations and parameters
@@ -10440,48 +10440,6 @@
 
 		addEOperation(multiplicityElementEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
 
-		initEClass(directedRelationshipEClass, DirectedRelationship.class, "DirectedRelationship", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getDirectedRelationship_Source(), this.getElement(), null, "source", null, 1, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getDirectedRelationship_Target(), this.getElement(), null, "target", null, 1, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(directedRelationshipEClass, ecorePackage.getEEList(), "getRelatedElements"); //$NON-NLS-1$
-
-		initEClass(relationshipEClass, Relationship.class, "Relationship", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getRelationship_RelatedElement(), this.getElement(), null, "relatedElement", null, 1, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(opaqueExpressionEClass, OpaqueExpression.class, "OpaqueExpression", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getOpaqueExpression_Body(), this.getString(), "body", "", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getOpaqueExpression_Language(), this.getString(), "language", "", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(getOpaqueExpression_Result(), this.getParameter(), null, "result", null, 0, 1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getOpaqueExpression_Behavior(), this.getBehavior(), null, "behavior", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(valueSpecificationEClass, ValueSpecification.class, "ValueSpecification", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		addEOperation(valueSpecificationEClass, this.getBoolean(), "isComputable"); //$NON-NLS-1$
-
-		addEOperation(valueSpecificationEClass, this.getInteger(), "integerValue"); //$NON-NLS-1$
-
-		addEOperation(valueSpecificationEClass, this.getBoolean(), "booleanValue"); //$NON-NLS-1$
-
-		addEOperation(valueSpecificationEClass, this.getString(), "stringValue"); //$NON-NLS-1$
-
-		addEOperation(valueSpecificationEClass, this.getUnlimitedNatural(), "unlimitedValue"); //$NON-NLS-1$
-
-		addEOperation(valueSpecificationEClass, this.getBoolean(), "isNull"); //$NON-NLS-1$
-
-		initEClass(expressionEClass, Expression.class, "Expression", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getExpression_Symbol(), this.getString(), "symbol", "", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(getExpression_Operand(), this.getValueSpecification(), null, "operand", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(expressionEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
-
-		initEClass(commentEClass, Comment.class, "Comment", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getComment_Body(), this.getString(), "body", "", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(getComment_AnnotatedElement(), this.getElement(), null, "annotatedElement", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getComment_BodyExpression(), this.getStringExpression(), null, "bodyExpression", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(commentEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
-
 		initEClass(namedElementEClass, NamedElement.class, "NamedElement", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 		initEAttribute(getNamedElement_Name(), this.getString(), "name", "", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
 		initEAttribute(getNamedElement_QualifiedName(), this.getString(), "qualifiedName", "", 0, 1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
@@ -10549,6 +10507,48 @@
 
 		addEOperation(namespaceEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
 
+		initEClass(directedRelationshipEClass, DirectedRelationship.class, "DirectedRelationship", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getDirectedRelationship_Source(), this.getElement(), null, "source", null, 1, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getDirectedRelationship_Target(), this.getElement(), null, "target", null, 1, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(directedRelationshipEClass, ecorePackage.getEEList(), "getRelatedElements"); //$NON-NLS-1$
+
+		initEClass(relationshipEClass, Relationship.class, "Relationship", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getRelationship_RelatedElement(), this.getElement(), null, "relatedElement", null, 1, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(opaqueExpressionEClass, OpaqueExpression.class, "OpaqueExpression", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getOpaqueExpression_Body(), this.getString(), "body", "", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getOpaqueExpression_Language(), this.getString(), "language", "", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getOpaqueExpression_Result(), this.getParameter(), null, "result", null, 0, 1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getOpaqueExpression_Behavior(), this.getBehavior(), null, "behavior", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(valueSpecificationEClass, ValueSpecification.class, "ValueSpecification", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+
+		addEOperation(valueSpecificationEClass, this.getBoolean(), "isComputable"); //$NON-NLS-1$
+
+		addEOperation(valueSpecificationEClass, this.getInteger(), "integerValue"); //$NON-NLS-1$
+
+		addEOperation(valueSpecificationEClass, this.getBoolean(), "booleanValue"); //$NON-NLS-1$
+
+		addEOperation(valueSpecificationEClass, this.getString(), "stringValue"); //$NON-NLS-1$
+
+		addEOperation(valueSpecificationEClass, this.getUnlimitedNatural(), "unlimitedValue"); //$NON-NLS-1$
+
+		addEOperation(valueSpecificationEClass, this.getBoolean(), "isNull"); //$NON-NLS-1$
+
+		initEClass(expressionEClass, Expression.class, "Expression", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getExpression_Symbol(), this.getString(), "symbol", "", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getExpression_Operand(), this.getValueSpecification(), null, "operand", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(expressionEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+
+		initEClass(commentEClass, Comment.class, "Comment", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getComment_Body(), this.getString(), "body", "", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getComment_AnnotatedElement(), this.getElement(), null, "annotatedElement", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getComment_BodyExpression(), this.getStringExpression(), null, "bodyExpression", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(commentEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+
 		initEClass(classEClass, org.eclipse.uml2.Class.class, "Class", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 		initEReference(getClass_OwnedOperation(), this.getOperation(), this.getOperation_Class_(), "ownedOperation", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEReference(getClass_SuperClass(), this.getClass_(), null, "superClass", null, 0, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
@@ -10938,18 +10938,6 @@
 
 		addEOperation(redefinableElementEClass, ecorePackage.getEEList(), "getRedefinedElements"); //$NON-NLS-1$
 
-		initEClass(generalizationEClass, Generalization.class, "Generalization", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getGeneralization_Specific(), this.getClassifier(), this.getClassifier_Generalization(), "specific", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getGeneralization_General(), this.getClassifier(), null, "general", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getGeneralization_IsSubstitutable(), this.getBoolean(), "isSubstitutable", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getGeneralization_GeneralizationSet(), this.getGeneralizationSet(), this.getGeneralizationSet_Generalization(), "generalizationSet", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(generalizationEClass, ecorePackage.getEEList(), "getSources"); //$NON-NLS-1$
-
-		addEOperation(generalizationEClass, this.getElement(), "getOwner"); //$NON-NLS-1$
-
-		addEOperation(generalizationEClass, ecorePackage.getEEList(), "getTargets"); //$NON-NLS-1$
-
 		initEClass(instanceSpecificationEClass, InstanceSpecification.class, "InstanceSpecification", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 		initEReference(getInstanceSpecification_Slot(), this.getSlot(), this.getSlot_OwningInstance(), "slot", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 		initEReference(getInstanceSpecification_Classifier(), this.getClassifier(), null, "classifier", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
@@ -10977,6 +10965,18 @@
 		initEClass(instanceValueEClass, InstanceValue.class, "InstanceValue", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 		initEReference(getInstanceValue_Instance(), this.getInstanceSpecification(), null, "instance", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
+		initEClass(generalizationEClass, Generalization.class, "Generalization", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getGeneralization_Specific(), this.getClassifier(), this.getClassifier_Generalization(), "specific", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getGeneralization_General(), this.getClassifier(), null, "general", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getGeneralization_IsSubstitutable(), this.getBoolean(), "isSubstitutable", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getGeneralization_GeneralizationSet(), this.getGeneralizationSet(), this.getGeneralizationSet_Generalization(), "generalizationSet", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(generalizationEClass, ecorePackage.getEEList(), "getSources"); //$NON-NLS-1$
+
+		addEOperation(generalizationEClass, this.getElement(), "getOwner"); //$NON-NLS-1$
+
+		addEOperation(generalizationEClass, ecorePackage.getEEList(), "getTargets"); //$NON-NLS-1$
+
 		initEClass(packageableElementEClass, PackageableElement.class, "PackageableElement", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 		initEAttribute(getPackageableElement_PackageableElement_visibility(), this.getVisibilityKind(), "packageableElement_visibility", null, 0, 1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
@@ -11210,6 +11210,91 @@
 
 		addEOperation(structuredClassifierEClass, ecorePackage.getEEList(), "getFeatures"); //$NON-NLS-1$
 
+		initEClass(interfaceEClass, Interface.class, "Interface", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getInterface_OwnedAttribute(), this.getProperty(), null, "ownedAttribute", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getInterface_OwnedOperation(), this.getOperation(), null, "ownedOperation", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getInterface_RedefinedInterface(), this.getInterface(), null, "redefinedInterface", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getInterface_NestedClassifier(), this.getClassifier(), null, "nestedClassifier", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getInterface_OwnedReception(), this.getReception(), null, "ownedReception", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getInterface_Protocol(), this.getProtocolStateMachine(), null, "protocol", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(interfaceEClass, ecorePackage.getEEList(), "getAttributes"); //$NON-NLS-1$
+
+		addEOperation(interfaceEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
+
+		addEOperation(interfaceEClass, ecorePackage.getEEList(), "getFeatures"); //$NON-NLS-1$
+
+		addEOperation(interfaceEClass, ecorePackage.getEEList(), "getRedefinedElements"); //$NON-NLS-1$
+
+		initEClass(implementationEClass, Implementation.class, "Implementation", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getImplementation_Contract(), this.getInterface(), null, "contract", null, 1, 1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getImplementation_ImplementingClassifier(), this.getBehavioredClassifier(), this.getBehavioredClassifier_Implementation(), "implementingClassifier", null, 1, 1, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(implementationEClass, ecorePackage.getEEList(), "getSuppliers"); //$NON-NLS-1$
+
+		addEOperation(implementationEClass, ecorePackage.getEEList(), "getTargets"); //$NON-NLS-1$
+
+		addEOperation(implementationEClass, ecorePackage.getEEList(), "getClients"); //$NON-NLS-1$
+
+		addEOperation(implementationEClass, ecorePackage.getEEList(), "getSources"); //$NON-NLS-1$
+
+		initEClass(artifactEClass, Artifact.class, "Artifact", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getArtifact_FileName(), this.getString(), "fileName", "", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getArtifact_NestedArtifact(), this.getArtifact(), null, "nestedArtifact", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getArtifact_Manifestation(), this.getManifestation(), null, "manifestation", null, 0, -1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getArtifact_OwnedOperation(), this.getOperation(), null, "ownedOperation", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getArtifact_OwnedAttribute(), this.getProperty(), null, "ownedAttribute", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(artifactEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+
+		addEOperation(artifactEClass, ecorePackage.getEEList(), "getClientDependencies"); //$NON-NLS-1$
+
+		addEOperation(artifactEClass, ecorePackage.getEEList(), "getFeatures"); //$NON-NLS-1$
+
+		addEOperation(artifactEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
+
+		addEOperation(artifactEClass, ecorePackage.getEEList(), "getAttributes"); //$NON-NLS-1$
+
+		initEClass(manifestationEClass, Manifestation.class, "Manifestation", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getManifestation_UtilizedElement(), this.getPackageableElement(), null, "utilizedElement", null, 1, 1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(manifestationEClass, ecorePackage.getEEList(), "getSuppliers"); //$NON-NLS-1$
+
+		addEOperation(manifestationEClass, ecorePackage.getEEList(), "getTargets"); //$NON-NLS-1$
+
+		initEClass(actorEClass, Actor.class, "Actor", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+
+		initEClass(extendEClass, Extend.class, "Extend", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getExtend_ExtendedCase(), this.getUseCase(), null, "extendedCase", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getExtend_Extension(), this.getUseCase(), this.getUseCase_Extend(), "extension", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getExtend_Condition(), this.getConstraint(), null, "condition", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getExtend_ExtensionLocation(), this.getExtensionPoint(), null, "extensionLocation", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(extendEClass, ecorePackage.getEEList(), "getTargets"); //$NON-NLS-1$
+
+		addEOperation(extendEClass, ecorePackage.getEEList(), "getSources"); //$NON-NLS-1$
+
+		addEOperation(extendEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+
+		initEClass(useCaseEClass, UseCase.class, "UseCase", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getUseCase_Include(), this.getInclude(), this.getInclude_IncludingCase(), "include", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getUseCase_Extend(), this.getExtend(), this.getExtend_Extension(), "extend", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getUseCase_ExtensionPoint(), this.getExtensionPoint(), this.getExtensionPoint_UseCase(), "extensionPoint", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getUseCase_Subject(), this.getClassifier(), this.getClassifier_UseCase(), "subject", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(useCaseEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
+
+		initEClass(extensionPointEClass, ExtensionPoint.class, "ExtensionPoint", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getExtensionPoint_UseCase(), this.getUseCase(), this.getUseCase_ExtensionPoint(), "useCase", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(includeEClass, Include.class, "Include", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getInclude_IncludingCase(), this.getUseCase(), this.getUseCase_Include(), "includingCase", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getInclude_Addition(), this.getUseCase(), null, "addition", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(includeEClass, ecorePackage.getEEList(), "getSources"); //$NON-NLS-1$
+
+		addEOperation(includeEClass, ecorePackage.getEEList(), "getTargets"); //$NON-NLS-1$
+
 		initEClass(activityEdgeEClass, ActivityEdge.class, "ActivityEdge", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 		initEReference(getActivityEdge_Activity(), this.getActivity(), this.getActivity_Edge(), "activity", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEReference(getActivityEdge_Source(), this.getActivityNode(), this.getActivityNode_Outgoing(), "source", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
@@ -11313,90 +11398,125 @@
 		initEClass(valuePinEClass, ValuePin.class, "ValuePin", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 		initEReference(getValuePin_Value(), this.getValueSpecification(), null, "value", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(artifactEClass, Artifact.class, "Artifact", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getArtifact_FileName(), this.getString(), "fileName", "", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(getArtifact_NestedArtifact(), this.getArtifact(), null, "nestedArtifact", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getArtifact_Manifestation(), this.getManifestation(), null, "manifestation", null, 0, -1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getArtifact_OwnedOperation(), this.getOperation(), null, "ownedOperation", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getArtifact_OwnedAttribute(), this.getProperty(), null, "ownedAttribute", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(callTriggerEClass, CallTrigger.class, "CallTrigger", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getCallTrigger_Operation(), this.getOperation(), null, "operation", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(artifactEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+		initEClass(messageTriggerEClass, MessageTrigger.class, "MessageTrigger", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 
-		addEOperation(artifactEClass, ecorePackage.getEEList(), "getClientDependencies"); //$NON-NLS-1$
+		initEClass(changeTriggerEClass, ChangeTrigger.class, "ChangeTrigger", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getChangeTrigger_ChangeExpression(), this.getValueSpecification(), null, "changeExpression", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(artifactEClass, ecorePackage.getEEList(), "getFeatures"); //$NON-NLS-1$
+		addEOperation(changeTriggerEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
 
-		addEOperation(artifactEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
+		initEClass(triggerEClass, Trigger.class, "Trigger", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getTrigger_Port(), this.getPort(), null, "port", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(artifactEClass, ecorePackage.getEEList(), "getAttributes"); //$NON-NLS-1$
+		initEClass(receptionEClass, Reception.class, "Reception", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getReception_Signal(), this.getSignal(), null, "signal", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(manifestationEClass, Manifestation.class, "Manifestation", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getManifestation_UtilizedElement(), this.getPackageableElement(), null, "utilizedElement", null, 1, 1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(signalEClass, Signal.class, "Signal", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getSignal_OwnedAttribute(), this.getProperty(), null, "ownedAttribute", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(manifestationEClass, ecorePackage.getEEList(), "getSuppliers"); //$NON-NLS-1$
+		addEOperation(signalEClass, ecorePackage.getEEList(), "getAttributes"); //$NON-NLS-1$
 
-		addEOperation(manifestationEClass, ecorePackage.getEEList(), "getTargets"); //$NON-NLS-1$
+		addEOperation(signalEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
 
-		initEClass(interfaceEClass, Interface.class, "Interface", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getInterface_OwnedAttribute(), this.getProperty(), null, "ownedAttribute", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterface_OwnedOperation(), this.getOperation(), null, "ownedOperation", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterface_RedefinedInterface(), this.getInterface(), null, "redefinedInterface", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterface_NestedClassifier(), this.getClassifier(), null, "nestedClassifier", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterface_OwnedReception(), this.getReception(), null, "ownedReception", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterface_Protocol(), this.getProtocolStateMachine(), null, "protocol", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(signalTriggerEClass, SignalTrigger.class, "SignalTrigger", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getSignalTrigger_Signal(), this.getSignal(), null, "signal", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(interfaceEClass, ecorePackage.getEEList(), "getAttributes"); //$NON-NLS-1$
+		initEClass(timeTriggerEClass, TimeTrigger.class, "TimeTrigger", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getTimeTrigger_IsRelative(), this.getBoolean(), "isRelative", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTimeTrigger_When(), this.getValueSpecification(), null, "when", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(interfaceEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
+		addEOperation(timeTriggerEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
 
-		addEOperation(interfaceEClass, ecorePackage.getEEList(), "getFeatures"); //$NON-NLS-1$
+		initEClass(anyTriggerEClass, AnyTrigger.class, "AnyTrigger", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 
-		addEOperation(interfaceEClass, ecorePackage.getEEList(), "getRedefinedElements"); //$NON-NLS-1$
+		initEClass(collaborationOccurrenceEClass, CollaborationOccurrence.class, "CollaborationOccurrence", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getCollaborationOccurrence_Type(), this.getCollaboration(), null, "type", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getCollaborationOccurrence_RoleBinding(), this.getDependency(), null, "roleBinding", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(implementationEClass, Implementation.class, "Implementation", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getImplementation_Contract(), this.getInterface(), null, "contract", null, 1, 1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getImplementation_ImplementingClassifier(), this.getBehavioredClassifier(), this.getBehavioredClassifier_Implementation(), "implementingClassifier", null, 1, 1, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		addEOperation(collaborationOccurrenceEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
 
-		addEOperation(implementationEClass, ecorePackage.getEEList(), "getSuppliers"); //$NON-NLS-1$
+		initEClass(collaborationEClass, Collaboration.class, "Collaboration", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getCollaboration_CollaborationRole(), this.getConnectableElement(), null, "collaborationRole", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(implementationEClass, ecorePackage.getEEList(), "getTargets"); //$NON-NLS-1$
+		addEOperation(collaborationEClass, ecorePackage.getEEList(), "getRoles"); //$NON-NLS-1$
 
-		addEOperation(implementationEClass, ecorePackage.getEEList(), "getClients"); //$NON-NLS-1$
+		initEClass(portEClass, Port.class, "Port", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getPort_IsBehavior(), this.getBoolean(), "isBehavior", "false", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getPort_IsService(), this.getBoolean(), "isService", "true", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getPort_Required(), this.getInterface(), null, "required", null, 0, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getPort_RedefinedPort(), this.getPort(), null, "redefinedPort", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getPort_Provided(), this.getInterface(), null, "provided", null, 0, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getPort_Protocol(), this.getProtocolStateMachine(), null, "protocol", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(implementationEClass, ecorePackage.getEEList(), "getSources"); //$NON-NLS-1$
+		addEOperation(portEClass, ecorePackage.getEEList(), "getRedefinedElements"); //$NON-NLS-1$
 
-		initEClass(actorEClass, Actor.class, "Actor", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEClass(encapsulatedClassifierEClass, EncapsulatedClassifier.class, "EncapsulatedClassifier", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getEncapsulatedClassifier_OwnedPort(), this.getPort(), null, "ownedPort", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(extendEClass, Extend.class, "Extend", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getExtend_ExtendedCase(), this.getUseCase(), null, "extendedCase", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getExtend_Extension(), this.getUseCase(), this.getUseCase_Extend(), "extension", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getExtend_Condition(), this.getConstraint(), null, "condition", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getExtend_ExtensionLocation(), this.getExtensionPoint(), null, "extensionLocation", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		addEOperation(encapsulatedClassifierEClass, ecorePackage.getEEList(), "getFeatures"); //$NON-NLS-1$
 
-		addEOperation(extendEClass, ecorePackage.getEEList(), "getTargets"); //$NON-NLS-1$
+		addEOperation(encapsulatedClassifierEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
 
-		addEOperation(extendEClass, ecorePackage.getEEList(), "getSources"); //$NON-NLS-1$
+		initEClass(variableEClass, Variable.class, "Variable", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getVariable_Scope(), this.getStructuredActivityNode(), this.getStructuredActivityNode_Variable(), "scope", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(extendEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+		addEOperation(variableEClass, this.getElement(), "getOwner"); //$NON-NLS-1$
 
-		initEClass(useCaseEClass, UseCase.class, "UseCase", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getUseCase_Include(), this.getInclude(), this.getInclude_IncludingCase(), "include", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getUseCase_Extend(), this.getExtend(), this.getExtend_Extension(), "extend", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getUseCase_ExtensionPoint(), this.getExtensionPoint(), this.getExtensionPoint_UseCase(), "extensionPoint", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getUseCase_Subject(), this.getClassifier(), this.getClassifier_UseCase(), "subject", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(structuredActivityNodeEClass, StructuredActivityNode.class, "StructuredActivityNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getStructuredActivityNode_Variable(), this.getVariable(), this.getVariable_Scope(), "variable", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getStructuredActivityNode_ContainedNode(), this.getActivityNode(), this.getActivityNode_InStructuredNode(), "containedNode", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getStructuredActivityNode_ContainedEdge(), this.getActivityEdge(), this.getActivityEdge_InStructuredNode(), "containedEdge", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getStructuredActivityNode_MustIsolate(), this.getBoolean(), "mustIsolate", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(useCaseEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
+		addEOperation(structuredActivityNodeEClass, this.getActivity(), "getActivity"); //$NON-NLS-1$
 
-		initEClass(extensionPointEClass, ExtensionPoint.class, "ExtensionPoint", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getExtensionPoint_UseCase(), this.getUseCase(), this.getUseCase_ExtensionPoint(), "useCase", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		op = addEOperation(structuredActivityNodeEClass, null, "setActivity"); //$NON-NLS-1$
+		addEParameter(op, this.getActivity(), "newActivity"); //$NON-NLS-1$
 
-		initEClass(includeEClass, Include.class, "Include", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getInclude_IncludingCase(), this.getUseCase(), this.getUseCase_Include(), "includingCase", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInclude_Addition(), this.getUseCase(), null, "addition", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		addEOperation(structuredActivityNodeEClass, this.getActivity(), "getActivityGroup_activity"); //$NON-NLS-1$
 
-		addEOperation(includeEClass, ecorePackage.getEEList(), "getSources"); //$NON-NLS-1$
+		op = addEOperation(structuredActivityNodeEClass, null, "setActivityGroup_activity"); //$NON-NLS-1$
+		addEParameter(op, this.getActivity(), "newActivityGroup_activity"); //$NON-NLS-1$
 
-		addEOperation(includeEClass, ecorePackage.getEEList(), "getTargets"); //$NON-NLS-1$
+		addEOperation(structuredActivityNodeEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
+
+		initEClass(conditionalNodeEClass, ConditionalNode.class, "ConditionalNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getConditionalNode_IsDeterminate(), this.getBoolean(), "isDeterminate", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getConditionalNode_IsAssured(), this.getBoolean(), "isAssured", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getConditionalNode_Clause(), this.getClause(), null, "clause", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getConditionalNode_Result(), this.getOutputPin(), null, "result", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(conditionalNodeEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+
+		addEOperation(conditionalNodeEClass, ecorePackage.getEEList(), "getOutputs"); //$NON-NLS-1$
+
+		initEClass(clauseEClass, Clause.class, "Clause", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getClause_Test(), this.getActivityNode(), null, "test", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getClause_Body(), this.getActivityNode(), null, "body", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getClause_PredecessorClause(), this.getClause(), this.getClause_SuccessorClause(), "predecessorClause", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getClause_SuccessorClause(), this.getClause(), this.getClause_PredecessorClause(), "successorClause", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getClause_Decider(), this.getOutputPin(), null, "decider", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getClause_BodyOutput(), this.getOutputPin(), null, "bodyOutput", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(loopNodeEClass, LoopNode.class, "LoopNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getLoopNode_IsTestedFirst(), this.getBoolean(), "isTestedFirst", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getLoopNode_BodyPart(), this.getActivityNode(), null, "bodyPart", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getLoopNode_SetupPart(), this.getActivityNode(), null, "setupPart", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getLoopNode_Decider(), this.getOutputPin(), null, "decider", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getLoopNode_Test(), this.getActivityNode(), null, "test", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getLoopNode_Result(), this.getOutputPin(), null, "result", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getLoopNode_LoopVariable(), this.getOutputPin(), null, "loopVariable", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getLoopNode_BodyOutput(), this.getOutputPin(), null, "bodyOutput", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getLoopNode_LoopVariableInput(), this.getInputPin(), null, "loopVariableInput", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(loopNodeEClass, ecorePackage.getEEList(), "getOutputs"); //$NON-NLS-1$
+
+		addEOperation(loopNodeEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+
+		addEOperation(loopNodeEClass, ecorePackage.getEEList(), "getInputs"); //$NON-NLS-1$
 
 		initEClass(templateSignatureEClass, TemplateSignature.class, "TemplateSignature", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 		initEReference(getTemplateSignature_Parameter(), this.getTemplateParameter(), null, "parameter", null, 1, -1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
@@ -11465,11 +11585,6 @@
 
 		addEOperation(templateParameterSubstitutionEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
 
-		initEClass(collaborationEClass, Collaboration.class, "Collaboration", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getCollaboration_CollaborationRole(), this.getConnectableElement(), null, "collaborationRole", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(collaborationEClass, ecorePackage.getEEList(), "getRoles"); //$NON-NLS-1$
-
 		initEClass(operationTemplateParameterEClass, OperationTemplateParameter.class, "OperationTemplateParameter", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 
 		initEClass(classifierTemplateParameterEClass, ClassifierTemplateParameter.class, "ClassifierTemplateParameter", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
@@ -11483,29 +11598,6 @@
 
 		initEClass(connectableElementTemplateParameterEClass, ConnectableElementTemplateParameter.class, "ConnectableElementTemplateParameter", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 
-		initEClass(collaborationOccurrenceEClass, CollaborationOccurrence.class, "CollaborationOccurrence", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getCollaborationOccurrence_Type(), this.getCollaboration(), null, "type", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getCollaborationOccurrence_RoleBinding(), this.getDependency(), null, "roleBinding", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(collaborationOccurrenceEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
-
-		initEClass(portEClass, Port.class, "Port", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getPort_IsBehavior(), this.getBoolean(), "isBehavior", "false", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getPort_IsService(), this.getBoolean(), "isService", "true", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(getPort_Required(), this.getInterface(), null, "required", null, 0, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getPort_RedefinedPort(), this.getPort(), null, "redefinedPort", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getPort_Provided(), this.getInterface(), null, "provided", null, 0, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getPort_Protocol(), this.getProtocolStateMachine(), null, "protocol", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(portEClass, ecorePackage.getEEList(), "getRedefinedElements"); //$NON-NLS-1$
-
-		initEClass(encapsulatedClassifierEClass, EncapsulatedClassifier.class, "EncapsulatedClassifier", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getEncapsulatedClassifier_OwnedPort(), this.getPort(), null, "ownedPort", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(encapsulatedClassifierEClass, ecorePackage.getEEList(), "getFeatures"); //$NON-NLS-1$
-
-		addEOperation(encapsulatedClassifierEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
-
 		initEClass(interactionEClass, Interaction.class, "Interaction", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 		initEReference(getInteraction_Lifeline(), this.getLifeline(), this.getLifeline_Interaction(), "lifeline", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 		initEReference(getInteraction_Message(), this.getMessage(), this.getMessage_Interaction(), "message", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
@@ -11579,137 +11671,89 @@
 
 		initEClass(stopEClass, Stop.class, "Stop", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 
-		initEClass(variableEClass, Variable.class, "Variable", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getVariable_Scope(), this.getStructuredActivityNode(), this.getStructuredActivityNode_Variable(), "scope", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(stateMachineEClass, StateMachine.class, "StateMachine", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getStateMachine_Region(), this.getRegion(), this.getRegion_StateMachine(), "region", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getStateMachine_ConnectionPoint(), this.getPseudostate(), null, "connectionPoint", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getStateMachine_ExtendedStateMachine(), this.getStateMachine(), null, "extendedStateMachine", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getStateMachine_StateMachine_redefinitionContext(), this.getBehavioredClassifier(), this.getBehavioredClassifier_OwnedStateMachine(), "stateMachine_redefinitionContext", null, 0, 1, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(variableEClass, this.getElement(), "getOwner"); //$NON-NLS-1$
+		addEOperation(stateMachineEClass, ecorePackage.getEEList(), "getRedefinedElements"); //$NON-NLS-1$
 
-		initEClass(structuredActivityNodeEClass, StructuredActivityNode.class, "StructuredActivityNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getStructuredActivityNode_Variable(), this.getVariable(), this.getVariable_Scope(), "variable", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getStructuredActivityNode_ContainedNode(), this.getActivityNode(), this.getActivityNode_InStructuredNode(), "containedNode", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getStructuredActivityNode_ContainedEdge(), this.getActivityEdge(), this.getActivityEdge_InStructuredNode(), "containedEdge", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getStructuredActivityNode_MustIsolate(), this.getBoolean(), "mustIsolate", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		addEOperation(stateMachineEClass, ecorePackage.getEEList(), "getRedefinitionContexts"); //$NON-NLS-1$
 
-		addEOperation(structuredActivityNodeEClass, this.getActivity(), "getActivity"); //$NON-NLS-1$
+		addEOperation(stateMachineEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
 
-		op = addEOperation(structuredActivityNodeEClass, null, "setActivity"); //$NON-NLS-1$
-		addEParameter(op, this.getActivity(), "newActivity"); //$NON-NLS-1$
+		initEClass(regionEClass, Region.class, "Region", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getRegion_Subvertex(), this.getVertex(), this.getVertex_Container(), "subvertex", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getRegion_Transition(), this.getTransition(), this.getTransition_Container(), "transition", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getRegion_StateMachine(), this.getStateMachine(), this.getStateMachine_Region(), "stateMachine", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getRegion_State(), this.getState(), this.getState_Region(), "state", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getRegion_ExtendedRegion(), this.getRegion(), null, "extendedRegion", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(structuredActivityNodeEClass, this.getActivity(), "getActivityGroup_activity"); //$NON-NLS-1$
+		addEOperation(regionEClass, ecorePackage.getEEList(), "getRedefinitionContexts"); //$NON-NLS-1$
 
-		op = addEOperation(structuredActivityNodeEClass, null, "setActivityGroup_activity"); //$NON-NLS-1$
-		addEParameter(op, this.getActivity(), "newActivityGroup_activity"); //$NON-NLS-1$
+		addEOperation(regionEClass, ecorePackage.getEEList(), "getRedefinedElements"); //$NON-NLS-1$
 
-		addEOperation(structuredActivityNodeEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
+		addEOperation(regionEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
 
-		initEClass(conditionalNodeEClass, ConditionalNode.class, "ConditionalNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getConditionalNode_IsDeterminate(), this.getBoolean(), "isDeterminate", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getConditionalNode_IsAssured(), this.getBoolean(), "isAssured", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getConditionalNode_Clause(), this.getClause(), null, "clause", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getConditionalNode_Result(), this.getOutputPin(), null, "result", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		addEOperation(regionEClass, this.getNamespace(), "getNamespace"); //$NON-NLS-1$
 
-		addEOperation(conditionalNodeEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+		initEClass(pseudostateEClass, Pseudostate.class, "Pseudostate", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getPseudostate_Kind(), this.getPseudostateKind(), "kind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(conditionalNodeEClass, ecorePackage.getEEList(), "getOutputs"); //$NON-NLS-1$
+		initEClass(stateEClass, State.class, "State", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getState_IsComposite(), this.getBoolean(), "isComposite", null, 0, 1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getState_IsOrthogonal(), this.getBoolean(), "isOrthogonal", null, 0, 1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getState_IsSimple(), this.getBoolean(), "isSimple", null, 0, 1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getState_IsSubmachineState(), this.getBoolean(), "isSubmachineState", null, 0, 1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getState_Submachine(), this.getStateMachine(), null, "submachine", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getState_Connection(), this.getConnectionPointReference(), null, "connection", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getState_RedefinedState(), this.getState(), null, "redefinedState", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getState_DeferrableTrigger(), this.getTrigger(), null, "deferrableTrigger", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getState_Region(), this.getRegion(), this.getRegion_State(), "region", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getState_Entry(), this.getActivity(), null, "entry", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getState_Exit(), this.getActivity(), null, "exit", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getState_DoActivity(), this.getActivity(), null, "doActivity", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getState_StateInvariant(), this.getConstraint(), null, "stateInvariant", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(clauseEClass, Clause.class, "Clause", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getClause_Test(), this.getActivityNode(), null, "test", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getClause_Body(), this.getActivityNode(), null, "body", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getClause_PredecessorClause(), this.getClause(), this.getClause_SuccessorClause(), "predecessorClause", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getClause_SuccessorClause(), this.getClause(), this.getClause_PredecessorClause(), "successorClause", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getClause_Decider(), this.getOutputPin(), null, "decider", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getClause_BodyOutput(), this.getOutputPin(), null, "bodyOutput", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		addEOperation(stateEClass, ecorePackage.getEEList(), "getRedefinitionContexts"); //$NON-NLS-1$
 
-		initEClass(loopNodeEClass, LoopNode.class, "LoopNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getLoopNode_IsTestedFirst(), this.getBoolean(), "isTestedFirst", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getLoopNode_BodyPart(), this.getActivityNode(), null, "bodyPart", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getLoopNode_SetupPart(), this.getActivityNode(), null, "setupPart", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getLoopNode_Decider(), this.getOutputPin(), null, "decider", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getLoopNode_Test(), this.getActivityNode(), null, "test", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getLoopNode_Result(), this.getOutputPin(), null, "result", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getLoopNode_LoopVariable(), this.getOutputPin(), null, "loopVariable", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getLoopNode_BodyOutput(), this.getOutputPin(), null, "bodyOutput", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getLoopNode_LoopVariableInput(), this.getInputPin(), null, "loopVariableInput", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		addEOperation(stateEClass, ecorePackage.getEEList(), "getRedefinedElements"); //$NON-NLS-1$
 
-		addEOperation(loopNodeEClass, ecorePackage.getEEList(), "getOutputs"); //$NON-NLS-1$
+		addEOperation(stateEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
 
-		addEOperation(loopNodeEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+		addEOperation(stateEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
 
-		addEOperation(loopNodeEClass, ecorePackage.getEEList(), "getInputs"); //$NON-NLS-1$
+		initEClass(vertexEClass, Vertex.class, "Vertex", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getVertex_Container(), this.getRegion(), this.getRegion_Subvertex(), "container", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getVertex_Outgoing(), this.getTransition(), this.getTransition_Source(), "outgoing", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getVertex_Incoming(), this.getTransition(), this.getTransition_Target(), "incoming", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(callTriggerEClass, CallTrigger.class, "CallTrigger", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getCallTrigger_Operation(), this.getOperation(), null, "operation", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		addEOperation(vertexEClass, this.getElement(), "getOwner"); //$NON-NLS-1$
 
-		initEClass(messageTriggerEClass, MessageTrigger.class, "MessageTrigger", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEClass(connectionPointReferenceEClass, ConnectionPointReference.class, "ConnectionPointReference", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getConnectionPointReference_Entry(), this.getPseudostate(), null, "entry", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getConnectionPointReference_Exit(), this.getPseudostate(), null, "exit", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(changeTriggerEClass, ChangeTrigger.class, "ChangeTrigger", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getChangeTrigger_ChangeExpression(), this.getValueSpecification(), null, "changeExpression", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(transitionEClass, Transition.class, "Transition", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getTransition_Kind(), this.getTransitionKind(), "kind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTransition_Container(), this.getRegion(), this.getRegion_Transition(), "container", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTransition_Source(), this.getVertex(), this.getVertex_Outgoing(), "source", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTransition_Target(), this.getVertex(), this.getVertex_Incoming(), "target", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTransition_RedefinedTransition(), this.getTransition(), null, "redefinedTransition", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTransition_Trigger(), this.getTrigger(), null, "trigger", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTransition_Guard(), this.getConstraint(), null, "guard", null, 0, 1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTransition_Effect(), this.getActivity(), null, "effect", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(changeTriggerEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+		addEOperation(transitionEClass, ecorePackage.getEEList(), "getRedefinitionContexts"); //$NON-NLS-1$
 
-		initEClass(triggerEClass, Trigger.class, "Trigger", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getTrigger_Port(), this.getPort(), null, "port", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		addEOperation(transitionEClass, ecorePackage.getEEList(), "getRedefinedElements"); //$NON-NLS-1$
 
-		initEClass(receptionEClass, Reception.class, "Reception", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getReception_Signal(), this.getSignal(), null, "signal", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		addEOperation(transitionEClass, this.getElement(), "getOwner"); //$NON-NLS-1$
 
-		initEClass(signalEClass, Signal.class, "Signal", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getSignal_OwnedAttribute(), this.getProperty(), null, "ownedAttribute", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		addEOperation(transitionEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
 
-		addEOperation(signalEClass, ecorePackage.getEEList(), "getAttributes"); //$NON-NLS-1$
-
-		addEOperation(signalEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
-
-		initEClass(signalTriggerEClass, SignalTrigger.class, "SignalTrigger", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getSignalTrigger_Signal(), this.getSignal(), null, "signal", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(timeTriggerEClass, TimeTrigger.class, "TimeTrigger", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getTimeTrigger_IsRelative(), this.getBoolean(), "isRelative", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getTimeTrigger_When(), this.getValueSpecification(), null, "when", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(timeTriggerEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
-
-		initEClass(anyTriggerEClass, AnyTrigger.class, "AnyTrigger", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(expansionNodeEClass, ExpansionNode.class, "ExpansionNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getExpansionNode_RegionAsOutput(), this.getExpansionRegion(), this.getExpansionRegion_OutputElement(), "regionAsOutput", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getExpansionNode_RegionAsInput(), this.getExpansionRegion(), this.getExpansionRegion_InputElement(), "regionAsInput", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(expansionRegionEClass, ExpansionRegion.class, "ExpansionRegion", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getExpansionRegion_Mode(), this.getExpansionKind(), "mode", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getExpansionRegion_OutputElement(), this.getExpansionNode(), this.getExpansionNode_RegionAsOutput(), "outputElement", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getExpansionRegion_InputElement(), this.getExpansionNode(), this.getExpansionNode_RegionAsInput(), "inputElement", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(exceptionHandlerEClass, ExceptionHandler.class, "ExceptionHandler", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getExceptionHandler_ProtectedNode(), this.getExecutableNode(), this.getExecutableNode_Handler(), "protectedNode", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getExceptionHandler_HandlerBody(), this.getExecutableNode(), null, "handlerBody", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getExceptionHandler_ExceptionInput(), this.getObjectNode(), null, "exceptionInput", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getExceptionHandler_ExceptionType(), this.getClassifier(), null, "exceptionType", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(exceptionHandlerEClass, this.getElement(), "getOwner"); //$NON-NLS-1$
-
-		initEClass(forkNodeEClass, ForkNode.class, "ForkNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(joinNodeEClass, JoinNode.class, "JoinNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getJoinNode_IsCombineDuplicate(), this.getBoolean(), "isCombineDuplicate", "true", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(getJoinNode_JoinSpec(), this.getValueSpecification(), null, "joinSpec", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(joinNodeEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
-
-		initEClass(flowFinalNodeEClass, FlowFinalNode.class, "FlowFinalNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(centralBufferNodeEClass, CentralBufferNode.class, "CentralBufferNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(activityPartitionEClass, ActivityPartition.class, "ActivityPartition", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getActivityPartition_IsDimension(), this.getBoolean(), "isDimension", "false", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(getActivityPartition_IsExternal(), this.getBoolean(), "isExternal", "false", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(getActivityPartition_ContainedEdge(), this.getActivityEdge(), this.getActivityEdge_InPartition(), "containedEdge", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getActivityPartition_ContainedNode(), this.getActivityNode(), this.getActivityNode_InPartition(), "containedNode", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getActivityPartition_Subgroup(), this.getActivityPartition(), this.getActivityPartition_SuperPartition(), "subgroup", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getActivityPartition_SuperPartition(), this.getActivityPartition(), this.getActivityPartition_Subgroup(), "superPartition", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getActivityPartition_Represents(), this.getElement(), null, "represents", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(activityPartitionEClass, this.getActivityGroup(), "getSuperGroup"); //$NON-NLS-1$
+		initEClass(finalStateEClass, FinalState.class, "FinalState", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 
 		initEClass(createObjectActionEClass, CreateObjectAction.class, "CreateObjectAction", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 		initEReference(getCreateObjectAction_Classifier(), this.getClassifier(), null, "classifier", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
@@ -11871,89 +11915,45 @@
 		initEClass(callBehaviorActionEClass, CallBehaviorAction.class, "CallBehaviorAction", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 		initEReference(getCallBehaviorAction_Behavior(), this.getBehavior(), null, "behavior", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(stateMachineEClass, StateMachine.class, "StateMachine", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getStateMachine_Region(), this.getRegion(), this.getRegion_StateMachine(), "region", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getStateMachine_ConnectionPoint(), this.getPseudostate(), null, "connectionPoint", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getStateMachine_ExtendedStateMachine(), this.getStateMachine(), null, "extendedStateMachine", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getStateMachine_StateMachine_redefinitionContext(), this.getBehavioredClassifier(), this.getBehavioredClassifier_OwnedStateMachine(), "stateMachine_redefinitionContext", null, 0, 1, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(forkNodeEClass, ForkNode.class, "ForkNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 
-		addEOperation(stateMachineEClass, ecorePackage.getEEList(), "getRedefinedElements"); //$NON-NLS-1$
+		initEClass(joinNodeEClass, JoinNode.class, "JoinNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getJoinNode_IsCombineDuplicate(), this.getBoolean(), "isCombineDuplicate", "true", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getJoinNode_JoinSpec(), this.getValueSpecification(), null, "joinSpec", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(stateMachineEClass, ecorePackage.getEEList(), "getRedefinitionContexts"); //$NON-NLS-1$
+		addEOperation(joinNodeEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
 
-		addEOperation(stateMachineEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
+		initEClass(flowFinalNodeEClass, FlowFinalNode.class, "FlowFinalNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 
-		initEClass(regionEClass, Region.class, "Region", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getRegion_Subvertex(), this.getVertex(), this.getVertex_Container(), "subvertex", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getRegion_Transition(), this.getTransition(), this.getTransition_Container(), "transition", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getRegion_StateMachine(), this.getStateMachine(), this.getStateMachine_Region(), "stateMachine", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getRegion_State(), this.getState(), this.getState_Region(), "state", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getRegion_ExtendedRegion(), this.getRegion(), null, "extendedRegion", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(centralBufferNodeEClass, CentralBufferNode.class, "CentralBufferNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 
-		addEOperation(regionEClass, ecorePackage.getEEList(), "getRedefinitionContexts"); //$NON-NLS-1$
+		initEClass(activityPartitionEClass, ActivityPartition.class, "ActivityPartition", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getActivityPartition_IsDimension(), this.getBoolean(), "isDimension", "false", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getActivityPartition_IsExternal(), this.getBoolean(), "isExternal", "false", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getActivityPartition_ContainedEdge(), this.getActivityEdge(), this.getActivityEdge_InPartition(), "containedEdge", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getActivityPartition_ContainedNode(), this.getActivityNode(), this.getActivityNode_InPartition(), "containedNode", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getActivityPartition_Subgroup(), this.getActivityPartition(), this.getActivityPartition_SuperPartition(), "subgroup", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getActivityPartition_SuperPartition(), this.getActivityPartition(), this.getActivityPartition_Subgroup(), "superPartition", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getActivityPartition_Represents(), this.getElement(), null, "represents", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(regionEClass, ecorePackage.getEEList(), "getRedefinedElements"); //$NON-NLS-1$
+		addEOperation(activityPartitionEClass, this.getActivityGroup(), "getSuperGroup"); //$NON-NLS-1$
 
-		addEOperation(regionEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+		initEClass(expansionNodeEClass, ExpansionNode.class, "ExpansionNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getExpansionNode_RegionAsOutput(), this.getExpansionRegion(), this.getExpansionRegion_OutputElement(), "regionAsOutput", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getExpansionNode_RegionAsInput(), this.getExpansionRegion(), this.getExpansionRegion_InputElement(), "regionAsInput", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-		addEOperation(regionEClass, this.getNamespace(), "getNamespace"); //$NON-NLS-1$
+		initEClass(expansionRegionEClass, ExpansionRegion.class, "ExpansionRegion", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getExpansionRegion_Mode(), this.getExpansionKind(), "mode", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getExpansionRegion_OutputElement(), this.getExpansionNode(), this.getExpansionNode_RegionAsOutput(), "outputElement", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getExpansionRegion_InputElement(), this.getExpansionNode(), this.getExpansionNode_RegionAsInput(), "inputElement", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(pseudostateEClass, Pseudostate.class, "Pseudostate", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getPseudostate_Kind(), this.getPseudostateKind(), "kind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(exceptionHandlerEClass, ExceptionHandler.class, "ExceptionHandler", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getExceptionHandler_ProtectedNode(), this.getExecutableNode(), this.getExecutableNode_Handler(), "protectedNode", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getExceptionHandler_HandlerBody(), this.getExecutableNode(), null, "handlerBody", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getExceptionHandler_ExceptionInput(), this.getObjectNode(), null, "exceptionInput", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getExceptionHandler_ExceptionType(), this.getClassifier(), null, "exceptionType", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(stateEClass, State.class, "State", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getState_IsComposite(), this.getBoolean(), "isComposite", null, 0, 1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getState_IsOrthogonal(), this.getBoolean(), "isOrthogonal", null, 0, 1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getState_IsSimple(), this.getBoolean(), "isSimple", null, 0, 1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getState_IsSubmachineState(), this.getBoolean(), "isSubmachineState", null, 0, 1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getState_Submachine(), this.getStateMachine(), null, "submachine", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getState_Connection(), this.getConnectionPointReference(), null, "connection", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getState_RedefinedState(), this.getState(), null, "redefinedState", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getState_DeferrableTrigger(), this.getTrigger(), null, "deferrableTrigger", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getState_Region(), this.getRegion(), this.getRegion_State(), "region", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getState_Entry(), this.getActivity(), null, "entry", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getState_Exit(), this.getActivity(), null, "exit", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getState_DoActivity(), this.getActivity(), null, "doActivity", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getState_StateInvariant(), this.getConstraint(), null, "stateInvariant", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(stateEClass, ecorePackage.getEEList(), "getRedefinitionContexts"); //$NON-NLS-1$
-
-		addEOperation(stateEClass, ecorePackage.getEEList(), "getRedefinedElements"); //$NON-NLS-1$
-
-		addEOperation(stateEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
-
-		addEOperation(stateEClass, ecorePackage.getEEList(), "getOwnedMembers"); //$NON-NLS-1$
-
-		initEClass(vertexEClass, Vertex.class, "Vertex", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getVertex_Container(), this.getRegion(), this.getRegion_Subvertex(), "container", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getVertex_Outgoing(), this.getTransition(), this.getTransition_Source(), "outgoing", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getVertex_Incoming(), this.getTransition(), this.getTransition_Target(), "incoming", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(vertexEClass, this.getElement(), "getOwner"); //$NON-NLS-1$
-
-		initEClass(connectionPointReferenceEClass, ConnectionPointReference.class, "ConnectionPointReference", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getConnectionPointReference_Entry(), this.getPseudostate(), null, "entry", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getConnectionPointReference_Exit(), this.getPseudostate(), null, "exit", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(transitionEClass, Transition.class, "Transition", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getTransition_Kind(), this.getTransitionKind(), "kind", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getTransition_Container(), this.getRegion(), this.getRegion_Transition(), "container", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getTransition_Source(), this.getVertex(), this.getVertex_Outgoing(), "source", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getTransition_Target(), this.getVertex(), this.getVertex_Incoming(), "target", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getTransition_RedefinedTransition(), this.getTransition(), null, "redefinedTransition", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getTransition_Trigger(), this.getTrigger(), null, "trigger", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getTransition_Guard(), this.getConstraint(), null, "guard", null, 0, 1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getTransition_Effect(), this.getActivity(), null, "effect", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(transitionEClass, ecorePackage.getEEList(), "getRedefinitionContexts"); //$NON-NLS-1$
-
-		addEOperation(transitionEClass, ecorePackage.getEEList(), "getRedefinedElements"); //$NON-NLS-1$
-
-		addEOperation(transitionEClass, this.getElement(), "getOwner"); //$NON-NLS-1$
-
-		addEOperation(transitionEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
-
-		initEClass(finalStateEClass, FinalState.class, "FinalState", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		addEOperation(exceptionHandlerEClass, this.getElement(), "getOwner"); //$NON-NLS-1$
 
 		initEClass(interactionOccurrenceEClass, InteractionOccurrence.class, "InteractionOccurrence", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 		initEReference(getInteractionOccurrence_RefersTo(), this.getInteraction(), null, "refersTo", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
@@ -11999,140 +11999,6 @@
 
 		addEOperation(componentEClass, ecorePackage.getEEList(), "getClientDependencies"); //$NON-NLS-1$
 
-		initEClass(protocolConformanceEClass, ProtocolConformance.class, "ProtocolConformance", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getProtocolConformance_SpecificMachine(), this.getProtocolStateMachine(), this.getProtocolStateMachine_Conformance(), "specificMachine", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getProtocolConformance_GeneralMachine(), this.getProtocolStateMachine(), null, "generalMachine", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(protocolConformanceEClass, ecorePackage.getEEList(), "getSources"); //$NON-NLS-1$
-
-		addEOperation(protocolConformanceEClass, this.getElement(), "getOwner"); //$NON-NLS-1$
-
-		addEOperation(protocolConformanceEClass, ecorePackage.getEEList(), "getTargets"); //$NON-NLS-1$
-
-		initEClass(protocolStateMachineEClass, ProtocolStateMachine.class, "ProtocolStateMachine", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getProtocolStateMachine_Conformance(), this.getProtocolConformance(), this.getProtocolConformance_SpecificMachine(), "conformance", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(protocolStateMachineEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
-
-		initEClass(protocolTransitionEClass, ProtocolTransition.class, "ProtocolTransition", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getProtocolTransition_PostCondition(), this.getConstraint(), null, "postCondition", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getProtocolTransition_Referred(), this.getOperation(), null, "referred", null, 0, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getProtocolTransition_PreCondition(), this.getConstraint(), null, "preCondition", null, 0, 1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(protocolTransitionEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
-
-		op = addEOperation(protocolTransitionEClass, null, "setGuard"); //$NON-NLS-1$
-		addEParameter(op, this.getConstraint(), "newGuard"); //$NON-NLS-1$
-
-		initEClass(timeExpressionEClass, TimeExpression.class, "TimeExpression", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getTimeExpression_FirstTime(), this.getBoolean(), "firstTime", "True", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(getTimeExpression_Event(), this.getNamedElement(), null, "event", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(durationEClass, Duration.class, "Duration", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEAttribute(getDuration_FirstTime(), this.getBoolean(), "firstTime", "True", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(getDuration_Event(), this.getNamedElement(), null, "event", null, 0, 2, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(timeObservationActionEClass, TimeObservationAction.class, "TimeObservationAction", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getTimeObservationAction_Now(), this.getTimeExpression(), null, "now", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(timeObservationActionEClass, this.getInputPin(), "getValue"); //$NON-NLS-1$
-
-		op = addEOperation(timeObservationActionEClass, null, "setValue"); //$NON-NLS-1$
-		addEParameter(op, this.getInputPin(), "newValue"); //$NON-NLS-1$
-
-		initEClass(durationIntervalEClass, DurationInterval.class, "DurationInterval", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		addEOperation(durationIntervalEClass, ecorePackage.getEEList(), "getMins"); //$NON-NLS-1$
-
-		addEOperation(durationIntervalEClass, ecorePackage.getEEList(), "getMaxes"); //$NON-NLS-1$
-
-		initEClass(intervalEClass, Interval.class, "Interval", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getInterval_Min(), this.getValueSpecification(), null, "min", null, 0, -1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterval_Max(), this.getValueSpecification(), null, "max", null, 0, -1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(timeConstraintEClass, TimeConstraint.class, "TimeConstraint", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		addEOperation(timeConstraintEClass, this.getValueSpecification(), "getSpecification"); //$NON-NLS-1$
-
-		op = addEOperation(timeConstraintEClass, null, "setSpecification"); //$NON-NLS-1$
-		addEParameter(op, this.getValueSpecification(), "newSpecification"); //$NON-NLS-1$
-
-		initEClass(intervalConstraintEClass, IntervalConstraint.class, "IntervalConstraint", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		addEOperation(intervalConstraintEClass, this.getValueSpecification(), "getSpecification"); //$NON-NLS-1$
-
-		op = addEOperation(intervalConstraintEClass, null, "setSpecification"); //$NON-NLS-1$
-		addEParameter(op, this.getValueSpecification(), "newSpecification"); //$NON-NLS-1$
-
-		initEClass(timeIntervalEClass, TimeInterval.class, "TimeInterval", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		addEOperation(timeIntervalEClass, ecorePackage.getEEList(), "getMaxes"); //$NON-NLS-1$
-
-		addEOperation(timeIntervalEClass, ecorePackage.getEEList(), "getMins"); //$NON-NLS-1$
-
-		initEClass(durationObservationActionEClass, DurationObservationAction.class, "DurationObservationAction", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getDurationObservationAction_Duration(), this.getDuration(), null, "duration", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(durationObservationActionEClass, this.getInputPin(), "getValue"); //$NON-NLS-1$
-
-		op = addEOperation(durationObservationActionEClass, null, "setValue"); //$NON-NLS-1$
-		addEParameter(op, this.getInputPin(), "newValue"); //$NON-NLS-1$
-
-		initEClass(durationConstraintEClass, DurationConstraint.class, "DurationConstraint", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		addEOperation(durationConstraintEClass, this.getValueSpecification(), "getSpecification"); //$NON-NLS-1$
-
-		op = addEOperation(durationConstraintEClass, null, "setSpecification"); //$NON-NLS-1$
-		addEParameter(op, this.getValueSpecification(), "newSpecification"); //$NON-NLS-1$
-
-		initEClass(dataStoreNodeEClass, DataStoreNode.class, "DataStoreNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(interruptibleActivityRegionEClass, InterruptibleActivityRegion.class, "InterruptibleActivityRegion", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getInterruptibleActivityRegion_InterruptingEdge(), this.getActivityEdge(), this.getActivityEdge_Interrupts(), "interruptingEdge", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getInterruptibleActivityRegion_ContainedNode(), this.getActivityNode(), this.getActivityNode_InInterruptibleRegion(), "containedNode", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(parameterSetEClass, ParameterSet.class, "ParameterSet", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getParameterSet_Parameter(), this.getParameter(), this.getParameter_ParameterSet(), "parameter", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getParameterSet_Condition(), this.getConstraint(), null, "condition", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(parameterSetEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
-
-		initEClass(deploymentEClass, Deployment.class, "Deployment", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getDeployment_DeployedArtifact(), this.getDeployedArtifact(), null, "deployedArtifact", null, 0, -1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getDeployment_Location(), this.getDeploymentTarget(), this.getDeploymentTarget_Deployment(), "location", null, 1, 1, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(getDeployment_Configuration(), this.getDeploymentSpecification(), null, "configuration", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(deploymentEClass, ecorePackage.getEEList(), "getSuppliers"); //$NON-NLS-1$
-
-		addEOperation(deploymentEClass, ecorePackage.getEEList(), "getTargets"); //$NON-NLS-1$
-
-		addEOperation(deploymentEClass, ecorePackage.getEEList(), "getSources"); //$NON-NLS-1$
-
-		addEOperation(deploymentEClass, ecorePackage.getEEList(), "getClients"); //$NON-NLS-1$
-
-		addEOperation(deploymentEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
-
-		initEClass(deployedArtifactEClass, DeployedArtifact.class, "DeployedArtifact", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(deploymentTargetEClass, DeploymentTarget.class, "DeploymentTarget", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getDeploymentTarget_Deployment(), this.getDeployment(), this.getDeployment_Location(), "deployment", null, 0, -1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getDeploymentTarget_DeployedElement(), this.getPackageableElement(), null, "deployedElement", null, 0, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(deploymentTargetEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
-
-		addEOperation(deploymentTargetEClass, ecorePackage.getEEList(), "getClientDependencies"); //$NON-NLS-1$
-
-		initEClass(nodeEClass, Node.class, "Node", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-		initEReference(getNode_NestedNode(), this.getNode(), null, "nestedNode", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
-		addEOperation(nodeEClass, ecorePackage.getEEList(), "getNestedClassifiers"); //$NON-NLS-1$
-
-		initEClass(deviceEClass, Device.class, "Device", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(executionEnvironmentEClass, ExecutionEnvironment.class, "ExecutionEnvironment", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
-		initEClass(communicationPathEClass, CommunicationPath.class, "CommunicationPath", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
-
 		initEClass(readExtentActionEClass, ReadExtentAction.class, "ReadExtentAction", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 		initEReference(getReadExtentAction_Result(), this.getOutputPin(), null, "result", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 		initEReference(getReadExtentAction_Classifier(), this.getClassifier(), null, "classifier", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
@@ -12216,6 +12082,140 @@
 
 		addEOperation(raiseExceptionActionEClass, ecorePackage.getEEList(), "getInputs"); //$NON-NLS-1$
 
+		initEClass(dataStoreNodeEClass, DataStoreNode.class, "DataStoreNode", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+
+		initEClass(interruptibleActivityRegionEClass, InterruptibleActivityRegion.class, "InterruptibleActivityRegion", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getInterruptibleActivityRegion_InterruptingEdge(), this.getActivityEdge(), this.getActivityEdge_Interrupts(), "interruptingEdge", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getInterruptibleActivityRegion_ContainedNode(), this.getActivityNode(), this.getActivityNode_InInterruptibleRegion(), "containedNode", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(parameterSetEClass, ParameterSet.class, "ParameterSet", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getParameterSet_Parameter(), this.getParameter(), this.getParameter_ParameterSet(), "parameter", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getParameterSet_Condition(), this.getConstraint(), null, "condition", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(parameterSetEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+
+		initEClass(timeExpressionEClass, TimeExpression.class, "TimeExpression", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getTimeExpression_FirstTime(), this.getBoolean(), "firstTime", "True", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getTimeExpression_Event(), this.getNamedElement(), null, "event", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(durationEClass, Duration.class, "Duration", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEAttribute(getDuration_FirstTime(), this.getBoolean(), "firstTime", "True", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getDuration_Event(), this.getNamedElement(), null, "event", null, 0, 2, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(timeObservationActionEClass, TimeObservationAction.class, "TimeObservationAction", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getTimeObservationAction_Now(), this.getTimeExpression(), null, "now", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(timeObservationActionEClass, this.getInputPin(), "getValue"); //$NON-NLS-1$
+
+		op = addEOperation(timeObservationActionEClass, null, "setValue"); //$NON-NLS-1$
+		addEParameter(op, this.getInputPin(), "newValue"); //$NON-NLS-1$
+
+		initEClass(durationIntervalEClass, DurationInterval.class, "DurationInterval", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+
+		addEOperation(durationIntervalEClass, ecorePackage.getEEList(), "getMins"); //$NON-NLS-1$
+
+		addEOperation(durationIntervalEClass, ecorePackage.getEEList(), "getMaxes"); //$NON-NLS-1$
+
+		initEClass(intervalEClass, Interval.class, "Interval", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getInterval_Min(), this.getValueSpecification(), null, "min", null, 0, -1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getInterval_Max(), this.getValueSpecification(), null, "max", null, 0, -1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(timeConstraintEClass, TimeConstraint.class, "TimeConstraint", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+
+		addEOperation(timeConstraintEClass, this.getValueSpecification(), "getSpecification"); //$NON-NLS-1$
+
+		op = addEOperation(timeConstraintEClass, null, "setSpecification"); //$NON-NLS-1$
+		addEParameter(op, this.getValueSpecification(), "newSpecification"); //$NON-NLS-1$
+
+		initEClass(intervalConstraintEClass, IntervalConstraint.class, "IntervalConstraint", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+
+		addEOperation(intervalConstraintEClass, this.getValueSpecification(), "getSpecification"); //$NON-NLS-1$
+
+		op = addEOperation(intervalConstraintEClass, null, "setSpecification"); //$NON-NLS-1$
+		addEParameter(op, this.getValueSpecification(), "newSpecification"); //$NON-NLS-1$
+
+		initEClass(timeIntervalEClass, TimeInterval.class, "TimeInterval", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+
+		addEOperation(timeIntervalEClass, ecorePackage.getEEList(), "getMaxes"); //$NON-NLS-1$
+
+		addEOperation(timeIntervalEClass, ecorePackage.getEEList(), "getMins"); //$NON-NLS-1$
+
+		initEClass(durationObservationActionEClass, DurationObservationAction.class, "DurationObservationAction", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getDurationObservationAction_Duration(), this.getDuration(), null, "duration", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(durationObservationActionEClass, this.getInputPin(), "getValue"); //$NON-NLS-1$
+
+		op = addEOperation(durationObservationActionEClass, null, "setValue"); //$NON-NLS-1$
+		addEParameter(op, this.getInputPin(), "newValue"); //$NON-NLS-1$
+
+		initEClass(durationConstraintEClass, DurationConstraint.class, "DurationConstraint", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+
+		addEOperation(durationConstraintEClass, this.getValueSpecification(), "getSpecification"); //$NON-NLS-1$
+
+		op = addEOperation(durationConstraintEClass, null, "setSpecification"); //$NON-NLS-1$
+		addEParameter(op, this.getValueSpecification(), "newSpecification"); //$NON-NLS-1$
+
+		initEClass(deploymentEClass, Deployment.class, "Deployment", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getDeployment_DeployedArtifact(), this.getDeployedArtifact(), null, "deployedArtifact", null, 0, -1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getDeployment_Location(), this.getDeploymentTarget(), this.getDeploymentTarget_Deployment(), "location", null, 1, 1, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getDeployment_Configuration(), this.getDeploymentSpecification(), null, "configuration", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(deploymentEClass, ecorePackage.getEEList(), "getSuppliers"); //$NON-NLS-1$
+
+		addEOperation(deploymentEClass, ecorePackage.getEEList(), "getTargets"); //$NON-NLS-1$
+
+		addEOperation(deploymentEClass, ecorePackage.getEEList(), "getSources"); //$NON-NLS-1$
+
+		addEOperation(deploymentEClass, ecorePackage.getEEList(), "getClients"); //$NON-NLS-1$
+
+		addEOperation(deploymentEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+
+		initEClass(deployedArtifactEClass, DeployedArtifact.class, "DeployedArtifact", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+
+		initEClass(deploymentTargetEClass, DeploymentTarget.class, "DeploymentTarget", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getDeploymentTarget_Deployment(), this.getDeployment(), this.getDeployment_Location(), "deployment", null, 0, -1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getDeploymentTarget_DeployedElement(), this.getPackageableElement(), null, "deployedElement", null, 0, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(deploymentTargetEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+
+		addEOperation(deploymentTargetEClass, ecorePackage.getEEList(), "getClientDependencies"); //$NON-NLS-1$
+
+		initEClass(nodeEClass, Node.class, "Node", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getNode_NestedNode(), this.getNode(), null, "nestedNode", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(nodeEClass, ecorePackage.getEEList(), "getNestedClassifiers"); //$NON-NLS-1$
+
+		initEClass(deviceEClass, Device.class, "Device", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+
+		initEClass(executionEnvironmentEClass, ExecutionEnvironment.class, "ExecutionEnvironment", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+
+		initEClass(communicationPathEClass, CommunicationPath.class, "CommunicationPath", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+
+		initEClass(protocolConformanceEClass, ProtocolConformance.class, "ProtocolConformance", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getProtocolConformance_SpecificMachine(), this.getProtocolStateMachine(), this.getProtocolStateMachine_Conformance(), "specificMachine", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getProtocolConformance_GeneralMachine(), this.getProtocolStateMachine(), null, "generalMachine", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(protocolConformanceEClass, ecorePackage.getEEList(), "getSources"); //$NON-NLS-1$
+
+		addEOperation(protocolConformanceEClass, this.getElement(), "getOwner"); //$NON-NLS-1$
+
+		addEOperation(protocolConformanceEClass, ecorePackage.getEEList(), "getTargets"); //$NON-NLS-1$
+
+		initEClass(protocolStateMachineEClass, ProtocolStateMachine.class, "ProtocolStateMachine", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getProtocolStateMachine_Conformance(), this.getProtocolConformance(), this.getProtocolConformance_SpecificMachine(), "conformance", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(protocolStateMachineEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+
+		initEClass(protocolTransitionEClass, ProtocolTransition.class, "ProtocolTransition", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
+		initEReference(getProtocolTransition_PostCondition(), this.getConstraint(), null, "postCondition", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getProtocolTransition_Referred(), this.getOperation(), null, "referred", null, 0, -1, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getProtocolTransition_PreCondition(), this.getConstraint(), null, "preCondition", null, 0, 1, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+		addEOperation(protocolTransitionEClass, ecorePackage.getEEList(), "getOwnedElements"); //$NON-NLS-1$
+
+		op = addEOperation(protocolTransitionEClass, null, "setGuard"); //$NON-NLS-1$
+		addEParameter(op, this.getConstraint(), "newGuard"); //$NON-NLS-1$
+
 		initEClass(deploymentSpecificationEClass, DeploymentSpecification.class, "DeploymentSpecification", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$
 		initEAttribute(getDeploymentSpecification_DeploymentLocation(), this.getString(), "deploymentLocation", "", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
 		initEAttribute(getDeploymentSpecification_ExecutionLocation(), this.getString(), "executionLocation", "", 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
@@ -12238,6 +12238,11 @@
 		addEEnumLiteral(aggregationKindEEnum, AggregationKind.SHARED_LITERAL);
 		addEEnumLiteral(aggregationKindEEnum, AggregationKind.COMPOSITE_LITERAL);
 
+		initEEnum(callConcurrencyKindEEnum, CallConcurrencyKind.class, "CallConcurrencyKind"); //$NON-NLS-1$
+		addEEnumLiteral(callConcurrencyKindEEnum, CallConcurrencyKind.SEQUENTIAL_LITERAL);
+		addEEnumLiteral(callConcurrencyKindEEnum, CallConcurrencyKind.GUARDED_LITERAL);
+		addEEnumLiteral(callConcurrencyKindEEnum, CallConcurrencyKind.CONCURRENT_LITERAL);
+
 		initEEnum(messageKindEEnum, MessageKind.class, "MessageKind"); //$NON-NLS-1$
 		addEEnumLiteral(messageKindEEnum, MessageKind.COMPLETE_LITERAL);
 		addEEnumLiteral(messageKindEEnum, MessageKind.LOST_LITERAL);
@@ -12250,16 +12255,6 @@
 		addEEnumLiteral(messageSortEEnum, MessageSort.ASYNCH_CALL_LITERAL);
 		addEEnumLiteral(messageSortEEnum, MessageSort.ASYNCH_SIGNAL_LITERAL);
 
-		initEEnum(callConcurrencyKindEEnum, CallConcurrencyKind.class, "CallConcurrencyKind"); //$NON-NLS-1$
-		addEEnumLiteral(callConcurrencyKindEEnum, CallConcurrencyKind.SEQUENTIAL_LITERAL);
-		addEEnumLiteral(callConcurrencyKindEEnum, CallConcurrencyKind.GUARDED_LITERAL);
-		addEEnumLiteral(callConcurrencyKindEEnum, CallConcurrencyKind.CONCURRENT_LITERAL);
-
-		initEEnum(expansionKindEEnum, ExpansionKind.class, "ExpansionKind"); //$NON-NLS-1$
-		addEEnumLiteral(expansionKindEEnum, ExpansionKind.PARALLEL_LITERAL);
-		addEEnumLiteral(expansionKindEEnum, ExpansionKind.ITERATIVE_LITERAL);
-		addEEnumLiteral(expansionKindEEnum, ExpansionKind.STREAM_LITERAL);
-
 		initEEnum(transitionKindEEnum, TransitionKind.class, "TransitionKind"); //$NON-NLS-1$
 		addEEnumLiteral(transitionKindEEnum, TransitionKind.INTERNAL_LITERAL);
 		addEEnumLiteral(transitionKindEEnum, TransitionKind.LOCAL_LITERAL);
@@ -12277,6 +12272,11 @@
 		addEEnumLiteral(pseudostateKindEEnum, PseudostateKind.EXIT_POINT_LITERAL);
 		addEEnumLiteral(pseudostateKindEEnum, PseudostateKind.TERMINATE_LITERAL);
 
+		initEEnum(expansionKindEEnum, ExpansionKind.class, "ExpansionKind"); //$NON-NLS-1$
+		addEEnumLiteral(expansionKindEEnum, ExpansionKind.PARALLEL_LITERAL);
+		addEEnumLiteral(expansionKindEEnum, ExpansionKind.ITERATIVE_LITERAL);
+		addEEnumLiteral(expansionKindEEnum, ExpansionKind.STREAM_LITERAL);
+
 		initEEnum(interactionOperatorEEnum, InteractionOperator.class, "InteractionOperator"); //$NON-NLS-1$
 		addEEnumLiteral(interactionOperatorEEnum, InteractionOperator.SEQ_LITERAL);
 		addEEnumLiteral(interactionOperatorEEnum, InteractionOperator.ALT_LITERAL);
@@ -12346,6 +12346,12 @@
 	protected void createGenModelAnnotations() {
 		String source = "http://www.eclipse.org/emf/2002/GenModel"; //$NON-NLS-1$		
 		addAnnotation
+		  (elementEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "Element is an abstract metaclass with no superclass. It is used as the common superclass for all metaclasses in the infrastructure library. Element has a derived composition association to itself to support the general capability for elements to own other elements. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  ((EOperation)elementEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -12374,6 +12380,12 @@
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\ntrue\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
 		   });					
 		addAnnotation
+		  (multiplicityElementEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A MultiplicityElement is an abstract metaclass which includes optional attributes for defining the bounds of a multiplicity. A MultiplicityElement also includes specifications of whether the values in an instantiation of this element must be unique or ordered. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  ((EOperation)multiplicityElementEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -12456,50 +12468,14 @@
 		   new String[] {
 			 "body", "return org.eclipse.uml2.internal.operation.MultiplicityElementOperations.upper(this);", //$NON-NLS-1$ //$NON-NLS-2$
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nupperBound()\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
-		   });													
+		   });						
 		addAnnotation
-		  ((EOperation)valueSpecificationEClass.getEOperations().get(0), 
+		  (namedElementEClass, 
 		   source, 
 		   new String[] {
-			 "body", "return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.isComputable(this);", //$NON-NLS-1$ //$NON-NLS-2$
-			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nfalse\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
+			 "documentation", "A named element represents elements that may have a name. The name is used for identification of the named element within the namespace in which it is defined. A named element also has a qualified name that allows it to be unambiguously identified within a hierarchy of nested namespaces. NamedElement is an abstract metaclass. " //$NON-NLS-1$ //$NON-NLS-2$
 		   });		
 		addAnnotation
-		  ((EOperation)valueSpecificationEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "body", "return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.integerValue(this);", //$NON-NLS-1$ //$NON-NLS-2$
-			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nSet{}\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  ((EOperation)valueSpecificationEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-			 "body", "return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.booleanValue(this);", //$NON-NLS-1$ //$NON-NLS-2$
-			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nSet{}\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  ((EOperation)valueSpecificationEClass.getEOperations().get(3), 
-		   source, 
-		   new String[] {
-			 "body", "return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.stringValue(this);", //$NON-NLS-1$ //$NON-NLS-2$
-			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nSet{}\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  ((EOperation)valueSpecificationEClass.getEOperations().get(4), 
-		   source, 
-		   new String[] {
-			 "body", "return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.unlimitedValue(this);", //$NON-NLS-1$ //$NON-NLS-2$
-			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nSet{}\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  ((EOperation)valueSpecificationEClass.getEOperations().get(5), 
-		   source, 
-		   new String[] {
-			 "body", "return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.isNull(this);", //$NON-NLS-1$ //$NON-NLS-2$
-			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nfalse\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
-		   });								
-		addAnnotation
 		  ((EOperation)namedElementEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -12549,6 +12525,12 @@
 			 "documentation", "An invariant constraint based on the following OCL expression:\r\n<code>\r\nnamespace->isEmpty() implies visibility->isEmpty()\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
 		   });											
 		addAnnotation
+		  (namespaceEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A namespace is a named element that can own other named elements. Each named element may be owned by at most one namespace. A namespace provides a means for identifying named elements by name. Named elements can be identified by name in a namespace either by being directly owned by the namespace or by being introduced into the namespace by other means e.g. importing or inheriting. Namespace is an abstract metaclass. A namespace can own constraints. The constraint does not necessarily apply to the namespace itself, but may also apply to elements in the namespace. A namespace has the ability to import either individial members or all members of a package, thereby making it possible to refer to those named elements without qualification in the importing namespace. In the case of conflicts, it is necessary to use qualified names or aliases to disambiguate the referenced elements. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  ((EOperation)namespaceEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -12598,6 +12580,90 @@
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nimps->reject(imp1 | imps.exists(imp2 | not imp1.isDistinguishableFrom(imp2, self)))\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
 		   });												
 		addAnnotation
+		  (directedRelationshipEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A directed relationship references one or more source elements and one or more target elements. Directed relationship is an abstract metaclass. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });								
+		addAnnotation
+		  (relationshipEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A relationship references one or more related elements. Relationship is an abstract metaclass. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  (opaqueExpressionEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "An expression contains a language-specific text string used to describe a value or values, and an optional specification of the language. One predefined language for specifying expressions is OCL. Natural language or programming languages may also be used. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (valueSpecificationEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "ValueSpecification is an abstract metaclass used to identify a value or values in a model. It may reference an instance or it may be an expression denoting an instance or instances when evaluated. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  ((EOperation)valueSpecificationEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "body", "return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.isComputable(this);", //$NON-NLS-1$ //$NON-NLS-2$
+			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nfalse\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  ((EOperation)valueSpecificationEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "body", "return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.integerValue(this);", //$NON-NLS-1$ //$NON-NLS-2$
+			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nSet{}\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  ((EOperation)valueSpecificationEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+			 "body", "return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.booleanValue(this);", //$NON-NLS-1$ //$NON-NLS-2$
+			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nSet{}\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  ((EOperation)valueSpecificationEClass.getEOperations().get(3), 
+		   source, 
+		   new String[] {
+			 "body", "return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.stringValue(this);", //$NON-NLS-1$ //$NON-NLS-2$
+			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nSet{}\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  ((EOperation)valueSpecificationEClass.getEOperations().get(4), 
+		   source, 
+		   new String[] {
+			 "body", "return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.unlimitedValue(this);", //$NON-NLS-1$ //$NON-NLS-2$
+			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nSet{}\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  ((EOperation)valueSpecificationEClass.getEOperations().get(5), 
+		   source, 
+		   new String[] {
+			 "body", "return org.eclipse.uml2.internal.operation.ValueSpecificationOperations.isNull(this);", //$NON-NLS-1$ //$NON-NLS-2$
+			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nfalse\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (expressionEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "An expression represents a node in an expression tree, which may be non-terminal or terminal. It defines a symbol, and has a possibly empty sequence of operands which are value specifications. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (commentEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A comment gives the ability to attach various remarks to elements. A comment carries no semantic force, but may contain information that is useful to a modeler. A comment can be owned by any element. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (classEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "Class is a kind of classifier whose features are attributes and operations. Attributes of a class are represented by instances of Property that are owned by the class. Some of these attributes may represent the navigable ends of binary associations. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  ((EOperation)classEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -12605,6 +12671,12 @@
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\ninhs->excluding(inh | ownedMember->select(oclIsKindOf(RedefinableElement))->select(redefinedElement->includes(inh)))\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
 		   });																					
 		addAnnotation
+		  (typeEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A type serves as a constraint on the range of values represented by a typed element. Type is an abstract metaclass. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  ((EOperation)typeEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -12612,6 +12684,12 @@
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nfalse\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
 		   });					
 		addAnnotation
+		  (propertyEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "Property represents a declared state of one or more instances in terms of a named relationship to a value or values. When a property is an attribute of a classifier, the value or values are related to the instance of the classifier by being held in slots of the instance. When a property is an association end, the value or values are related to the instance or instances at the other end(s) of the association (see semantics of Association). Property is indirectly a subclass of Constructs::TypedElement. The range of valid values represented by the property can be controlled by setting the property\u2019s type. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  ((EOperation)propertyEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -12682,6 +12760,12 @@
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nif association->notEmpty()\r\nthen association.endType-type \r\nelse if classifier->notEmpty then Set{classifier} else Set{} endif\r\nendif\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
 		   });																									
 		addAnnotation
+		  (operationEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "An operation is a behavioral feature of a classifier that specifies the name, type, parameters, and constraints for invoking an associated behavior. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  ((EOperation)operationEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -12736,7 +12820,25 @@
 		   new String[] {
 			 "body", "return org.eclipse.uml2.internal.operation.OperationOperations.isConsistentWith(this, redefinee);", //$NON-NLS-1$ //$NON-NLS-2$
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\n(redefinee.oclIsKindOf(Operation) and\r\n    let op: Operation = redefinee.oclAsType(Operation) in\r\n        self.formalParameter.size() = op.formalParameter.size() and\r\n        self.returnResult.size() = op.returnResult.size() and\r\n        forAll(i | op.formalParameter[i].type.conformsTo(self.formalParameter[i].type)) and\r\n        forAll(i | op.returnResult[i].type.conformsTo(self.returnResult[i].type))\r\n)\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																										
+		   });																																				
+		addAnnotation
+		  (typedElementEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A typed element is an element that has a type that serves as a constraint on the range of values the element can represent. Typed element is an abstract metaclass. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (parameterEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A parameter is a specification of an argument used to pass information into or out of an invocation of a behavioral feature. It has a type, and may have a multiplicity and an optional default value. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });								
+		addAnnotation
+		  (packageEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A package is a namespace for its members, and may contain other packages. Only packageable elements can be owned members of a package. By virtue of being a namespace, a package can import either individual members of other packages, or all the members of other packages. In addition a package can be merged with other packages. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
 		addAnnotation
 		  ((EOperation)packageEClass.getEOperations().get(0), 
 		   source, 
@@ -12764,14 +12866,44 @@
 		   new String[] {
 			 "body", "return org.eclipse.uml2.internal.operation.PackageOperations.makesVisible(this, el);", //$NON-NLS-1$ //$NON-NLS-2$
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nel.visibility->isEmpty() or el.visibility = #public\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																		
+		   });															
+		addAnnotation
+		  (enumerationEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "Enumeration is a kind of data type, whose instances may be any of a number of user-defined enumeration literals. It is possible to extend the set of applicable enumeration literals in other packages or profiles. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (dataTypeEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "DataType defines a kind of classifier in which operations are all pure functions (i.e., they can return data values but they cannot change data values, because they have no identity). For example, an \u201cadd\u201d operation on a number with another number as an argument yields a third number as a result; the target and argument are unchanged. A DataType may also contain attributes to support the modeling of structured data types. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
 		addAnnotation
 		  ((EOperation)dataTypeEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
 			 "body", "return org.eclipse.uml2.internal.operation.DataTypeOperations.inherit(this, inhs);", //$NON-NLS-1$ //$NON-NLS-2$
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\ninhs->excluding(inh |\r\n\townedMember->select(oclIsKindOf(RedefinableElement))->select(redefinedElement->includes(inh)))\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
-		   });													
+		   });										
+		addAnnotation
+		  (enumerationLiteralEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "An enumeration literal is a user-defined data value for an enumeration. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (primitiveTypeEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "The instances of primitive type used in UML itself include Boolean, Integer, UnlimitedNatural, and String. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (literalBooleanEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A literal boolean contains a Boolean-valued attribute. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
 		addAnnotation
 		  ((EOperation)literalBooleanEClass.getEOperations().get(0), 
 		   source, 
@@ -12787,6 +12919,18 @@
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nvalue\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
 		   });		
 		addAnnotation
+		  (literalSpecificationEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A literal specification is an abstract specialization of ValueSpecification that identifies a literal constant being modeled. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (literalStringEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A literal string contains a String-valued attribute. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  ((EOperation)literalStringEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -12801,6 +12945,12 @@
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nvalue\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
 		   });		
 		addAnnotation
+		  (literalNullEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A literal null is used to represent null, i.e., the absence of a value. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  ((EOperation)literalNullEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -12815,6 +12965,12 @@
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\ntrue\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
 		   });		
 		addAnnotation
+		  (literalIntegerEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A literal integer contains an Integer-valued attribute. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  ((EOperation)literalIntegerEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -12829,6 +12985,12 @@
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nvalue\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
 		   });		
 		addAnnotation
+		  (literalUnlimitedNaturalEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A literal unlimited natural contains a UnlimitedNatural-valued attribute. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  ((EOperation)literalUnlimitedNaturalEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -12843,6 +13005,18 @@
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nvalue\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
 		   });		
 		addAnnotation
+		  (visibilityKindEEnum, 
+		   source, 
+		   new String[] {
+			 "documentation", "VisibilityKind is an enumeration of the following literal values: \u2022 public \u2022 private \u2022 protected \u2022 package " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (classifierEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A classifier is a namespace whose members can include features. Classifier is an abstract metaclass. A classifier is a type and can own generalizations, thereby making it possible to define generalization relationships to other classifiers. A classifier can specify a generalization hierarchy by referencing its general classifiers. A classifier is a redefinable element, meaning that it is possible to redefine nested classifiers. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  ((EOperation)classifierEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -12939,7 +13113,19 @@
 		   new String[] {
 			 "body", "return org.eclipse.uml2.internal.operation.ClassifierOperations.conformsTo(this, other);", //$NON-NLS-1$ //$NON-NLS-2$
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\n(self=other) or (self.allParents()->includes(other))\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																									
+		   });																								
+		addAnnotation
+		  (featureEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A feature declares a behavioral or structural characteristic of instances of classifiers. Feature is an abstract metaclass. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  (constraintEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "Constraint contains a ValueSpecification that specifies additional semantics for one or more elements. Certain kinds of constraints (such as an association \u201cxor\u201d constraint) are predefined in UML, others may be user-defined. A user-defined Constraint is described using a specified language, whose syntax and interpretation is a tool responsibility. One predefined language for writing constraints is OCL. In some situations, a programming language such as Java may be appropriate for expressing a constraint. In other situations natural language may be used. Constraint is a condition (a Boolean expression) that restricts the extension of the associated element beyond what is imposed by the other language constructs applied to that element. Constraint contains an optional name, although they are commonly unnamed. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
 		addAnnotation
 		  ((EOperation)constraintEClass.getEOperations().get(0), 
 		   source, 
@@ -12948,6 +13134,12 @@
 			 "documentation", "An invariant constraint based on the following OCL expression:\r\n<code>\r\nnot constrainedElement->includes(self)\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
 		   });									
 		addAnnotation
+		  (behavioralFeatureEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A behavioral feature specifies that an instance of a classifier will respond to a designated request by invoking a behavior. BehavioralFeature is an abstract metaclass specializing Feature and Namespace. Kinds of behavioral aspects are modeled by subclasses of BehavioralFeature. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  ((EOperation)behavioralFeatureEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -12955,6 +13147,18 @@
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nif n.oclIsKindOf(BehavioralFeature)\r\nthen\r\n    if ns.getNamesOfMember(self)->intersection(ns.getNamesOfMember(n))->notEmpty()\r\n    then Set{}->include(self)->include(n)->isUnique( bf | bf.parameter->collect(type))\r\n    else true\r\n    endif\r\nelse true\r\nendif\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
 		   });										
 		addAnnotation
+		  (structuralFeatureEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A structural feature is a typed feature of a classifier that specify the structure of instances of the classifier. Structural feature is an abstract metaclass. By specializing multiplicity element, it supports a multiplicity that specifies valid cardinalities for the set of values associated with an instantiation of the structural feature. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (redefinableElementEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A redefinable element is a named element that can be redefined in the context of a generalization. RedefinableElement is an abstract metaclass. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  ((EOperation)redefinableElementEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -12981,7 +13185,13 @@
 		   new String[] {
 			 "body", "return org.eclipse.uml2.internal.operation.RedefinableElementOperations.isRedefinitionContextValid(this, redefinable);", //$NON-NLS-1$ //$NON-NLS-2$
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nself.redefinitionContext->exists(c | redefinable.redefinitionContext->exists(r | c.allParents()->includes(r)))\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
-		   });													
+		   });					
+		addAnnotation
+		  (instanceSpecificationEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "In the metamodel, InstanceSpecification is a specialization of DeploymentTarget and DeployedArtifact. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
 		addAnnotation
 		  ((EOperation)instanceSpecificationEClass.getEOperations().get(0), 
 		   source, 
@@ -12995,7 +13205,37 @@
 		   new String[] {
 			 "body", "return org.eclipse.uml2.internal.operation.InstanceSpecificationOperations.validateNoDuplicateSlots(this, diagnostics, context);", //$NON-NLS-1$ //$NON-NLS-2$
 			 "documentation", "An invariant constraint based on the following OCL expression:\r\n<code>\r\nclassifier->forAll(c |\r\n\t(c.allFeatures()->forAll(f | slot->select(s | s.definingFeature = f)->size() <= 1)\r\n\t)\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																		
+		   });							
+		addAnnotation
+		  (slotEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A slot is owned by an instance specification. It specifies the value or values for its defining feature, which must be a structural feature of a classifier of the instance specification owning the slot. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });								
+		addAnnotation
+		  (instanceValueEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "An instance value specifies the value modeled by an instance specification. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (generalizationEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A generalization relates a specific classifier to a more general classifier, and is owned by the specific classifier. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });										
+		addAnnotation
+		  (packageableElementEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A packageable element indicates a named element that may be owned directly by a package. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  (elementImportEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "An element import is defined as a directed relationship between an importing namespace and a packageable element. The name of the packageable element or its alias is to be added to the namespace of the importing namespace. It is also possible to control whether the imported element can be further imported. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
 		addAnnotation
 		  ((EOperation)elementImportEClass.getEOperations().get(0), 
 		   source, 
@@ -13018,18 +13258,318 @@
 			 "documentation", "A query based on the following OCL expression:\r\n<code>\r\nif self.alias->notEmpty() then \r\n    self.alias\r\nelse\r\n    self.importedElement.name\r\nendif\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
 		   });										
 		addAnnotation
+		  (packageImportEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A package import is defined as a directed relationship that identifies a package whose members are to be imported by a namespace. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
 		  ((EOperation)packageImportEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
 			 "body", "return org.eclipse.uml2.internal.operation.PackageImportOperations.validatePublicOrPrivate(this, diagnostics, context);", //$NON-NLS-1$ //$NON-NLS-2$
 			 "documentation", "An invariant constraint based on the following OCL expression:\r\n<code>\r\nself.visibility = #public or self.visibility = #private\r\n</code>" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																																																																																																																																																																																																																																												
+		   });											
+		addAnnotation
+		  (associationEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "An association specifies a semantic relationship that can occur between typed instances. It has at least two ends represented by properties, each of which is connected to the type of the end. More than one end of the association may have the same type. When a property is owned by an association it represents a non-navigable end of the association. In this case the property does not appear in the namespace of any of the associated classifiers. When a property at an end of an association is owned by one of the associated classifiers it represents a navigable end of the association. In this case the property is also an attribute of the associated classifier. Only binary associations may have navigable ends. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });														
+		addAnnotation
+		  (packageMergeEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A package merge is a relationship between two packages, where the contents of the target package (the one pointed at) is merged with the contents of the source package through specialization and redefinition, where applicable. This is a mechanism that should be used when elements of the same name are intended to represent the same concept, regardless of the package in which they are defined. A merging package will take elements of the same kind with the same name from one or more packages and merge them together into a single element using generalization and redefinitions. It should be noted that a package merge can be viewed as a short-hand way of explicitly defining those generalizations and redefinitions. The merged packages are still available, and the elements in those packages can be separately qualified. From an XMI point of view, it is either possible to exchange a model with all PackageMerges retained or a model where all PackageMerges have been transformed away (in which case package imports, generalizations, and redefinitions are used instead). " //$NON-NLS-1$ //$NON-NLS-2$
+		   });										
+		addAnnotation
+		  (parameterDirectionKindEEnum, 
+		   source, 
+		   new String[] {
+			 "documentation", "ParameterDirectionKind is an enumeration of the following literal values: \u2022 in Indicates that parameter values are passed into the behavioral element by the caller. \u2022 inout Indicates that parameter values are passed into a behavioral element by the caller and then back out to the caller from the behavioral element. \u2022 out Indicates that parameter values are passed from a behavioral element out to the caller. \u2022 return Indicates that parameter values are passed as return values from a behavioral element back to the caller. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (aggregationKindEEnum, 
+		   source, 
+		   new String[] {
+			 "documentation", "AggregationKind is an enumeration of the following literal values: \u2022 none Indicates that the property has no aggregation. \u2022 shared Indicates that the property has a shared aggregation. \u2022 composite Indicates that the property is aggregated compositely, i.e., the composite object has responsibility for the existence and storage of the composed objects (parts). " //$NON-NLS-1$ //$NON-NLS-2$
+		   });																		
+		addAnnotation
+		  (behaviorEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "Behavior is a specification of how its context classifier changes state over time. This specification may be either a definition of possible behavior execution or emergent behavior, or a selective illustration of an interesting subset of possible executions. The latter form is typically used for capturing examples, such as a trace of a particular execution. A classifier behavior is always a definition of behavior and not an illustration. It describes the sequence of state changes an instance of a classifier may undergo in the course of its lifetime. Its precise semantics depends on the kind of classifier. For example, the classifier behavior of a collaboration represents emergent behavior of all the parts, whereas the classifier behavior of a class is just the behavior of instances of the class separated from the behaviors of any of its parts. When a behavior is associated as the method of a behavioral feature, it defines the implementation of that feature; i.e., the computation that generates the effects of the behavioral feature. As a classifier, a behavior can be specialized. Instantiating a behavior is referred to as \u201cinvocating\u201d the behavior, an instantiated behavior is also called a behavior \u201cexecution.\u201d A behavior may be invoked directly or its invocation may be the result of invoking the behavioral feature that specifies this behavior. A behavior can also be instantiated as an object in virtue of it being a class. The specification of a behavior can take a number of forms, as described in the subclasses of Behavior. Behavior is an abstract metaclass factoring out the commonalities of these different specification mechanisms. When a behavior is invoked, its execution receives a set of input values that are used to affect the course of execution and as a result of its execution it produces a set of output values which are returned, as specified by its parameters. The observable effects of a behavior execution may include changes of values of various objects involved in the execution, the creation and destruction of objects, generation of communications between objects, as well as an explicit set of output values. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });												
+		addAnnotation
+		  (behavioredClassifierEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A classifier can have behavior specifications defined in its namespace. One of these may specify the behavior of the classifier itself. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });														
+		addAnnotation
+		  (activityEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "An activity contains a language-specific text string used to describe a computation, and an optional specification of the language. OCL, natural language, or programming languages may be used to specify an activity. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });											
+		addAnnotation
+		  (generalizationSetEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "Each Generalization is a binary relationship that relates a specific Classifier to a more general Classifier (i.e., a subclass). Each GeneralizationSet defines a particular set of Generalization relationships that describe the way in which a specific Classifier " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (modelEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "The Model construct is defined as a Package. It contains a (hierarchical) set of elements that together describe the physical system being modeled. A Model may also contain a set of elements that represents the environment of the system, typically Actors, together with their interrelationships, such as Associations and Dependencies " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (associationClassEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "In the metamodel, an AssociationClass is a declaration of a semantic relationship between Classifiers, which has a set of features of its own. AssociationClass is both an Association and a Class. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (permissionEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A Permission signifies granting of access rights from the supplier model element to a client model element. Or to put it another way, it signifies that the client requires access to some or all of the constituent elements of the supplier. The supplier element gives the client permission to access some or all of its constituents elements. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (dependencyEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A dependency is a relationship that signifies that a single or a set of model elements requires other model elements for their specification or implementation. This means that the complete semantics of the depending elements is either semantically or structurally dependent on the definition of the supplier element(s). " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (usageEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A usage is a relationship in which one element requires another element (or set of elements) for its full implementation or operation. In the metamodel, a Usage is a Dependency in which the client requires the presence of the supplier. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (abstractionEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "An abstraction is a relationship that relates two elements or sets of elements that represent the same concept at different levels of abstraction or from different viewpoints. (See also, the definition of abstration in the Glossary.) In the metamodel, an Abstraction is a Dependency in which there is a mapping between the supplier and the client. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (realizationEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "In the metamodel, a Realization is a subtype of Dependencies::Realization. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });														
+		addAnnotation
+		  (substitutionEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A substitution is a relationship between two classifiers signifies that the substitutingClassifier complies with the contract specified by the contract classifier. This implies that instances of the substitutingClassifier are runtime substitutable where instances of the contract classifier are expected. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });												
+		addAnnotation
+		  (connectorEndEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A connector end is an endpoint of a connector, which attaches the connector to a connectable element. Each connector end is part of one connector. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (connectableElementEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A ConnectableElement is an abstract metaclass representing a set of instances that are owned by a containing classifier instance. Connectable elements may be joined by attached connectors and specify configurations of linked instances to be created within an instance of the containing classifier. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (connectorEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "Each connector may be attached to two or more connectable elements, each representing a set of instances. Each connector end " //$NON-NLS-1$ //$NON-NLS-2$
+		   });								
+		addAnnotation
+		  (structuredClassifierEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A structured classifier is an abstract metaclass that represents any classifier whose behavior can be fully or partly described by the collaboration of owned or referenced instances. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });														
+		addAnnotation
+		  (interfaceEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "An interface is a kind of classifier that represents a declaration of a set of coherent public features and obligations. In a sense, " //$NON-NLS-1$ //$NON-NLS-2$
+		   });																
+		addAnnotation
+		  (implementationEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "An Implementation is a specialized Realization relationship between a Classifier and an Interface. The implementation relationship signifies that the realizing classifier conforms to the contract specified by the interface. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });																														
+		addAnnotation
+		  (actorEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "An Actor models a type of role played by an entity that interacts with the subject (e.g., by exchanging signals and data), " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (extendEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "This relationship specifies that the behavior of a use case may be extended by the behavior of another (usually supplementary) use case. The extension takes place at one or more specific extension points defined in the extended use case. Note, however, that the extended use case is defined independently of the extending use case and is meaningful independently of the extending use case. On the other hand, the extending use case typically defines behavior that may not necessarily be meaningful by itself. Instead, the extending use case defines a set of modular behavior increments that augment an execution of the extended use case under specific conditions. Note that the same extending use case can extend more than one use case. Furthermore, an extending use case may itself be extended. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });											
+		addAnnotation
+		  (useCaseEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A UseCase is a kind of behaviored classifier that represents a declaration of an offered behavior. Each use case specifies some behavior, possibly including variants, that the subject can perform in collaboration with one or more actors. Use cases define the offered behavior of the subject without reference to its internal structure. These behaviors, involving interactions between the actor and the subject, may result in changes to the state of the subject and communications with its environment. A use case can include possible variations of its basic behavior, including exceptional behavior and error handling. The subject of a use case could be a physical system or any other element that may have behavior, such as a component, subsystem or class. Each use case specifies a unit of useful functionality that the subject provides to its users, i.e., a specific way of interacting with the subject. This functionality, which is initiated by an actor, must always be completed for the use case to complete. It is deemed complete if, after its execution, the subject will be in a state in which no further inputs or actions are expected and the use case can be initiated again or in an error state. Use cases can be used both for specification of the (external) requirements on a subject and for the specification of the functionality offered by a subject. Moreover, the use cases also state the requirements the specified subject poses on its environment by defining how they should interact with the subject so that it will be able to perform its services. The behavior of a use case can be described by a specification that is some kind of Behavior (through its ownedBehavior relationship), such as interactions, activities, and state machines, or by pre-conditions and post-conditions as well as by natural language text where appropriate. It may also be described indirectly through a Collaboration that uses the use case and its actors as the classifiers that type its parts. Which of these techniques to use depends on the nature of the use case behavior as well as on the intended reader. These descriptions can be combined. An example of a use case with an associated state machine description is shown in Figure 405. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  (extensionPointEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "An ExtensionPoint is a feature of a use case that identifies a point where the behavior of a use case can be augmented with elements of another (extending) use case. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });																																																													
+		addAnnotation
+		  (callConcurrencyKindEEnum, 
+		   source, 
+		   new String[] {
+			 "documentation", "CallConcurrencyKind is an enumeration with the following literals: \u2022 sequential No concurrency management mechanism is associated with the operation and, therefore, concurrency conflicts may occur. Instances that invoke a behavioral feature need to coordinate so that only one invocation to a target on any behavioral feature occurs at once. \u2022 guarded Multiple invocations of a behavioral feature may occur simultaneously to one instance, but only one is allowed to commence. The others are blocked until the performance of the first behavioral feature is complete. It is the responsibility of the system designer to ensure that deadlocks do not occur due to simultaneous blocks. \u2022 concurrent Multiple invocations of a behavioral feature may occur simultaneously to one instance and all of them may proceed concurrently. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (messageTriggerEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A message trigger specifies the an observable event caused by a either a call or a signal. MessageTrigger is an abstract metaclass. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (changeTriggerEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A change trigger specifies an event that occurs when a Boolean-valued expression becomes true as a result of a change in " //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (triggerEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A trigger specifies the an event that may cause the execution of an associated behavior. An event is often ultimately caused by the execution of an action, but need not be. Trigger is an abstract metaclass. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (receptionEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A reception is a declaration stating that a classifier is prepared to react to the receipt of a signal. A reception designates a signal and specifies the expected behavioral response. The details of handling a signal are specified by the behavior associated with the reception or the classifier itself. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (signalEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A signal is a specification of type of send request instances communicated between objects. The receiving object handles the signal instance as specified by its receptions. The data carried by a send request and passed to it by the occurrence of the send invocation event that caused the request is represented as attributes of the signal instance. A signal is defined independently of the classifiers handling the signal. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  (timeTriggerEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A time trigger specifies a time event, which models the expiration of a specific deadline. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (anyTriggerEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "An AnyTrigger for a given state specifies that the transition is triggered for all applicable message triggers except for those specified explicitly on other transitions for this state. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (collaborationOccurrenceEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A collaboration occurrence represents one particular use of a collaboration to explain the relationships between the properties of a classifier. A collaboration occurrence indicates a set of roles and connectors that cooperate within the classifier according to a given collaboration, indicated by the type of the collaboration occurrence. There may be multiple occurrences of a given collaboration within a classifier, each involving a different set of roles and connectors. A given role or connector may be involved in multiple occurrences of the same or different collaborations. Associated dependencies map features of the collaboration type to features in the classifier. These dependencies indicate which role in the classifier plays which role in the collaboration. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (collaborationEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A collaboration is represented as a kind of classifier and defines a set of cooperating entities to be played by instances (its roles), as well as a set of connectors that define communication paths between the participating instances. The cooperating entities are the properties of the collaboration (see \u201cProperty\u201d on page 161). A collaboration specifies a view (or projection) of a set of cooperating classifiers. It describes the required links between instances that play the roles of the collaboration, as well as the features required of the classifiers that specify the participating instances. Several collaborations may describe different projections of the same set of classifiers. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (portEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "Ports represent interaction points between a classifier and its environment. The interfaces associated with a port specify the nature of the interactions that may occur over a port. The required interfaces of a port characterize the requests which may be made from the classifier to its environment through this port. The provided interfaces of a port characterize requests to the classifier that its environment may make through this port. A port has the ability to specify that any requests arriving at this port are handled by the behavior of the instance of the owning classifier, rather than being forwarded to any contained instances, if any. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (encapsulatedClassifierEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "Extends a classifier with the ability to own ports as specific and type checked interaction points. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  (variableEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A variable is considered a connectable element. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });																																	
+		addAnnotation
+		  (templateSignatureEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A TemplateSignature is owned by a TemplateableElement and has one or more TemplateParameters that define the signature for binding this template. A TemplateSignature may reference a set of nested template signatures to reflect the hierarchical nature of a template. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });									
+		addAnnotation
+		  (templateParameterEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "TemplateParameter references a ParameterableElement which is exposed as a formal template parameter in the containing template. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });											
+		addAnnotation
+		  (templateableElementEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "TemplateableElement may contain a template signature which specifies the formal template parameters. A TemplateableElement that contains a template signature is often referred to as a template. TemplateableElement may contain bindings to templates that describe how the templateable element is constructed by replacing the formal template parameters with actual parameters. A TemplateableElement containing bindings is often referred to as a bound element. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
 		addAnnotation
 		  ((EOperation)templateableElementEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
 			 "body", "try {\r\n\tjava.lang.reflect.Method method = getClass().getMethod(\"parameterableElements\", null); //$NON-NLS-1$\r\n\tSet result = (Set) getCacheAdapter().get(this, method);\r\n\r\n\tif (null == result) {\r\n\t\tresult = java.util.Collections.unmodifiableSet(org.eclipse.uml2.internal.operation.TemplateableElementOperations.parameterableElements(this));\r\n\t\tgetCacheAdapter().put(this, method, result);\r\n\t}\r\n\r\n\treturn result;\r\n} catch (Exception e) {\r\n\treturn org.eclipse.uml2.internal.operation.TemplateableElementOperations.parameterableElements(this);\r\n}" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		   });																																																
+		   });												
+		addAnnotation
+		  (parameterableElementEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A ParameterableElement can be referenced by a TemplateParameter when defining a formal template parameter for a template. A ParameterableElement can be referenced by a TemplateParameterSubstitution when used as an actual parameter in a binding of a template. ParameterableElement is an abstract metaclass. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
+		addAnnotation
+		  (templateBindingEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "TemplateBinding is a directed relationship from a bound templateable element to the template signature of the target template. A TemplateBinding owns a set of template parameter substitutions. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });													
+		addAnnotation
+		  (templateParameterSubstitutionEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "TemplateParameterSubstitution associates one or more actual parameters with a formal template parameter within the context of a TemplateBinding. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });									
+		addAnnotation
+		  (operationTemplateParameterEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "OperationTemplateParameter is a template parameter where the parametered element is an Operation. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (classifierTemplateParameterEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "ClassifierTemplateParameter is a template parameter where the parametered element is a Classifier in its capacity of being a kind of ParameterableElement. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (redefinableTemplateSignatureEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "RedefinableTemplateSignature specializes both TemplateSignature and RedefinableElement in order to allow the addition of new formal template parameters in the context of a specializing template Classifier. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (connectableElementTemplateParameterEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "ConnectableElementTemplateParameter is a template parameter where the parametered element is a ConnectableElement. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
 		addAnnotation
 		  (interactionEClass, 
 		   source, 
@@ -13047,12 +13587,18 @@
 		   source, 
 		   new String[] {
 			 "documentation", "A Lifelineis the concept behind a lifeline in a Sequence \r\nDiagram. A Participant may be a Part or it may be a parameter representing a part. Its qualification is a Classifier which in turn may be an Interface (or ClassifierRole?)" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																																																																																																																																																																																							
+		   });																																																														
+		addAnnotation
+		  (connectionPointReferenceEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "Connection point references of a submachine state can be used as sources/targets of transitions. They represent entries into or exits out of the submachine state machine referenced by the submachine state. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });																																																																																																	
 		addAnnotation
 		  (interactionOccurrenceEClass, 
 		   source, 
 		   new String[] {
-			 "documentation", "A reference to an interaction with actual values. The interpretation is that the sequence diagram replaces the reference (with actual parameters substituted)" //$NON-NLS-1$ //$NON-NLS-2$
+			 "documentation", "InteractionOccurrence is a specialization of InteractionFragment. An InteractionOccurrence has a set of actual gates that must match the formal gates of the referenced Interaction. " //$NON-NLS-1$ //$NON-NLS-2$
 		   });					
 		addAnnotation
 		  (gateEClass, 
@@ -13077,7 +13623,73 @@
 		   source, 
 		   new String[] {
 			 "documentation", "An interaction fragment that decomposes into a set of other interaction fragments under some operator.\r\nIn principle the whole sequence diagram is an combined interaction. Syntactically, however, we will have special notation for combineations such that operands may be easily distinguished.\r\nCombined interactions consist of operands and an implicit or explicit operator" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																																																																																																																				
+		   });																																																																
+		addAnnotation
+		  (timeExpressionEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A TimeExpression defines a value specification that represent a time value. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (durationEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A duration defines a value specification that specifies the temporal distance between two time expressions that specify time instants. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (timeObservationActionEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A TimeObservationAction defines an action that observes the current point in time. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  (durationIntervalEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A DurationInterval defines the range between two Durations. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
+		addAnnotation
+		  (intervalEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "An Interval defines the range between two value specifications. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });				
+		addAnnotation
+		  (timeConstraintEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A TimeConstraint defines a Constraint that refers to a TimeInterval. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
+		addAnnotation
+		  (intervalConstraintEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A IntervalConstraint defines a Constraint that refers to an Interval. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
+		addAnnotation
+		  (timeIntervalEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A TimeInterval defines the range between two TimeExpressions. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
+		addAnnotation
+		  (durationObservationActionEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A DurationObservationAction defines an action that observes duration in time. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  (durationConstraintEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A DurationConstraint defines a Constraint that refers to a DurationInterval. " //$NON-NLS-1$ //$NON-NLS-2$
+		   });																																						
+		addAnnotation
+		  (protocolTransitionEClass, 
+		   source, 
+		   new String[] {
+			 "documentation", "A protocol transition (transition as specialized in the ProtocolStateMachines package) specifies a legal transition for an operation. Transitions of protocol state machines have the following information: a pre condition (guard), on trigger, and a post condition. Every protocol transition is associated to zero or one operation (referred BehavioralFeature) that belongs to the context classifier of the protocol state machine. The protocol transition specifies that the associated (referred) operation can be called for an instance in the origin state under the initial condition (guard), and that at the end of the transition, the destination state will be reached under the final condition (post). " //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
 	}
 
 	/**
@@ -13087,7 +13699,7 @@
 	 * @generated
 	 */
     protected void createConstraintAnnotations() {
-		String source = "constraint"; //$NON-NLS-1$			
+		String source = "constraint"; //$NON-NLS-1$				
 		addAnnotation
 		  ((EOperation)elementEClass.getEOperations().get(0), 
 		   source, 
@@ -13097,7 +13709,7 @@
 		  ((EOperation)elementEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });													
+		   });														
 		addAnnotation
 		  ((EOperation)multiplicityElementEClass.getEOperations().get(5), 
 		   source, 
@@ -13122,7 +13734,7 @@
 		  ((EOperation)multiplicityElementEClass.getEOperations().get(9), 
 		   source, 
 		   new String[] {
-		   });																												
+		   });										
 		addAnnotation
 		  ((EOperation)namedElementEClass.getEOperations().get(0), 
 		   source, 
@@ -13137,7 +13749,7 @@
 		  ((EOperation)namedElementEClass.getEOperations().get(6), 
 		   source, 
 		   new String[] {
-		   });											
+		   });												
 		addAnnotation
 		  ((EOperation)namespaceEClass.getEOperations().get(0), 
 		   source, 
@@ -13147,7 +13759,7 @@
 		  ((EOperation)namespaceEClass.getEOperations().get(3), 
 		   source, 
 		   new String[] {
-		   });																																								
+		   });																																																																				
 		addAnnotation
 		  ((EOperation)propertyEClass.getEOperations().get(0), 
 		   source, 
@@ -13182,7 +13794,7 @@
 		  ((EOperation)propertyEClass.getEOperations().get(7), 
 		   source, 
 		   new String[] {
-		   });																												
+		   });																													
 		addAnnotation
 		  ((EOperation)operationEClass.getEOperations().get(0), 
 		   source, 
@@ -13192,12 +13804,12 @@
 		  ((EOperation)operationEClass.getEOperations().get(6), 
 		   source, 
 		   new String[] {
-		   });																																												
+		   });																																															
 		addAnnotation
 		  ((EOperation)packageEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });																																													
+		   });																																																									
 		addAnnotation
 		  ((EOperation)classifierEClass.getEOperations().get(1), 
 		   source, 
@@ -13217,12 +13829,12 @@
 		  ((EOperation)classifierEClass.getEOperations().get(12), 
 		   source, 
 		   new String[] {
-		   });																											
+		   });																													
 		addAnnotation
 		  ((EOperation)constraintEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });																		
+		   });																					
 		addAnnotation
 		  ((EOperation)redefinableElementEClass.getEOperations().get(0), 
 		   source, 
@@ -13232,7 +13844,7 @@
 		  ((EOperation)redefinableElementEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });																
+		   });									
 		addAnnotation
 		  ((EOperation)instanceSpecificationEClass.getEOperations().get(0), 
 		   source, 
@@ -13242,7 +13854,7 @@
 		  ((EOperation)instanceSpecificationEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });																		
+		   });																															
 		addAnnotation
 		  ((EOperation)elementImportEClass.getEOperations().get(0), 
 		   source, 
@@ -13252,12 +13864,12 @@
 		  ((EOperation)elementImportEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });												
+		   });													
 		addAnnotation
 		  ((EOperation)packageImportEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																														
+		   });																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																																											
 	}
 
 	/**
@@ -13267,7 +13879,7 @@
 	 * @generated
 	 */
 	protected void createUnionAnnotations() {
-		String source = "union"; //$NON-NLS-1$								
+		String source = "union"; //$NON-NLS-1$									
 		addAnnotation
 		  (getElement_OwnedElement(), 
 		   source, 
@@ -13277,42 +13889,12 @@
 		  (getElement_Owner(), 
 		   source, 
 		   new String[] {
-		   });																					
+		   });																						
 		addAnnotation
 		  ((EOperation)multiplicityElementEClass.getEOperations().get(12), 
 		   source, 
 		   new String[] {
-		   });					
-		addAnnotation
-		  ((EOperation)directedRelationshipEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });		
-		addAnnotation
-		  (getDirectedRelationship_Source(), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  (getDirectedRelationship_Target(), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  (getRelationship_RelatedElement(), 
-		   source, 
-		   new String[] {
-		   });									
-		addAnnotation
-		  ((EOperation)expressionEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });				
-		addAnnotation
-		  ((EOperation)commentEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });															
+		   });																	
 		addAnnotation
 		  ((EOperation)namedElementEClass.getEOperations().get(7), 
 		   source, 
@@ -13327,7 +13909,7 @@
 		  ((EOperation)namedElementEClass.getEOperations().get(9), 
 		   source, 
 		   new String[] {
-		   });														
+		   });															
 		addAnnotation
 		  ((EOperation)namespaceEClass.getEOperations().get(7), 
 		   source, 
@@ -13342,7 +13924,37 @@
 		  (getNamespace_Member(), 
 		   source, 
 		   new String[] {
-		   });																	
+		   });								
+		addAnnotation
+		  ((EOperation)directedRelationshipEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });		
+		addAnnotation
+		  (getDirectedRelationship_Source(), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  (getDirectedRelationship_Target(), 
+		   source, 
+		   new String[] {
+		   });				
+		addAnnotation
+		  (getRelationship_RelatedElement(), 
+		   source, 
+		   new String[] {
+		   });												
+		addAnnotation
+		  ((EOperation)expressionEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });					
+		addAnnotation
+		  ((EOperation)commentEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });															
 		addAnnotation
 		  ((EOperation)classEClass.getEOperations().get(5), 
 		   source, 
@@ -13357,12 +13969,12 @@
 		  ((EOperation)classEClass.getEOperations().get(7), 
 		   source, 
 		   new String[] {
-		   });								
+		   });									
 		addAnnotation
 		  ((EOperation)typeEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });																									
+		   });																										
 		addAnnotation
 		  ((EOperation)propertyEClass.getEOperations().get(12), 
 		   source, 
@@ -13387,7 +13999,7 @@
 		  ((EOperation)propertyEClass.getEOperations().get(16), 
 		   source, 
 		   new String[] {
-		   });																																						
+		   });																																							
 		addAnnotation
 		  ((EOperation)operationEClass.getEOperations().get(16), 
 		   source, 
@@ -13412,7 +14024,7 @@
 		  ((EOperation)operationEClass.getEOperations().get(21), 
 		   source, 
 		   new String[] {
-		   });									
+		   });											
 		addAnnotation
 		  ((EOperation)parameterEClass.getEOperations().get(0), 
 		   source, 
@@ -13422,7 +14034,7 @@
 		  ((EOperation)parameterEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });										
+		   });											
 		addAnnotation
 		  ((EOperation)packageEClass.getEOperations().get(4), 
 		   source, 
@@ -13432,12 +14044,12 @@
 		  ((EOperation)packageEClass.getEOperations().get(5), 
 		   source, 
 		   new String[] {
-		   });												
+		   });													
 		addAnnotation
 		  ((EOperation)enumerationEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });					
+		   });						
 		addAnnotation
 		  ((EOperation)dataTypeEClass.getEOperations().get(1), 
 		   source, 
@@ -13452,12 +14064,12 @@
 		  ((EOperation)dataTypeEClass.getEOperations().get(3), 
 		   source, 
 		   new String[] {
-		   });					
+		   });						
 		addAnnotation
 		  ((EOperation)enumerationLiteralEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });																																
+		   });																																									
 		addAnnotation
 		  ((EOperation)classifierEClass.getEOperations().get(14), 
 		   source, 
@@ -13487,12 +14099,12 @@
 		  (getClassifier_Attribute(), 
 		   source, 
 		   new String[] {
-		   });									
+		   });										
 		addAnnotation
 		  (getFeature_FeaturingClassifier(), 
 		   source, 
 		   new String[] {
-		   });					
+		   });						
 		addAnnotation
 		  ((EOperation)constraintEClass.getEOperations().get(1), 
 		   source, 
@@ -13502,7 +14114,7 @@
 		  (getConstraint_Context(), 
 		   source, 
 		   new String[] {
-		   });							
+		   });								
 		addAnnotation
 		  ((EOperation)behavioralFeatureEClass.getEOperations().get(1), 
 		   source, 
@@ -13517,7 +14129,7 @@
 		  (getBehavioralFeature_Parameter(), 
 		   source, 
 		   new String[] {
-		   });												
+		   });														
 		addAnnotation
 		  ((EOperation)redefinableElementEClass.getEOperations().get(4), 
 		   source, 
@@ -13527,8 +14139,23 @@
 		  (getRedefinableElement_RedefinitionContext(), 
 		   source, 
 		   new String[] {
+		   });								
+		addAnnotation
+		  ((EOperation)instanceSpecificationEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+		   });						
+		addAnnotation
+		  ((EOperation)slotEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
 		   });			
 		addAnnotation
+		  ((EOperation)slotEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+		   });							
+		addAnnotation
 		  ((EOperation)generalizationEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -13542,22 +14169,7 @@
 		  ((EOperation)generalizationEClass.getEOperations().get(2), 
 		   source, 
 		   new String[] {
-		   });									
-		addAnnotation
-		  ((EOperation)instanceSpecificationEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-		   });					
-		addAnnotation
-		  ((EOperation)slotEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)slotEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-		   });															
+		   });																	
 		addAnnotation
 		  ((EOperation)elementImportEClass.getEOperations().get(3), 
 		   source, 
@@ -13572,7 +14184,7 @@
 		  ((EOperation)elementImportEClass.getEOperations().get(5), 
 		   source, 
 		   new String[] {
-		   });							
+		   });								
 		addAnnotation
 		  ((EOperation)packageImportEClass.getEOperations().get(1), 
 		   source, 
@@ -13587,7 +14199,7 @@
 		  ((EOperation)packageImportEClass.getEOperations().get(3), 
 		   source, 
 		   new String[] {
-		   });					
+		   });						
 		addAnnotation
 		  ((EOperation)associationEClass.getEOperations().get(0), 
 		   source, 
@@ -13607,7 +14219,7 @@
 		  ((EOperation)associationEClass.getEOperations().get(3), 
 		   source, 
 		   new String[] {
-		   });							
+		   });								
 		addAnnotation
 		  ((EOperation)packageMergeEClass.getEOperations().get(0), 
 		   source, 
@@ -13622,7 +14234,7 @@
 		  ((EOperation)packageMergeEClass.getEOperations().get(2), 
 		   source, 
 		   new String[] {
-		   });																					
+		   });																								
 		addAnnotation
 		  ((EOperation)behaviorEClass.getEOperations().get(0), 
 		   source, 
@@ -13632,7 +14244,7 @@
 		  ((EOperation)behaviorEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });									
+		   });										
 		addAnnotation
 		  ((EOperation)behavioredClassifierEClass.getEOperations().get(0), 
 		   source, 
@@ -13642,17 +14254,17 @@
 		  ((EOperation)behavioredClassifierEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });											
+		   });												
 		addAnnotation
 		  ((EOperation)activityEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });										
+		   });																	
 		addAnnotation
 		  ((EOperation)abstractionEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });				
+		   });					
 		addAnnotation
 		  ((EOperation)realizationEClass.getEOperations().get(0), 
 		   source, 
@@ -13667,7 +14279,7 @@
 		  ((EOperation)realizationEClass.getEOperations().get(4), 
 		   source, 
 		   new String[] {
-		   });							
+		   });								
 		addAnnotation
 		  ((EOperation)substitutionEClass.getEOperations().get(1), 
 		   source, 
@@ -13677,7 +14289,7 @@
 		  ((EOperation)substitutionEClass.getEOperations().get(3), 
 		   source, 
 		   new String[] {
-		   });					
+		   });								
 		addAnnotation
 		  ((EOperation)connectorEClass.getEOperations().get(0), 
 		   source, 
@@ -13687,7 +14299,7 @@
 		  ((EOperation)connectorEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });					
+		   });						
 		addAnnotation
 		  ((EOperation)structuredClassifierEClass.getEOperations().get(0), 
 		   source, 
@@ -13712,6 +14324,91 @@
 		  (getStructuredClassifier_Role(), 
 		   source, 
 		   new String[] {
+		   });						
+		addAnnotation
+		  ((EOperation)interfaceEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)interfaceEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)interfaceEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)interfaceEClass.getEOperations().get(3), 
+		   source, 
+		   new String[] {
+		   });												
+		addAnnotation
+		  ((EOperation)implementationEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+		   });					
+		addAnnotation
+		  ((EOperation)implementationEClass.getEOperations().get(3), 
+		   source, 
+		   new String[] {
+		   });					
+		addAnnotation
+		  ((EOperation)artifactEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });					
+		addAnnotation
+		  ((EOperation)artifactEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)artifactEClass.getEOperations().get(3), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)artifactEClass.getEOperations().get(4), 
+		   source, 
+		   new String[] {
+		   });								
+		addAnnotation
+		  ((EOperation)manifestationEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+		   });						
+		addAnnotation
+		  ((EOperation)extendEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)extendEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)extendEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+		   });							
+		addAnnotation
+		  ((EOperation)useCaseEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });							
+		addAnnotation
+		  ((EOperation)includeEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)includeEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
 		   });					
 		addAnnotation
 		  ((EOperation)activityEdgeEClass.getEOperations().get(0), 
@@ -13782,93 +14479,88 @@
 		  ((EOperation)executableNodeEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });				
+		   });							
 		addAnnotation
-		  ((EOperation)artifactEClass.getEOperations().get(0), 
+		  ((EOperation)changeTriggerEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });							
+		addAnnotation
+		  ((EOperation)signalEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)signalEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
 		   });					
 		addAnnotation
-		  ((EOperation)artifactEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)artifactEClass.getEOperations().get(3), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)artifactEClass.getEOperations().get(4), 
-		   source, 
-		   new String[] {
-		   });								
-		addAnnotation
-		  ((EOperation)manifestationEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-		   });				
-		addAnnotation
-		  ((EOperation)interfaceEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)interfaceEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)interfaceEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)interfaceEClass.getEOperations().get(3), 
-		   source, 
-		   new String[] {
-		   });											
-		addAnnotation
-		  ((EOperation)implementationEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-		   });					
-		addAnnotation
-		  ((EOperation)implementationEClass.getEOperations().get(3), 
-		   source, 
-		   new String[] {
-		   });					
-		addAnnotation
-		  ((EOperation)extendEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)extendEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)extendEClass.getEOperations().get(2), 
+		  ((EOperation)timeTriggerEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
 		   });						
 		addAnnotation
-		  ((EOperation)useCaseEClass.getEOperations().get(0), 
+		  ((EOperation)collaborationOccurrenceEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });						
+		   });					
 		addAnnotation
-		  ((EOperation)includeEClass.getEOperations().get(0), 
+		  ((EOperation)collaborationEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });					
+		addAnnotation
+		  ((EOperation)portEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });					
+		addAnnotation
+		  ((EOperation)encapsulatedClassifierEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
 		   });			
 		addAnnotation
-		  ((EOperation)includeEClass.getEOperations().get(1), 
+		  ((EOperation)encapsulatedClassifierEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
 		   });					
 		addAnnotation
+		  ((EOperation)variableEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });												
+		addAnnotation
+		  ((EOperation)structuredActivityNodeEClass.getEOperations().get(4), 
+		   source, 
+		   new String[] {
+		   });						
+		addAnnotation
+		  ((EOperation)conditionalNodeEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)conditionalNodeEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+		   });					
+		addAnnotation
+		  ((EOperation)loopNodeEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)loopNodeEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)loopNodeEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+		   });							
+		addAnnotation
 		  ((EOperation)templateSignatureEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -13877,7 +14569,7 @@
 		  ((EOperation)templateSignatureEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });						
+		   });							
 		addAnnotation
 		  ((EOperation)templateParameterEClass.getEOperations().get(0), 
 		   source, 
@@ -13887,7 +14579,7 @@
 		  ((EOperation)templateParameterEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });									
+		   });										
 		addAnnotation
 		  ((EOperation)templateableElementEClass.getEOperations().get(1), 
 		   source, 
@@ -13902,12 +14594,12 @@
 		  ((EOperation)stringExpressionEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });					
+		   });						
 		addAnnotation
 		  ((EOperation)parameterableElementEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });					
+		   });						
 		addAnnotation
 		  ((EOperation)templateBindingEClass.getEOperations().get(0), 
 		   source, 
@@ -13927,7 +14619,7 @@
 		  ((EOperation)templateBindingEClass.getEOperations().get(3), 
 		   source, 
 		   new String[] {
-		   });						
+		   });							
 		addAnnotation
 		  ((EOperation)templateParameterSubstitutionEClass.getEOperations().get(0), 
 		   source, 
@@ -13937,32 +14629,7 @@
 		  ((EOperation)templateParameterSubstitutionEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });						
-		addAnnotation
-		  ((EOperation)collaborationEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });				
-		addAnnotation
-		  ((EOperation)collaborationOccurrenceEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });				
-		addAnnotation
-		  ((EOperation)portEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });				
-		addAnnotation
-		  ((EOperation)encapsulatedClassifierEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)encapsulatedClassifierEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-		   });					
+		   });											
 		addAnnotation
 		  ((EOperation)interactionEClass.getEOperations().get(0), 
 		   source, 
@@ -14002,74 +14669,39 @@
 		  ((EOperation)stateInvariantEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });				
+		   });								
 		addAnnotation
-		  ((EOperation)variableEClass.getEOperations().get(0), 
+		  ((EOperation)stateMachineEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+		   });											
+		addAnnotation
+		  ((EOperation)regionEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)regionEClass.getEOperations().get(3), 
 		   source, 
 		   new String[] {
 		   });												
 		addAnnotation
-		  ((EOperation)structuredActivityNodeEClass.getEOperations().get(4), 
-		   source, 
-		   new String[] {
-		   });						
-		addAnnotation
-		  ((EOperation)conditionalNodeEClass.getEOperations().get(0), 
+		  ((EOperation)stateEClass.getEOperations().get(2), 
 		   source, 
 		   new String[] {
 		   });			
 		addAnnotation
-		  ((EOperation)conditionalNodeEClass.getEOperations().get(1), 
+		  ((EOperation)stateEClass.getEOperations().get(3), 
 		   source, 
 		   new String[] {
-		   });					
+		   });																		
 		addAnnotation
-		  ((EOperation)loopNodeEClass.getEOperations().get(0), 
+		  ((EOperation)transitionEClass.getEOperations().get(2), 
 		   source, 
 		   new String[] {
 		   });			
 		addAnnotation
-		  ((EOperation)loopNodeEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)loopNodeEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-		   });						
-		addAnnotation
-		  ((EOperation)changeTriggerEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });				
-		addAnnotation
-		  ((EOperation)signalEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)signalEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-		   });				
-		addAnnotation
-		  ((EOperation)timeTriggerEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });				
-		addAnnotation
-		  ((EOperation)exceptionHandlerEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });				
-		addAnnotation
-		  ((EOperation)joinNodeEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });				
-		addAnnotation
-		  ((EOperation)activityPartitionEClass.getEOperations().get(0), 
+		  ((EOperation)transitionEClass.getEOperations().get(3), 
 		   source, 
 		   new String[] {
 		   });							
@@ -14177,42 +14809,22 @@
 		  ((EOperation)callOperationActionEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });								
+		   });				
 		addAnnotation
-		  ((EOperation)stateMachineEClass.getEOperations().get(2), 
+		  ((EOperation)joinNodeEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });											
+		   });				
 		addAnnotation
-		  ((EOperation)regionEClass.getEOperations().get(2), 
+		  ((EOperation)activityPartitionEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });			
+		   });							
 		addAnnotation
-		  ((EOperation)regionEClass.getEOperations().get(3), 
+		  ((EOperation)exceptionHandlerEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });												
-		addAnnotation
-		  ((EOperation)stateEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)stateEClass.getEOperations().get(3), 
-		   source, 
-		   new String[] {
-		   });																	
-		addAnnotation
-		  ((EOperation)transitionEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)transitionEClass.getEOperations().get(3), 
-		   source, 
-		   new String[] {
-		   });								
+		   });					
 		addAnnotation
 		  ((EOperation)interactionOccurrenceEClass.getEOperations().get(0), 
 		   source, 
@@ -14239,56 +14851,6 @@
 		   new String[] {
 		   });							
 		addAnnotation
-		  ((EOperation)protocolConformanceEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)protocolConformanceEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)protocolConformanceEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-		   });					
-		addAnnotation
-		  ((EOperation)protocolStateMachineEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });				
-		addAnnotation
-		  ((EOperation)protocolTransitionEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });																																								
-		addAnnotation
-		  ((EOperation)parameterSetEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });						
-		addAnnotation
-		  ((EOperation)deploymentEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  ((EOperation)deploymentEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-		   });					
-		addAnnotation
-		  ((EOperation)deploymentEClass.getEOperations().get(4), 
-		   source, 
-		   new String[] {
-		   });						
-		addAnnotation
-		  ((EOperation)deploymentTargetEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });									
-		addAnnotation
 		  ((EOperation)readExtentActionEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -14357,7 +14919,57 @@
 		  ((EOperation)raiseExceptionActionEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });	
+		   });					
+		addAnnotation
+		  ((EOperation)parameterSetEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });																																																
+		addAnnotation
+		  ((EOperation)deploymentEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)deploymentEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+		   });					
+		addAnnotation
+		  ((EOperation)deploymentEClass.getEOperations().get(4), 
+		   source, 
+		   new String[] {
+		   });						
+		addAnnotation
+		  ((EOperation)deploymentTargetEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });									
+		addAnnotation
+		  ((EOperation)protocolConformanceEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)protocolConformanceEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  ((EOperation)protocolConformanceEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+		   });					
+		addAnnotation
+		  ((EOperation)protocolStateMachineEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });					
+		addAnnotation
+		  ((EOperation)protocolTransitionEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });				
 	}
 
 	/**
@@ -14367,13 +14979,13 @@
 	 * @generated
 	 */
 	protected void createSubsetsAnnotations() {
-		String source = "subsets"; //$NON-NLS-1$										
+		String source = "subsets"; //$NON-NLS-1$											
 		addAnnotation
 		  (getElement_OwnedComment(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																					
+		   });																						
 		addAnnotation
 		  (getMultiplicityElement_UpperValue(), 
 		   source, 
@@ -14385,31 +14997,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
-		addAnnotation
-		  (getDirectedRelationship_Source(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Relationship#getRelatedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getDirectedRelationship_Target(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Relationship#getRelatedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });											
-		addAnnotation
-		  (getExpression_Operand(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  (getComment_BodyExpression(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });													
+		   });														
 		addAnnotation
 		  ((EOperation)namedElementEClass.getEOperations().get(7), 
 		   source, 
@@ -14421,7 +15009,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });												
+		   });													
 		addAnnotation
 		  ((EOperation)namespaceEClass.getEOperations().get(7), 
 		   source, 
@@ -14452,7 +15040,31 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });									
+		   });						
+		addAnnotation
+		  (getDirectedRelationship_Source(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Relationship#getRelatedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  (getDirectedRelationship_Target(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Relationship#getRelatedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });															
+		addAnnotation
+		  (getExpression_Operand(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (getComment_BodyExpression(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });										
 		addAnnotation
 		  ((EOperation)classEClass.getEOperations().get(3), 
 		   source, 
@@ -14479,13 +15091,13 @@
 		   new String[] {
 			 "org.eclipse.uml2.Classifier#getFeatures", "", //$NON-NLS-1$ //$NON-NLS-2$
 			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
+		   });						
 		addAnnotation
 		  (getType_Package(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.NamedElement#getNamespace", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																	
+		   });																																		
 		addAnnotation
 		  (getProperty_Class_(), 
 		   source, 
@@ -14531,7 +15143,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwner", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																								
+		   });																																									
 		addAnnotation
 		  (getOperation_Class_(), 
 		   source, 
@@ -14574,7 +15186,7 @@
 		   new String[] {
 			 "org.eclipse.uml2.Namespace#getOwnedMembers", "", //$NON-NLS-1$ //$NON-NLS-2$
 			 "org.eclipse.uml2.Namespace#getOwnedRules", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
+		   });								
 		addAnnotation
 		  (getParameter_Operation(), 
 		   source, 
@@ -14586,7 +15198,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });													
+		   });														
 		addAnnotation
 		  (getPackage_NestedPackage(), 
 		   source, 
@@ -14622,13 +15234,13 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Namespace#getPackageImports", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
+		   });					
 		addAnnotation
 		  (getEnumeration_OwnedLiteral(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });									
+		   });										
 		addAnnotation
 		  (getDataType_OwnedAttribute(), 
 		   source, 
@@ -14642,13 +15254,13 @@
 		   new String[] {
 			 "org.eclipse.uml2.Namespace#getOwnedMembers", "", //$NON-NLS-1$ //$NON-NLS-2$
 			 "org.eclipse.uml2.Classifier#getFeatures", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
+		   });					
 		addAnnotation
 		  (getEnumerationLiteral_Enumeration(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.NamedElement#getNamespace", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																									
+		   });																																																		
 		addAnnotation
 		  (getClassifier_Feature(), 
 		   source, 
@@ -14703,7 +15315,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });									
+		   });											
 		addAnnotation
 		  (getConstraint_Namespace(), 
 		   source, 
@@ -14715,7 +15327,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });								
+		   });									
 		addAnnotation
 		  (getBehavioralFeature_Parameter(), 
 		   source, 
@@ -14735,7 +15347,31 @@
 		   new String[] {
 			 "org.eclipse.uml2.BehavioralFeature#getParameters", "", //$NON-NLS-1$ //$NON-NLS-2$
 			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																	
+		   });																				
+		addAnnotation
+		  (getInstanceSpecification_Slot(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getInstanceSpecification_Specification(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  (getSlot_OwningInstance(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwner", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getSlot_Value(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });										
 		addAnnotation
 		  (getGeneralization_Specific(), 
 		   source, 
@@ -14748,31 +15384,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.DirectedRelationship#getTargets", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });								
-		addAnnotation
-		  (getInstanceSpecification_Slot(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInstanceSpecification_Specification(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
-		addAnnotation
-		  (getSlot_OwningInstance(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwner", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getSlot_Value(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																		
+		   });																				
 		addAnnotation
 		  (getElementImport_ImportedElement(), 
 		   source, 
@@ -14785,7 +15397,7 @@
 		   new String[] {
 			 "org.eclipse.uml2.DirectedRelationship#getSources", "", //$NON-NLS-1$ //$NON-NLS-2$
 			 "org.eclipse.uml2.Element#getOwner", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });										
+		   });											
 		addAnnotation
 		  (getPackageImport_ImportedPackage(), 
 		   source, 
@@ -14798,7 +15410,7 @@
 		   new String[] {
 			 "org.eclipse.uml2.DirectedRelationship#getSources", "", //$NON-NLS-1$ //$NON-NLS-2$
 			 "org.eclipse.uml2.Element#getOwner", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });										
+		   });											
 		addAnnotation
 		  (getAssociation_OwnedEnd(), 
 		   source, 
@@ -14818,7 +15430,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Namespace#getMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });									
+		   });										
 		addAnnotation
 		  (getPackageMerge_MergingPackage(), 
 		   source, 
@@ -14831,7 +15443,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.DirectedRelationship#getTargets", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
+		   });								
 		addAnnotation
 		  (getProfile_OwnedStereotype(), 
 		   source, 
@@ -14855,7 +15467,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.PackageImport#getImportedPackage", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });														
+		   });															
 		addAnnotation
 		  (getBehavior_RedefinedBehavior(), 
 		   source, 
@@ -14879,7 +15491,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Namespace#getOwnedRules", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });								
+		   });									
 		addAnnotation
 		  (getBehavioredClassifier_OwnedBehavior(), 
 		   source, 
@@ -14904,7 +15516,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
+		   });						
 		addAnnotation
 		  (getActivity_Edge(), 
 		   source, 
@@ -14935,13 +15547,13 @@
 		   new String[] {
 			 "org.eclipse.uml2.Activity#getNodes", "", //$NON-NLS-1$ //$NON-NLS-2$
 			 "org.eclipse.uml2.Activity#getGroups", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
+		   });												
 		addAnnotation
 		  (getAbstraction_Mapping(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });												
+		   });													
 		addAnnotation
 		  (getRealization_Abstraction(), 
 		   source, 
@@ -14956,7 +15568,7 @@
 		   new String[] {
 			 "org.eclipse.uml2.Dependency#getSuppliers", "", //$NON-NLS-1$ //$NON-NLS-2$
 			 "org.eclipse.uml2.DirectedRelationship#getTargets", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });										
+		   });											
 		addAnnotation
 		  (getSubstitution_Contract(), 
 		   source, 
@@ -14970,7 +15582,7 @@
 		   new String[] {
 			 "org.eclipse.uml2.Dependency#getClients", "", //$NON-NLS-1$ //$NON-NLS-2$
 			 "org.eclipse.uml2.DirectedRelationship#getSources", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
+		   });									
 		addAnnotation
 		  (getConnector_RedefinedConnector(), 
 		   source, 
@@ -14982,7 +15594,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });										
+		   });											
 		addAnnotation
 		  (getStructuredClassifier_OwnedAttribute(), 
 		   source, 
@@ -15003,6 +15615,135 @@
 		   new String[] {
 			 "org.eclipse.uml2.Classifier#getFeatures", "", //$NON-NLS-1$ //$NON-NLS-2$
 			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });											
+		addAnnotation
+		  (getInterface_OwnedAttribute(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Classifier#getAttributes", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getInterface_OwnedOperation(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Classifier#getFeatures", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getInterface_RedefinedInterface(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.RedefinableElement#getRedefinedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getInterface_NestedClassifier(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getInterface_OwnedReception(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Classifier#getFeatures", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getInterface_Protocol(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });											
+		addAnnotation
+		  (getImplementation_Contract(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Dependency#getSuppliers", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.DirectedRelationship#getTargets", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getImplementation_ImplementingClassifier(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Dependency#getClients", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.DirectedRelationship#getSources", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });												
+		addAnnotation
+		  (getArtifact_Manifestation(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.NamedElement#getClientDependencies", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getArtifact_OwnedOperation(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Classifier#getFeatures", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getArtifact_OwnedAttribute(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Classifier#getAttributes", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
+		addAnnotation
+		  (getManifestation_UtilizedElement(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Dependency#getSuppliers", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.DirectedRelationship#getTargets", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });										
+		addAnnotation
+		  (getExtend_ExtendedCase(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.DirectedRelationship#getTargets", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getExtend_Extension(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.DirectedRelationship#getSources", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getExtend_Condition(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (getUseCase_Include(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getUseCase_Extend(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getUseCase_ExtensionPoint(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  (getInclude_IncludingCase(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.DirectedRelationship#getSources", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getInclude_Addition(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.DirectedRelationship#getTargets", "" //$NON-NLS-1$ //$NON-NLS-2$
 		   });						
 		addAnnotation
 		  (getActivityEdge_Activity(), 
@@ -15111,136 +15852,93 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });												
+		   });							
 		addAnnotation
-		  (getArtifact_Manifestation(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.NamedElement#getClientDependencies", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getArtifact_OwnedOperation(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Classifier#getFeatures", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getArtifact_OwnedAttribute(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Classifier#getAttributes", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
-		addAnnotation
-		  (getManifestation_UtilizedElement(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Dependency#getSuppliers", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.DirectedRelationship#getTargets", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });										
-		addAnnotation
-		  (getInterface_OwnedAttribute(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Classifier#getAttributes", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterface_OwnedOperation(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Classifier#getFeatures", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterface_RedefinedInterface(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.RedefinableElement#getRedefinedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterface_NestedClassifier(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterface_OwnedReception(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Classifier#getFeatures", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterface_Protocol(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });										
-		addAnnotation
-		  (getImplementation_Contract(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Dependency#getSuppliers", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.DirectedRelationship#getTargets", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getImplementation_ImplementingClassifier(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Dependency#getClients", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.DirectedRelationship#getSources", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });								
-		addAnnotation
-		  (getExtend_ExtendedCase(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.DirectedRelationship#getTargets", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getExtend_Extension(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.DirectedRelationship#getSources", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getExtend_Condition(), 
+		  (getChangeTrigger_ChangeExpression(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
+		   });									
 		addAnnotation
-		  (getUseCase_Include(), 
+		  (getSignal_OwnedAttribute(), 
 		   source, 
 		   new String[] {
+			 "org.eclipse.uml2.Classifier#getAttributes", "", //$NON-NLS-1$ //$NON-NLS-2$
 			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
+		   });					
 		addAnnotation
-		  (getUseCase_Extend(), 
+		  (getTimeTrigger_When(), 
 		   source, 
 		   new String[] {
-			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getUseCase_ExtensionPoint(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
 		   });						
 		addAnnotation
-		  (getInclude_IncludingCase(), 
+		  (getCollaborationOccurrence_RoleBinding(), 
 		   source, 
 		   new String[] {
-			 "org.eclipse.uml2.DirectedRelationship#getSources", "" //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (getCollaboration_CollaborationRole(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.StructuredClassifier#getRoles", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (getPort_RedefinedPort(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.RedefinableElement#getRedefinedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  (getEncapsulatedClassifier_OwnedPort(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Classifier#getFeatures", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (getVariable_Scope(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwner", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });												
+		addAnnotation
+		  (getStructuredActivityNode_Variable(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });								
+		addAnnotation
+		  (getConditionalNode_Clause(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
 		   });		
 		addAnnotation
-		  (getInclude_Addition(), 
+		  (getConditionalNode_Result(), 
 		   source, 
 		   new String[] {
-			 "org.eclipse.uml2.DirectedRelationship#getTargets", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });							
+			 "org.eclipse.uml2.Action#getOutputs", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });								
+		addAnnotation
+		  (getLoopNode_Result(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Action#getOutputs", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getLoopNode_LoopVariable(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getLoopNode_LoopVariableInput(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Action#getInputs", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });								
 		addAnnotation
 		  (getTemplateSignature_OwnedParameter(), 
 		   source, 
@@ -15253,7 +15951,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwner", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
+		   });							
 		addAnnotation
 		  (getTemplateParameter_Signature(), 
 		   source, 
@@ -15273,7 +15971,7 @@
 		   new String[] {
 			 "org.eclipse.uml2.TemplateParameter#getDefault", "", //$NON-NLS-1$ //$NON-NLS-2$
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
+		   });						
 		addAnnotation
 		  (getTemplateableElement_TemplateBinding(), 
 		   source, 
@@ -15297,14 +15995,14 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwner", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
+		   });						
 		addAnnotation
 		  (getParameterableElement_OwningParameter(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwner", "", //$NON-NLS-1$ //$NON-NLS-2$
 			 "org.eclipse.uml2.ParameterableElement#getTemplateParameter", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });										
+		   });											
 		addAnnotation
 		  (getTemplateBinding_BoundElement(), 
 		   source, 
@@ -15323,7 +16021,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
+		   });							
 		addAnnotation
 		  (getTemplateParameterSubstitution_TemplateBinding(), 
 		   source, 
@@ -15336,32 +16034,7 @@
 		   new String[] {
 			 "org.eclipse.uml2.TemplateParameterSubstitution#getActuals", "", //$NON-NLS-1$ //$NON-NLS-2$
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  (getCollaboration_CollaborationRole(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.StructuredClassifier#getRoles", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  (getCollaborationOccurrence_RoleBinding(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  (getPort_RedefinedPort(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.RedefinableElement#getRedefinedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
-		addAnnotation
-		  (getEncapsulatedClassifier_OwnedPort(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Classifier#getFeatures", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
+		   });									
 		addAnnotation
 		  (getInteraction_Lifeline(), 
 		   source, 
@@ -15421,85 +16094,96 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
+		   });								
 		addAnnotation
-		  (getVariable_Scope(), 
+		  (getStateMachine_Region(), 
 		   source, 
 		   new String[] {
-			 "org.eclipse.uml2.Element#getOwner", "" //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getStateMachine_ConnectionPoint(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
 		   });												
 		addAnnotation
-		  (getStructuredActivityNode_Variable(), 
+		  (getRegion_Subvertex(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getRegion_Transition(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getRegion_StateMachine(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.NamedElement#getNamespace", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getRegion_State(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.NamedElement#getNamespace", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });											
+		addAnnotation
+		  (getState_Connection(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  (getState_Region(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });								
+		   });		
 		addAnnotation
-		  (getConditionalNode_Clause(), 
+		  (getState_Entry(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
 		   });		
 		addAnnotation
-		  (getConditionalNode_Result(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Action#getOutputs", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });								
-		addAnnotation
-		  (getLoopNode_Result(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Action#getOutputs", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getLoopNode_LoopVariable(), 
+		  (getState_Exit(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
 		   });		
 		addAnnotation
-		  (getLoopNode_LoopVariableInput(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Action#getInputs", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  (getChangeTrigger_ChangeExpression(), 
+		  (getState_DoActivity(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
+		   });		
 		addAnnotation
-		  (getSignal_OwnedAttribute(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Classifier#getAttributes", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  (getTimeTrigger_When(), 
+		  (getState_StateInvariant(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
+		   });														
 		addAnnotation
-		  (getExceptionHandler_ProtectedNode(), 
+		  (getTransition_Container(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwner", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
+		   });			
 		addAnnotation
-		  (getJoinNode_JoinSpec(), 
+		  (getTransition_Guard(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });							
+		   });		
 		addAnnotation
-		  (getActivityPartition_SuperPartition(), 
+		  (getTransition_Effect(), 
 		   source, 
 		   new String[] {
-			 "org.eclipse.uml2.ActivityGroup#getSuperGroup", "" //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
 		   });				
 		addAnnotation
 		  (getCreateObjectAction_Result(), 
@@ -15632,96 +16316,24 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Action#getInputs", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });								
+		   });				
 		addAnnotation
-		  (getStateMachine_Region(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getStateMachine_ConnectionPoint(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });												
-		addAnnotation
-		  (getRegion_Subvertex(), 
+		  (getJoinNode_JoinSpec(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
+		   });							
 		addAnnotation
-		  (getRegion_Transition(), 
+		  (getActivityPartition_SuperPartition(), 
 		   source, 
 		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
+			 "org.eclipse.uml2.ActivityGroup#getSuperGroup", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });				
 		addAnnotation
-		  (getRegion_StateMachine(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.NamedElement#getNamespace", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getRegion_State(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.NamedElement#getNamespace", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });											
-		addAnnotation
-		  (getState_Connection(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getState_Region(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getState_Entry(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getState_Exit(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getState_DoActivity(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getState_StateInvariant(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });													
-		addAnnotation
-		  (getTransition_Container(), 
+		  (getExceptionHandler_ProtectedNode(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwner", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  (getTransition_Guard(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getTransition_Effect(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
 		   });					
 		addAnnotation
 		  (getInteractionOccurrence_ActualGate(), 
@@ -15765,71 +16377,7 @@
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwnedElements", "", //$NON-NLS-1$ //$NON-NLS-2$
 			 "org.eclipse.uml2.NamedElement#getClientDependencies", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });									
-		addAnnotation
-		  (getProtocolConformance_SpecificMachine(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.DirectedRelationship#getSources", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.Element#getOwner", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getProtocolConformance_GeneralMachine(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.DirectedRelationship#getTargets", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  (getProtocolStateMachine_Conformance(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
-		addAnnotation
-		  (getProtocolTransition_PostCondition(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getProtocolTransition_PreCondition(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Transition#getGuard", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																					
-		addAnnotation
-		  (getParameterSet_Condition(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });												
-		addAnnotation
-		  (getDeployment_DeployedArtifact(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Dependency#getSuppliers", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.DirectedRelationship#getTargets", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getDeployment_Location(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.DirectedRelationship#getSources", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.Dependency#getClients", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getDeployment_Configuration(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
-		addAnnotation
-		  (getDeploymentTarget_Deployment(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Element#getOwnedElements", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.NamedElement#getClientDependencies", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });							
+		   });					
 		addAnnotation
 		  (getReadExtentAction_Result(), 
 		   source, 
@@ -15919,6 +16467,70 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Action#getInputs", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  (getParameterSet_Condition(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });																																																						
+		addAnnotation
+		  (getDeployment_DeployedArtifact(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Dependency#getSuppliers", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.DirectedRelationship#getTargets", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getDeployment_Location(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.DirectedRelationship#getSources", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.Dependency#getClients", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getDeployment_Configuration(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
+		addAnnotation
+		  (getDeploymentTarget_Deployment(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.NamedElement#getClientDependencies", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });											
+		addAnnotation
+		  (getProtocolConformance_SpecificMachine(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.DirectedRelationship#getSources", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.Element#getOwner", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getProtocolConformance_GeneralMachine(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.DirectedRelationship#getTargets", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });				
+		addAnnotation
+		  (getProtocolStateMachine_Conformance(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  (getProtocolTransition_PostCondition(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Element#getOwnedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getProtocolTransition_PreCondition(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Transition#getGuard", "" //$NON-NLS-1$ //$NON-NLS-2$
 		   });
 	}
 
@@ -15929,7 +16541,7 @@
 	 * @generated
 	 */
 	protected void createFeatureAnnotations() {
-		String source = "feature"; //$NON-NLS-1$																												
+		String source = "feature"; //$NON-NLS-1$																														
 		addAnnotation
 		  ((EOperation)multiplicityElementEClass.getEOperations().get(12), 
 		   source, 
@@ -15942,42 +16554,7 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
-		addAnnotation
-		  ((EOperation)directedRelationshipEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "relatedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });														
-		addAnnotation
-		  ((EOperation)expressionEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  ((EOperation)commentEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });														
+		   });																
 		addAnnotation
 		  ((EOperation)namedElementEClass.getEOperations().get(7), 
 		   source, 
@@ -16016,7 +16593,7 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });													
+		   });														
 		addAnnotation
 		  ((EOperation)namespaceEClass.getEOperations().get(7), 
 		   source, 
@@ -16044,6 +16621,41 @@
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
 		   });									
 		addAnnotation
+		  ((EOperation)directedRelationshipEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "relatedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });																		
+		addAnnotation
+		  ((EOperation)expressionEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  ((EOperation)commentEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
+		addAnnotation
 		  ((EOperation)classEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
@@ -16117,7 +16729,7 @@
 			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Feature", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });								
+		   });									
 		addAnnotation
 		  ((EOperation)typeEClass.getEOperations().get(1), 
 		   source, 
@@ -16130,7 +16742,7 @@
 			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.upperBound", "-1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																					
+		   });																						
 		addAnnotation
 		  ((EOperation)propertyEClass.getEOperations().get(10), 
 		   source, 
@@ -16209,7 +16821,7 @@
 			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																						
+		   });																							
 		addAnnotation
 		  ((EOperation)operationEClass.getEOperations().get(8), 
 		   source, 
@@ -16347,7 +16959,7 @@
 			 "name", "redefinedElement", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.RedefinableElement", //$NON-NLS-1$ //$NON-NLS-2$
 			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });									
+		   });											
 		addAnnotation
 		  ((EOperation)parameterEClass.getEOperations().get(0), 
 		   source, 
@@ -16373,7 +16985,7 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });										
+		   });											
 		addAnnotation
 		  ((EOperation)packageEClass.getEOperations().get(4), 
 		   source, 
@@ -16412,7 +17024,7 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.PackageImport", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });										
+		   });											
 		addAnnotation
 		  ((EOperation)enumerationEClass.getEOperations().get(0), 
 		   source, 
@@ -16425,7 +17037,7 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
+		   });						
 		addAnnotation
 		  ((EOperation)dataTypeEClass.getEOperations().get(1), 
 		   source, 
@@ -16460,7 +17072,7 @@
 			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Feature", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
+		   });						
 		addAnnotation
 		  ((EOperation)enumerationLiteralEClass.getEOperations().get(0), 
 		   source, 
@@ -16473,7 +17085,7 @@
 			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.upperBound", "-1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																
+		   });																																									
 		addAnnotation
 		  ((EOperation)classifierEClass.getEOperations().get(14), 
 		   source, 
@@ -16530,7 +17142,7 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																		
+		   });																				
 		addAnnotation
 		  ((EOperation)constraintEClass.getEOperations().get(1), 
 		   source, 
@@ -16543,7 +17155,7 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });								
+		   });									
 		addAnnotation
 		  ((EOperation)behavioralFeatureEClass.getEOperations().get(1), 
 		   source, 
@@ -16565,7 +17177,7 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });													
+		   });															
 		addAnnotation
 		  ((EOperation)redefinableElementEClass.getEOperations().get(4), 
 		   source, 
@@ -16574,7 +17186,46 @@
 			 "name", "redefinedElement", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.RedefinableElement", //$NON-NLS-1$ //$NON-NLS-2$
 			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
+		   });									
+		addAnnotation
+		  ((EOperation)instanceSpecificationEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
+		addAnnotation
+		  ((EOperation)slotEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)slotEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
 		addAnnotation
 		  ((EOperation)generalizationEClass.getEOperations().get(0), 
 		   source, 
@@ -16605,46 +17256,7 @@
 			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });									
-		addAnnotation
-		  ((EOperation)instanceSpecificationEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
-		addAnnotation
-		  ((EOperation)slotEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)slotEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
+		   });						
 		addAnnotation
 		  ((EOperation)packageableElementEClass.getEOperations().get(0), 
 		   source, 
@@ -16660,7 +17272,7 @@
 			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
 			 "name", "visibility", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.VisibilityKind" //$NON-NLS-1$ //$NON-NLS-2$
-		   });									
+		   });										
 		addAnnotation
 		  ((EOperation)elementImportEClass.getEOperations().get(3), 
 		   source, 
@@ -16691,7 +17303,7 @@
 			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });							
+		   });								
 		addAnnotation
 		  ((EOperation)packageImportEClass.getEOperations().get(1), 
 		   source, 
@@ -16722,7 +17334,7 @@
 			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
+		   });						
 		addAnnotation
 		  ((EOperation)associationEClass.getEOperations().get(0), 
 		   source, 
@@ -16766,7 +17378,7 @@
 			 "name", "member", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
 			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });							
+		   });								
 		addAnnotation
 		  ((EOperation)packageMergeEClass.getEOperations().get(0), 
 		   source, 
@@ -16797,7 +17409,7 @@
 			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
+		   });							
 		addAnnotation
 		  ((EOperation)profileEClass.getEOperations().get(0), 
 		   source, 
@@ -16859,7 +17471,7 @@
 			 "name", "type", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Stereotype", //$NON-NLS-1$ //$NON-NLS-2$
 			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
+		   });				
 		addAnnotation
 		  ((EOperation)behaviorEClass.getEOperations().get(0), 
 		   source, 
@@ -16894,7 +17506,7 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Constraint", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });							
+		   });								
 		addAnnotation
 		  ((EOperation)behavioredClassifierEClass.getEOperations().get(0), 
 		   source, 
@@ -16933,7 +17545,7 @@
 			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Dependency", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });									
+		   });										
 		addAnnotation
 		  ((EOperation)activityEClass.getEOperations().get(0), 
 		   source, 
@@ -16946,7 +17558,7 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });										
+		   });																	
 		addAnnotation
 		  ((EOperation)abstractionEClass.getEOperations().get(0), 
 		   source, 
@@ -16959,7 +17571,7 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
+		   });					
 		addAnnotation
 		  ((EOperation)realizationEClass.getEOperations().get(0), 
 		   source, 
@@ -17012,7 +17624,7 @@
 			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
+		   });						
 		addAnnotation
 		  ((EOperation)substitutionEClass.getEOperations().get(0), 
 		   source, 
@@ -17052,7 +17664,7 @@
 			 "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
+		   });								
 		addAnnotation
 		  ((EOperation)connectorEClass.getEOperations().get(0), 
 		   source, 
@@ -17074,7 +17686,7 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
+		   });						
 		addAnnotation
 		  ((EOperation)structuredClassifierEClass.getEOperations().get(0), 
 		   source, 
@@ -17118,8 +17730,233 @@
 			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Feature", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });								
+		addAnnotation
+		  ((EOperation)interfaceEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Property", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)interfaceEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)interfaceEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "feature", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "featuringClassifier", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Feature", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)interfaceEClass.getEOperations().get(3), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "redefinedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.RedefinableElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });										
+		addAnnotation
+		  ((EOperation)implementationEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "supplier", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)implementationEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)implementationEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "client", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "clientDependency", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)implementationEClass.getEOperations().get(3), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  ((EOperation)artifactEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)artifactEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "clientDependency", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "client", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Dependency", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "1" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)artifactEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "feature", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "featuringClassifier", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Feature", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)artifactEClass.getEOperations().get(3), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)artifactEClass.getEOperations().get(4), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Property", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
+		addAnnotation
+		  ((EOperation)manifestationEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "supplier", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)manifestationEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
+		addAnnotation
+		  ((EOperation)extendEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)extendEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)extendEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
 		   });							
 		addAnnotation
+		  ((EOperation)useCaseEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  ((EOperation)includeEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)includeEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
 		  ((EOperation)activityEdgeEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -17287,9 +18124,9 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
+		   });							
 		addAnnotation
-		  ((EOperation)artifactEClass.getEOperations().get(0), 
+		  ((EOperation)changeTriggerEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
 			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
@@ -17300,75 +18137,9 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
+		   });							
 		addAnnotation
-		  ((EOperation)artifactEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "clientDependency", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "client", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Dependency", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)artifactEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "feature", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "featuringClassifier", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Feature", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)artifactEClass.getEOperations().get(3), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)artifactEClass.getEOperations().get(4), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Property", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
-		addAnnotation
-		  ((EOperation)manifestationEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "supplier", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)manifestationEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  ((EOperation)interfaceEClass.getEOperations().get(0), 
+		  ((EOperation)signalEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
 			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
@@ -17377,7 +18148,7 @@
 			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
 		   });			
 		addAnnotation
-		  ((EOperation)interfaceEClass.getEOperations().get(1), 
+		  ((EOperation)signalEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
 			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
@@ -17388,89 +18159,9 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)interfaceEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "feature", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "featuringClassifier", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Feature", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)interfaceEClass.getEOperations().get(3), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "redefinedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.RedefinableElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });									
-		addAnnotation
-		  ((EOperation)implementationEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "supplier", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)implementationEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)implementationEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "client", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "clientDependency", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)implementationEClass.getEOperations().get(3), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
 		   });					
 		addAnnotation
-		  ((EOperation)extendEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)extendEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)extendEClass.getEOperations().get(2), 
+		  ((EOperation)timeTriggerEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
 			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
@@ -17483,220 +18174,6 @@
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
 		   });						
 		addAnnotation
-		  ((EOperation)useCaseEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
-		addAnnotation
-		  ((EOperation)includeEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)includeEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
-		addAnnotation
-		  ((EOperation)templateSignatureEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)templateSignatureEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
-		addAnnotation
-		  ((EOperation)templateParameterEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)templateParameterEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });									
-		addAnnotation
-		  ((EOperation)templateableElementEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
-		addAnnotation
-		  ((EOperation)stringExpressionEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)stringExpressionEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
-		addAnnotation
-		  ((EOperation)parameterableElementEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
-		addAnnotation
-		  ((EOperation)templateBindingEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)templateBindingEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)templateBindingEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)templateBindingEClass.getEOperations().get(3), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
-		addAnnotation
-		  ((EOperation)templateParameterSubstitutionEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)templateParameterSubstitutionEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
-		addAnnotation
-		  ((EOperation)collaborationEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "role", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.ConnectableElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
 		  ((EOperation)collaborationOccurrenceEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -17708,7 +18185,16 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
+		   });					
+		addAnnotation
+		  ((EOperation)collaborationEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "role", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.ConnectableElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
 		addAnnotation
 		  ((EOperation)portEClass.getEOperations().get(0), 
 		   source, 
@@ -17717,7 +18203,7 @@
 			 "name", "redefinedElement", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.RedefinableElement", //$NON-NLS-1$ //$NON-NLS-2$
 			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
+		   });					
 		addAnnotation
 		  ((EOperation)encapsulatedClassifierEClass.getEOperations().get(0), 
 		   source, 
@@ -17745,128 +18231,6 @@
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
 		   });					
 		addAnnotation
-		  ((EOperation)interactionEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });							
-		addAnnotation
-		  ((EOperation)interactionFragmentEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)interactionFragmentEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Namespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
-		addAnnotation
-		  ((EOperation)lifelineEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Namespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)lifelineEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
-		addAnnotation
-		  ((EOperation)messageEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Namespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)messageEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
-		addAnnotation
-		  ((EOperation)eventOccurrenceEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "covered", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Lifeline", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)stateInvariantEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "covered", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Lifeline", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)stateInvariantEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
 		  ((EOperation)variableEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -17996,9 +18360,9 @@
 			 "name", "input", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.InputPin", //$NON-NLS-1$ //$NON-NLS-2$
 			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
+		   });							
 		addAnnotation
-		  ((EOperation)changeTriggerEClass.getEOperations().get(0), 
+		  ((EOperation)templateSignatureEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
 			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
@@ -18009,44 +18373,9 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  ((EOperation)signalEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Property", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
 		   });			
 		addAnnotation
-		  ((EOperation)signalEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  ((EOperation)timeTriggerEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  ((EOperation)exceptionHandlerEClass.getEOperations().get(0), 
+		  ((EOperation)templateSignatureEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
 			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
@@ -18057,9 +18386,266 @@
 			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
+		   });							
 		addAnnotation
-		  ((EOperation)joinNodeEClass.getEOperations().get(0), 
+		  ((EOperation)templateParameterEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)templateParameterEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });										
+		addAnnotation
+		  ((EOperation)templateableElementEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  ((EOperation)stringExpressionEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)stringExpressionEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
+		addAnnotation
+		  ((EOperation)parameterableElementEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
+		addAnnotation
+		  ((EOperation)templateBindingEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)templateBindingEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)templateBindingEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)templateBindingEClass.getEOperations().get(3), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  ((EOperation)templateParameterSubstitutionEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)templateParameterSubstitutionEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });											
+		addAnnotation
+		  ((EOperation)interactionEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  ((EOperation)interactionFragmentEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)interactionFragmentEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Namespace", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1" //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
+		addAnnotation
+		  ((EOperation)lifelineEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Namespace", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)lifelineEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  ((EOperation)messageEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Namespace", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)messageEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  ((EOperation)eventOccurrenceEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "covered", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Lifeline", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)stateInvariantEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "covered", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Lifeline", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)stateInvariantEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
 			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
@@ -18072,17 +18658,180 @@
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
 		   });				
 		addAnnotation
-		  ((EOperation)activityPartitionEClass.getEOperations().get(0), 
+		  ((EOperation)stateMachineEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
 			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "superGroup", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.ActivityGroup", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "redefinedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.RedefinableElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)stateMachineEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "redefinitionContext", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Classifier", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)stateMachineEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
 			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "subgroup", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  ((EOperation)regionEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "redefinitionContext", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Classifier", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)regionEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "redefinedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.RedefinableElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)regionEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)regionEClass.getEOperations().get(3), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Namespace", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.upperBound", "-1" //$NON-NLS-1$ //$NON-NLS-2$
+		   });								
+		addAnnotation
+		  ((EOperation)stateEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "redefinitionContext", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Classifier", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)stateEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "redefinedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.RedefinableElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)stateEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)stateEClass.getEOperations().get(3), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });										
+		addAnnotation
+		  ((EOperation)vertexEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  ((EOperation)transitionEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "redefinitionContext", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Classifier", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)transitionEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "redefinedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.RedefinableElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)transitionEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)transitionEClass.getEOperations().get(3), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
 		   });							
 		addAnnotation
 		  ((EOperation)createObjectActionEClass.getEOperations().get(0), 
@@ -18301,56 +19050,7 @@
 			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
 		   });				
 		addAnnotation
-		  ((EOperation)stateMachineEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "redefinedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.RedefinableElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)stateMachineEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "redefinitionContext", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Classifier", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)stateMachineEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });							
-		addAnnotation
-		  ((EOperation)regionEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "redefinitionContext", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Classifier", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)regionEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "redefinedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.RedefinableElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)regionEClass.getEOperations().get(2), 
+		  ((EOperation)joinNodeEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
 			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
@@ -18361,97 +19061,22 @@
 			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)regionEClass.getEOperations().get(3), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Namespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });								
-		addAnnotation
-		  ((EOperation)stateEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "redefinitionContext", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Classifier", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)stateEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "redefinedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.RedefinableElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)stateEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)stateEClass.getEOperations().get(3), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedMember", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });										
-		addAnnotation
-		  ((EOperation)vertexEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
 		   });				
 		addAnnotation
-		  ((EOperation)transitionEClass.getEOperations().get(0), 
+		  ((EOperation)activityPartitionEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
 			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "redefinitionContext", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Classifier", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
+			 "name", "superGroup", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.ActivityGroup", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "subgroup", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1" //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
 		addAnnotation
-		  ((EOperation)transitionEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "redefinedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.RedefinableElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)transitionEClass.getEOperations().get(2), 
+		  ((EOperation)exceptionHandlerEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
 			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
@@ -18462,20 +19087,7 @@
 			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)transitionEClass.getEOperations().get(3), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });								
+		   });					
 		addAnnotation
 		  ((EOperation)interactionOccurrenceEClass.getEOperations().get(0), 
 		   source, 
@@ -18555,299 +19167,6 @@
 			 "eOpposite.lowerBound", "1" //$NON-NLS-1$ //$NON-NLS-2$
 		   });					
 		addAnnotation
-		  ((EOperation)protocolConformanceEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)protocolConformanceEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)protocolConformanceEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
-		addAnnotation
-		  ((EOperation)protocolStateMachineEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  ((EOperation)protocolTransitionEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)protocolTransitionEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "guard", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Constraint", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "true" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
-		addAnnotation
-		  ((EOperation)timeObservationActionEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "value", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.InputPin", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "true" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)timeObservationActionEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "value", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.InputPin", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "true" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  ((EOperation)durationIntervalEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "min", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Duration", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)durationIntervalEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "max", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Duration", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
-		addAnnotation
-		  ((EOperation)timeConstraintEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "specification", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.TimeInterval", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)timeConstraintEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "specification", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.TimeInterval", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)intervalConstraintEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "specification", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Interval", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)intervalConstraintEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "specification", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Interval", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)timeIntervalEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "max", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.TimeExpression", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)timeIntervalEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "min", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.TimeExpression", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)durationObservationActionEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "value", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.InputPin", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "true" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)durationObservationActionEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "value", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.InputPin", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "true" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  ((EOperation)durationConstraintEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "specification", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.DurationInterval", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)durationConstraintEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "specification", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.DurationInterval", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  ((EOperation)parameterSetEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  ((EOperation)deploymentEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "supplier", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)deploymentEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)deploymentEClass.getEOperations().get(2), 
-		   source, 
-		   new String[] {
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)deploymentEClass.getEOperations().get(3), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "client", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "clientDependency", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)deploymentEClass.getEOperations().get(4), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
-		addAnnotation
-		  ((EOperation)deploymentTargetEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)deploymentTargetEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "clientDependency", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite", "client", //$NON-NLS-1$ //$NON-NLS-2$
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Dependency", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eOpposite.lowerBound", "1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
-		  ((EOperation)nodeEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
-			 "name", "nestedClassifier", //$NON-NLS-1$ //$NON-NLS-2$
-			 "eType", "org.eclipse.uml2.Classifier", //$NON-NLS-1$ //$NON-NLS-2$
-			 "containment", "true" //$NON-NLS-1$ //$NON-NLS-2$
-		   });				
-		addAnnotation
 		  ((EOperation)readExtentActionEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
@@ -18990,7 +19309,300 @@
 			 "name", "input", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eType", "org.eclipse.uml2.InputPin", //$NON-NLS-1$ //$NON-NLS-2$
 			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
+		   });					
+		addAnnotation
+		  ((EOperation)parameterSetEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  ((EOperation)timeObservationActionEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "value", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.InputPin", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)timeObservationActionEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "value", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.InputPin", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  ((EOperation)durationIntervalEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "min", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Duration", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)durationIntervalEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "max", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Duration", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  ((EOperation)timeConstraintEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "specification", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.TimeInterval", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)timeConstraintEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "specification", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.TimeInterval", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });				
+		addAnnotation
+		  ((EOperation)intervalConstraintEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "specification", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Interval", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)intervalConstraintEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "specification", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Interval", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });				
+		addAnnotation
+		  ((EOperation)timeIntervalEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "max", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.TimeExpression", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)timeIntervalEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "min", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.TimeExpression", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });				
+		addAnnotation
+		  ((EOperation)durationObservationActionEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "value", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.InputPin", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)durationObservationActionEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "value", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.InputPin", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  ((EOperation)durationConstraintEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "specification", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.DurationInterval", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)durationConstraintEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "specification", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.DurationInterval", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)deploymentEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "supplier", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)deploymentEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)deploymentEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)deploymentEClass.getEOperations().get(3), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "client", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "clientDependency", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.NamedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)deploymentEClass.getEOperations().get(4), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });						
+		addAnnotation
+		  ((EOperation)deploymentTargetEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)deploymentTargetEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "clientDependency", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "client", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Dependency", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "1" //$NON-NLS-1$ //$NON-NLS-2$
+		   });				
+		addAnnotation
+		  ((EOperation)nodeEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "nestedClassifier", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Classifier", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		   });				
+		addAnnotation
+		  ((EOperation)protocolConformanceEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)protocolConformanceEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "-1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)protocolConformanceEClass.getEOperations().get(2), 
+		   source, 
+		   new String[] {
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "target", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  ((EOperation)protocolStateMachineEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });					
+		addAnnotation
+		  ((EOperation)protocolTransitionEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "ownedElement", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite", "owner", //$NON-NLS-1$ //$NON-NLS-2$
+			 "derived", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.upperBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Element", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eOpposite.lowerBound", "0" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)protocolTransitionEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "derived", "false", //$NON-NLS-1$ //$NON-NLS-2$
+			 "name", "guard", //$NON-NLS-1$ //$NON-NLS-2$
+			 "eType", "org.eclipse.uml2.Constraint", //$NON-NLS-1$ //$NON-NLS-2$
+			 "containment", "true" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
 	}
 
 	/**
@@ -19000,7 +19612,7 @@
 	 * @generated
 	 */
 	protected void createRedefinesAnnotations() {
-		String source = "redefines"; //$NON-NLS-1$																																																																																										
+		String source = "redefines"; //$NON-NLS-1$																																																																																																					
 		addAnnotation
 		  ((EOperation)classEClass.getEOperations().get(1), 
 		   source, 
@@ -19024,7 +19636,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Classifier#getGenerals", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																										
+		   });																												
 		addAnnotation
 		  ((EOperation)propertyEClass.getEOperations().get(10), 
 		   source, 
@@ -19036,7 +19648,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.StructuralFeature#isReadOnly", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																
+		   });																																	
 		addAnnotation
 		  ((EOperation)operationEClass.getEOperations().get(8), 
 		   source, 
@@ -19085,25 +19697,25 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.TypedElement#getType", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																								
+		   });																																											
 		addAnnotation
 		  (getPackage_OwnedMember(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																																																													
+		   });																																																																																											
 		addAnnotation
 		  (getConstraint_Namespace(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.NamedElement#getNamespace", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																															
+		   });																																																							
 		addAnnotation
 		  (getPackageableElement_PackageableElement_visibility(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.NamedElement#getVisibility", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																																								
+		   });																																																														
 		addAnnotation
 		  ((EOperation)extensionEClass.getEOperations().get(0), 
 		   source, 
@@ -19121,13 +19733,13 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.TypedElement#getType", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																							
+		   });																									
 		addAnnotation
 		  (getBehavioredClassifier_OwnedStateMachine(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.BehavioredClassifier#getOwnedBehaviors", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																																														
+		   });																																																																																																																																																
 		addAnnotation
 		  (getActivityEdge_RedefinedElement(), 
 		   source, 
@@ -19145,19 +19757,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.RedefinableElement#getRedefinedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																																																																																																																																																											
-		addAnnotation
-		  ((EOperation)eventOccurrenceEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.InteractionFragment#getCovereds", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)stateInvariantEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.InteractionFragment#getCovereds", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });									
+		   });																																																													
 		addAnnotation
 		  ((EOperation)structuredActivityNodeEClass.getEOperations().get(0), 
 		   source, 
@@ -19183,42 +19783,18 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.ActivityGroup#getContainedEdges", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																				
+		   });																																																																																																							
 		addAnnotation
-		  (getActivityPartition_ContainedEdge(), 
+		  ((EOperation)eventOccurrenceEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-			 "org.eclipse.uml2.ActivityGroup#getContainedEdges", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getActivityPartition_ContainedNode(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.ActivityGroup#getContainedNodes", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getActivityPartition_Subgroup(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.ActivityGroup#getSubgroups", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																			
-		addAnnotation
-		  ((EOperation)linkEndCreationDataEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.LinkEndData#getQualifiers", "" //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.InteractionFragment#getCovereds", "" //$NON-NLS-1$ //$NON-NLS-2$
 		   });			
 		addAnnotation
-		  ((EOperation)createLinkActionEClass.getEOperations().get(0), 
+		  ((EOperation)stateInvariantEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-			 "org.eclipse.uml2.LinkAction#getEndData", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																		
-		addAnnotation
-		  (getSendObjectAction_Request(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.InvocationAction#getArguments", "" //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.InteractionFragment#getCovereds", "" //$NON-NLS-1$ //$NON-NLS-2$
 		   });													
 		addAnnotation
 		  (getStateMachine_ExtendedStateMachine(), 
@@ -19261,7 +19837,7 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Element#getOwner", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
+		   });				
 		addAnnotation
 		  ((EOperation)transitionEClass.getEOperations().get(0), 
 		   source, 
@@ -19273,100 +19849,48 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.RedefinableElement#getRedefinedElements", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																												
+		   });																																				
+		addAnnotation
+		  ((EOperation)linkEndCreationDataEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.LinkEndData#getQualifiers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)createLinkActionEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.LinkAction#getEndData", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });																																		
+		addAnnotation
+		  (getSendObjectAction_Request(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.InvocationAction#getArguments", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });										
+		addAnnotation
+		  (getActivityPartition_ContainedEdge(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.ActivityGroup#getContainedEdges", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getActivityPartition_ContainedNode(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.ActivityGroup#getContainedNodes", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });		
+		addAnnotation
+		  (getActivityPartition_Subgroup(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.ActivityGroup#getSubgroups", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });																														
 		addAnnotation
 		  (getComponent_OwnedMember(), 
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.Namespace#getOwnedMembers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																							
-		addAnnotation
-		  (getTimeObservationAction_Now(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.WriteStructuralFeatureAction#getValue", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)durationIntervalEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Interval#getMins", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)durationIntervalEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Interval#getMaxes", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });					
-		addAnnotation
-		  ((EOperation)timeConstraintEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Constraint#getSpecification", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.IntervalConstraint#getSpecification", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)timeConstraintEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Constraint#getSpecification", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.IntervalConstraint#getSpecification", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)intervalConstraintEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Constraint#getSpecification", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)intervalConstraintEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Constraint#getSpecification", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)timeIntervalEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Interval#getMaxes", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)timeIntervalEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Interval#getMins", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });						
-		addAnnotation
-		  (getDurationObservationAction_Duration(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.WriteStructuralFeatureAction#getValue", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)durationConstraintEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Constraint#getSpecification", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.IntervalConstraint#getSpecification", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });			
-		addAnnotation
-		  ((EOperation)durationConstraintEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Constraint#getSpecification", "", //$NON-NLS-1$ //$NON-NLS-2$
-			 "org.eclipse.uml2.IntervalConstraint#getSpecification", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });		
-		addAnnotation
-		  (getInterruptibleActivityRegion_ContainedNode(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.ActivityGroup#getContainedNodes", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																									
-		addAnnotation
-		  (getNode_NestedNode(), 
-		   source, 
-		   new String[] {
-			 "org.eclipse.uml2.Class#getNestedClassifiers", "" //$NON-NLS-1$ //$NON-NLS-2$
 		   });																														
 		addAnnotation
 		  ((EOperation)createLinkObjectActionEClass.getEOperations().get(0), 
@@ -19380,7 +19904,95 @@
 		   source, 
 		   new String[] {
 			 "org.eclipse.uml2.AcceptEventAction#getTriggers", "" //$NON-NLS-1$ //$NON-NLS-2$
-		   });										
+		   });												
+		addAnnotation
+		  (getInterruptibleActivityRegion_ContainedNode(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.ActivityGroup#getContainedNodes", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });												
+		addAnnotation
+		  (getTimeObservationAction_Now(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.WriteStructuralFeatureAction#getValue", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });				
+		addAnnotation
+		  ((EOperation)durationIntervalEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Interval#getMins", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)durationIntervalEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Interval#getMaxes", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  ((EOperation)timeConstraintEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Constraint#getSpecification", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.IntervalConstraint#getSpecification", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)timeConstraintEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Constraint#getSpecification", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.IntervalConstraint#getSpecification", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });				
+		addAnnotation
+		  ((EOperation)intervalConstraintEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Constraint#getSpecification", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)intervalConstraintEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Constraint#getSpecification", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });				
+		addAnnotation
+		  ((EOperation)timeIntervalEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Interval#getMaxes", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)timeIntervalEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Interval#getMins", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });							
+		addAnnotation
+		  (getDurationObservationAction_Duration(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.WriteStructuralFeatureAction#getValue", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });				
+		addAnnotation
+		  ((EOperation)durationConstraintEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Constraint#getSpecification", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.IntervalConstraint#getSpecification", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });			
+		addAnnotation
+		  ((EOperation)durationConstraintEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Constraint#getSpecification", "", //$NON-NLS-1$ //$NON-NLS-2$
+			 "org.eclipse.uml2.IntervalConstraint#getSpecification", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });																						
+		addAnnotation
+		  (getNode_NestedNode(), 
+		   source, 
+		   new String[] {
+			 "org.eclipse.uml2.Class#getNestedClassifiers", "" //$NON-NLS-1$ //$NON-NLS-2$
+		   });																		
 	}
 
 	/**
@@ -19390,12 +20002,12 @@
 	 * @generated
 	 */
 	protected void createRedefinedAnnotations() {
-		String source = "redefined"; //$NON-NLS-1$																																																																																																	
+		String source = "redefined"; //$NON-NLS-1$																																																																																																												
 		addAnnotation
 		  ((EOperation)classEClass.getEOperations().get(4), 
 		   source, 
 		   new String[] {
-		   });																																																
+		   });																																																		
 		addAnnotation
 		  (getProperty_Class_(), 
 		   source, 
@@ -19404,7 +20016,7 @@
 			 "eOpposite.containment", "true", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.upperBound", "-1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																																																																																																																																																																																
+		   });																																																																																																																																																																																																																										
 		addAnnotation
 		  ((EOperation)packageableElementEClass.getEOperations().get(0), 
 		   source, 
@@ -19414,7 +20026,7 @@
 		  ((EOperation)packageableElementEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });																																																																																												
+		   });																																																																																																					
 		addAnnotation
 		  (getActivity_StructuredNode(), 
 		   source, 
@@ -19423,7 +20035,7 @@
 			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.upperBound", "1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																																			
+		   });																																																																																																																																				
 		addAnnotation
 		  (getActivityEdge_InGroup(), 
 		   source, 
@@ -19460,7 +20072,7 @@
 			 "eOpposite.containment", "false", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.lowerBound", "0", //$NON-NLS-1$ //$NON-NLS-2$
 			 "eOpposite.upperBound", "-1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });																																																																																																																																																																																											
+		   });																																																																			
 		addAnnotation
 		  ((EOperation)structuredActivityNodeEClass.getEOperations().get(2), 
 		   source, 
@@ -19470,12 +20082,7 @@
 		  ((EOperation)structuredActivityNodeEClass.getEOperations().get(3), 
 		   source, 
 		   new String[] {
-		   });																																																																																																												
-		addAnnotation
-		  ((EOperation)sendObjectActionEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });										
+		   });																																																																																																																			
 		addAnnotation
 		  ((EOperation)stateMachineEClass.getEOperations().get(0), 
 		   source, 
@@ -19500,12 +20107,24 @@
 		  ((EOperation)vertexEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });						
+		   });							
 		addAnnotation
 		  ((EOperation)transitionEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });																																																					
+		   });																																																																									
+		addAnnotation
+		  ((EOperation)sendObjectActionEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });																																																																																
+		addAnnotation
+		  (getAcceptEventAction_Trigger(), 
+		   source, 
+		   new String[] {
+			 "lowerBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
+			 "upperBound", "1" //$NON-NLS-1$ //$NON-NLS-2$
+		   });																							
 		addAnnotation
 		  ((EOperation)timeObservationActionEClass.getEOperations().get(0), 
 		   source, 
@@ -19515,7 +20134,7 @@
 		  ((EOperation)timeObservationActionEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });							
+		   });									
 		addAnnotation
 		  (getInterval_Min(), 
 		   source, 
@@ -19529,7 +20148,7 @@
 		   new String[] {
 			 "lowerBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
 			 "upperBound", "1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });															
+		   });																			
 		addAnnotation
 		  ((EOperation)durationObservationActionEClass.getEOperations().get(0), 
 		   source, 
@@ -19539,19 +20158,12 @@
 		  ((EOperation)durationObservationActionEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });																														
+		   });																											
 		addAnnotation
 		  ((EOperation)nodeEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });																																					
-		addAnnotation
-		  (getAcceptEventAction_Trigger(), 
-		   source, 
-		   new String[] {
-			 "lowerBound", "1", //$NON-NLS-1$ //$NON-NLS-2$
-			 "upperBound", "1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });													
+		   });																			
 	}
 
 	/**
@@ -19561,22 +20173,22 @@
 	 * @generated
 	 */
 	protected void createSupersetAnnotations() {
-		String source = "superset"; //$NON-NLS-1$																																																																																																																																																				
+		String source = "superset"; //$NON-NLS-1$																																																																																																																																																																	
 		addAnnotation
 		  (getProperty_Association(), 
 		   source, 
 		   new String[] {
-		   });																																								
+		   });																																									
 		addAnnotation
 		  ((EOperation)operationEClass.getEOperations().get(20), 
 		   source, 
 		   new String[] {
-		   });																										
+		   });																													
 		addAnnotation
 		  ((EOperation)packageEClass.getEOperations().get(6), 
 		   source, 
 		   new String[] {
-		   });																																																											
+		   });																																																																							
 		addAnnotation
 		  ((EOperation)classifierEClass.getEOperations().get(17), 
 		   source, 
@@ -19586,12 +20198,12 @@
 		  (getClassifier_Occurrence(), 
 		   source, 
 		   new String[] {
-		   });																																																																																										
+		   });																																																																																																							
 		addAnnotation
 		  (getAssociation_MemberEnd(), 
 		   source, 
 		   new String[] {
-		   });											
+		   });														
 		addAnnotation
 		  ((EOperation)profileEClass.getEOperations().get(0), 
 		   source, 
@@ -19606,12 +20218,12 @@
 		  ((EOperation)profileApplicationEClass.getEOperations().get(0), 
 		   source, 
 		   new String[] {
-		   });														
+		   });															
 		addAnnotation
 		  ((EOperation)behaviorEClass.getEOperations().get(2), 
 		   source, 
 		   new String[] {
-		   });											
+		   });												
 		addAnnotation
 		  ((EOperation)behavioredClassifierEClass.getEOperations().get(2), 
 		   source, 
@@ -19621,12 +20233,12 @@
 		  (getBehavioredClassifier_OwnedBehavior(), 
 		   source, 
 		   new String[] {
-		   });											
+		   });												
 		addAnnotation
 		  (getActivity_Node(), 
 		   source, 
 		   new String[] {
-		   });													
+		   });																					
 		addAnnotation
 		  ((EOperation)realizationEClass.getEOperations().get(2), 
 		   source, 
@@ -19636,7 +20248,7 @@
 		  ((EOperation)realizationEClass.getEOperations().get(3), 
 		   source, 
 		   new String[] {
-		   });							
+		   });								
 		addAnnotation
 		  ((EOperation)substitutionEClass.getEOperations().get(0), 
 		   source, 
@@ -19646,17 +20258,7 @@
 		  ((EOperation)substitutionEClass.getEOperations().get(2), 
 		   source, 
 		   new String[] {
-		   });																																																																																
-		addAnnotation
-		  ((EOperation)artifactEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-		   });												
-		addAnnotation
-		  ((EOperation)manifestationEClass.getEOperations().get(0), 
-		   source, 
-		   new String[] {
-		   });																				
+		   });																																													
 		addAnnotation
 		  ((EOperation)implementationEClass.getEOperations().get(0), 
 		   source, 
@@ -19666,12 +20268,22 @@
 		  ((EOperation)implementationEClass.getEOperations().get(2), 
 		   source, 
 		   new String[] {
-		   });																														
+		   });									
+		addAnnotation
+		  ((EOperation)artifactEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+		   });												
+		addAnnotation
+		  ((EOperation)manifestationEClass.getEOperations().get(0), 
+		   source, 
+		   new String[] {
+		   });																																																																																																																																																												
 		addAnnotation
 		  (getTemplateSignature_Parameter(), 
 		   source, 
 		   new String[] {
-		   });									
+		   });										
 		addAnnotation
 		  (getTemplateParameter_ParameteredElement(), 
 		   source, 
@@ -19681,27 +20293,22 @@
 		  (getTemplateParameter_Default(), 
 		   source, 
 		   new String[] {
-		   });																
+		   });																		
 		addAnnotation
 		  (getParameterableElement_TemplateParameter(), 
 		   source, 
 		   new String[] {
-		   });																			
+		   });																					
 		addAnnotation
 		  (getTemplateParameterSubstitution_Actual(), 
 		   source, 
 		   new String[] {
-		   });																																																																																																																																																																																																																																																										
+		   });																																																																																																																																																																																																							
 		addAnnotation
 		  ((EOperation)componentEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });																		
-		addAnnotation
-		  ((EOperation)protocolTransitionEClass.getEOperations().get(1), 
-		   source, 
-		   new String[] {
-		   });																																									
+		   });																																																																																																			
 		addAnnotation
 		  ((EOperation)deploymentEClass.getEOperations().get(0), 
 		   source, 
@@ -19716,7 +20323,12 @@
 		  ((EOperation)deploymentTargetEClass.getEOperations().get(1), 
 		   source, 
 		   new String[] {
-		   });																																																				
+		   });																					
+		addAnnotation
+		  ((EOperation)protocolTransitionEClass.getEOperations().get(1), 
+		   source, 
+		   new String[] {
+		   });		
 	}
 
 } //UML2PackageImpl
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2AdapterFactory.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2AdapterFactory.java
index 19a4411..3756a46 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2AdapterFactory.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2AdapterFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: UML2AdapterFactory.java,v 1.11 2004/06/02 05:02:27 khussey Exp $
+ * $Id: UML2AdapterFactory.java,v 1.12 2004/06/03 02:59:19 khussey Exp $
  */
 package org.eclipse.uml2.util;
 
@@ -313,6 +313,12 @@
 			public Object caseMultiplicityElement(MultiplicityElement object) {
 				return createMultiplicityElementAdapter();
 			}
+			public Object caseNamedElement(NamedElement object) {
+				return createNamedElementAdapter();
+			}
+			public Object caseNamespace(Namespace object) {
+				return createNamespaceAdapter();
+			}
 			public Object caseDirectedRelationship(DirectedRelationship object) {
 				return createDirectedRelationshipAdapter();
 			}
@@ -331,12 +337,6 @@
 			public Object caseComment(Comment object) {
 				return createCommentAdapter();
 			}
-			public Object caseNamedElement(NamedElement object) {
-				return createNamedElementAdapter();
-			}
-			public Object caseNamespace(Namespace object) {
-				return createNamespaceAdapter();
-			}
 			public Object caseClass(org.eclipse.uml2.Class object) {
 				return createClassAdapter();
 			}
@@ -406,9 +406,6 @@
 			public Object caseRedefinableElement(RedefinableElement object) {
 				return createRedefinableElementAdapter();
 			}
-			public Object caseGeneralization(Generalization object) {
-				return createGeneralizationAdapter();
-			}
 			public Object caseInstanceSpecification(InstanceSpecification object) {
 				return createInstanceSpecificationAdapter();
 			}
@@ -418,6 +415,9 @@
 			public Object caseInstanceValue(InstanceValue object) {
 				return createInstanceValueAdapter();
 			}
+			public Object caseGeneralization(Generalization object) {
+				return createGeneralizationAdapter();
+			}
 			public Object casePackageableElement(PackageableElement object) {
 				return createPackageableElementAdapter();
 			}
@@ -502,6 +502,33 @@
 			public Object caseStructuredClassifier(StructuredClassifier object) {
 				return createStructuredClassifierAdapter();
 			}
+			public Object caseInterface(Interface object) {
+				return createInterfaceAdapter();
+			}
+			public Object caseImplementation(Implementation object) {
+				return createImplementationAdapter();
+			}
+			public Object caseArtifact(Artifact object) {
+				return createArtifactAdapter();
+			}
+			public Object caseManifestation(Manifestation object) {
+				return createManifestationAdapter();
+			}
+			public Object caseActor(Actor object) {
+				return createActorAdapter();
+			}
+			public Object caseExtend(Extend object) {
+				return createExtendAdapter();
+			}
+			public Object caseUseCase(UseCase object) {
+				return createUseCaseAdapter();
+			}
+			public Object caseExtensionPoint(ExtensionPoint object) {
+				return createExtensionPointAdapter();
+			}
+			public Object caseInclude(Include object) {
+				return createIncludeAdapter();
+			}
 			public Object caseActivityEdge(ActivityEdge object) {
 				return createActivityEdgeAdapter();
 			}
@@ -559,32 +586,59 @@
 			public Object caseValuePin(ValuePin object) {
 				return createValuePinAdapter();
 			}
-			public Object caseArtifact(Artifact object) {
-				return createArtifactAdapter();
+			public Object caseCallTrigger(CallTrigger object) {
+				return createCallTriggerAdapter();
 			}
-			public Object caseManifestation(Manifestation object) {
-				return createManifestationAdapter();
+			public Object caseMessageTrigger(MessageTrigger object) {
+				return createMessageTriggerAdapter();
 			}
-			public Object caseInterface(Interface object) {
-				return createInterfaceAdapter();
+			public Object caseChangeTrigger(ChangeTrigger object) {
+				return createChangeTriggerAdapter();
 			}
-			public Object caseImplementation(Implementation object) {
-				return createImplementationAdapter();
+			public Object caseTrigger(Trigger object) {
+				return createTriggerAdapter();
 			}
-			public Object caseActor(Actor object) {
-				return createActorAdapter();
+			public Object caseReception(Reception object) {
+				return createReceptionAdapter();
 			}
-			public Object caseExtend(Extend object) {
-				return createExtendAdapter();
+			public Object caseSignal(Signal object) {
+				return createSignalAdapter();
 			}
-			public Object caseUseCase(UseCase object) {
-				return createUseCaseAdapter();
+			public Object caseSignalTrigger(SignalTrigger object) {
+				return createSignalTriggerAdapter();
 			}
-			public Object caseExtensionPoint(ExtensionPoint object) {
-				return createExtensionPointAdapter();
+			public Object caseTimeTrigger(TimeTrigger object) {
+				return createTimeTriggerAdapter();
 			}
-			public Object caseInclude(Include object) {
-				return createIncludeAdapter();
+			public Object caseAnyTrigger(AnyTrigger object) {
+				return createAnyTriggerAdapter();
+			}
+			public Object caseCollaborationOccurrence(CollaborationOccurrence object) {
+				return createCollaborationOccurrenceAdapter();
+			}
+			public Object caseCollaboration(Collaboration object) {
+				return createCollaborationAdapter();
+			}
+			public Object casePort(Port object) {
+				return createPortAdapter();
+			}
+			public Object caseEncapsulatedClassifier(EncapsulatedClassifier object) {
+				return createEncapsulatedClassifierAdapter();
+			}
+			public Object caseVariable(Variable object) {
+				return createVariableAdapter();
+			}
+			public Object caseStructuredActivityNode(StructuredActivityNode object) {
+				return createStructuredActivityNodeAdapter();
+			}
+			public Object caseConditionalNode(ConditionalNode object) {
+				return createConditionalNodeAdapter();
+			}
+			public Object caseClause(Clause object) {
+				return createClauseAdapter();
+			}
+			public Object caseLoopNode(LoopNode object) {
+				return createLoopNodeAdapter();
 			}
 			public Object caseTemplateSignature(TemplateSignature object) {
 				return createTemplateSignatureAdapter();
@@ -607,9 +661,6 @@
 			public Object caseTemplateParameterSubstitution(TemplateParameterSubstitution object) {
 				return createTemplateParameterSubstitutionAdapter();
 			}
-			public Object caseCollaboration(Collaboration object) {
-				return createCollaborationAdapter();
-			}
 			public Object caseOperationTemplateParameter(OperationTemplateParameter object) {
 				return createOperationTemplateParameterAdapter();
 			}
@@ -628,15 +679,6 @@
 			public Object caseConnectableElementTemplateParameter(ConnectableElementTemplateParameter object) {
 				return createConnectableElementTemplateParameterAdapter();
 			}
-			public Object caseCollaborationOccurrence(CollaborationOccurrence object) {
-				return createCollaborationOccurrenceAdapter();
-			}
-			public Object casePort(Port object) {
-				return createPortAdapter();
-			}
-			public Object caseEncapsulatedClassifier(EncapsulatedClassifier object) {
-				return createEncapsulatedClassifierAdapter();
-			}
 			public Object caseInteraction(Interaction object) {
 				return createInteractionAdapter();
 			}
@@ -667,71 +709,29 @@
 			public Object caseStop(Stop object) {
 				return createStopAdapter();
 			}
-			public Object caseVariable(Variable object) {
-				return createVariableAdapter();
+			public Object caseStateMachine(StateMachine object) {
+				return createStateMachineAdapter();
 			}
-			public Object caseStructuredActivityNode(StructuredActivityNode object) {
-				return createStructuredActivityNodeAdapter();
+			public Object caseRegion(Region object) {
+				return createRegionAdapter();
 			}
-			public Object caseConditionalNode(ConditionalNode object) {
-				return createConditionalNodeAdapter();
+			public Object casePseudostate(Pseudostate object) {
+				return createPseudostateAdapter();
 			}
-			public Object caseClause(Clause object) {
-				return createClauseAdapter();
+			public Object caseState(State object) {
+				return createStateAdapter();
 			}
-			public Object caseLoopNode(LoopNode object) {
-				return createLoopNodeAdapter();
+			public Object caseVertex(Vertex object) {
+				return createVertexAdapter();
 			}
-			public Object caseCallTrigger(CallTrigger object) {
-				return createCallTriggerAdapter();
+			public Object caseConnectionPointReference(ConnectionPointReference object) {
+				return createConnectionPointReferenceAdapter();
 			}
-			public Object caseMessageTrigger(MessageTrigger object) {
-				return createMessageTriggerAdapter();
+			public Object caseTransition(Transition object) {
+				return createTransitionAdapter();
 			}
-			public Object caseChangeTrigger(ChangeTrigger object) {
-				return createChangeTriggerAdapter();
-			}
-			public Object caseTrigger(Trigger object) {
-				return createTriggerAdapter();
-			}
-			public Object caseReception(Reception object) {
-				return createReceptionAdapter();
-			}
-			public Object caseSignal(Signal object) {
-				return createSignalAdapter();
-			}
-			public Object caseSignalTrigger(SignalTrigger object) {
-				return createSignalTriggerAdapter();
-			}
-			public Object caseTimeTrigger(TimeTrigger object) {
-				return createTimeTriggerAdapter();
-			}
-			public Object caseAnyTrigger(AnyTrigger object) {
-				return createAnyTriggerAdapter();
-			}
-			public Object caseExpansionNode(ExpansionNode object) {
-				return createExpansionNodeAdapter();
-			}
-			public Object caseExpansionRegion(ExpansionRegion object) {
-				return createExpansionRegionAdapter();
-			}
-			public Object caseExceptionHandler(ExceptionHandler object) {
-				return createExceptionHandlerAdapter();
-			}
-			public Object caseForkNode(ForkNode object) {
-				return createForkNodeAdapter();
-			}
-			public Object caseJoinNode(JoinNode object) {
-				return createJoinNodeAdapter();
-			}
-			public Object caseFlowFinalNode(FlowFinalNode object) {
-				return createFlowFinalNodeAdapter();
-			}
-			public Object caseCentralBufferNode(CentralBufferNode object) {
-				return createCentralBufferNodeAdapter();
-			}
-			public Object caseActivityPartition(ActivityPartition object) {
-				return createActivityPartitionAdapter();
+			public Object caseFinalState(FinalState object) {
+				return createFinalStateAdapter();
 			}
 			public Object caseCreateObjectAction(CreateObjectAction object) {
 				return createCreateObjectActionAdapter();
@@ -832,29 +832,29 @@
 			public Object caseCallBehaviorAction(CallBehaviorAction object) {
 				return createCallBehaviorActionAdapter();
 			}
-			public Object caseStateMachine(StateMachine object) {
-				return createStateMachineAdapter();
+			public Object caseForkNode(ForkNode object) {
+				return createForkNodeAdapter();
 			}
-			public Object caseRegion(Region object) {
-				return createRegionAdapter();
+			public Object caseJoinNode(JoinNode object) {
+				return createJoinNodeAdapter();
 			}
-			public Object casePseudostate(Pseudostate object) {
-				return createPseudostateAdapter();
+			public Object caseFlowFinalNode(FlowFinalNode object) {
+				return createFlowFinalNodeAdapter();
 			}
-			public Object caseState(State object) {
-				return createStateAdapter();
+			public Object caseCentralBufferNode(CentralBufferNode object) {
+				return createCentralBufferNodeAdapter();
 			}
-			public Object caseVertex(Vertex object) {
-				return createVertexAdapter();
+			public Object caseActivityPartition(ActivityPartition object) {
+				return createActivityPartitionAdapter();
 			}
-			public Object caseConnectionPointReference(ConnectionPointReference object) {
-				return createConnectionPointReferenceAdapter();
+			public Object caseExpansionNode(ExpansionNode object) {
+				return createExpansionNodeAdapter();
 			}
-			public Object caseTransition(Transition object) {
-				return createTransitionAdapter();
+			public Object caseExpansionRegion(ExpansionRegion object) {
+				return createExpansionRegionAdapter();
 			}
-			public Object caseFinalState(FinalState object) {
-				return createFinalStateAdapter();
+			public Object caseExceptionHandler(ExceptionHandler object) {
+				return createExceptionHandlerAdapter();
 			}
 			public Object caseInteractionOccurrence(InteractionOccurrence object) {
 				return createInteractionOccurrenceAdapter();
@@ -880,75 +880,6 @@
 			public Object caseComponent(Component object) {
 				return createComponentAdapter();
 			}
-			public Object caseProtocolConformance(ProtocolConformance object) {
-				return createProtocolConformanceAdapter();
-			}
-			public Object caseProtocolStateMachine(ProtocolStateMachine object) {
-				return createProtocolStateMachineAdapter();
-			}
-			public Object caseProtocolTransition(ProtocolTransition object) {
-				return createProtocolTransitionAdapter();
-			}
-			public Object caseTimeExpression(TimeExpression object) {
-				return createTimeExpressionAdapter();
-			}
-			public Object caseDuration(Duration object) {
-				return createDurationAdapter();
-			}
-			public Object caseTimeObservationAction(TimeObservationAction object) {
-				return createTimeObservationActionAdapter();
-			}
-			public Object caseDurationInterval(DurationInterval object) {
-				return createDurationIntervalAdapter();
-			}
-			public Object caseInterval(Interval object) {
-				return createIntervalAdapter();
-			}
-			public Object caseTimeConstraint(TimeConstraint object) {
-				return createTimeConstraintAdapter();
-			}
-			public Object caseIntervalConstraint(IntervalConstraint object) {
-				return createIntervalConstraintAdapter();
-			}
-			public Object caseTimeInterval(TimeInterval object) {
-				return createTimeIntervalAdapter();
-			}
-			public Object caseDurationObservationAction(DurationObservationAction object) {
-				return createDurationObservationActionAdapter();
-			}
-			public Object caseDurationConstraint(DurationConstraint object) {
-				return createDurationConstraintAdapter();
-			}
-			public Object caseDataStoreNode(DataStoreNode object) {
-				return createDataStoreNodeAdapter();
-			}
-			public Object caseInterruptibleActivityRegion(InterruptibleActivityRegion object) {
-				return createInterruptibleActivityRegionAdapter();
-			}
-			public Object caseParameterSet(ParameterSet object) {
-				return createParameterSetAdapter();
-			}
-			public Object caseDeployment(Deployment object) {
-				return createDeploymentAdapter();
-			}
-			public Object caseDeployedArtifact(DeployedArtifact object) {
-				return createDeployedArtifactAdapter();
-			}
-			public Object caseDeploymentTarget(DeploymentTarget object) {
-				return createDeploymentTargetAdapter();
-			}
-			public Object caseNode(Node object) {
-				return createNodeAdapter();
-			}
-			public Object caseDevice(Device object) {
-				return createDeviceAdapter();
-			}
-			public Object caseExecutionEnvironment(ExecutionEnvironment object) {
-				return createExecutionEnvironmentAdapter();
-			}
-			public Object caseCommunicationPath(CommunicationPath object) {
-				return createCommunicationPathAdapter();
-			}
 			public Object caseReadExtentAction(ReadExtentAction object) {
 				return createReadExtentActionAdapter();
 			}
@@ -985,6 +916,75 @@
 			public Object caseRaiseExceptionAction(RaiseExceptionAction object) {
 				return createRaiseExceptionActionAdapter();
 			}
+			public Object caseDataStoreNode(DataStoreNode object) {
+				return createDataStoreNodeAdapter();
+			}
+			public Object caseInterruptibleActivityRegion(InterruptibleActivityRegion object) {
+				return createInterruptibleActivityRegionAdapter();
+			}
+			public Object caseParameterSet(ParameterSet object) {
+				return createParameterSetAdapter();
+			}
+			public Object caseTimeExpression(TimeExpression object) {
+				return createTimeExpressionAdapter();
+			}
+			public Object caseDuration(Duration object) {
+				return createDurationAdapter();
+			}
+			public Object caseTimeObservationAction(TimeObservationAction object) {
+				return createTimeObservationActionAdapter();
+			}
+			public Object caseDurationInterval(DurationInterval object) {
+				return createDurationIntervalAdapter();
+			}
+			public Object caseInterval(Interval object) {
+				return createIntervalAdapter();
+			}
+			public Object caseTimeConstraint(TimeConstraint object) {
+				return createTimeConstraintAdapter();
+			}
+			public Object caseIntervalConstraint(IntervalConstraint object) {
+				return createIntervalConstraintAdapter();
+			}
+			public Object caseTimeInterval(TimeInterval object) {
+				return createTimeIntervalAdapter();
+			}
+			public Object caseDurationObservationAction(DurationObservationAction object) {
+				return createDurationObservationActionAdapter();
+			}
+			public Object caseDurationConstraint(DurationConstraint object) {
+				return createDurationConstraintAdapter();
+			}
+			public Object caseDeployment(Deployment object) {
+				return createDeploymentAdapter();
+			}
+			public Object caseDeployedArtifact(DeployedArtifact object) {
+				return createDeployedArtifactAdapter();
+			}
+			public Object caseDeploymentTarget(DeploymentTarget object) {
+				return createDeploymentTargetAdapter();
+			}
+			public Object caseNode(Node object) {
+				return createNodeAdapter();
+			}
+			public Object caseDevice(Device object) {
+				return createDeviceAdapter();
+			}
+			public Object caseExecutionEnvironment(ExecutionEnvironment object) {
+				return createExecutionEnvironmentAdapter();
+			}
+			public Object caseCommunicationPath(CommunicationPath object) {
+				return createCommunicationPathAdapter();
+			}
+			public Object caseProtocolConformance(ProtocolConformance object) {
+				return createProtocolConformanceAdapter();
+			}
+			public Object caseProtocolStateMachine(ProtocolStateMachine object) {
+				return createProtocolStateMachineAdapter();
+			}
+			public Object caseProtocolTransition(ProtocolTransition object) {
+				return createProtocolTransitionAdapter();
+			}
 			public Object caseDeploymentSpecification(DeploymentSpecification object) {
 				return createDeploymentSpecificationAdapter();
 			}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Switch.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Switch.java
index c72bbce..6c451e4 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Switch.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Switch.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: UML2Switch.java,v 1.11 2004/06/02 05:02:27 khussey Exp $
+ * $Id: UML2Switch.java,v 1.12 2004/06/03 02:59:19 khussey Exp $
  */
 package org.eclipse.uml2.util;
 
@@ -590,16 +590,6 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.GENERALIZATION: {
-				Generalization generalization = (Generalization)theEObject;
-				Object result = caseGeneralization(generalization);
-				if (result == null) result = caseDirectedRelationship(generalization);
-				if (result == null) result = caseRelationship(generalization);
-				if (result == null) result = caseElement(generalization);
-				if (result == null) result = caseEModelElement(generalization);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
 			case UML2Package.INSTANCE_SPECIFICATION: {
 				InstanceSpecification instanceSpecification = (InstanceSpecification)theEObject;
 				Object result = caseInstanceSpecification(instanceSpecification);
@@ -635,6 +625,16 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case UML2Package.GENERALIZATION: {
+				Generalization generalization = (Generalization)theEObject;
+				Object result = caseGeneralization(generalization);
+				if (result == null) result = caseDirectedRelationship(generalization);
+				if (result == null) result = caseRelationship(generalization);
+				if (result == null) result = caseElement(generalization);
+				if (result == null) result = caseEModelElement(generalization);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case UML2Package.ELEMENT_IMPORT: {
 				ElementImport elementImport = (ElementImport)theEObject;
 				Object result = caseElementImport(elementImport);
@@ -976,6 +976,140 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case UML2Package.INTERFACE: {
+				Interface interface_ = (Interface)theEObject;
+				Object result = caseInterface(interface_);
+				if (result == null) result = caseClassifier(interface_);
+				if (result == null) result = caseNamespace(interface_);
+				if (result == null) result = caseType(interface_);
+				if (result == null) result = caseRedefinableElement(interface_);
+				if (result == null) result = caseNamedElement(interface_);
+				if (result == null) result = casePackageableElement(interface_);
+				if (result == null) result = caseTemplateableElement(interface_);
+				if (result == null) result = caseParameterableElement(interface_);
+				if (result == null) result = caseElement(interface_);
+				if (result == null) result = caseEModelElement(interface_);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.IMPLEMENTATION: {
+				Implementation implementation = (Implementation)theEObject;
+				Object result = caseImplementation(implementation);
+				if (result == null) result = caseRealization(implementation);
+				if (result == null) result = caseAbstraction(implementation);
+				if (result == null) result = caseDependency(implementation);
+				if (result == null) result = casePackageableElement(implementation);
+				if (result == null) result = caseDirectedRelationship(implementation);
+				if (result == null) result = caseNamedElement(implementation);
+				if (result == null) result = caseParameterableElement(implementation);
+				if (result == null) result = caseRelationship(implementation);
+				if (result == null) result = caseTemplateableElement(implementation);
+				if (result == null) result = caseElement(implementation);
+				if (result == null) result = caseEModelElement(implementation);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.ARTIFACT: {
+				Artifact artifact = (Artifact)theEObject;
+				Object result = caseArtifact(artifact);
+				if (result == null) result = caseClassifier(artifact);
+				if (result == null) result = caseDeployedArtifact(artifact);
+				if (result == null) result = caseNamespace(artifact);
+				if (result == null) result = caseType(artifact);
+				if (result == null) result = caseRedefinableElement(artifact);
+				if (result == null) result = caseNamedElement(artifact);
+				if (result == null) result = casePackageableElement(artifact);
+				if (result == null) result = caseTemplateableElement(artifact);
+				if (result == null) result = caseParameterableElement(artifact);
+				if (result == null) result = caseElement(artifact);
+				if (result == null) result = caseEModelElement(artifact);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.MANIFESTATION: {
+				Manifestation manifestation = (Manifestation)theEObject;
+				Object result = caseManifestation(manifestation);
+				if (result == null) result = caseAbstraction(manifestation);
+				if (result == null) result = caseDependency(manifestation);
+				if (result == null) result = casePackageableElement(manifestation);
+				if (result == null) result = caseDirectedRelationship(manifestation);
+				if (result == null) result = caseNamedElement(manifestation);
+				if (result == null) result = caseParameterableElement(manifestation);
+				if (result == null) result = caseRelationship(manifestation);
+				if (result == null) result = caseTemplateableElement(manifestation);
+				if (result == null) result = caseElement(manifestation);
+				if (result == null) result = caseEModelElement(manifestation);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.ACTOR: {
+				Actor actor = (Actor)theEObject;
+				Object result = caseActor(actor);
+				if (result == null) result = caseClassifier(actor);
+				if (result == null) result = caseNamespace(actor);
+				if (result == null) result = caseType(actor);
+				if (result == null) result = caseRedefinableElement(actor);
+				if (result == null) result = caseNamedElement(actor);
+				if (result == null) result = casePackageableElement(actor);
+				if (result == null) result = caseTemplateableElement(actor);
+				if (result == null) result = caseParameterableElement(actor);
+				if (result == null) result = caseElement(actor);
+				if (result == null) result = caseEModelElement(actor);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.EXTEND: {
+				Extend extend = (Extend)theEObject;
+				Object result = caseExtend(extend);
+				if (result == null) result = caseNamedElement(extend);
+				if (result == null) result = caseDirectedRelationship(extend);
+				if (result == null) result = caseTemplateableElement(extend);
+				if (result == null) result = caseRelationship(extend);
+				if (result == null) result = caseElement(extend);
+				if (result == null) result = caseEModelElement(extend);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.USE_CASE: {
+				UseCase useCase = (UseCase)theEObject;
+				Object result = caseUseCase(useCase);
+				if (result == null) result = caseBehavioredClassifier(useCase);
+				if (result == null) result = caseClassifier(useCase);
+				if (result == null) result = caseNamespace(useCase);
+				if (result == null) result = caseType(useCase);
+				if (result == null) result = caseRedefinableElement(useCase);
+				if (result == null) result = caseNamedElement(useCase);
+				if (result == null) result = casePackageableElement(useCase);
+				if (result == null) result = caseTemplateableElement(useCase);
+				if (result == null) result = caseParameterableElement(useCase);
+				if (result == null) result = caseElement(useCase);
+				if (result == null) result = caseEModelElement(useCase);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.EXTENSION_POINT: {
+				ExtensionPoint extensionPoint = (ExtensionPoint)theEObject;
+				Object result = caseExtensionPoint(extensionPoint);
+				if (result == null) result = caseRedefinableElement(extensionPoint);
+				if (result == null) result = caseNamedElement(extensionPoint);
+				if (result == null) result = caseTemplateableElement(extensionPoint);
+				if (result == null) result = caseElement(extensionPoint);
+				if (result == null) result = caseEModelElement(extensionPoint);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.INCLUDE: {
+				Include include = (Include)theEObject;
+				Object result = caseInclude(include);
+				if (result == null) result = caseNamedElement(include);
+				if (result == null) result = caseDirectedRelationship(include);
+				if (result == null) result = caseTemplateableElement(include);
+				if (result == null) result = caseRelationship(include);
+				if (result == null) result = caseElement(include);
+				if (result == null) result = caseEModelElement(include);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case UML2Package.ACTION: {
 				Action action = (Action)theEObject;
 				Object result = caseAction(action);
@@ -1129,137 +1263,210 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.ARTIFACT: {
-				Artifact artifact = (Artifact)theEObject;
-				Object result = caseArtifact(artifact);
-				if (result == null) result = caseClassifier(artifact);
-				if (result == null) result = caseDeployedArtifact(artifact);
-				if (result == null) result = caseNamespace(artifact);
-				if (result == null) result = caseType(artifact);
-				if (result == null) result = caseRedefinableElement(artifact);
-				if (result == null) result = caseNamedElement(artifact);
-				if (result == null) result = casePackageableElement(artifact);
-				if (result == null) result = caseTemplateableElement(artifact);
-				if (result == null) result = caseParameterableElement(artifact);
-				if (result == null) result = caseElement(artifact);
-				if (result == null) result = caseEModelElement(artifact);
+			case UML2Package.CALL_TRIGGER: {
+				CallTrigger callTrigger = (CallTrigger)theEObject;
+				Object result = caseCallTrigger(callTrigger);
+				if (result == null) result = caseMessageTrigger(callTrigger);
+				if (result == null) result = caseTrigger(callTrigger);
+				if (result == null) result = caseNamedElement(callTrigger);
+				if (result == null) result = caseTemplateableElement(callTrigger);
+				if (result == null) result = caseElement(callTrigger);
+				if (result == null) result = caseEModelElement(callTrigger);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.MANIFESTATION: {
-				Manifestation manifestation = (Manifestation)theEObject;
-				Object result = caseManifestation(manifestation);
-				if (result == null) result = caseAbstraction(manifestation);
-				if (result == null) result = caseDependency(manifestation);
-				if (result == null) result = casePackageableElement(manifestation);
-				if (result == null) result = caseDirectedRelationship(manifestation);
-				if (result == null) result = caseNamedElement(manifestation);
-				if (result == null) result = caseParameterableElement(manifestation);
-				if (result == null) result = caseRelationship(manifestation);
-				if (result == null) result = caseTemplateableElement(manifestation);
-				if (result == null) result = caseElement(manifestation);
-				if (result == null) result = caseEModelElement(manifestation);
+			case UML2Package.CHANGE_TRIGGER: {
+				ChangeTrigger changeTrigger = (ChangeTrigger)theEObject;
+				Object result = caseChangeTrigger(changeTrigger);
+				if (result == null) result = caseTrigger(changeTrigger);
+				if (result == null) result = caseNamedElement(changeTrigger);
+				if (result == null) result = caseTemplateableElement(changeTrigger);
+				if (result == null) result = caseElement(changeTrigger);
+				if (result == null) result = caseEModelElement(changeTrigger);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.INTERFACE: {
-				Interface interface_ = (Interface)theEObject;
-				Object result = caseInterface(interface_);
-				if (result == null) result = caseClassifier(interface_);
-				if (result == null) result = caseNamespace(interface_);
-				if (result == null) result = caseType(interface_);
-				if (result == null) result = caseRedefinableElement(interface_);
-				if (result == null) result = caseNamedElement(interface_);
-				if (result == null) result = casePackageableElement(interface_);
-				if (result == null) result = caseTemplateableElement(interface_);
-				if (result == null) result = caseParameterableElement(interface_);
-				if (result == null) result = caseElement(interface_);
-				if (result == null) result = caseEModelElement(interface_);
+			case UML2Package.RECEPTION: {
+				Reception reception = (Reception)theEObject;
+				Object result = caseReception(reception);
+				if (result == null) result = caseBehavioralFeature(reception);
+				if (result == null) result = caseNamespace(reception);
+				if (result == null) result = caseFeature(reception);
+				if (result == null) result = caseNamedElement(reception);
+				if (result == null) result = caseRedefinableElement(reception);
+				if (result == null) result = caseTemplateableElement(reception);
+				if (result == null) result = caseElement(reception);
+				if (result == null) result = caseEModelElement(reception);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.IMPLEMENTATION: {
-				Implementation implementation = (Implementation)theEObject;
-				Object result = caseImplementation(implementation);
-				if (result == null) result = caseRealization(implementation);
-				if (result == null) result = caseAbstraction(implementation);
-				if (result == null) result = caseDependency(implementation);
-				if (result == null) result = casePackageableElement(implementation);
-				if (result == null) result = caseDirectedRelationship(implementation);
-				if (result == null) result = caseNamedElement(implementation);
-				if (result == null) result = caseParameterableElement(implementation);
-				if (result == null) result = caseRelationship(implementation);
-				if (result == null) result = caseTemplateableElement(implementation);
-				if (result == null) result = caseElement(implementation);
-				if (result == null) result = caseEModelElement(implementation);
+			case UML2Package.SIGNAL: {
+				Signal signal = (Signal)theEObject;
+				Object result = caseSignal(signal);
+				if (result == null) result = caseClassifier(signal);
+				if (result == null) result = caseNamespace(signal);
+				if (result == null) result = caseType(signal);
+				if (result == null) result = caseRedefinableElement(signal);
+				if (result == null) result = caseNamedElement(signal);
+				if (result == null) result = casePackageableElement(signal);
+				if (result == null) result = caseTemplateableElement(signal);
+				if (result == null) result = caseParameterableElement(signal);
+				if (result == null) result = caseElement(signal);
+				if (result == null) result = caseEModelElement(signal);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.ACTOR: {
-				Actor actor = (Actor)theEObject;
-				Object result = caseActor(actor);
-				if (result == null) result = caseClassifier(actor);
-				if (result == null) result = caseNamespace(actor);
-				if (result == null) result = caseType(actor);
-				if (result == null) result = caseRedefinableElement(actor);
-				if (result == null) result = caseNamedElement(actor);
-				if (result == null) result = casePackageableElement(actor);
-				if (result == null) result = caseTemplateableElement(actor);
-				if (result == null) result = caseParameterableElement(actor);
-				if (result == null) result = caseElement(actor);
-				if (result == null) result = caseEModelElement(actor);
+			case UML2Package.SIGNAL_TRIGGER: {
+				SignalTrigger signalTrigger = (SignalTrigger)theEObject;
+				Object result = caseSignalTrigger(signalTrigger);
+				if (result == null) result = caseMessageTrigger(signalTrigger);
+				if (result == null) result = caseTrigger(signalTrigger);
+				if (result == null) result = caseNamedElement(signalTrigger);
+				if (result == null) result = caseTemplateableElement(signalTrigger);
+				if (result == null) result = caseElement(signalTrigger);
+				if (result == null) result = caseEModelElement(signalTrigger);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.EXTEND: {
-				Extend extend = (Extend)theEObject;
-				Object result = caseExtend(extend);
-				if (result == null) result = caseNamedElement(extend);
-				if (result == null) result = caseDirectedRelationship(extend);
-				if (result == null) result = caseTemplateableElement(extend);
-				if (result == null) result = caseRelationship(extend);
-				if (result == null) result = caseElement(extend);
-				if (result == null) result = caseEModelElement(extend);
+			case UML2Package.TIME_TRIGGER: {
+				TimeTrigger timeTrigger = (TimeTrigger)theEObject;
+				Object result = caseTimeTrigger(timeTrigger);
+				if (result == null) result = caseTrigger(timeTrigger);
+				if (result == null) result = caseNamedElement(timeTrigger);
+				if (result == null) result = caseTemplateableElement(timeTrigger);
+				if (result == null) result = caseElement(timeTrigger);
+				if (result == null) result = caseEModelElement(timeTrigger);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.USE_CASE: {
-				UseCase useCase = (UseCase)theEObject;
-				Object result = caseUseCase(useCase);
-				if (result == null) result = caseBehavioredClassifier(useCase);
-				if (result == null) result = caseClassifier(useCase);
-				if (result == null) result = caseNamespace(useCase);
-				if (result == null) result = caseType(useCase);
-				if (result == null) result = caseRedefinableElement(useCase);
-				if (result == null) result = caseNamedElement(useCase);
-				if (result == null) result = casePackageableElement(useCase);
-				if (result == null) result = caseTemplateableElement(useCase);
-				if (result == null) result = caseParameterableElement(useCase);
-				if (result == null) result = caseElement(useCase);
-				if (result == null) result = caseEModelElement(useCase);
+			case UML2Package.ANY_TRIGGER: {
+				AnyTrigger anyTrigger = (AnyTrigger)theEObject;
+				Object result = caseAnyTrigger(anyTrigger);
+				if (result == null) result = caseMessageTrigger(anyTrigger);
+				if (result == null) result = caseTrigger(anyTrigger);
+				if (result == null) result = caseNamedElement(anyTrigger);
+				if (result == null) result = caseTemplateableElement(anyTrigger);
+				if (result == null) result = caseElement(anyTrigger);
+				if (result == null) result = caseEModelElement(anyTrigger);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.EXTENSION_POINT: {
-				ExtensionPoint extensionPoint = (ExtensionPoint)theEObject;
-				Object result = caseExtensionPoint(extensionPoint);
-				if (result == null) result = caseRedefinableElement(extensionPoint);
-				if (result == null) result = caseNamedElement(extensionPoint);
-				if (result == null) result = caseTemplateableElement(extensionPoint);
-				if (result == null) result = caseElement(extensionPoint);
-				if (result == null) result = caseEModelElement(extensionPoint);
+			case UML2Package.COLLABORATION_OCCURRENCE: {
+				CollaborationOccurrence collaborationOccurrence = (CollaborationOccurrence)theEObject;
+				Object result = caseCollaborationOccurrence(collaborationOccurrence);
+				if (result == null) result = caseNamedElement(collaborationOccurrence);
+				if (result == null) result = caseTemplateableElement(collaborationOccurrence);
+				if (result == null) result = caseElement(collaborationOccurrence);
+				if (result == null) result = caseEModelElement(collaborationOccurrence);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.INCLUDE: {
-				Include include = (Include)theEObject;
-				Object result = caseInclude(include);
-				if (result == null) result = caseNamedElement(include);
-				if (result == null) result = caseDirectedRelationship(include);
-				if (result == null) result = caseTemplateableElement(include);
-				if (result == null) result = caseRelationship(include);
-				if (result == null) result = caseElement(include);
-				if (result == null) result = caseEModelElement(include);
+			case UML2Package.COLLABORATION: {
+				Collaboration collaboration = (Collaboration)theEObject;
+				Object result = caseCollaboration(collaboration);
+				if (result == null) result = caseBehavioredClassifier(collaboration);
+				if (result == null) result = caseStructuredClassifier(collaboration);
+				if (result == null) result = caseClassifier(collaboration);
+				if (result == null) result = caseNamespace(collaboration);
+				if (result == null) result = caseType(collaboration);
+				if (result == null) result = caseRedefinableElement(collaboration);
+				if (result == null) result = caseNamedElement(collaboration);
+				if (result == null) result = casePackageableElement(collaboration);
+				if (result == null) result = caseTemplateableElement(collaboration);
+				if (result == null) result = caseParameterableElement(collaboration);
+				if (result == null) result = caseElement(collaboration);
+				if (result == null) result = caseEModelElement(collaboration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.PORT: {
+				Port port = (Port)theEObject;
+				Object result = casePort(port);
+				if (result == null) result = caseProperty(port);
+				if (result == null) result = caseStructuralFeature(port);
+				if (result == null) result = caseConnectableElement(port);
+				if (result == null) result = caseDeploymentTarget(port);
+				if (result == null) result = caseFeature(port);
+				if (result == null) result = caseTypedElement(port);
+				if (result == null) result = caseMultiplicityElement(port);
+				if (result == null) result = caseNamedElement(port);
+				if (result == null) result = caseParameterableElement(port);
+				if (result == null) result = caseRedefinableElement(port);
+				if (result == null) result = caseElement(port);
+				if (result == null) result = caseTemplateableElement(port);
+				if (result == null) result = caseEModelElement(port);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.VARIABLE: {
+				Variable variable = (Variable)theEObject;
+				Object result = caseVariable(variable);
+				if (result == null) result = caseConnectableElement(variable);
+				if (result == null) result = caseTypedElement(variable);
+				if (result == null) result = caseMultiplicityElement(variable);
+				if (result == null) result = caseNamedElement(variable);
+				if (result == null) result = caseParameterableElement(variable);
+				if (result == null) result = caseElement(variable);
+				if (result == null) result = caseTemplateableElement(variable);
+				if (result == null) result = caseEModelElement(variable);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.STRUCTURED_ACTIVITY_NODE: {
+				StructuredActivityNode structuredActivityNode = (StructuredActivityNode)theEObject;
+				Object result = caseStructuredActivityNode(structuredActivityNode);
+				if (result == null) result = caseAction(structuredActivityNode);
+				if (result == null) result = caseNamespace(structuredActivityNode);
+				if (result == null) result = caseActivityGroup(structuredActivityNode);
+				if (result == null) result = caseExecutableNode(structuredActivityNode);
+				if (result == null) result = caseNamedElement(structuredActivityNode);
+				if (result == null) result = caseElement(structuredActivityNode);
+				if (result == null) result = caseActivityNode(structuredActivityNode);
+				if (result == null) result = caseTemplateableElement(structuredActivityNode);
+				if (result == null) result = caseEModelElement(structuredActivityNode);
+				if (result == null) result = caseRedefinableElement(structuredActivityNode);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.CONDITIONAL_NODE: {
+				ConditionalNode conditionalNode = (ConditionalNode)theEObject;
+				Object result = caseConditionalNode(conditionalNode);
+				if (result == null) result = caseStructuredActivityNode(conditionalNode);
+				if (result == null) result = caseAction(conditionalNode);
+				if (result == null) result = caseNamespace(conditionalNode);
+				if (result == null) result = caseActivityGroup(conditionalNode);
+				if (result == null) result = caseExecutableNode(conditionalNode);
+				if (result == null) result = caseNamedElement(conditionalNode);
+				if (result == null) result = caseElement(conditionalNode);
+				if (result == null) result = caseActivityNode(conditionalNode);
+				if (result == null) result = caseTemplateableElement(conditionalNode);
+				if (result == null) result = caseEModelElement(conditionalNode);
+				if (result == null) result = caseRedefinableElement(conditionalNode);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.CLAUSE: {
+				Clause clause = (Clause)theEObject;
+				Object result = caseClause(clause);
+				if (result == null) result = caseElement(clause);
+				if (result == null) result = caseEModelElement(clause);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.LOOP_NODE: {
+				LoopNode loopNode = (LoopNode)theEObject;
+				Object result = caseLoopNode(loopNode);
+				if (result == null) result = caseStructuredActivityNode(loopNode);
+				if (result == null) result = caseAction(loopNode);
+				if (result == null) result = caseNamespace(loopNode);
+				if (result == null) result = caseActivityGroup(loopNode);
+				if (result == null) result = caseExecutableNode(loopNode);
+				if (result == null) result = caseNamedElement(loopNode);
+				if (result == null) result = caseElement(loopNode);
+				if (result == null) result = caseActivityNode(loopNode);
+				if (result == null) result = caseTemplateableElement(loopNode);
+				if (result == null) result = caseEModelElement(loopNode);
+				if (result == null) result = caseRedefinableElement(loopNode);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -1306,24 +1513,6 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.COLLABORATION: {
-				Collaboration collaboration = (Collaboration)theEObject;
-				Object result = caseCollaboration(collaboration);
-				if (result == null) result = caseBehavioredClassifier(collaboration);
-				if (result == null) result = caseStructuredClassifier(collaboration);
-				if (result == null) result = caseClassifier(collaboration);
-				if (result == null) result = caseNamespace(collaboration);
-				if (result == null) result = caseType(collaboration);
-				if (result == null) result = caseRedefinableElement(collaboration);
-				if (result == null) result = caseNamedElement(collaboration);
-				if (result == null) result = casePackageableElement(collaboration);
-				if (result == null) result = caseTemplateableElement(collaboration);
-				if (result == null) result = caseParameterableElement(collaboration);
-				if (result == null) result = caseElement(collaboration);
-				if (result == null) result = caseEModelElement(collaboration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
 			case UML2Package.OPERATION_TEMPLATE_PARAMETER: {
 				OperationTemplateParameter operationTemplateParameter = (OperationTemplateParameter)theEObject;
 				Object result = caseOperationTemplateParameter(operationTemplateParameter);
@@ -1363,35 +1552,6 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.COLLABORATION_OCCURRENCE: {
-				CollaborationOccurrence collaborationOccurrence = (CollaborationOccurrence)theEObject;
-				Object result = caseCollaborationOccurrence(collaborationOccurrence);
-				if (result == null) result = caseNamedElement(collaborationOccurrence);
-				if (result == null) result = caseTemplateableElement(collaborationOccurrence);
-				if (result == null) result = caseElement(collaborationOccurrence);
-				if (result == null) result = caseEModelElement(collaborationOccurrence);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.PORT: {
-				Port port = (Port)theEObject;
-				Object result = casePort(port);
-				if (result == null) result = caseProperty(port);
-				if (result == null) result = caseStructuralFeature(port);
-				if (result == null) result = caseConnectableElement(port);
-				if (result == null) result = caseDeploymentTarget(port);
-				if (result == null) result = caseFeature(port);
-				if (result == null) result = caseTypedElement(port);
-				if (result == null) result = caseMultiplicityElement(port);
-				if (result == null) result = caseNamedElement(port);
-				if (result == null) result = caseParameterableElement(port);
-				if (result == null) result = caseRedefinableElement(port);
-				if (result == null) result = caseElement(port);
-				if (result == null) result = caseTemplateableElement(port);
-				if (result == null) result = caseEModelElement(port);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
 			case UML2Package.INTERACTION: {
 				Interaction interaction = (Interaction)theEObject;
 				Object result = caseInteraction(interaction);
@@ -1491,267 +1651,96 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.VARIABLE: {
-				Variable variable = (Variable)theEObject;
-				Object result = caseVariable(variable);
-				if (result == null) result = caseConnectableElement(variable);
-				if (result == null) result = caseTypedElement(variable);
-				if (result == null) result = caseMultiplicityElement(variable);
-				if (result == null) result = caseNamedElement(variable);
-				if (result == null) result = caseParameterableElement(variable);
-				if (result == null) result = caseElement(variable);
-				if (result == null) result = caseTemplateableElement(variable);
-				if (result == null) result = caseEModelElement(variable);
+			case UML2Package.STATE_MACHINE: {
+				StateMachine stateMachine = (StateMachine)theEObject;
+				Object result = caseStateMachine(stateMachine);
+				if (result == null) result = caseBehavior(stateMachine);
+				if (result == null) result = caseClass(stateMachine);
+				if (result == null) result = caseBehavioredClassifier(stateMachine);
+				if (result == null) result = caseEncapsulatedClassifier(stateMachine);
+				if (result == null) result = caseClassifier(stateMachine);
+				if (result == null) result = caseStructuredClassifier(stateMachine);
+				if (result == null) result = caseNamespace(stateMachine);
+				if (result == null) result = caseType(stateMachine);
+				if (result == null) result = caseRedefinableElement(stateMachine);
+				if (result == null) result = caseNamedElement(stateMachine);
+				if (result == null) result = casePackageableElement(stateMachine);
+				if (result == null) result = caseTemplateableElement(stateMachine);
+				if (result == null) result = caseParameterableElement(stateMachine);
+				if (result == null) result = caseElement(stateMachine);
+				if (result == null) result = caseEModelElement(stateMachine);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.STRUCTURED_ACTIVITY_NODE: {
-				StructuredActivityNode structuredActivityNode = (StructuredActivityNode)theEObject;
-				Object result = caseStructuredActivityNode(structuredActivityNode);
-				if (result == null) result = caseAction(structuredActivityNode);
-				if (result == null) result = caseNamespace(structuredActivityNode);
-				if (result == null) result = caseActivityGroup(structuredActivityNode);
-				if (result == null) result = caseExecutableNode(structuredActivityNode);
-				if (result == null) result = caseNamedElement(structuredActivityNode);
-				if (result == null) result = caseElement(structuredActivityNode);
-				if (result == null) result = caseActivityNode(structuredActivityNode);
-				if (result == null) result = caseTemplateableElement(structuredActivityNode);
-				if (result == null) result = caseEModelElement(structuredActivityNode);
-				if (result == null) result = caseRedefinableElement(structuredActivityNode);
+			case UML2Package.REGION: {
+				Region region = (Region)theEObject;
+				Object result = caseRegion(region);
+				if (result == null) result = caseNamespace(region);
+				if (result == null) result = caseRedefinableElement(region);
+				if (result == null) result = caseNamedElement(region);
+				if (result == null) result = caseTemplateableElement(region);
+				if (result == null) result = caseElement(region);
+				if (result == null) result = caseEModelElement(region);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.CONDITIONAL_NODE: {
-				ConditionalNode conditionalNode = (ConditionalNode)theEObject;
-				Object result = caseConditionalNode(conditionalNode);
-				if (result == null) result = caseStructuredActivityNode(conditionalNode);
-				if (result == null) result = caseAction(conditionalNode);
-				if (result == null) result = caseNamespace(conditionalNode);
-				if (result == null) result = caseActivityGroup(conditionalNode);
-				if (result == null) result = caseExecutableNode(conditionalNode);
-				if (result == null) result = caseNamedElement(conditionalNode);
-				if (result == null) result = caseElement(conditionalNode);
-				if (result == null) result = caseActivityNode(conditionalNode);
-				if (result == null) result = caseTemplateableElement(conditionalNode);
-				if (result == null) result = caseEModelElement(conditionalNode);
-				if (result == null) result = caseRedefinableElement(conditionalNode);
+			case UML2Package.PSEUDOSTATE: {
+				Pseudostate pseudostate = (Pseudostate)theEObject;
+				Object result = casePseudostate(pseudostate);
+				if (result == null) result = caseVertex(pseudostate);
+				if (result == null) result = caseNamedElement(pseudostate);
+				if (result == null) result = caseTemplateableElement(pseudostate);
+				if (result == null) result = caseElement(pseudostate);
+				if (result == null) result = caseEModelElement(pseudostate);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.CLAUSE: {
-				Clause clause = (Clause)theEObject;
-				Object result = caseClause(clause);
-				if (result == null) result = caseElement(clause);
-				if (result == null) result = caseEModelElement(clause);
+			case UML2Package.STATE: {
+				State state = (State)theEObject;
+				Object result = caseState(state);
+				if (result == null) result = caseNamespace(state);
+				if (result == null) result = caseRedefinableElement(state);
+				if (result == null) result = caseVertex(state);
+				if (result == null) result = caseNamedElement(state);
+				if (result == null) result = caseTemplateableElement(state);
+				if (result == null) result = caseElement(state);
+				if (result == null) result = caseEModelElement(state);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.LOOP_NODE: {
-				LoopNode loopNode = (LoopNode)theEObject;
-				Object result = caseLoopNode(loopNode);
-				if (result == null) result = caseStructuredActivityNode(loopNode);
-				if (result == null) result = caseAction(loopNode);
-				if (result == null) result = caseNamespace(loopNode);
-				if (result == null) result = caseActivityGroup(loopNode);
-				if (result == null) result = caseExecutableNode(loopNode);
-				if (result == null) result = caseNamedElement(loopNode);
-				if (result == null) result = caseElement(loopNode);
-				if (result == null) result = caseActivityNode(loopNode);
-				if (result == null) result = caseTemplateableElement(loopNode);
-				if (result == null) result = caseEModelElement(loopNode);
-				if (result == null) result = caseRedefinableElement(loopNode);
+			case UML2Package.CONNECTION_POINT_REFERENCE: {
+				ConnectionPointReference connectionPointReference = (ConnectionPointReference)theEObject;
+				Object result = caseConnectionPointReference(connectionPointReference);
+				if (result == null) result = caseVertex(connectionPointReference);
+				if (result == null) result = caseNamedElement(connectionPointReference);
+				if (result == null) result = caseTemplateableElement(connectionPointReference);
+				if (result == null) result = caseElement(connectionPointReference);
+				if (result == null) result = caseEModelElement(connectionPointReference);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.CALL_TRIGGER: {
-				CallTrigger callTrigger = (CallTrigger)theEObject;
-				Object result = caseCallTrigger(callTrigger);
-				if (result == null) result = caseMessageTrigger(callTrigger);
-				if (result == null) result = caseTrigger(callTrigger);
-				if (result == null) result = caseNamedElement(callTrigger);
-				if (result == null) result = caseTemplateableElement(callTrigger);
-				if (result == null) result = caseElement(callTrigger);
-				if (result == null) result = caseEModelElement(callTrigger);
+			case UML2Package.TRANSITION: {
+				Transition transition = (Transition)theEObject;
+				Object result = caseTransition(transition);
+				if (result == null) result = caseRedefinableElement(transition);
+				if (result == null) result = caseNamedElement(transition);
+				if (result == null) result = caseTemplateableElement(transition);
+				if (result == null) result = caseElement(transition);
+				if (result == null) result = caseEModelElement(transition);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.CHANGE_TRIGGER: {
-				ChangeTrigger changeTrigger = (ChangeTrigger)theEObject;
-				Object result = caseChangeTrigger(changeTrigger);
-				if (result == null) result = caseTrigger(changeTrigger);
-				if (result == null) result = caseNamedElement(changeTrigger);
-				if (result == null) result = caseTemplateableElement(changeTrigger);
-				if (result == null) result = caseElement(changeTrigger);
-				if (result == null) result = caseEModelElement(changeTrigger);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.RECEPTION: {
-				Reception reception = (Reception)theEObject;
-				Object result = caseReception(reception);
-				if (result == null) result = caseBehavioralFeature(reception);
-				if (result == null) result = caseNamespace(reception);
-				if (result == null) result = caseFeature(reception);
-				if (result == null) result = caseNamedElement(reception);
-				if (result == null) result = caseRedefinableElement(reception);
-				if (result == null) result = caseTemplateableElement(reception);
-				if (result == null) result = caseElement(reception);
-				if (result == null) result = caseEModelElement(reception);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.SIGNAL: {
-				Signal signal = (Signal)theEObject;
-				Object result = caseSignal(signal);
-				if (result == null) result = caseClassifier(signal);
-				if (result == null) result = caseNamespace(signal);
-				if (result == null) result = caseType(signal);
-				if (result == null) result = caseRedefinableElement(signal);
-				if (result == null) result = caseNamedElement(signal);
-				if (result == null) result = casePackageableElement(signal);
-				if (result == null) result = caseTemplateableElement(signal);
-				if (result == null) result = caseParameterableElement(signal);
-				if (result == null) result = caseElement(signal);
-				if (result == null) result = caseEModelElement(signal);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.SIGNAL_TRIGGER: {
-				SignalTrigger signalTrigger = (SignalTrigger)theEObject;
-				Object result = caseSignalTrigger(signalTrigger);
-				if (result == null) result = caseMessageTrigger(signalTrigger);
-				if (result == null) result = caseTrigger(signalTrigger);
-				if (result == null) result = caseNamedElement(signalTrigger);
-				if (result == null) result = caseTemplateableElement(signalTrigger);
-				if (result == null) result = caseElement(signalTrigger);
-				if (result == null) result = caseEModelElement(signalTrigger);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.TIME_TRIGGER: {
-				TimeTrigger timeTrigger = (TimeTrigger)theEObject;
-				Object result = caseTimeTrigger(timeTrigger);
-				if (result == null) result = caseTrigger(timeTrigger);
-				if (result == null) result = caseNamedElement(timeTrigger);
-				if (result == null) result = caseTemplateableElement(timeTrigger);
-				if (result == null) result = caseElement(timeTrigger);
-				if (result == null) result = caseEModelElement(timeTrigger);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.ANY_TRIGGER: {
-				AnyTrigger anyTrigger = (AnyTrigger)theEObject;
-				Object result = caseAnyTrigger(anyTrigger);
-				if (result == null) result = caseMessageTrigger(anyTrigger);
-				if (result == null) result = caseTrigger(anyTrigger);
-				if (result == null) result = caseNamedElement(anyTrigger);
-				if (result == null) result = caseTemplateableElement(anyTrigger);
-				if (result == null) result = caseElement(anyTrigger);
-				if (result == null) result = caseEModelElement(anyTrigger);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.EXPANSION_NODE: {
-				ExpansionNode expansionNode = (ExpansionNode)theEObject;
-				Object result = caseExpansionNode(expansionNode);
-				if (result == null) result = caseObjectNode(expansionNode);
-				if (result == null) result = caseActivityNode(expansionNode);
-				if (result == null) result = caseTypedElement(expansionNode);
-				if (result == null) result = caseRedefinableElement(expansionNode);
-				if (result == null) result = caseNamedElement(expansionNode);
-				if (result == null) result = caseTemplateableElement(expansionNode);
-				if (result == null) result = caseElement(expansionNode);
-				if (result == null) result = caseEModelElement(expansionNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.EXPANSION_REGION: {
-				ExpansionRegion expansionRegion = (ExpansionRegion)theEObject;
-				Object result = caseExpansionRegion(expansionRegion);
-				if (result == null) result = caseStructuredActivityNode(expansionRegion);
-				if (result == null) result = caseAction(expansionRegion);
-				if (result == null) result = caseNamespace(expansionRegion);
-				if (result == null) result = caseActivityGroup(expansionRegion);
-				if (result == null) result = caseExecutableNode(expansionRegion);
-				if (result == null) result = caseNamedElement(expansionRegion);
-				if (result == null) result = caseElement(expansionRegion);
-				if (result == null) result = caseActivityNode(expansionRegion);
-				if (result == null) result = caseTemplateableElement(expansionRegion);
-				if (result == null) result = caseEModelElement(expansionRegion);
-				if (result == null) result = caseRedefinableElement(expansionRegion);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.EXCEPTION_HANDLER: {
-				ExceptionHandler exceptionHandler = (ExceptionHandler)theEObject;
-				Object result = caseExceptionHandler(exceptionHandler);
-				if (result == null) result = caseElement(exceptionHandler);
-				if (result == null) result = caseEModelElement(exceptionHandler);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.FORK_NODE: {
-				ForkNode forkNode = (ForkNode)theEObject;
-				Object result = caseForkNode(forkNode);
-				if (result == null) result = caseControlNode(forkNode);
-				if (result == null) result = caseActivityNode(forkNode);
-				if (result == null) result = caseRedefinableElement(forkNode);
-				if (result == null) result = caseNamedElement(forkNode);
-				if (result == null) result = caseTemplateableElement(forkNode);
-				if (result == null) result = caseElement(forkNode);
-				if (result == null) result = caseEModelElement(forkNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.JOIN_NODE: {
-				JoinNode joinNode = (JoinNode)theEObject;
-				Object result = caseJoinNode(joinNode);
-				if (result == null) result = caseControlNode(joinNode);
-				if (result == null) result = caseActivityNode(joinNode);
-				if (result == null) result = caseRedefinableElement(joinNode);
-				if (result == null) result = caseNamedElement(joinNode);
-				if (result == null) result = caseTemplateableElement(joinNode);
-				if (result == null) result = caseElement(joinNode);
-				if (result == null) result = caseEModelElement(joinNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.FLOW_FINAL_NODE: {
-				FlowFinalNode flowFinalNode = (FlowFinalNode)theEObject;
-				Object result = caseFlowFinalNode(flowFinalNode);
-				if (result == null) result = caseFinalNode(flowFinalNode);
-				if (result == null) result = caseControlNode(flowFinalNode);
-				if (result == null) result = caseActivityNode(flowFinalNode);
-				if (result == null) result = caseRedefinableElement(flowFinalNode);
-				if (result == null) result = caseNamedElement(flowFinalNode);
-				if (result == null) result = caseTemplateableElement(flowFinalNode);
-				if (result == null) result = caseElement(flowFinalNode);
-				if (result == null) result = caseEModelElement(flowFinalNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.CENTRAL_BUFFER_NODE: {
-				CentralBufferNode centralBufferNode = (CentralBufferNode)theEObject;
-				Object result = caseCentralBufferNode(centralBufferNode);
-				if (result == null) result = caseObjectNode(centralBufferNode);
-				if (result == null) result = caseActivityNode(centralBufferNode);
-				if (result == null) result = caseTypedElement(centralBufferNode);
-				if (result == null) result = caseRedefinableElement(centralBufferNode);
-				if (result == null) result = caseNamedElement(centralBufferNode);
-				if (result == null) result = caseTemplateableElement(centralBufferNode);
-				if (result == null) result = caseElement(centralBufferNode);
-				if (result == null) result = caseEModelElement(centralBufferNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.ACTIVITY_PARTITION: {
-				ActivityPartition activityPartition = (ActivityPartition)theEObject;
-				Object result = caseActivityPartition(activityPartition);
-				if (result == null) result = caseNamedElement(activityPartition);
-				if (result == null) result = caseActivityGroup(activityPartition);
-				if (result == null) result = caseTemplateableElement(activityPartition);
-				if (result == null) result = caseElement(activityPartition);
-				if (result == null) result = caseEModelElement(activityPartition);
+			case UML2Package.FINAL_STATE: {
+				FinalState finalState = (FinalState)theEObject;
+				Object result = caseFinalState(finalState);
+				if (result == null) result = caseState(finalState);
+				if (result == null) result = caseNamespace(finalState);
+				if (result == null) result = caseRedefinableElement(finalState);
+				if (result == null) result = caseVertex(finalState);
+				if (result == null) result = caseNamedElement(finalState);
+				if (result == null) result = caseTemplateableElement(finalState);
+				if (result == null) result = caseElement(finalState);
+				if (result == null) result = caseEModelElement(finalState);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -2116,96 +2105,107 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.STATE_MACHINE: {
-				StateMachine stateMachine = (StateMachine)theEObject;
-				Object result = caseStateMachine(stateMachine);
-				if (result == null) result = caseBehavior(stateMachine);
-				if (result == null) result = caseClass(stateMachine);
-				if (result == null) result = caseBehavioredClassifier(stateMachine);
-				if (result == null) result = caseEncapsulatedClassifier(stateMachine);
-				if (result == null) result = caseClassifier(stateMachine);
-				if (result == null) result = caseStructuredClassifier(stateMachine);
-				if (result == null) result = caseNamespace(stateMachine);
-				if (result == null) result = caseType(stateMachine);
-				if (result == null) result = caseRedefinableElement(stateMachine);
-				if (result == null) result = caseNamedElement(stateMachine);
-				if (result == null) result = casePackageableElement(stateMachine);
-				if (result == null) result = caseTemplateableElement(stateMachine);
-				if (result == null) result = caseParameterableElement(stateMachine);
-				if (result == null) result = caseElement(stateMachine);
-				if (result == null) result = caseEModelElement(stateMachine);
+			case UML2Package.FORK_NODE: {
+				ForkNode forkNode = (ForkNode)theEObject;
+				Object result = caseForkNode(forkNode);
+				if (result == null) result = caseControlNode(forkNode);
+				if (result == null) result = caseActivityNode(forkNode);
+				if (result == null) result = caseRedefinableElement(forkNode);
+				if (result == null) result = caseNamedElement(forkNode);
+				if (result == null) result = caseTemplateableElement(forkNode);
+				if (result == null) result = caseElement(forkNode);
+				if (result == null) result = caseEModelElement(forkNode);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.REGION: {
-				Region region = (Region)theEObject;
-				Object result = caseRegion(region);
-				if (result == null) result = caseNamespace(region);
-				if (result == null) result = caseRedefinableElement(region);
-				if (result == null) result = caseNamedElement(region);
-				if (result == null) result = caseTemplateableElement(region);
-				if (result == null) result = caseElement(region);
-				if (result == null) result = caseEModelElement(region);
+			case UML2Package.JOIN_NODE: {
+				JoinNode joinNode = (JoinNode)theEObject;
+				Object result = caseJoinNode(joinNode);
+				if (result == null) result = caseControlNode(joinNode);
+				if (result == null) result = caseActivityNode(joinNode);
+				if (result == null) result = caseRedefinableElement(joinNode);
+				if (result == null) result = caseNamedElement(joinNode);
+				if (result == null) result = caseTemplateableElement(joinNode);
+				if (result == null) result = caseElement(joinNode);
+				if (result == null) result = caseEModelElement(joinNode);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.PSEUDOSTATE: {
-				Pseudostate pseudostate = (Pseudostate)theEObject;
-				Object result = casePseudostate(pseudostate);
-				if (result == null) result = caseVertex(pseudostate);
-				if (result == null) result = caseNamedElement(pseudostate);
-				if (result == null) result = caseTemplateableElement(pseudostate);
-				if (result == null) result = caseElement(pseudostate);
-				if (result == null) result = caseEModelElement(pseudostate);
+			case UML2Package.FLOW_FINAL_NODE: {
+				FlowFinalNode flowFinalNode = (FlowFinalNode)theEObject;
+				Object result = caseFlowFinalNode(flowFinalNode);
+				if (result == null) result = caseFinalNode(flowFinalNode);
+				if (result == null) result = caseControlNode(flowFinalNode);
+				if (result == null) result = caseActivityNode(flowFinalNode);
+				if (result == null) result = caseRedefinableElement(flowFinalNode);
+				if (result == null) result = caseNamedElement(flowFinalNode);
+				if (result == null) result = caseTemplateableElement(flowFinalNode);
+				if (result == null) result = caseElement(flowFinalNode);
+				if (result == null) result = caseEModelElement(flowFinalNode);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.STATE: {
-				State state = (State)theEObject;
-				Object result = caseState(state);
-				if (result == null) result = caseNamespace(state);
-				if (result == null) result = caseRedefinableElement(state);
-				if (result == null) result = caseVertex(state);
-				if (result == null) result = caseNamedElement(state);
-				if (result == null) result = caseTemplateableElement(state);
-				if (result == null) result = caseElement(state);
-				if (result == null) result = caseEModelElement(state);
+			case UML2Package.CENTRAL_BUFFER_NODE: {
+				CentralBufferNode centralBufferNode = (CentralBufferNode)theEObject;
+				Object result = caseCentralBufferNode(centralBufferNode);
+				if (result == null) result = caseObjectNode(centralBufferNode);
+				if (result == null) result = caseActivityNode(centralBufferNode);
+				if (result == null) result = caseTypedElement(centralBufferNode);
+				if (result == null) result = caseRedefinableElement(centralBufferNode);
+				if (result == null) result = caseNamedElement(centralBufferNode);
+				if (result == null) result = caseTemplateableElement(centralBufferNode);
+				if (result == null) result = caseElement(centralBufferNode);
+				if (result == null) result = caseEModelElement(centralBufferNode);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.CONNECTION_POINT_REFERENCE: {
-				ConnectionPointReference connectionPointReference = (ConnectionPointReference)theEObject;
-				Object result = caseConnectionPointReference(connectionPointReference);
-				if (result == null) result = caseVertex(connectionPointReference);
-				if (result == null) result = caseNamedElement(connectionPointReference);
-				if (result == null) result = caseTemplateableElement(connectionPointReference);
-				if (result == null) result = caseElement(connectionPointReference);
-				if (result == null) result = caseEModelElement(connectionPointReference);
+			case UML2Package.ACTIVITY_PARTITION: {
+				ActivityPartition activityPartition = (ActivityPartition)theEObject;
+				Object result = caseActivityPartition(activityPartition);
+				if (result == null) result = caseNamedElement(activityPartition);
+				if (result == null) result = caseActivityGroup(activityPartition);
+				if (result == null) result = caseTemplateableElement(activityPartition);
+				if (result == null) result = caseElement(activityPartition);
+				if (result == null) result = caseEModelElement(activityPartition);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.TRANSITION: {
-				Transition transition = (Transition)theEObject;
-				Object result = caseTransition(transition);
-				if (result == null) result = caseRedefinableElement(transition);
-				if (result == null) result = caseNamedElement(transition);
-				if (result == null) result = caseTemplateableElement(transition);
-				if (result == null) result = caseElement(transition);
-				if (result == null) result = caseEModelElement(transition);
+			case UML2Package.EXPANSION_NODE: {
+				ExpansionNode expansionNode = (ExpansionNode)theEObject;
+				Object result = caseExpansionNode(expansionNode);
+				if (result == null) result = caseObjectNode(expansionNode);
+				if (result == null) result = caseActivityNode(expansionNode);
+				if (result == null) result = caseTypedElement(expansionNode);
+				if (result == null) result = caseRedefinableElement(expansionNode);
+				if (result == null) result = caseNamedElement(expansionNode);
+				if (result == null) result = caseTemplateableElement(expansionNode);
+				if (result == null) result = caseElement(expansionNode);
+				if (result == null) result = caseEModelElement(expansionNode);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.FINAL_STATE: {
-				FinalState finalState = (FinalState)theEObject;
-				Object result = caseFinalState(finalState);
-				if (result == null) result = caseState(finalState);
-				if (result == null) result = caseNamespace(finalState);
-				if (result == null) result = caseRedefinableElement(finalState);
-				if (result == null) result = caseVertex(finalState);
-				if (result == null) result = caseNamedElement(finalState);
-				if (result == null) result = caseTemplateableElement(finalState);
-				if (result == null) result = caseElement(finalState);
-				if (result == null) result = caseEModelElement(finalState);
+			case UML2Package.EXPANSION_REGION: {
+				ExpansionRegion expansionRegion = (ExpansionRegion)theEObject;
+				Object result = caseExpansionRegion(expansionRegion);
+				if (result == null) result = caseStructuredActivityNode(expansionRegion);
+				if (result == null) result = caseAction(expansionRegion);
+				if (result == null) result = caseNamespace(expansionRegion);
+				if (result == null) result = caseActivityGroup(expansionRegion);
+				if (result == null) result = caseExecutableNode(expansionRegion);
+				if (result == null) result = caseNamedElement(expansionRegion);
+				if (result == null) result = caseElement(expansionRegion);
+				if (result == null) result = caseActivityNode(expansionRegion);
+				if (result == null) result = caseTemplateableElement(expansionRegion);
+				if (result == null) result = caseEModelElement(expansionRegion);
+				if (result == null) result = caseRedefinableElement(expansionRegion);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.EXCEPTION_HANDLER: {
+				ExceptionHandler exceptionHandler = (ExceptionHandler)theEObject;
+				Object result = caseExceptionHandler(exceptionHandler);
+				if (result == null) result = caseElement(exceptionHandler);
+				if (result == null) result = caseEModelElement(exceptionHandler);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -2310,322 +2310,6 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case UML2Package.PROTOCOL_CONFORMANCE: {
-				ProtocolConformance protocolConformance = (ProtocolConformance)theEObject;
-				Object result = caseProtocolConformance(protocolConformance);
-				if (result == null) result = caseDirectedRelationship(protocolConformance);
-				if (result == null) result = caseRelationship(protocolConformance);
-				if (result == null) result = caseElement(protocolConformance);
-				if (result == null) result = caseEModelElement(protocolConformance);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.PROTOCOL_STATE_MACHINE: {
-				ProtocolStateMachine protocolStateMachine = (ProtocolStateMachine)theEObject;
-				Object result = caseProtocolStateMachine(protocolStateMachine);
-				if (result == null) result = caseStateMachine(protocolStateMachine);
-				if (result == null) result = caseBehavior(protocolStateMachine);
-				if (result == null) result = caseClass(protocolStateMachine);
-				if (result == null) result = caseBehavioredClassifier(protocolStateMachine);
-				if (result == null) result = caseEncapsulatedClassifier(protocolStateMachine);
-				if (result == null) result = caseClassifier(protocolStateMachine);
-				if (result == null) result = caseStructuredClassifier(protocolStateMachine);
-				if (result == null) result = caseNamespace(protocolStateMachine);
-				if (result == null) result = caseType(protocolStateMachine);
-				if (result == null) result = caseRedefinableElement(protocolStateMachine);
-				if (result == null) result = caseNamedElement(protocolStateMachine);
-				if (result == null) result = casePackageableElement(protocolStateMachine);
-				if (result == null) result = caseTemplateableElement(protocolStateMachine);
-				if (result == null) result = caseParameterableElement(protocolStateMachine);
-				if (result == null) result = caseElement(protocolStateMachine);
-				if (result == null) result = caseEModelElement(protocolStateMachine);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.PROTOCOL_TRANSITION: {
-				ProtocolTransition protocolTransition = (ProtocolTransition)theEObject;
-				Object result = caseProtocolTransition(protocolTransition);
-				if (result == null) result = caseTransition(protocolTransition);
-				if (result == null) result = caseRedefinableElement(protocolTransition);
-				if (result == null) result = caseNamedElement(protocolTransition);
-				if (result == null) result = caseTemplateableElement(protocolTransition);
-				if (result == null) result = caseElement(protocolTransition);
-				if (result == null) result = caseEModelElement(protocolTransition);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.TIME_EXPRESSION: {
-				TimeExpression timeExpression = (TimeExpression)theEObject;
-				Object result = caseTimeExpression(timeExpression);
-				if (result == null) result = caseValueSpecification(timeExpression);
-				if (result == null) result = caseTypedElement(timeExpression);
-				if (result == null) result = caseParameterableElement(timeExpression);
-				if (result == null) result = caseNamedElement(timeExpression);
-				if (result == null) result = caseElement(timeExpression);
-				if (result == null) result = caseTemplateableElement(timeExpression);
-				if (result == null) result = caseEModelElement(timeExpression);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.DURATION: {
-				Duration duration = (Duration)theEObject;
-				Object result = caseDuration(duration);
-				if (result == null) result = caseValueSpecification(duration);
-				if (result == null) result = caseTypedElement(duration);
-				if (result == null) result = caseParameterableElement(duration);
-				if (result == null) result = caseNamedElement(duration);
-				if (result == null) result = caseElement(duration);
-				if (result == null) result = caseTemplateableElement(duration);
-				if (result == null) result = caseEModelElement(duration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.TIME_OBSERVATION_ACTION: {
-				TimeObservationAction timeObservationAction = (TimeObservationAction)theEObject;
-				Object result = caseTimeObservationAction(timeObservationAction);
-				if (result == null) result = caseWriteStructuralFeatureAction(timeObservationAction);
-				if (result == null) result = caseStructuralFeatureAction(timeObservationAction);
-				if (result == null) result = caseAction(timeObservationAction);
-				if (result == null) result = caseExecutableNode(timeObservationAction);
-				if (result == null) result = caseActivityNode(timeObservationAction);
-				if (result == null) result = caseRedefinableElement(timeObservationAction);
-				if (result == null) result = caseNamedElement(timeObservationAction);
-				if (result == null) result = caseTemplateableElement(timeObservationAction);
-				if (result == null) result = caseElement(timeObservationAction);
-				if (result == null) result = caseEModelElement(timeObservationAction);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.DURATION_INTERVAL: {
-				DurationInterval durationInterval = (DurationInterval)theEObject;
-				Object result = caseDurationInterval(durationInterval);
-				if (result == null) result = caseInterval(durationInterval);
-				if (result == null) result = caseValueSpecification(durationInterval);
-				if (result == null) result = caseTypedElement(durationInterval);
-				if (result == null) result = caseParameterableElement(durationInterval);
-				if (result == null) result = caseNamedElement(durationInterval);
-				if (result == null) result = caseElement(durationInterval);
-				if (result == null) result = caseTemplateableElement(durationInterval);
-				if (result == null) result = caseEModelElement(durationInterval);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.INTERVAL: {
-				Interval interval = (Interval)theEObject;
-				Object result = caseInterval(interval);
-				if (result == null) result = caseValueSpecification(interval);
-				if (result == null) result = caseTypedElement(interval);
-				if (result == null) result = caseParameterableElement(interval);
-				if (result == null) result = caseNamedElement(interval);
-				if (result == null) result = caseElement(interval);
-				if (result == null) result = caseTemplateableElement(interval);
-				if (result == null) result = caseEModelElement(interval);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.TIME_CONSTRAINT: {
-				TimeConstraint timeConstraint = (TimeConstraint)theEObject;
-				Object result = caseTimeConstraint(timeConstraint);
-				if (result == null) result = caseIntervalConstraint(timeConstraint);
-				if (result == null) result = caseConstraint(timeConstraint);
-				if (result == null) result = casePackageableElement(timeConstraint);
-				if (result == null) result = caseNamedElement(timeConstraint);
-				if (result == null) result = caseParameterableElement(timeConstraint);
-				if (result == null) result = caseTemplateableElement(timeConstraint);
-				if (result == null) result = caseElement(timeConstraint);
-				if (result == null) result = caseEModelElement(timeConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.INTERVAL_CONSTRAINT: {
-				IntervalConstraint intervalConstraint = (IntervalConstraint)theEObject;
-				Object result = caseIntervalConstraint(intervalConstraint);
-				if (result == null) result = caseConstraint(intervalConstraint);
-				if (result == null) result = casePackageableElement(intervalConstraint);
-				if (result == null) result = caseNamedElement(intervalConstraint);
-				if (result == null) result = caseParameterableElement(intervalConstraint);
-				if (result == null) result = caseTemplateableElement(intervalConstraint);
-				if (result == null) result = caseElement(intervalConstraint);
-				if (result == null) result = caseEModelElement(intervalConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.TIME_INTERVAL: {
-				TimeInterval timeInterval = (TimeInterval)theEObject;
-				Object result = caseTimeInterval(timeInterval);
-				if (result == null) result = caseInterval(timeInterval);
-				if (result == null) result = caseValueSpecification(timeInterval);
-				if (result == null) result = caseTypedElement(timeInterval);
-				if (result == null) result = caseParameterableElement(timeInterval);
-				if (result == null) result = caseNamedElement(timeInterval);
-				if (result == null) result = caseElement(timeInterval);
-				if (result == null) result = caseTemplateableElement(timeInterval);
-				if (result == null) result = caseEModelElement(timeInterval);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.DURATION_OBSERVATION_ACTION: {
-				DurationObservationAction durationObservationAction = (DurationObservationAction)theEObject;
-				Object result = caseDurationObservationAction(durationObservationAction);
-				if (result == null) result = caseWriteStructuralFeatureAction(durationObservationAction);
-				if (result == null) result = caseStructuralFeatureAction(durationObservationAction);
-				if (result == null) result = caseAction(durationObservationAction);
-				if (result == null) result = caseExecutableNode(durationObservationAction);
-				if (result == null) result = caseActivityNode(durationObservationAction);
-				if (result == null) result = caseRedefinableElement(durationObservationAction);
-				if (result == null) result = caseNamedElement(durationObservationAction);
-				if (result == null) result = caseTemplateableElement(durationObservationAction);
-				if (result == null) result = caseElement(durationObservationAction);
-				if (result == null) result = caseEModelElement(durationObservationAction);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.DURATION_CONSTRAINT: {
-				DurationConstraint durationConstraint = (DurationConstraint)theEObject;
-				Object result = caseDurationConstraint(durationConstraint);
-				if (result == null) result = caseIntervalConstraint(durationConstraint);
-				if (result == null) result = caseConstraint(durationConstraint);
-				if (result == null) result = casePackageableElement(durationConstraint);
-				if (result == null) result = caseNamedElement(durationConstraint);
-				if (result == null) result = caseParameterableElement(durationConstraint);
-				if (result == null) result = caseTemplateableElement(durationConstraint);
-				if (result == null) result = caseElement(durationConstraint);
-				if (result == null) result = caseEModelElement(durationConstraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.DATA_STORE_NODE: {
-				DataStoreNode dataStoreNode = (DataStoreNode)theEObject;
-				Object result = caseDataStoreNode(dataStoreNode);
-				if (result == null) result = caseCentralBufferNode(dataStoreNode);
-				if (result == null) result = caseObjectNode(dataStoreNode);
-				if (result == null) result = caseActivityNode(dataStoreNode);
-				if (result == null) result = caseTypedElement(dataStoreNode);
-				if (result == null) result = caseRedefinableElement(dataStoreNode);
-				if (result == null) result = caseNamedElement(dataStoreNode);
-				if (result == null) result = caseTemplateableElement(dataStoreNode);
-				if (result == null) result = caseElement(dataStoreNode);
-				if (result == null) result = caseEModelElement(dataStoreNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.INTERRUPTIBLE_ACTIVITY_REGION: {
-				InterruptibleActivityRegion interruptibleActivityRegion = (InterruptibleActivityRegion)theEObject;
-				Object result = caseInterruptibleActivityRegion(interruptibleActivityRegion);
-				if (result == null) result = caseActivityGroup(interruptibleActivityRegion);
-				if (result == null) result = caseElement(interruptibleActivityRegion);
-				if (result == null) result = caseEModelElement(interruptibleActivityRegion);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.PARAMETER_SET: {
-				ParameterSet parameterSet = (ParameterSet)theEObject;
-				Object result = caseParameterSet(parameterSet);
-				if (result == null) result = caseNamedElement(parameterSet);
-				if (result == null) result = caseTemplateableElement(parameterSet);
-				if (result == null) result = caseElement(parameterSet);
-				if (result == null) result = caseEModelElement(parameterSet);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.DEPLOYMENT: {
-				Deployment deployment = (Deployment)theEObject;
-				Object result = caseDeployment(deployment);
-				if (result == null) result = caseDependency(deployment);
-				if (result == null) result = casePackageableElement(deployment);
-				if (result == null) result = caseDirectedRelationship(deployment);
-				if (result == null) result = caseNamedElement(deployment);
-				if (result == null) result = caseParameterableElement(deployment);
-				if (result == null) result = caseRelationship(deployment);
-				if (result == null) result = caseTemplateableElement(deployment);
-				if (result == null) result = caseElement(deployment);
-				if (result == null) result = caseEModelElement(deployment);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.NODE: {
-				Node node = (Node)theEObject;
-				Object result = caseNode(node);
-				if (result == null) result = caseClass(node);
-				if (result == null) result = caseDeploymentTarget(node);
-				if (result == null) result = caseBehavioredClassifier(node);
-				if (result == null) result = caseEncapsulatedClassifier(node);
-				if (result == null) result = caseNamedElement(node);
-				if (result == null) result = caseClassifier(node);
-				if (result == null) result = caseStructuredClassifier(node);
-				if (result == null) result = caseTemplateableElement(node);
-				if (result == null) result = caseNamespace(node);
-				if (result == null) result = caseType(node);
-				if (result == null) result = caseRedefinableElement(node);
-				if (result == null) result = caseElement(node);
-				if (result == null) result = casePackageableElement(node);
-				if (result == null) result = caseEModelElement(node);
-				if (result == null) result = caseParameterableElement(node);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.DEVICE: {
-				Device device = (Device)theEObject;
-				Object result = caseDevice(device);
-				if (result == null) result = caseNode(device);
-				if (result == null) result = caseClass(device);
-				if (result == null) result = caseDeploymentTarget(device);
-				if (result == null) result = caseBehavioredClassifier(device);
-				if (result == null) result = caseEncapsulatedClassifier(device);
-				if (result == null) result = caseNamedElement(device);
-				if (result == null) result = caseClassifier(device);
-				if (result == null) result = caseStructuredClassifier(device);
-				if (result == null) result = caseTemplateableElement(device);
-				if (result == null) result = caseNamespace(device);
-				if (result == null) result = caseType(device);
-				if (result == null) result = caseRedefinableElement(device);
-				if (result == null) result = caseElement(device);
-				if (result == null) result = casePackageableElement(device);
-				if (result == null) result = caseEModelElement(device);
-				if (result == null) result = caseParameterableElement(device);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.EXECUTION_ENVIRONMENT: {
-				ExecutionEnvironment executionEnvironment = (ExecutionEnvironment)theEObject;
-				Object result = caseExecutionEnvironment(executionEnvironment);
-				if (result == null) result = caseNode(executionEnvironment);
-				if (result == null) result = caseClass(executionEnvironment);
-				if (result == null) result = caseDeploymentTarget(executionEnvironment);
-				if (result == null) result = caseBehavioredClassifier(executionEnvironment);
-				if (result == null) result = caseEncapsulatedClassifier(executionEnvironment);
-				if (result == null) result = caseNamedElement(executionEnvironment);
-				if (result == null) result = caseClassifier(executionEnvironment);
-				if (result == null) result = caseStructuredClassifier(executionEnvironment);
-				if (result == null) result = caseTemplateableElement(executionEnvironment);
-				if (result == null) result = caseNamespace(executionEnvironment);
-				if (result == null) result = caseType(executionEnvironment);
-				if (result == null) result = caseRedefinableElement(executionEnvironment);
-				if (result == null) result = caseElement(executionEnvironment);
-				if (result == null) result = casePackageableElement(executionEnvironment);
-				if (result == null) result = caseEModelElement(executionEnvironment);
-				if (result == null) result = caseParameterableElement(executionEnvironment);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UML2Package.COMMUNICATION_PATH: {
-				CommunicationPath communicationPath = (CommunicationPath)theEObject;
-				Object result = caseCommunicationPath(communicationPath);
-				if (result == null) result = caseAssociation(communicationPath);
-				if (result == null) result = caseClassifier(communicationPath);
-				if (result == null) result = caseRelationship(communicationPath);
-				if (result == null) result = caseNamespace(communicationPath);
-				if (result == null) result = caseType(communicationPath);
-				if (result == null) result = caseRedefinableElement(communicationPath);
-				if (result == null) result = caseElement(communicationPath);
-				if (result == null) result = caseNamedElement(communicationPath);
-				if (result == null) result = casePackageableElement(communicationPath);
-				if (result == null) result = caseEModelElement(communicationPath);
-				if (result == null) result = caseTemplateableElement(communicationPath);
-				if (result == null) result = caseParameterableElement(communicationPath);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
 			case UML2Package.READ_EXTENT_ACTION: {
 				ReadExtentAction readExtentAction = (ReadExtentAction)theEObject;
 				Object result = caseReadExtentAction(readExtentAction);
@@ -2792,6 +2476,322 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case UML2Package.DATA_STORE_NODE: {
+				DataStoreNode dataStoreNode = (DataStoreNode)theEObject;
+				Object result = caseDataStoreNode(dataStoreNode);
+				if (result == null) result = caseCentralBufferNode(dataStoreNode);
+				if (result == null) result = caseObjectNode(dataStoreNode);
+				if (result == null) result = caseActivityNode(dataStoreNode);
+				if (result == null) result = caseTypedElement(dataStoreNode);
+				if (result == null) result = caseRedefinableElement(dataStoreNode);
+				if (result == null) result = caseNamedElement(dataStoreNode);
+				if (result == null) result = caseTemplateableElement(dataStoreNode);
+				if (result == null) result = caseElement(dataStoreNode);
+				if (result == null) result = caseEModelElement(dataStoreNode);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.INTERRUPTIBLE_ACTIVITY_REGION: {
+				InterruptibleActivityRegion interruptibleActivityRegion = (InterruptibleActivityRegion)theEObject;
+				Object result = caseInterruptibleActivityRegion(interruptibleActivityRegion);
+				if (result == null) result = caseActivityGroup(interruptibleActivityRegion);
+				if (result == null) result = caseElement(interruptibleActivityRegion);
+				if (result == null) result = caseEModelElement(interruptibleActivityRegion);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.PARAMETER_SET: {
+				ParameterSet parameterSet = (ParameterSet)theEObject;
+				Object result = caseParameterSet(parameterSet);
+				if (result == null) result = caseNamedElement(parameterSet);
+				if (result == null) result = caseTemplateableElement(parameterSet);
+				if (result == null) result = caseElement(parameterSet);
+				if (result == null) result = caseEModelElement(parameterSet);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.TIME_EXPRESSION: {
+				TimeExpression timeExpression = (TimeExpression)theEObject;
+				Object result = caseTimeExpression(timeExpression);
+				if (result == null) result = caseValueSpecification(timeExpression);
+				if (result == null) result = caseTypedElement(timeExpression);
+				if (result == null) result = caseParameterableElement(timeExpression);
+				if (result == null) result = caseNamedElement(timeExpression);
+				if (result == null) result = caseElement(timeExpression);
+				if (result == null) result = caseTemplateableElement(timeExpression);
+				if (result == null) result = caseEModelElement(timeExpression);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.DURATION: {
+				Duration duration = (Duration)theEObject;
+				Object result = caseDuration(duration);
+				if (result == null) result = caseValueSpecification(duration);
+				if (result == null) result = caseTypedElement(duration);
+				if (result == null) result = caseParameterableElement(duration);
+				if (result == null) result = caseNamedElement(duration);
+				if (result == null) result = caseElement(duration);
+				if (result == null) result = caseTemplateableElement(duration);
+				if (result == null) result = caseEModelElement(duration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.TIME_OBSERVATION_ACTION: {
+				TimeObservationAction timeObservationAction = (TimeObservationAction)theEObject;
+				Object result = caseTimeObservationAction(timeObservationAction);
+				if (result == null) result = caseWriteStructuralFeatureAction(timeObservationAction);
+				if (result == null) result = caseStructuralFeatureAction(timeObservationAction);
+				if (result == null) result = caseAction(timeObservationAction);
+				if (result == null) result = caseExecutableNode(timeObservationAction);
+				if (result == null) result = caseActivityNode(timeObservationAction);
+				if (result == null) result = caseRedefinableElement(timeObservationAction);
+				if (result == null) result = caseNamedElement(timeObservationAction);
+				if (result == null) result = caseTemplateableElement(timeObservationAction);
+				if (result == null) result = caseElement(timeObservationAction);
+				if (result == null) result = caseEModelElement(timeObservationAction);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.DURATION_INTERVAL: {
+				DurationInterval durationInterval = (DurationInterval)theEObject;
+				Object result = caseDurationInterval(durationInterval);
+				if (result == null) result = caseInterval(durationInterval);
+				if (result == null) result = caseValueSpecification(durationInterval);
+				if (result == null) result = caseTypedElement(durationInterval);
+				if (result == null) result = caseParameterableElement(durationInterval);
+				if (result == null) result = caseNamedElement(durationInterval);
+				if (result == null) result = caseElement(durationInterval);
+				if (result == null) result = caseTemplateableElement(durationInterval);
+				if (result == null) result = caseEModelElement(durationInterval);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.INTERVAL: {
+				Interval interval = (Interval)theEObject;
+				Object result = caseInterval(interval);
+				if (result == null) result = caseValueSpecification(interval);
+				if (result == null) result = caseTypedElement(interval);
+				if (result == null) result = caseParameterableElement(interval);
+				if (result == null) result = caseNamedElement(interval);
+				if (result == null) result = caseElement(interval);
+				if (result == null) result = caseTemplateableElement(interval);
+				if (result == null) result = caseEModelElement(interval);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.TIME_CONSTRAINT: {
+				TimeConstraint timeConstraint = (TimeConstraint)theEObject;
+				Object result = caseTimeConstraint(timeConstraint);
+				if (result == null) result = caseIntervalConstraint(timeConstraint);
+				if (result == null) result = caseConstraint(timeConstraint);
+				if (result == null) result = casePackageableElement(timeConstraint);
+				if (result == null) result = caseNamedElement(timeConstraint);
+				if (result == null) result = caseParameterableElement(timeConstraint);
+				if (result == null) result = caseTemplateableElement(timeConstraint);
+				if (result == null) result = caseElement(timeConstraint);
+				if (result == null) result = caseEModelElement(timeConstraint);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.INTERVAL_CONSTRAINT: {
+				IntervalConstraint intervalConstraint = (IntervalConstraint)theEObject;
+				Object result = caseIntervalConstraint(intervalConstraint);
+				if (result == null) result = caseConstraint(intervalConstraint);
+				if (result == null) result = casePackageableElement(intervalConstraint);
+				if (result == null) result = caseNamedElement(intervalConstraint);
+				if (result == null) result = caseParameterableElement(intervalConstraint);
+				if (result == null) result = caseTemplateableElement(intervalConstraint);
+				if (result == null) result = caseElement(intervalConstraint);
+				if (result == null) result = caseEModelElement(intervalConstraint);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.TIME_INTERVAL: {
+				TimeInterval timeInterval = (TimeInterval)theEObject;
+				Object result = caseTimeInterval(timeInterval);
+				if (result == null) result = caseInterval(timeInterval);
+				if (result == null) result = caseValueSpecification(timeInterval);
+				if (result == null) result = caseTypedElement(timeInterval);
+				if (result == null) result = caseParameterableElement(timeInterval);
+				if (result == null) result = caseNamedElement(timeInterval);
+				if (result == null) result = caseElement(timeInterval);
+				if (result == null) result = caseTemplateableElement(timeInterval);
+				if (result == null) result = caseEModelElement(timeInterval);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.DURATION_OBSERVATION_ACTION: {
+				DurationObservationAction durationObservationAction = (DurationObservationAction)theEObject;
+				Object result = caseDurationObservationAction(durationObservationAction);
+				if (result == null) result = caseWriteStructuralFeatureAction(durationObservationAction);
+				if (result == null) result = caseStructuralFeatureAction(durationObservationAction);
+				if (result == null) result = caseAction(durationObservationAction);
+				if (result == null) result = caseExecutableNode(durationObservationAction);
+				if (result == null) result = caseActivityNode(durationObservationAction);
+				if (result == null) result = caseRedefinableElement(durationObservationAction);
+				if (result == null) result = caseNamedElement(durationObservationAction);
+				if (result == null) result = caseTemplateableElement(durationObservationAction);
+				if (result == null) result = caseElement(durationObservationAction);
+				if (result == null) result = caseEModelElement(durationObservationAction);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.DURATION_CONSTRAINT: {
+				DurationConstraint durationConstraint = (DurationConstraint)theEObject;
+				Object result = caseDurationConstraint(durationConstraint);
+				if (result == null) result = caseIntervalConstraint(durationConstraint);
+				if (result == null) result = caseConstraint(durationConstraint);
+				if (result == null) result = casePackageableElement(durationConstraint);
+				if (result == null) result = caseNamedElement(durationConstraint);
+				if (result == null) result = caseParameterableElement(durationConstraint);
+				if (result == null) result = caseTemplateableElement(durationConstraint);
+				if (result == null) result = caseElement(durationConstraint);
+				if (result == null) result = caseEModelElement(durationConstraint);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.DEPLOYMENT: {
+				Deployment deployment = (Deployment)theEObject;
+				Object result = caseDeployment(deployment);
+				if (result == null) result = caseDependency(deployment);
+				if (result == null) result = casePackageableElement(deployment);
+				if (result == null) result = caseDirectedRelationship(deployment);
+				if (result == null) result = caseNamedElement(deployment);
+				if (result == null) result = caseParameterableElement(deployment);
+				if (result == null) result = caseRelationship(deployment);
+				if (result == null) result = caseTemplateableElement(deployment);
+				if (result == null) result = caseElement(deployment);
+				if (result == null) result = caseEModelElement(deployment);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.NODE: {
+				Node node = (Node)theEObject;
+				Object result = caseNode(node);
+				if (result == null) result = caseClass(node);
+				if (result == null) result = caseDeploymentTarget(node);
+				if (result == null) result = caseBehavioredClassifier(node);
+				if (result == null) result = caseEncapsulatedClassifier(node);
+				if (result == null) result = caseNamedElement(node);
+				if (result == null) result = caseClassifier(node);
+				if (result == null) result = caseStructuredClassifier(node);
+				if (result == null) result = caseTemplateableElement(node);
+				if (result == null) result = caseNamespace(node);
+				if (result == null) result = caseType(node);
+				if (result == null) result = caseRedefinableElement(node);
+				if (result == null) result = caseElement(node);
+				if (result == null) result = casePackageableElement(node);
+				if (result == null) result = caseEModelElement(node);
+				if (result == null) result = caseParameterableElement(node);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.DEVICE: {
+				Device device = (Device)theEObject;
+				Object result = caseDevice(device);
+				if (result == null) result = caseNode(device);
+				if (result == null) result = caseClass(device);
+				if (result == null) result = caseDeploymentTarget(device);
+				if (result == null) result = caseBehavioredClassifier(device);
+				if (result == null) result = caseEncapsulatedClassifier(device);
+				if (result == null) result = caseNamedElement(device);
+				if (result == null) result = caseClassifier(device);
+				if (result == null) result = caseStructuredClassifier(device);
+				if (result == null) result = caseTemplateableElement(device);
+				if (result == null) result = caseNamespace(device);
+				if (result == null) result = caseType(device);
+				if (result == null) result = caseRedefinableElement(device);
+				if (result == null) result = caseElement(device);
+				if (result == null) result = casePackageableElement(device);
+				if (result == null) result = caseEModelElement(device);
+				if (result == null) result = caseParameterableElement(device);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.EXECUTION_ENVIRONMENT: {
+				ExecutionEnvironment executionEnvironment = (ExecutionEnvironment)theEObject;
+				Object result = caseExecutionEnvironment(executionEnvironment);
+				if (result == null) result = caseNode(executionEnvironment);
+				if (result == null) result = caseClass(executionEnvironment);
+				if (result == null) result = caseDeploymentTarget(executionEnvironment);
+				if (result == null) result = caseBehavioredClassifier(executionEnvironment);
+				if (result == null) result = caseEncapsulatedClassifier(executionEnvironment);
+				if (result == null) result = caseNamedElement(executionEnvironment);
+				if (result == null) result = caseClassifier(executionEnvironment);
+				if (result == null) result = caseStructuredClassifier(executionEnvironment);
+				if (result == null) result = caseTemplateableElement(executionEnvironment);
+				if (result == null) result = caseNamespace(executionEnvironment);
+				if (result == null) result = caseType(executionEnvironment);
+				if (result == null) result = caseRedefinableElement(executionEnvironment);
+				if (result == null) result = caseElement(executionEnvironment);
+				if (result == null) result = casePackageableElement(executionEnvironment);
+				if (result == null) result = caseEModelElement(executionEnvironment);
+				if (result == null) result = caseParameterableElement(executionEnvironment);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.COMMUNICATION_PATH: {
+				CommunicationPath communicationPath = (CommunicationPath)theEObject;
+				Object result = caseCommunicationPath(communicationPath);
+				if (result == null) result = caseAssociation(communicationPath);
+				if (result == null) result = caseClassifier(communicationPath);
+				if (result == null) result = caseRelationship(communicationPath);
+				if (result == null) result = caseNamespace(communicationPath);
+				if (result == null) result = caseType(communicationPath);
+				if (result == null) result = caseRedefinableElement(communicationPath);
+				if (result == null) result = caseElement(communicationPath);
+				if (result == null) result = caseNamedElement(communicationPath);
+				if (result == null) result = casePackageableElement(communicationPath);
+				if (result == null) result = caseEModelElement(communicationPath);
+				if (result == null) result = caseTemplateableElement(communicationPath);
+				if (result == null) result = caseParameterableElement(communicationPath);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.PROTOCOL_CONFORMANCE: {
+				ProtocolConformance protocolConformance = (ProtocolConformance)theEObject;
+				Object result = caseProtocolConformance(protocolConformance);
+				if (result == null) result = caseDirectedRelationship(protocolConformance);
+				if (result == null) result = caseRelationship(protocolConformance);
+				if (result == null) result = caseElement(protocolConformance);
+				if (result == null) result = caseEModelElement(protocolConformance);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.PROTOCOL_STATE_MACHINE: {
+				ProtocolStateMachine protocolStateMachine = (ProtocolStateMachine)theEObject;
+				Object result = caseProtocolStateMachine(protocolStateMachine);
+				if (result == null) result = caseStateMachine(protocolStateMachine);
+				if (result == null) result = caseBehavior(protocolStateMachine);
+				if (result == null) result = caseClass(protocolStateMachine);
+				if (result == null) result = caseBehavioredClassifier(protocolStateMachine);
+				if (result == null) result = caseEncapsulatedClassifier(protocolStateMachine);
+				if (result == null) result = caseClassifier(protocolStateMachine);
+				if (result == null) result = caseStructuredClassifier(protocolStateMachine);
+				if (result == null) result = caseNamespace(protocolStateMachine);
+				if (result == null) result = caseType(protocolStateMachine);
+				if (result == null) result = caseRedefinableElement(protocolStateMachine);
+				if (result == null) result = caseNamedElement(protocolStateMachine);
+				if (result == null) result = casePackageableElement(protocolStateMachine);
+				if (result == null) result = caseTemplateableElement(protocolStateMachine);
+				if (result == null) result = caseParameterableElement(protocolStateMachine);
+				if (result == null) result = caseElement(protocolStateMachine);
+				if (result == null) result = caseEModelElement(protocolStateMachine);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UML2Package.PROTOCOL_TRANSITION: {
+				ProtocolTransition protocolTransition = (ProtocolTransition)theEObject;
+				Object result = caseProtocolTransition(protocolTransition);
+				if (result == null) result = caseTransition(protocolTransition);
+				if (result == null) result = caseRedefinableElement(protocolTransition);
+				if (result == null) result = caseNamedElement(protocolTransition);
+				if (result == null) result = caseTemplateableElement(protocolTransition);
+				if (result == null) result = caseElement(protocolTransition);
+				if (result == null) result = caseEModelElement(protocolTransition);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case UML2Package.DEPLOYMENT_SPECIFICATION: {
 				DeploymentSpecification deploymentSpecification = (DeploymentSpecification)theEObject;
 				Object result = caseDeploymentSpecification(deploymentSpecification);
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Validator.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Validator.java
index a9e4938..4c66351 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Validator.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Validator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: UML2Validator.java,v 1.7 2004/06/02 05:02:27 khussey Exp $
+ * $Id: UML2Validator.java,v 1.8 2004/06/03 02:59:19 khussey Exp $
  */
 package org.eclipse.uml2.util;
 
@@ -593,6 +593,10 @@
 				return validateElement((Element)value, diagnostics, context);
 			case UML2Package.MULTIPLICITY_ELEMENT:
 				return validateMultiplicityElement((MultiplicityElement)value, diagnostics, context);
+			case UML2Package.NAMED_ELEMENT:
+				return validateNamedElement((NamedElement)value, diagnostics, context);
+			case UML2Package.NAMESPACE:
+				return validateNamespace((Namespace)value, diagnostics, context);
 			case UML2Package.DIRECTED_RELATIONSHIP:
 				return validateDirectedRelationship((DirectedRelationship)value, diagnostics, context);
 			case UML2Package.RELATIONSHIP:
@@ -605,10 +609,6 @@
 				return validateExpression((Expression)value, diagnostics, context);
 			case UML2Package.COMMENT:
 				return validateComment((Comment)value, diagnostics, context);
-			case UML2Package.NAMED_ELEMENT:
-				return validateNamedElement((NamedElement)value, diagnostics, context);
-			case UML2Package.NAMESPACE:
-				return validateNamespace((Namespace)value, diagnostics, context);
 			case UML2Package.CLASS:
 				return validateClass((org.eclipse.uml2.Class)value, diagnostics, context);
 			case UML2Package.TYPE:
@@ -655,14 +655,14 @@
 				return validateStructuralFeature((StructuralFeature)value, diagnostics, context);
 			case UML2Package.REDEFINABLE_ELEMENT:
 				return validateRedefinableElement((RedefinableElement)value, diagnostics, context);
-			case UML2Package.GENERALIZATION:
-				return validateGeneralization((Generalization)value, diagnostics, context);
 			case UML2Package.INSTANCE_SPECIFICATION:
 				return validateInstanceSpecification((InstanceSpecification)value, diagnostics, context);
 			case UML2Package.SLOT:
 				return validateSlot((Slot)value, diagnostics, context);
 			case UML2Package.INSTANCE_VALUE:
 				return validateInstanceValue((InstanceValue)value, diagnostics, context);
+			case UML2Package.GENERALIZATION:
+				return validateGeneralization((Generalization)value, diagnostics, context);
 			case UML2Package.PACKAGEABLE_ELEMENT:
 				return validatePackageableElement((PackageableElement)value, diagnostics, context);
 			case UML2Package.ELEMENT_IMPORT:
@@ -719,6 +719,24 @@
 				return validateConnector((Connector)value, diagnostics, context);
 			case UML2Package.STRUCTURED_CLASSIFIER:
 				return validateStructuredClassifier((StructuredClassifier)value, diagnostics, context);
+			case UML2Package.INTERFACE:
+				return validateInterface((Interface)value, diagnostics, context);
+			case UML2Package.IMPLEMENTATION:
+				return validateImplementation((Implementation)value, diagnostics, context);
+			case UML2Package.ARTIFACT:
+				return validateArtifact((Artifact)value, diagnostics, context);
+			case UML2Package.MANIFESTATION:
+				return validateManifestation((Manifestation)value, diagnostics, context);
+			case UML2Package.ACTOR:
+				return validateActor((Actor)value, diagnostics, context);
+			case UML2Package.EXTEND:
+				return validateExtend((Extend)value, diagnostics, context);
+			case UML2Package.USE_CASE:
+				return validateUseCase((UseCase)value, diagnostics, context);
+			case UML2Package.EXTENSION_POINT:
+				return validateExtensionPoint((ExtensionPoint)value, diagnostics, context);
+			case UML2Package.INCLUDE:
+				return validateInclude((Include)value, diagnostics, context);
 			case UML2Package.ACTIVITY_EDGE:
 				return validateActivityEdge((ActivityEdge)value, diagnostics, context);
 			case UML2Package.ACTIVITY_GROUP:
@@ -757,24 +775,42 @@
 				return validateActivityParameterNode((ActivityParameterNode)value, diagnostics, context);
 			case UML2Package.VALUE_PIN:
 				return validateValuePin((ValuePin)value, diagnostics, context);
-			case UML2Package.ARTIFACT:
-				return validateArtifact((Artifact)value, diagnostics, context);
-			case UML2Package.MANIFESTATION:
-				return validateManifestation((Manifestation)value, diagnostics, context);
-			case UML2Package.INTERFACE:
-				return validateInterface((Interface)value, diagnostics, context);
-			case UML2Package.IMPLEMENTATION:
-				return validateImplementation((Implementation)value, diagnostics, context);
-			case UML2Package.ACTOR:
-				return validateActor((Actor)value, diagnostics, context);
-			case UML2Package.EXTEND:
-				return validateExtend((Extend)value, diagnostics, context);
-			case UML2Package.USE_CASE:
-				return validateUseCase((UseCase)value, diagnostics, context);
-			case UML2Package.EXTENSION_POINT:
-				return validateExtensionPoint((ExtensionPoint)value, diagnostics, context);
-			case UML2Package.INCLUDE:
-				return validateInclude((Include)value, diagnostics, context);
+			case UML2Package.CALL_TRIGGER:
+				return validateCallTrigger((CallTrigger)value, diagnostics, context);
+			case UML2Package.MESSAGE_TRIGGER:
+				return validateMessageTrigger((MessageTrigger)value, diagnostics, context);
+			case UML2Package.CHANGE_TRIGGER:
+				return validateChangeTrigger((ChangeTrigger)value, diagnostics, context);
+			case UML2Package.TRIGGER:
+				return validateTrigger((Trigger)value, diagnostics, context);
+			case UML2Package.RECEPTION:
+				return validateReception((Reception)value, diagnostics, context);
+			case UML2Package.SIGNAL:
+				return validateSignal((Signal)value, diagnostics, context);
+			case UML2Package.SIGNAL_TRIGGER:
+				return validateSignalTrigger((SignalTrigger)value, diagnostics, context);
+			case UML2Package.TIME_TRIGGER:
+				return validateTimeTrigger((TimeTrigger)value, diagnostics, context);
+			case UML2Package.ANY_TRIGGER:
+				return validateAnyTrigger((AnyTrigger)value, diagnostics, context);
+			case UML2Package.COLLABORATION_OCCURRENCE:
+				return validateCollaborationOccurrence((CollaborationOccurrence)value, diagnostics, context);
+			case UML2Package.COLLABORATION:
+				return validateCollaboration((Collaboration)value, diagnostics, context);
+			case UML2Package.PORT:
+				return validatePort((Port)value, diagnostics, context);
+			case UML2Package.ENCAPSULATED_CLASSIFIER:
+				return validateEncapsulatedClassifier((EncapsulatedClassifier)value, diagnostics, context);
+			case UML2Package.VARIABLE:
+				return validateVariable((Variable)value, diagnostics, context);
+			case UML2Package.STRUCTURED_ACTIVITY_NODE:
+				return validateStructuredActivityNode((StructuredActivityNode)value, diagnostics, context);
+			case UML2Package.CONDITIONAL_NODE:
+				return validateConditionalNode((ConditionalNode)value, diagnostics, context);
+			case UML2Package.CLAUSE:
+				return validateClause((Clause)value, diagnostics, context);
+			case UML2Package.LOOP_NODE:
+				return validateLoopNode((LoopNode)value, diagnostics, context);
 			case UML2Package.TEMPLATE_SIGNATURE:
 				return validateTemplateSignature((TemplateSignature)value, diagnostics, context);
 			case UML2Package.TEMPLATE_PARAMETER:
@@ -789,8 +825,6 @@
 				return validateTemplateBinding((TemplateBinding)value, diagnostics, context);
 			case UML2Package.TEMPLATE_PARAMETER_SUBSTITUTION:
 				return validateTemplateParameterSubstitution((TemplateParameterSubstitution)value, diagnostics, context);
-			case UML2Package.COLLABORATION:
-				return validateCollaboration((Collaboration)value, diagnostics, context);
 			case UML2Package.OPERATION_TEMPLATE_PARAMETER:
 				return validateOperationTemplateParameter((OperationTemplateParameter)value, diagnostics, context);
 			case UML2Package.CLASSIFIER_TEMPLATE_PARAMETER:
@@ -803,12 +837,6 @@
 				return validateTemplateableClassifier((TemplateableClassifier)value, diagnostics, context);
 			case UML2Package.CONNECTABLE_ELEMENT_TEMPLATE_PARAMETER:
 				return validateConnectableElementTemplateParameter((ConnectableElementTemplateParameter)value, diagnostics, context);
-			case UML2Package.COLLABORATION_OCCURRENCE:
-				return validateCollaborationOccurrence((CollaborationOccurrence)value, diagnostics, context);
-			case UML2Package.PORT:
-				return validatePort((Port)value, diagnostics, context);
-			case UML2Package.ENCAPSULATED_CLASSIFIER:
-				return validateEncapsulatedClassifier((EncapsulatedClassifier)value, diagnostics, context);
 			case UML2Package.INTERACTION:
 				return validateInteraction((Interaction)value, diagnostics, context);
 			case UML2Package.INTERACTION_FRAGMENT:
@@ -829,50 +857,22 @@
 				return validateStateInvariant((StateInvariant)value, diagnostics, context);
 			case UML2Package.STOP:
 				return validateStop((Stop)value, diagnostics, context);
-			case UML2Package.VARIABLE:
-				return validateVariable((Variable)value, diagnostics, context);
-			case UML2Package.STRUCTURED_ACTIVITY_NODE:
-				return validateStructuredActivityNode((StructuredActivityNode)value, diagnostics, context);
-			case UML2Package.CONDITIONAL_NODE:
-				return validateConditionalNode((ConditionalNode)value, diagnostics, context);
-			case UML2Package.CLAUSE:
-				return validateClause((Clause)value, diagnostics, context);
-			case UML2Package.LOOP_NODE:
-				return validateLoopNode((LoopNode)value, diagnostics, context);
-			case UML2Package.CALL_TRIGGER:
-				return validateCallTrigger((CallTrigger)value, diagnostics, context);
-			case UML2Package.MESSAGE_TRIGGER:
-				return validateMessageTrigger((MessageTrigger)value, diagnostics, context);
-			case UML2Package.CHANGE_TRIGGER:
-				return validateChangeTrigger((ChangeTrigger)value, diagnostics, context);
-			case UML2Package.TRIGGER:
-				return validateTrigger((Trigger)value, diagnostics, context);
-			case UML2Package.RECEPTION:
-				return validateReception((Reception)value, diagnostics, context);
-			case UML2Package.SIGNAL:
-				return validateSignal((Signal)value, diagnostics, context);
-			case UML2Package.SIGNAL_TRIGGER:
-				return validateSignalTrigger((SignalTrigger)value, diagnostics, context);
-			case UML2Package.TIME_TRIGGER:
-				return validateTimeTrigger((TimeTrigger)value, diagnostics, context);
-			case UML2Package.ANY_TRIGGER:
-				return validateAnyTrigger((AnyTrigger)value, diagnostics, context);
-			case UML2Package.EXPANSION_NODE:
-				return validateExpansionNode((ExpansionNode)value, diagnostics, context);
-			case UML2Package.EXPANSION_REGION:
-				return validateExpansionRegion((ExpansionRegion)value, diagnostics, context);
-			case UML2Package.EXCEPTION_HANDLER:
-				return validateExceptionHandler((ExceptionHandler)value, diagnostics, context);
-			case UML2Package.FORK_NODE:
-				return validateForkNode((ForkNode)value, diagnostics, context);
-			case UML2Package.JOIN_NODE:
-				return validateJoinNode((JoinNode)value, diagnostics, context);
-			case UML2Package.FLOW_FINAL_NODE:
-				return validateFlowFinalNode((FlowFinalNode)value, diagnostics, context);
-			case UML2Package.CENTRAL_BUFFER_NODE:
-				return validateCentralBufferNode((CentralBufferNode)value, diagnostics, context);
-			case UML2Package.ACTIVITY_PARTITION:
-				return validateActivityPartition((ActivityPartition)value, diagnostics, context);
+			case UML2Package.STATE_MACHINE:
+				return validateStateMachine((StateMachine)value, diagnostics, context);
+			case UML2Package.REGION:
+				return validateRegion((Region)value, diagnostics, context);
+			case UML2Package.PSEUDOSTATE:
+				return validatePseudostate((Pseudostate)value, diagnostics, context);
+			case UML2Package.STATE:
+				return validateState((State)value, diagnostics, context);
+			case UML2Package.VERTEX:
+				return validateVertex((Vertex)value, diagnostics, context);
+			case UML2Package.CONNECTION_POINT_REFERENCE:
+				return validateConnectionPointReference((ConnectionPointReference)value, diagnostics, context);
+			case UML2Package.TRANSITION:
+				return validateTransition((Transition)value, diagnostics, context);
+			case UML2Package.FINAL_STATE:
+				return validateFinalState((FinalState)value, diagnostics, context);
 			case UML2Package.CREATE_OBJECT_ACTION:
 				return validateCreateObjectAction((CreateObjectAction)value, diagnostics, context);
 			case UML2Package.DESTROY_OBJECT_ACTION:
@@ -939,22 +939,22 @@
 				return validateCallOperationAction((CallOperationAction)value, diagnostics, context);
 			case UML2Package.CALL_BEHAVIOR_ACTION:
 				return validateCallBehaviorAction((CallBehaviorAction)value, diagnostics, context);
-			case UML2Package.STATE_MACHINE:
-				return validateStateMachine((StateMachine)value, diagnostics, context);
-			case UML2Package.REGION:
-				return validateRegion((Region)value, diagnostics, context);
-			case UML2Package.PSEUDOSTATE:
-				return validatePseudostate((Pseudostate)value, diagnostics, context);
-			case UML2Package.STATE:
-				return validateState((State)value, diagnostics, context);
-			case UML2Package.VERTEX:
-				return validateVertex((Vertex)value, diagnostics, context);
-			case UML2Package.CONNECTION_POINT_REFERENCE:
-				return validateConnectionPointReference((ConnectionPointReference)value, diagnostics, context);
-			case UML2Package.TRANSITION:
-				return validateTransition((Transition)value, diagnostics, context);
-			case UML2Package.FINAL_STATE:
-				return validateFinalState((FinalState)value, diagnostics, context);
+			case UML2Package.FORK_NODE:
+				return validateForkNode((ForkNode)value, diagnostics, context);
+			case UML2Package.JOIN_NODE:
+				return validateJoinNode((JoinNode)value, diagnostics, context);
+			case UML2Package.FLOW_FINAL_NODE:
+				return validateFlowFinalNode((FlowFinalNode)value, diagnostics, context);
+			case UML2Package.CENTRAL_BUFFER_NODE:
+				return validateCentralBufferNode((CentralBufferNode)value, diagnostics, context);
+			case UML2Package.ACTIVITY_PARTITION:
+				return validateActivityPartition((ActivityPartition)value, diagnostics, context);
+			case UML2Package.EXPANSION_NODE:
+				return validateExpansionNode((ExpansionNode)value, diagnostics, context);
+			case UML2Package.EXPANSION_REGION:
+				return validateExpansionRegion((ExpansionRegion)value, diagnostics, context);
+			case UML2Package.EXCEPTION_HANDLER:
+				return validateExceptionHandler((ExceptionHandler)value, diagnostics, context);
 			case UML2Package.INTERACTION_OCCURRENCE:
 				return validateInteractionOccurrence((InteractionOccurrence)value, diagnostics, context);
 			case UML2Package.GATE:
@@ -971,52 +971,6 @@
 				return validateContinuation((Continuation)value, diagnostics, context);
 			case UML2Package.COMPONENT:
 				return validateComponent((Component)value, diagnostics, context);
-			case UML2Package.PROTOCOL_CONFORMANCE:
-				return validateProtocolConformance((ProtocolConformance)value, diagnostics, context);
-			case UML2Package.PROTOCOL_STATE_MACHINE:
-				return validateProtocolStateMachine((ProtocolStateMachine)value, diagnostics, context);
-			case UML2Package.PROTOCOL_TRANSITION:
-				return validateProtocolTransition((ProtocolTransition)value, diagnostics, context);
-			case UML2Package.TIME_EXPRESSION:
-				return validateTimeExpression((TimeExpression)value, diagnostics, context);
-			case UML2Package.DURATION:
-				return validateDuration((Duration)value, diagnostics, context);
-			case UML2Package.TIME_OBSERVATION_ACTION:
-				return validateTimeObservationAction((TimeObservationAction)value, diagnostics, context);
-			case UML2Package.DURATION_INTERVAL:
-				return validateDurationInterval((DurationInterval)value, diagnostics, context);
-			case UML2Package.INTERVAL:
-				return validateInterval((Interval)value, diagnostics, context);
-			case UML2Package.TIME_CONSTRAINT:
-				return validateTimeConstraint((TimeConstraint)value, diagnostics, context);
-			case UML2Package.INTERVAL_CONSTRAINT:
-				return validateIntervalConstraint((IntervalConstraint)value, diagnostics, context);
-			case UML2Package.TIME_INTERVAL:
-				return validateTimeInterval((TimeInterval)value, diagnostics, context);
-			case UML2Package.DURATION_OBSERVATION_ACTION:
-				return validateDurationObservationAction((DurationObservationAction)value, diagnostics, context);
-			case UML2Package.DURATION_CONSTRAINT:
-				return validateDurationConstraint((DurationConstraint)value, diagnostics, context);
-			case UML2Package.DATA_STORE_NODE:
-				return validateDataStoreNode((DataStoreNode)value, diagnostics, context);
-			case UML2Package.INTERRUPTIBLE_ACTIVITY_REGION:
-				return validateInterruptibleActivityRegion((InterruptibleActivityRegion)value, diagnostics, context);
-			case UML2Package.PARAMETER_SET:
-				return validateParameterSet((ParameterSet)value, diagnostics, context);
-			case UML2Package.DEPLOYMENT:
-				return validateDeployment((Deployment)value, diagnostics, context);
-			case UML2Package.DEPLOYED_ARTIFACT:
-				return validateDeployedArtifact((DeployedArtifact)value, diagnostics, context);
-			case UML2Package.DEPLOYMENT_TARGET:
-				return validateDeploymentTarget((DeploymentTarget)value, diagnostics, context);
-			case UML2Package.NODE:
-				return validateNode((Node)value, diagnostics, context);
-			case UML2Package.DEVICE:
-				return validateDevice((Device)value, diagnostics, context);
-			case UML2Package.EXECUTION_ENVIRONMENT:
-				return validateExecutionEnvironment((ExecutionEnvironment)value, diagnostics, context);
-			case UML2Package.COMMUNICATION_PATH:
-				return validateCommunicationPath((CommunicationPath)value, diagnostics, context);
 			case UML2Package.READ_EXTENT_ACTION:
 				return validateReadExtentAction((ReadExtentAction)value, diagnostics, context);
 			case UML2Package.RECLASSIFY_OBJECT_ACTION:
@@ -1041,6 +995,52 @@
 				return validateReplyAction((ReplyAction)value, diagnostics, context);
 			case UML2Package.RAISE_EXCEPTION_ACTION:
 				return validateRaiseExceptionAction((RaiseExceptionAction)value, diagnostics, context);
+			case UML2Package.DATA_STORE_NODE:
+				return validateDataStoreNode((DataStoreNode)value, diagnostics, context);
+			case UML2Package.INTERRUPTIBLE_ACTIVITY_REGION:
+				return validateInterruptibleActivityRegion((InterruptibleActivityRegion)value, diagnostics, context);
+			case UML2Package.PARAMETER_SET:
+				return validateParameterSet((ParameterSet)value, diagnostics, context);
+			case UML2Package.TIME_EXPRESSION:
+				return validateTimeExpression((TimeExpression)value, diagnostics, context);
+			case UML2Package.DURATION:
+				return validateDuration((Duration)value, diagnostics, context);
+			case UML2Package.TIME_OBSERVATION_ACTION:
+				return validateTimeObservationAction((TimeObservationAction)value, diagnostics, context);
+			case UML2Package.DURATION_INTERVAL:
+				return validateDurationInterval((DurationInterval)value, diagnostics, context);
+			case UML2Package.INTERVAL:
+				return validateInterval((Interval)value, diagnostics, context);
+			case UML2Package.TIME_CONSTRAINT:
+				return validateTimeConstraint((TimeConstraint)value, diagnostics, context);
+			case UML2Package.INTERVAL_CONSTRAINT:
+				return validateIntervalConstraint((IntervalConstraint)value, diagnostics, context);
+			case UML2Package.TIME_INTERVAL:
+				return validateTimeInterval((TimeInterval)value, diagnostics, context);
+			case UML2Package.DURATION_OBSERVATION_ACTION:
+				return validateDurationObservationAction((DurationObservationAction)value, diagnostics, context);
+			case UML2Package.DURATION_CONSTRAINT:
+				return validateDurationConstraint((DurationConstraint)value, diagnostics, context);
+			case UML2Package.DEPLOYMENT:
+				return validateDeployment((Deployment)value, diagnostics, context);
+			case UML2Package.DEPLOYED_ARTIFACT:
+				return validateDeployedArtifact((DeployedArtifact)value, diagnostics, context);
+			case UML2Package.DEPLOYMENT_TARGET:
+				return validateDeploymentTarget((DeploymentTarget)value, diagnostics, context);
+			case UML2Package.NODE:
+				return validateNode((Node)value, diagnostics, context);
+			case UML2Package.DEVICE:
+				return validateDevice((Device)value, diagnostics, context);
+			case UML2Package.EXECUTION_ENVIRONMENT:
+				return validateExecutionEnvironment((ExecutionEnvironment)value, diagnostics, context);
+			case UML2Package.COMMUNICATION_PATH:
+				return validateCommunicationPath((CommunicationPath)value, diagnostics, context);
+			case UML2Package.PROTOCOL_CONFORMANCE:
+				return validateProtocolConformance((ProtocolConformance)value, diagnostics, context);
+			case UML2Package.PROTOCOL_STATE_MACHINE:
+				return validateProtocolStateMachine((ProtocolStateMachine)value, diagnostics, context);
+			case UML2Package.PROTOCOL_TRANSITION:
+				return validateProtocolTransition((ProtocolTransition)value, diagnostics, context);
 			case UML2Package.DEPLOYMENT_SPECIFICATION:
 				return validateDeploymentSpecification((DeploymentSpecification)value, diagnostics, context);
 			case UML2Package.VISIBILITY_KIND:
@@ -1049,18 +1049,18 @@
 				return validateParameterDirectionKind((Object)value, diagnostics, context);
 			case UML2Package.AGGREGATION_KIND:
 				return validateAggregationKind((Object)value, diagnostics, context);
+			case UML2Package.CALL_CONCURRENCY_KIND:
+				return validateCallConcurrencyKind((Object)value, diagnostics, context);
 			case UML2Package.MESSAGE_KIND:
 				return validateMessageKind((Object)value, diagnostics, context);
 			case UML2Package.MESSAGE_SORT:
 				return validateMessageSort((Object)value, diagnostics, context);
-			case UML2Package.CALL_CONCURRENCY_KIND:
-				return validateCallConcurrencyKind((Object)value, diagnostics, context);
-			case UML2Package.EXPANSION_KIND:
-				return validateExpansionKind((Object)value, diagnostics, context);
 			case UML2Package.TRANSITION_KIND:
 				return validateTransitionKind((Object)value, diagnostics, context);
 			case UML2Package.PSEUDOSTATE_KIND:
 				return validatePseudostateKind((Object)value, diagnostics, context);
+			case UML2Package.EXPANSION_KIND:
+				return validateExpansionKind((Object)value, diagnostics, context);
 			case UML2Package.INTERACTION_OPERATOR:
 				return validateInteractionOperator((Object)value, diagnostics, context);
 			case UML2Package.CONNECTOR_KIND: