From 84d9a76f65ad3248125103a233ecbc76cee7cd57 Mon Sep 17 00:00:00 2001
From: David M Fobes <dfobes@lanl.gov>
Date: Tue, 17 Dec 2024 12:57:28 -0700
Subject: [PATCH] UPD: EnergyArea and EnergyAreaConnector

---
 ...325cim03v17b_CIM100.1.1.1_mgravens24v1.xmi | 955 ++++++++++++------
 ravens/cim_tools/cim_conversion_template.json |  33 +
 2 files changed, 661 insertions(+), 327 deletions(-)
 mode change 100644 => 100755 ravens/cim_tools/cim_conversion_template.json

diff --git a/cim/iec61970cim17v40_iec61968cim13v13b_iec62325cim03v17b_CIM100.1.1.1_mgravens24v1.xmi b/cim/iec61970cim17v40_iec61968cim13v13b_iec62325cim03v17b_CIM100.1.1.1_mgravens24v1.xmi
index 5e55c61c7..1dbc86d70 100755
--- a/cim/iec61970cim17v40_iec61968cim13v13b_iec62325cim03v17b_CIM100.1.1.1_mgravens24v1.xmi
+++ b/cim/iec61970cim17v40_iec61968cim13v13b_iec62325cim03v17b_CIM100.1.1.1_mgravens24v1.xmi
@@ -84424,6 +84424,40 @@
 			<Column name="IsActive" value="FALSE"/>
 			<Extension Package_ID="{6C99E9CA-2035-4035-B77F-9217E17D86F4}"/>
 		</Row>
+		<Row>
+			<Column name="Object_ID" value="38996"/>
+			<Column name="Object_Type" value="Class"/>
+			<Column name="Diagram_ID" value="0"/>
+			<Column name="Name" value="EnergyAreaConnector"/>
+			<Column name="Author" value="David Fobes"/>
+			<Column name="Version" value="1.0"/>
+			<Column name="Package_ID" value="2439"/>
+			<Column name="NType" value="0"/>
+			<Column name="Complexity" value="1"/>
+			<Column name="Effort" value="0"/>
+			<Column name="Backcolor" value="-1"/>
+			<Column name="BorderStyle" value="0"/>
+			<Column name="BorderWidth" value="-1"/>
+			<Column name="Fontcolor" value="-1"/>
+			<Column name="Bordercolor" value="-1"/>
+			<Column name="CreatedDate" value="2024-12-17 10:43:58"/>
+			<Column name="ModifiedDate" value="2024-12-17 10:43:58"/>
+			<Column name="Status" value="Proposed"/>
+			<Column name="Abstract" value="0"/>
+			<Column name="Tagged" value="0"/>
+			<Column name="PDATA4" value="0"/>
+			<Column name="GenType" value="Java"/>
+			<Column name="Phase" value="1.0"/>
+			<Column name="Scope" value="Public"/>
+			<Column name="Classifier" value="0"/>
+			<Column name="ea_guid" value="{C45B39A1-C7E0-4dde-806C-9A61F76038CB}"/>
+			<Column name="ParentID" value="0"/>
+			<Column name="IsRoot" value="FALSE"/>
+			<Column name="IsLeaf" value="FALSE"/>
+			<Column name="IsSpec" value="FALSE"/>
+			<Column name="IsActive" value="FALSE"/>
+			<Extension Package_ID="{1A042877-119E-4f3a-ABED-87DCB1343884}"/>
+		</Row>
 		<Row>
 			<Column name="Object_ID" value="29612"/>
 			<Column name="Object_Type" value="Class"/>
@@ -324825,30 +324859,6 @@
 			<Column name="StyleEx" value="IsLiteral=1;volatile=0;"/>
 			<Extension Object_ID="{CBA3FFC7-A5F6-4a8a-8107-3D12E6DE8F0E}"/>
 		</Row>
-		<Row>
-			<Column name="Object_ID" value="38226"/>
-			<Column name="Name" value="none"/>
-			<Column name="Scope" value="Public"/>
-			<Column name="Stereotype" value="enum"/>
-			<Column name="Containment" value="Not Specified"/>
-			<Column name="IsStatic" value="0"/>
-			<Column name="IsCollection" value="0"/>
-			<Column name="IsOrdered" value="0"/>
-			<Column name="AllowDuplicates" value="0"/>
-			<Column name="LowerBound" value="1"/>
-			<Column name="UpperBound" value="1"/>
-			<Column name="Notes" value="No standard edition."/>
-			<Column name="Derived" value="0"/>
-			<Column name="ID" value="137225"/>
-			<Column name="Pos" value="2"/>
-			<Column name="Length" value="0"/>
-			<Column name="Precision" value="0"/>
-			<Column name="Scale" value="0"/>
-			<Column name="Const" value="0"/>
-			<Column name="ea_guid" value="{CB550EE8-038C-4413-9030-D48F1B870F8E}"/>
-			<Column name="StyleEx" value="IsLiteral=1;volatile=0;"/>
-			<Extension Object_ID="{FED3D9B8-BD73-4dea-85A4-1556F72C59B7}"/>
-		</Row>
 		<Row>
 			<Column name="Object_ID" value="38050"/>
 			<Column name="Name" value="q3minusQ2"/>
@@ -333420,30 +333430,6 @@
 			<Column name="StyleEx" value="IsLiteral=1;volatile=0;"/>
 			<Extension Object_ID="{FB38FFF8-8B26-4438-A8B9-DDB8EA475FEB}"/>
 		</Row>
-		<Row>
-			<Column name="Object_ID" value="38226"/>
-			<Column name="Name" value="unknown"/>
-			<Column name="Scope" value="Public"/>
-			<Column name="Stereotype" value="enum"/>
-			<Column name="Containment" value="Not Specified"/>
-			<Column name="IsStatic" value="0"/>
-			<Column name="IsCollection" value="0"/>
-			<Column name="IsOrdered" value="0"/>
-			<Column name="AllowDuplicates" value="0"/>
-			<Column name="LowerBound" value="1"/>
-			<Column name="UpperBound" value="1"/>
-			<Column name="Notes" value="Unknown standard edition."/>
-			<Column name="Derived" value="0"/>
-			<Column name="ID" value="137614"/>
-			<Column name="Pos" value="3"/>
-			<Column name="Length" value="0"/>
-			<Column name="Precision" value="0"/>
-			<Column name="Scale" value="0"/>
-			<Column name="Const" value="0"/>
-			<Column name="ea_guid" value="{EC568586-4BEF-48e9-A26C-9D4EA7AAE9FF}"/>
-			<Column name="StyleEx" value="IsLiteral=1;volatile=0;"/>
-			<Extension Object_ID="{FED3D9B8-BD73-4dea-85A4-1556F72C59B7}"/>
-		</Row>
 		<Row>
 			<Column name="Object_ID" value="38193"/>
 			<Column name="Name" value="high"/>
@@ -334063,30 +334049,6 @@
 			<Column name="StyleEx" value="volatile=0;IsLiteral=1;"/>
 			<Extension Object_ID="{BAC4240E-5616-4e2c-8A6F-9F8689390E2E}"/>
 		</Row>
-		<Row>
-			<Column name="Object_ID" value="38226"/>
-			<Column name="Name" value="2000"/>
-			<Column name="Scope" value="Public"/>
-			<Column name="Stereotype" value="enum"/>
-			<Column name="Containment" value="Not Specified"/>
-			<Column name="IsStatic" value="0"/>
-			<Column name="IsCollection" value="0"/>
-			<Column name="IsOrdered" value="0"/>
-			<Column name="AllowDuplicates" value="0"/>
-			<Column name="LowerBound" value="1"/>
-			<Column name="UpperBound" value="1"/>
-			<Column name="Notes" value="2000 standard edition."/>
-			<Column name="Derived" value="0"/>
-			<Column name="ID" value="137638"/>
-			<Column name="Pos" value="0"/>
-			<Column name="Length" value="0"/>
-			<Column name="Precision" value="0"/>
-			<Column name="Scale" value="0"/>
-			<Column name="Const" value="0"/>
-			<Column name="ea_guid" value="{EE8F128C-A7A4-421d-AF8E-F5258C786C95}"/>
-			<Column name="StyleEx" value="IsLiteral=1;volatile=0;"/>
-			<Extension Object_ID="{FED3D9B8-BD73-4dea-85A4-1556F72C59B7}"/>
-		</Row>
 		<Row>
 			<Column name="Object_ID" value="38085"/>
 			<Column name="Name" value="1985"/>
@@ -340141,6 +340103,30 @@
 			<Column name="StyleEx" value="IsLiteral=1;volatile=0;"/>
 			<Extension Object_ID="{FF3816E1-1CFE-4051-9F75-0F3E94DABAFB}"/>
 		</Row>
+		<Row>
+			<Column name="Object_ID" value="38226"/>
+			<Column name="Name" value="none"/>
+			<Column name="Scope" value="Public"/>
+			<Column name="Stereotype" value="enum"/>
+			<Column name="Containment" value="Not Specified"/>
+			<Column name="IsStatic" value="0"/>
+			<Column name="IsCollection" value="0"/>
+			<Column name="IsOrdered" value="0"/>
+			<Column name="AllowDuplicates" value="0"/>
+			<Column name="LowerBound" value="1"/>
+			<Column name="UpperBound" value="1"/>
+			<Column name="Notes" value="No standard edition."/>
+			<Column name="Derived" value="0"/>
+			<Column name="ID" value="137225"/>
+			<Column name="Pos" value="2"/>
+			<Column name="Length" value="0"/>
+			<Column name="Precision" value="0"/>
+			<Column name="Scale" value="0"/>
+			<Column name="Const" value="0"/>
+			<Column name="ea_guid" value="{CB550EE8-038C-4413-9030-D48F1B870F8E}"/>
+			<Column name="StyleEx" value="IsLiteral=1;volatile=0;"/>
+			<Extension Object_ID="{FED3D9B8-BD73-4dea-85A4-1556F72C59B7}"/>
+		</Row>
 		<Row>
 			<Column name="Object_ID" value="38229"/>
 			<Column name="Name" value="alternateCostUnit"/>
@@ -340311,6 +340297,54 @@
 			<Column name="StyleEx" value="IsLiteral=1;volatile=0;"/>
 			<Extension Object_ID="{FF87046C-0F52-4924-8269-7F7E9E719673}"/>
 		</Row>
+		<Row>
+			<Column name="Object_ID" value="38226"/>
+			<Column name="Name" value="unknown"/>
+			<Column name="Scope" value="Public"/>
+			<Column name="Stereotype" value="enum"/>
+			<Column name="Containment" value="Not Specified"/>
+			<Column name="IsStatic" value="0"/>
+			<Column name="IsCollection" value="0"/>
+			<Column name="IsOrdered" value="0"/>
+			<Column name="AllowDuplicates" value="0"/>
+			<Column name="LowerBound" value="1"/>
+			<Column name="UpperBound" value="1"/>
+			<Column name="Notes" value="Unknown standard edition."/>
+			<Column name="Derived" value="0"/>
+			<Column name="ID" value="137614"/>
+			<Column name="Pos" value="3"/>
+			<Column name="Length" value="0"/>
+			<Column name="Precision" value="0"/>
+			<Column name="Scale" value="0"/>
+			<Column name="Const" value="0"/>
+			<Column name="ea_guid" value="{EC568586-4BEF-48e9-A26C-9D4EA7AAE9FF}"/>
+			<Column name="StyleEx" value="IsLiteral=1;volatile=0;"/>
+			<Extension Object_ID="{FED3D9B8-BD73-4dea-85A4-1556F72C59B7}"/>
+		</Row>
+		<Row>
+			<Column name="Object_ID" value="38226"/>
+			<Column name="Name" value="2000"/>
+			<Column name="Scope" value="Public"/>
+			<Column name="Stereotype" value="enum"/>
+			<Column name="Containment" value="Not Specified"/>
+			<Column name="IsStatic" value="0"/>
+			<Column name="IsCollection" value="0"/>
+			<Column name="IsOrdered" value="0"/>
+			<Column name="AllowDuplicates" value="0"/>
+			<Column name="LowerBound" value="1"/>
+			<Column name="UpperBound" value="1"/>
+			<Column name="Notes" value="2000 standard edition."/>
+			<Column name="Derived" value="0"/>
+			<Column name="ID" value="137638"/>
+			<Column name="Pos" value="0"/>
+			<Column name="Length" value="0"/>
+			<Column name="Precision" value="0"/>
+			<Column name="Scale" value="0"/>
+			<Column name="Const" value="0"/>
+			<Column name="ea_guid" value="{EE8F128C-A7A4-421d-AF8E-F5258C786C95}"/>
+			<Column name="StyleEx" value="IsLiteral=1;volatile=0;"/>
+			<Extension Object_ID="{FED3D9B8-BD73-4dea-85A4-1556F72C59B7}"/>
+		</Row>
 		<Row>
 			<Column name="Object_ID" value="38229"/>
 			<Column name="Name" value="priceTierLabel"/>
@@ -443689,6 +443723,60 @@
 			<Column name="DestStyle" value="Owned=0;Navigable=Unspecified;Union=0;Derived=0;AllowDuplicates=0;"/>
 			<Extension Start_Object_ID="{8C5F5500-4850-4997-A7C7-5C3B363E7049}" End_Object_ID="{5D8018E8-DD12-4e67-B98A-26B79A920B63}"/>
 		</Row>
+		<Row>
+			<Column name="Connector_ID" value="45108"/>
+			<Column name="Direction" value="Unspecified"/>
+			<Column name="Connector_Type" value="Association"/>
+			<Column name="SourceCard" value="0..*"/>
+			<Column name="SourceAccess" value="Public"/>
+			<Column name="DestCard" value="0..1"/>
+			<Column name="DestAccess" value="Public"/>
+			<Column name="SourceRole" value="GridFacilities"/>
+			<Column name="SourceContainment" value="Unspecified"/>
+			<Column name="SourceIsAggregate" value="0"/>
+			<Column name="SourceIsOrdered" value="0"/>
+			<Column name="DestRole" value="EnergyArea"/>
+			<Column name="DestContainment" value="Unspecified"/>
+			<Column name="DestIsAggregate" value="0"/>
+			<Column name="DestIsOrdered" value="0"/>
+			<Column name="Start_Object_ID" value="38937"/>
+			<Column name="End_Object_ID" value="13364"/>
+			<Column name="Top_Start_Label" value="+GridFacilities"/>
+			<Column name="Top_End_Label" value="+EnergyArea"/>
+			<Column name="Btm_Start_Label" value="0..*"/>
+			<Column name="Btm_End_Label" value="0..1"/>
+			<Column name="Start_Edge" value="1"/>
+			<Column name="End_Edge" value="3"/>
+			<Column name="PtStartX" value="287"/>
+			<Column name="PtStartY" value="-396"/>
+			<Column name="PtEndX" value="287"/>
+			<Column name="PtEndY" value="-260"/>
+			<Column name="SeqNo" value="0"/>
+			<Column name="HeadStyle" value="0"/>
+			<Column name="LineStyle" value="0"/>
+			<Column name="RouteStyle" value="3"/>
+			<Column name="IsBold" value="3"/>
+			<Column name="LineColor" value="128"/>
+			<Column name="VirtualInheritance" value="0"/>
+			<Column name="PDATA5" value="SX=0;SY=0;EX=0;EY=0;"/>
+			<Column name="DiagramID" value="0"/>
+			<Column name="ea_guid" value="{4382EDE9-0630-4b6f-B0EF-CBC5E33953CB}"/>
+			<Column name="SourceIsNavigable" value="FALSE"/>
+			<Column name="DestIsNavigable" value="FALSE"/>
+			<Column name="IsRoot" value="FALSE"/>
+			<Column name="IsLeaf" value="FALSE"/>
+			<Column name="IsSpec" value="FALSE"/>
+			<Column name="SourceChangeable" value="none"/>
+			<Column name="DestChangeable" value="none"/>
+			<Column name="SourceTS" value="instance"/>
+			<Column name="DestTS" value="instance"/>
+			<Column name="IsSignal" value="FALSE"/>
+			<Column name="IsStimulus" value="FALSE"/>
+			<Column name="Target2" value="0"/>
+			<Column name="SourceStyle" value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+			<Column name="DestStyle" value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+			<Extension Start_Object_ID="{7C645B90-FC24-42bc-9C4C-C57E8C3819C6}" End_Object_ID="{EBAF7081-971E-4960-A0AB-B38C20682FE7}"/>
+		</Row>
 		<Row>
 			<Column name="Connector_ID" value="33996"/>
 			<Column name="Direction" value="Unspecified"/>
@@ -449296,6 +449384,52 @@
 			<Column name="DestStyle" value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 			<Extension Start_Object_ID="{7B733E0A-EB0F-4e94-B638-9B140A883587}" End_Object_ID="{8C5F5500-4850-4997-A7C7-5C3B363E7049}"/>
 		</Row>
+		<Row>
+			<Column name="Connector_ID" value="45113"/>
+			<Column name="Direction" value="Source -&gt; Destination"/>
+			<Column name="Connector_Type" value="Generalization"/>
+			<Column name="SourceAccess" value="Public"/>
+			<Column name="DestAccess" value="Public"/>
+			<Column name="SourceContainment" value="Unspecified"/>
+			<Column name="SourceIsAggregate" value="0"/>
+			<Column name="SourceIsOrdered" value="0"/>
+			<Column name="DestContainment" value="Unspecified"/>
+			<Column name="DestIsAggregate" value="0"/>
+			<Column name="DestIsOrdered" value="0"/>
+			<Column name="Start_Object_ID" value="38996"/>
+			<Column name="End_Object_ID" value="13387"/>
+			<Column name="Start_Edge" value="0"/>
+			<Column name="End_Edge" value="0"/>
+			<Column name="PtStartX" value="0"/>
+			<Column name="PtStartY" value="0"/>
+			<Column name="PtEndX" value="0"/>
+			<Column name="PtEndY" value="0"/>
+			<Column name="SeqNo" value="0"/>
+			<Column name="HeadStyle" value="0"/>
+			<Column name="LineStyle" value="0"/>
+			<Column name="RouteStyle" value="3"/>
+			<Column name="IsBold" value="0"/>
+			<Column name="LineColor" value="-1"/>
+			<Column name="VirtualInheritance" value="0"/>
+			<Column name="PDATA5" value="SX=0;SY=0;EX=0;EY=0;"/>
+			<Column name="DiagramID" value="0"/>
+			<Column name="ea_guid" value="{660699D4-1763-4983-9841-AE1946F8DA5D}"/>
+			<Column name="SourceIsNavigable" value="FALSE"/>
+			<Column name="DestIsNavigable" value="TRUE"/>
+			<Column name="IsRoot" value="FALSE"/>
+			<Column name="IsLeaf" value="FALSE"/>
+			<Column name="IsSpec" value="FALSE"/>
+			<Column name="SourceChangeable" value="none"/>
+			<Column name="DestChangeable" value="none"/>
+			<Column name="SourceTS" value="instance"/>
+			<Column name="DestTS" value="instance"/>
+			<Column name="IsSignal" value="FALSE"/>
+			<Column name="IsStimulus" value="FALSE"/>
+			<Column name="Target2" value="0"/>
+			<Column name="SourceStyle" value="Union=0;Derived=0;AllowDuplicates=0;"/>
+			<Column name="DestStyle" value="Union=0;Derived=0;AllowDuplicates=0;"/>
+			<Extension Start_Object_ID="{C45B39A1-C7E0-4dde-806C-9A61F76038CB}" End_Object_ID="{966D682F-CD37-4038-9739-3EEC0E6CB044}"/>
+		</Row>
 		<Row>
 			<Column name="Connector_ID" value="44441"/>
 			<Column name="Connector_Type" value="Generalization"/>
@@ -458510,60 +458644,6 @@
 			<Column name="DestStyle" value="Owned=0;Navigable=Unspecified;Union=0;Derived=0;AllowDuplicates=0;"/>
 			<Extension Start_Object_ID="{5F91E07F-F701-4b38-8CB8-1CA87251C0D5}" End_Object_ID="{B59BE666-E41E-4f68-A564-2A6E32C8DA78}"/>
 		</Row>
-		<Row>
-			<Column name="Connector_ID" value="44978"/>
-			<Column name="Direction" value="Unspecified"/>
-			<Column name="Connector_Type" value="Association"/>
-			<Column name="SourceCard" value="0..1"/>
-			<Column name="SourceAccess" value="Public"/>
-			<Column name="DestCard" value="0..*"/>
-			<Column name="DestAccess" value="Public"/>
-			<Column name="SourceRole" value="FacilityPowerLine"/>
-			<Column name="SourceContainment" value="Unspecified"/>
-			<Column name="SourceIsAggregate" value="0"/>
-			<Column name="SourceIsOrdered" value="0"/>
-			<Column name="DestRole" value="GridFacilities"/>
-			<Column name="DestContainment" value="Unspecified"/>
-			<Column name="DestIsAggregate" value="0"/>
-			<Column name="DestIsOrdered" value="0"/>
-			<Column name="Start_Object_ID" value="38944"/>
-			<Column name="End_Object_ID" value="38937"/>
-			<Column name="Top_Start_Label" value="+FacilityPowerLine"/>
-			<Column name="Top_End_Label" value="+GridFacilities"/>
-			<Column name="Btm_Start_Label" value="0..1"/>
-			<Column name="Btm_End_Label" value="0..*"/>
-			<Column name="Start_Edge" value="3"/>
-			<Column name="End_Edge" value="1"/>
-			<Column name="PtStartX" value="286"/>
-			<Column name="PtStartY" value="-239"/>
-			<Column name="PtEndX" value="286"/>
-			<Column name="PtEndY" value="-315"/>
-			<Column name="SeqNo" value="0"/>
-			<Column name="HeadStyle" value="0"/>
-			<Column name="LineStyle" value="0"/>
-			<Column name="RouteStyle" value="3"/>
-			<Column name="IsBold" value="3"/>
-			<Column name="LineColor" value="128"/>
-			<Column name="VirtualInheritance" value="0"/>
-			<Column name="PDATA5" value="EDGE=3;SX=1;SY=0;EX=1;EY=0;"/>
-			<Column name="DiagramID" value="0"/>
-			<Column name="ea_guid" value="{A3A56A9B-2E94-4ecf-9108-7D988552A7DC}"/>
-			<Column name="SourceIsNavigable" value="FALSE"/>
-			<Column name="DestIsNavigable" value="FALSE"/>
-			<Column name="IsRoot" value="FALSE"/>
-			<Column name="IsLeaf" value="FALSE"/>
-			<Column name="IsSpec" value="FALSE"/>
-			<Column name="SourceChangeable" value="none"/>
-			<Column name="DestChangeable" value="none"/>
-			<Column name="SourceTS" value="instance"/>
-			<Column name="DestTS" value="instance"/>
-			<Column name="IsSignal" value="FALSE"/>
-			<Column name="IsStimulus" value="FALSE"/>
-			<Column name="Target2" value="0"/>
-			<Column name="SourceStyle" value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
-			<Column name="DestStyle" value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
-			<Extension Start_Object_ID="{F273ACC2-96F0-4609-9C07-3CD62512F608}" End_Object_ID="{7C645B90-FC24-42bc-9C4C-C57E8C3819C6}"/>
-		</Row>
 		<Row>
 			<Column name="Connector_ID" value="43800"/>
 			<Column name="Direction" value="Unspecified"/>
@@ -458870,6 +458950,60 @@
 			<Column name="DestStyle" value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 			<Extension Start_Object_ID="{C0FA5D45-3A6A-4642-B2F1-6DFC1FC762E7}" End_Object_ID="{7F2322C7-014A-4fc7-9F69-3474C0B89F7B}"/>
 		</Row>
+		<Row>
+			<Column name="Connector_ID" value="45112"/>
+			<Column name="Direction" value="Unspecified"/>
+			<Column name="Connector_Type" value="Association"/>
+			<Column name="SourceCard" value="0..1"/>
+			<Column name="SourceAccess" value="Public"/>
+			<Column name="DestCard" value="0..1"/>
+			<Column name="DestAccess" value="Public"/>
+			<Column name="SourceRole" value="EnergyArea"/>
+			<Column name="SourceContainment" value="Unspecified"/>
+			<Column name="SourceIsAggregate" value="0"/>
+			<Column name="SourceIsOrdered" value="0"/>
+			<Column name="DestRole" value="EquivalentInjection"/>
+			<Column name="DestContainment" value="Unspecified"/>
+			<Column name="DestIsAggregate" value="0"/>
+			<Column name="DestIsOrdered" value="0"/>
+			<Column name="Start_Object_ID" value="13364"/>
+			<Column name="End_Object_ID" value="13388"/>
+			<Column name="Top_Start_Label" value="+EnergyArea"/>
+			<Column name="Top_End_Label" value="+EquivalentInjection"/>
+			<Column name="Btm_Start_Label" value="0..1"/>
+			<Column name="Btm_End_Label" value="0..1"/>
+			<Column name="Start_Edge" value="3"/>
+			<Column name="End_Edge" value="2"/>
+			<Column name="PtStartX" value="317"/>
+			<Column name="PtStartY" value="-451"/>
+			<Column name="PtEndX" value="206"/>
+			<Column name="PtEndY" value="-529"/>
+			<Column name="SeqNo" value="0"/>
+			<Column name="HeadStyle" value="0"/>
+			<Column name="LineStyle" value="0"/>
+			<Column name="RouteStyle" value="3"/>
+			<Column name="IsBold" value="3"/>
+			<Column name="LineColor" value="128"/>
+			<Column name="VirtualInheritance" value="0"/>
+			<Column name="PDATA5" value="SX=0;SY=0;EX=0;EY=0;"/>
+			<Column name="DiagramID" value="0"/>
+			<Column name="ea_guid" value="{A52AF6F0-1A5B-4204-B1F3-3E8FD281E9FA}"/>
+			<Column name="SourceIsNavigable" value="FALSE"/>
+			<Column name="DestIsNavigable" value="FALSE"/>
+			<Column name="IsRoot" value="FALSE"/>
+			<Column name="IsLeaf" value="FALSE"/>
+			<Column name="IsSpec" value="FALSE"/>
+			<Column name="SourceChangeable" value="none"/>
+			<Column name="DestChangeable" value="none"/>
+			<Column name="SourceTS" value="instance"/>
+			<Column name="DestTS" value="instance"/>
+			<Column name="IsSignal" value="FALSE"/>
+			<Column name="IsStimulus" value="FALSE"/>
+			<Column name="Target2" value="0"/>
+			<Column name="SourceStyle" value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+			<Column name="DestStyle" value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+			<Extension Start_Object_ID="{EBAF7081-971E-4960-A0AB-B38C20682FE7}" End_Object_ID="{9749AD93-8F33-48c8-9291-02B9D671C172}"/>
+		</Row>
 		<Row>
 			<Column name="Connector_ID" value="32099"/>
 			<Column name="Direction" value="Source -&gt; Destination"/>
@@ -478680,6 +478814,60 @@
 			<Column name="DestStyle" value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 			<Extension Start_Object_ID="{B753F4F1-9D09-406e-990B-790FC16EFA5A}" End_Object_ID="{EE451097-1E73-4a48-98F7-5558C8D4D5AB}"/>
 		</Row>
+		<Row>
+			<Column name="Connector_ID" value="45111"/>
+			<Column name="Direction" value="Unspecified"/>
+			<Column name="Connector_Type" value="Association"/>
+			<Column name="SourceCard" value="0..1"/>
+			<Column name="SourceAccess" value="Public"/>
+			<Column name="DestCard" value="0..*"/>
+			<Column name="DestAccess" value="Public"/>
+			<Column name="SourceRole" value="EnergyArea"/>
+			<Column name="SourceContainment" value="Unspecified"/>
+			<Column name="SourceIsAggregate" value="0"/>
+			<Column name="SourceIsOrdered" value="0"/>
+			<Column name="DestRole" value="Equipments"/>
+			<Column name="DestContainment" value="Unspecified"/>
+			<Column name="DestIsAggregate" value="0"/>
+			<Column name="DestIsOrdered" value="0"/>
+			<Column name="Start_Object_ID" value="13364"/>
+			<Column name="End_Object_ID" value="13167"/>
+			<Column name="Top_Start_Label" value="+EnergyArea"/>
+			<Column name="Top_End_Label" value="+Equipments"/>
+			<Column name="Btm_Start_Label" value="0..1"/>
+			<Column name="Btm_End_Label" value="0..*"/>
+			<Column name="Start_Edge" value="1"/>
+			<Column name="End_Edge" value="3"/>
+			<Column name="PtStartX" value="189"/>
+			<Column name="PtStartY" value="-394"/>
+			<Column name="PtEndX" value="189"/>
+			<Column name="PtEndY" value="-152"/>
+			<Column name="SeqNo" value="0"/>
+			<Column name="HeadStyle" value="0"/>
+			<Column name="LineStyle" value="0"/>
+			<Column name="RouteStyle" value="3"/>
+			<Column name="IsBold" value="3"/>
+			<Column name="LineColor" value="128"/>
+			<Column name="VirtualInheritance" value="0"/>
+			<Column name="PDATA5" value="SX=-39;SY=0;EX=-39;EY=0;"/>
+			<Column name="DiagramID" value="0"/>
+			<Column name="ea_guid" value="{2ECDC3CD-019F-4579-98D0-20E31FCC9E7D}"/>
+			<Column name="SourceIsNavigable" value="FALSE"/>
+			<Column name="DestIsNavigable" value="FALSE"/>
+			<Column name="IsRoot" value="FALSE"/>
+			<Column name="IsLeaf" value="FALSE"/>
+			<Column name="IsSpec" value="FALSE"/>
+			<Column name="SourceChangeable" value="none"/>
+			<Column name="DestChangeable" value="none"/>
+			<Column name="SourceTS" value="instance"/>
+			<Column name="DestTS" value="instance"/>
+			<Column name="IsSignal" value="FALSE"/>
+			<Column name="IsStimulus" value="FALSE"/>
+			<Column name="Target2" value="0"/>
+			<Column name="SourceStyle" value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+			<Column name="DestStyle" value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+			<Extension Start_Object_ID="{EBAF7081-971E-4960-A0AB-B38C20682FE7}" End_Object_ID="{F8DD8DAC-3545-4660-9CA5-794881CC6591}"/>
+		</Row>
 		<Row>
 			<Column name="Connector_ID" value="44283"/>
 			<Column name="Direction" value="Unspecified"/>
@@ -492866,6 +493054,56 @@
 			<Column name="DestStyle" value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 			<Extension Start_Object_ID="{B6A20E36-8969-4657-B90F-000277DAC6C4}" End_Object_ID="{FCAD9A25-8D61-4b14-8D18-D988C0D98E52}"/>
 		</Row>
+		<Row>
+			<Column name="Connector_ID" value="45110"/>
+			<Column name="Direction" value="Unspecified"/>
+			<Column name="Connector_Type" value="Association"/>
+			<Column name="SourceCard" value="2"/>
+			<Column name="SourceAccess" value="Public"/>
+			<Column name="DestCard" value="0..*"/>
+			<Column name="DestAccess" value="Public"/>
+			<Column name="SourceRole" value="EnergyAreas"/>
+			<Column name="SourceContainment" value="Unspecified"/>
+			<Column name="SourceIsAggregate" value="0"/>
+			<Column name="SourceIsOrdered" value="0"/>
+			<Column name="DestRole" value="EnergyAreaConnectors"/>
+			<Column name="DestContainment" value="Unspecified"/>
+			<Column name="DestIsAggregate" value="0"/>
+			<Column name="DestIsOrdered" value="0"/>
+			<Column name="Start_Object_ID" value="13364"/>
+			<Column name="End_Object_ID" value="38996"/>
+			<Column name="Start_Edge" value="1"/>
+			<Column name="End_Edge" value="3"/>
+			<Column name="PtStartX" value="287"/>
+			<Column name="PtStartY" value="-190"/>
+			<Column name="PtEndX" value="287"/>
+			<Column name="PtEndY" value="-108"/>
+			<Column name="SeqNo" value="0"/>
+			<Column name="HeadStyle" value="0"/>
+			<Column name="LineStyle" value="0"/>
+			<Column name="RouteStyle" value="3"/>
+			<Column name="IsBold" value="3"/>
+			<Column name="LineColor" value="128"/>
+			<Column name="VirtualInheritance" value="0"/>
+			<Column name="PDATA5" value="SX=0;SY=0;EX=0;EY=0;"/>
+			<Column name="DiagramID" value="0"/>
+			<Column name="ea_guid" value="{F3577B57-E05A-43e9-9AD5-178860CF29AF}"/>
+			<Column name="SourceIsNavigable" value="FALSE"/>
+			<Column name="DestIsNavigable" value="FALSE"/>
+			<Column name="IsRoot" value="FALSE"/>
+			<Column name="IsLeaf" value="FALSE"/>
+			<Column name="IsSpec" value="FALSE"/>
+			<Column name="SourceChangeable" value="none"/>
+			<Column name="DestChangeable" value="none"/>
+			<Column name="SourceTS" value="instance"/>
+			<Column name="DestTS" value="instance"/>
+			<Column name="IsSignal" value="FALSE"/>
+			<Column name="IsStimulus" value="FALSE"/>
+			<Column name="Target2" value="0"/>
+			<Column name="SourceStyle" value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+			<Column name="DestStyle" value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
+			<Extension Start_Object_ID="{EBAF7081-971E-4960-A0AB-B38C20682FE7}" End_Object_ID="{C45B39A1-C7E0-4dde-806C-9A61F76038CB}"/>
+		</Row>
 		<Row>
 			<Column name="Connector_ID" value="33869"/>
 			<Column name="Direction" value="Source -&gt; Destination"/>
@@ -511825,7 +512063,7 @@
 			<Column name="cy" value="1098"/>
 			<Column name="Scale" value="100"/>
 			<Column name="CreatedDate" value="2024-03-27 13:37:10"/>
-			<Column name="ModifiedDate" value="2024-08-05 15:52:01"/>
+			<Column name="ModifiedDate" value="2024-12-17 12:53:16"/>
 			<Column name="ShowForeign" value="TRUE"/>
 			<Column name="ShowBorder" value="TRUE"/>
 			<Column name="ShowPackageContents" value="TRUE"/>
@@ -511833,7 +512071,7 @@
 			<Column name="Locked" value="FALSE"/>
 			<Column name="ea_guid" value="{DA862859-91BA-477e-AFDE-4BEA8E327910}"/>
 			<Column name="Swimlanes" value="locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;"/>
-			<Column name="StyleEx" value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;SPL=S_FC8BE3=B1A621,206391,CD8246,EEF7F8,B2DB32,8BB892,334AD4,F95AFB,1F492D,0D3320,AEAF2B,2C8325,68167E,D0CD71,A782C6,959BBB:;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=F0A28CF5;"/>
+			<Column name="StyleEx" value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=7839DC12;"/>
 			<Extension Package_ID="{1A042877-119E-4f3a-ABED-87DCB1343884}"/>
 		</Row>
 		<Row>
@@ -601595,24 +601833,60 @@
 		</Row>
 		<Row>
 			<Column name="Diagram_ID" value="11090"/>
-			<Column name="Object_ID" value="13389"/>
-			<Column name="RectTop" value="-125"/>
-			<Column name="RectLeft" value="201"/>
-			<Column name="RectRight" value="372"/>
-			<Column name="RectBottom" value="-184"/>
+			<Column name="Object_ID" value="13167"/>
+			<Column name="RectTop" value="-35"/>
+			<Column name="RectLeft" value="260"/>
+			<Column name="RectRight" value="478"/>
+			<Column name="RectBottom" value="-139"/>
 			<Column name="Sequence" value="3"/>
-			<Column name="ObjectStyle" value="DUID=4E120A5A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;AttPro=0;AttPri=0;AttPub=0;AttPkg=0;AttCustom=0;OpCustom=0;RzO=1;"/>
-			<Column name="Instance_ID" value="123594"/>
-			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{FC8BE368-2F3E-4ff8-BDC1-4229823DC5AE}"/>
+			<Column name="ObjectStyle" value="DUID=AB68FAF4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+			<Column name="Instance_ID" value="124073"/>
+			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{F8DD8DAC-3545-4660-9CA5-794881CC6591}"/>
 		</Row>
 		<Row>
 			<Column name="Diagram_ID" value="11090"/>
-			<Column name="Object_ID" value="37740"/>
-			<Column name="RectTop" value="-157"/>
-			<Column name="RectLeft" value="431"/>
-			<Column name="RectRight" value="665"/>
-			<Column name="RectBottom" value="-331"/>
+			<Column name="Object_ID" value="13364"/>
+			<Column name="RectTop" value="-381"/>
+			<Column name="RectLeft" value="274"/>
+			<Column name="RectRight" value="463"/>
+			<Column name="RectBottom" value="-451"/>
 			<Column name="Sequence" value="5"/>
+			<Column name="ObjectStyle" value="DUID=43503EDA;NSL=0;BCol=-1;BFol=-1;LCol=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;LWth=0;"/>
+			<Column name="Instance_ID" value="124063"/>
+			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{EBAF7081-971E-4960-A0AB-B38C20682FE7}"/>
+		</Row>
+		<Row>
+			<Column name="Diagram_ID" value="11090"/>
+			<Column name="Object_ID" value="13387"/>
+			<Column name="RectTop" value="-75"/>
+			<Column name="RectLeft" value="43"/>
+			<Column name="RectRight" value="169"/>
+			<Column name="RectBottom" value="-145"/>
+			<Column name="Sequence" value="1"/>
+			<Column name="ObjectStyle" value="DUID=E2E38BB2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+			<Column name="Instance_ID" value="124075"/>
+			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{966D682F-CD37-4038-9739-3EEC0E6CB044}"/>
+		</Row>
+		<Row>
+			<Column name="Diagram_ID" value="11090"/>
+			<Column name="Object_ID" value="13388"/>
+			<Column name="RectTop" value="-470"/>
+			<Column name="RectLeft" value="6"/>
+			<Column name="RectRight" value="206"/>
+			<Column name="RectBottom" value="-728"/>
+			<Column name="Sequence" value="2"/>
+			<Column name="ObjectStyle" value="DUID=53C85C1C;NSL=0;BCol=-1;BFol=-1;LCol=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;LWth=0;"/>
+			<Column name="Instance_ID" value="124074"/>
+			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{9749AD93-8F33-48c8-9291-02B9D671C172}"/>
+		</Row>
+		<Row>
+			<Column name="Diagram_ID" value="11090"/>
+			<Column name="Object_ID" value="37740"/>
+			<Column name="RectTop" value="-348"/>
+			<Column name="RectLeft" value="512"/>
+			<Column name="RectRight" value="746"/>
+			<Column name="RectBottom" value="-522"/>
+			<Column name="Sequence" value="8"/>
 			<Column name="ObjectStyle" value="DUID=B681DAC2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 			<Column name="Instance_ID" value="123590"/>
 			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{671B9EF5-A0CB-467e-ADAC-FBEA4156EEBB}"/>
@@ -601620,11 +601894,11 @@
 		<Row>
 			<Column name="Diagram_ID" value="11090"/>
 			<Column name="Object_ID" value="38896"/>
-			<Column name="RectTop" value="-632"/>
-			<Column name="RectLeft" value="457"/>
-			<Column name="RectRight" value="639"/>
-			<Column name="RectBottom" value="-764"/>
-			<Column name="Sequence" value="2"/>
+			<Column name="RectTop" value="-823"/>
+			<Column name="RectLeft" value="538"/>
+			<Column name="RectRight" value="720"/>
+			<Column name="RectBottom" value="-955"/>
+			<Column name="Sequence" value="7"/>
 			<Column name="ObjectStyle" value="DUID=871FB7AB;NSL=0;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;BCol=13353215;"/>
 			<Column name="Instance_ID" value="123623"/>
 			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{51327F03-6CDF-4744-9A87-69FBDFD05398}"/>
@@ -601632,11 +601906,11 @@
 		<Row>
 			<Column name="Diagram_ID" value="11090"/>
 			<Column name="Object_ID" value="38935"/>
-			<Column name="RectTop" value="-427"/>
-			<Column name="RectLeft" value="785"/>
-			<Column name="RectRight" value="928"/>
-			<Column name="RectBottom" value="-503"/>
-			<Column name="Sequence" value="12"/>
+			<Column name="RectTop" value="-618"/>
+			<Column name="RectLeft" value="866"/>
+			<Column name="RectRight" value="1009"/>
+			<Column name="RectBottom" value="-694"/>
+			<Column name="Sequence" value="15"/>
 			<Column name="ObjectStyle" value="DUID=6406A789;BCol=13353215;"/>
 			<Column name="Instance_ID" value="123580"/>
 			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{D79B537C-1809-4717-B943-98BA75A5E5F9}"/>
@@ -601644,11 +601918,11 @@
 		<Row>
 			<Column name="Diagram_ID" value="11090"/>
 			<Column name="Object_ID" value="38936"/>
-			<Column name="RectTop" value="-420"/>
-			<Column name="RectLeft" value="471"/>
-			<Column name="RectRight" value="626"/>
-			<Column name="RectBottom" value="-510"/>
-			<Column name="Sequence" value="11"/>
+			<Column name="RectTop" value="-611"/>
+			<Column name="RectLeft" value="552"/>
+			<Column name="RectRight" value="707"/>
+			<Column name="RectBottom" value="-701"/>
+			<Column name="Sequence" value="14"/>
 			<Column name="ObjectStyle" value="DUID=D21A91D2;BCol=13353215;"/>
 			<Column name="Instance_ID" value="123587"/>
 			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{CD07405D-EC7F-4226-AAE4-CA6AFB777CAE}"/>
@@ -601656,23 +601930,23 @@
 		<Row>
 			<Column name="Diagram_ID" value="11090"/>
 			<Column name="Object_ID" value="38937"/>
-			<Column name="RectTop" value="-396"/>
-			<Column name="RectLeft" value="208"/>
-			<Column name="RectRight" value="366"/>
-			<Column name="RectBottom" value="-466"/>
-			<Column name="Sequence" value="10"/>
-			<Column name="ObjectStyle" value="DUID=1BFB07AA;BCol=13353215;"/>
+			<Column name="RectTop" value="-587"/>
+			<Column name="RectLeft" value="289"/>
+			<Column name="RectRight" value="447"/>
+			<Column name="RectBottom" value="-657"/>
+			<Column name="Sequence" value="13"/>
+			<Column name="ObjectStyle" value="DUID=1BFB07AA;BCol=13353215;LWth=0;"/>
 			<Column name="Instance_ID" value="123586"/>
 			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{7C645B90-FC24-42bc-9C4C-C57E8C3819C6}"/>
 		</Row>
 		<Row>
 			<Column name="Diagram_ID" value="11090"/>
 			<Column name="Object_ID" value="38938"/>
-			<Column name="RectTop" value="-496"/>
-			<Column name="RectLeft" value="216"/>
-			<Column name="RectRight" value="357"/>
-			<Column name="RectBottom" value="-566"/>
-			<Column name="Sequence" value="9"/>
+			<Column name="RectTop" value="-687"/>
+			<Column name="RectLeft" value="297"/>
+			<Column name="RectRight" value="438"/>
+			<Column name="RectBottom" value="-757"/>
+			<Column name="Sequence" value="12"/>
 			<Column name="ObjectStyle" value="DUID=9B74D0C9;BCol=13353215;"/>
 			<Column name="Instance_ID" value="123585"/>
 			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{3BD7CE08-0A56-4f3b-BAB4-6CA032946B8A}"/>
@@ -601680,11 +601954,11 @@
 		<Row>
 			<Column name="Diagram_ID" value="11090"/>
 			<Column name="Object_ID" value="38939"/>
-			<Column name="RectTop" value="-560"/>
-			<Column name="RectLeft" value="776"/>
-			<Column name="RectRight" value="937"/>
-			<Column name="RectBottom" value="-608"/>
-			<Column name="Sequence" value="8"/>
+			<Column name="RectTop" value="-751"/>
+			<Column name="RectLeft" value="857"/>
+			<Column name="RectRight" value="1018"/>
+			<Column name="RectBottom" value="-799"/>
+			<Column name="Sequence" value="11"/>
 			<Column name="ObjectStyle" value="DUID=1179CB31;BCol=13353215;"/>
 			<Column name="Instance_ID" value="123584"/>
 			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{E599BDCF-8DAD-4775-BF25-D695A3ABFB10}"/>
@@ -601692,11 +601966,11 @@
 		<Row>
 			<Column name="Diagram_ID" value="11090"/>
 			<Column name="Object_ID" value="38940"/>
-			<Column name="RectTop" value="-549"/>
-			<Column name="RectLeft" value="1083"/>
-			<Column name="RectRight" value="1204"/>
-			<Column name="RectBottom" value="-619"/>
-			<Column name="Sequence" value="7"/>
+			<Column name="RectTop" value="-740"/>
+			<Column name="RectLeft" value="1164"/>
+			<Column name="RectRight" value="1285"/>
+			<Column name="RectBottom" value="-810"/>
+			<Column name="Sequence" value="10"/>
 			<Column name="ObjectStyle" value="DUID=48E5EFA7;BCol=13353215;"/>
 			<Column name="Instance_ID" value="123583"/>
 			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{8582EDFD-4786-4ee6-AF4C-5696B46F5E52}"/>
@@ -601704,39 +601978,39 @@
 		<Row>
 			<Column name="Diagram_ID" value="11090"/>
 			<Column name="Object_ID" value="38941"/>
-			<Column name="RectTop" value="-199"/>
-			<Column name="RectLeft" value="887"/>
-			<Column name="RectRight" value="1021"/>
-			<Column name="RectBottom" value="-289"/>
-			<Column name="Sequence" value="6"/>
+			<Column name="RectTop" value="-390"/>
+			<Column name="RectLeft" value="968"/>
+			<Column name="RectRight" value="1102"/>
+			<Column name="RectBottom" value="-480"/>
+			<Column name="Sequence" value="9"/>
 			<Column name="ObjectStyle" value="DUID=D841C2B6;BCol=13353215;"/>
 			<Column name="Instance_ID" value="123582"/>
 			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{19ABE779-02D6-4bda-BF38-1F9C0B9E1304}"/>
 		</Row>
-		<Row>
-			<Column name="Diagram_ID" value="11090"/>
-			<Column name="Object_ID" value="38944"/>
-			<Column name="RectTop" value="-252"/>
-			<Column name="RectLeft" value="208"/>
-			<Column name="RectRight" value="366"/>
-			<Column name="RectBottom" value="-331"/>
-			<Column name="Sequence" value="4"/>
-			<Column name="ObjectStyle" value="DUID=076EA774;BCol=13353215;"/>
-			<Column name="Instance_ID" value="123595"/>
-			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{F273ACC2-96F0-4609-9C07-3CD62512F608}"/>
-		</Row>
 		<Row>
 			<Column name="Diagram_ID" value="11090"/>
 			<Column name="Object_ID" value="38956"/>
-			<Column name="RectTop" value="-664"/>
-			<Column name="RectLeft" value="796"/>
-			<Column name="RectRight" value="915"/>
-			<Column name="RectBottom" value="-734"/>
-			<Column name="Sequence" value="1"/>
+			<Column name="RectTop" value="-855"/>
+			<Column name="RectLeft" value="877"/>
+			<Column name="RectRight" value="996"/>
+			<Column name="RectBottom" value="-925"/>
+			<Column name="Sequence" value="6"/>
 			<Column name="ObjectStyle" value="DUID=E3F8D41A;BCol=13353215;"/>
 			<Column name="Instance_ID" value="123630"/>
 			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{4A0211BE-FEA2-4435-B34F-1B714B24C303}"/>
 		</Row>
+		<Row>
+			<Column name="Diagram_ID" value="11090"/>
+			<Column name="Object_ID" value="38996"/>
+			<Column name="RectTop" value="-199"/>
+			<Column name="RectLeft" value="391"/>
+			<Column name="RectRight" value="524"/>
+			<Column name="RectBottom" value="-269"/>
+			<Column name="Sequence" value="4"/>
+			<Column name="ObjectStyle" value="DUID=ACF411C1;BCol=13353215;"/>
+			<Column name="Instance_ID" value="124066"/>
+			<Extension Diagram_ID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" Object_ID="{C45B39A1-C7E0-4dde-806C-9A61F76038CB}"/>
+		</Row>
 		<Row>
 			<Column name="Diagram_ID" value="11091"/>
 			<Column name="Object_ID" value="13138"/>
@@ -669969,6 +670243,15 @@
 			<Column name="Instance_ID" value="126213"/>
 			<Extension DiagramID="{84EF3C04-E78B-46f0-BA64-A80239866616}" ConnectorID="{DBA28167-C82E-4cab-AF41-75833CD8AF3F}"/>
 		</Row>
+		<Row>
+			<Column name="DiagramID" value="11090"/>
+			<Column name="ConnectorID" value="16791"/>
+			<Column name="Geometry" value="EDGE=1;$LLB=;LLT=;LMT=;LMB=CX=109:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRT=;LRB=;IRHS=;ILHS=;"/>
+			<Column name="Style" value="Mode=3;EOID=E2E38BB2;SOID=53C85C1C;Color=-1;LWidth=0;"/>
+			<Column name="Hidden" value="FALSE"/>
+			<Column name="Instance_ID" value="126717"/>
+			<Extension DiagramID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" ConnectorID="{DACA0DEE-1020-4a19-9013-EE8CB4C24663}"/>
+		</Row>
 		<Row>
 			<Column name="DiagramID" value="11090"/>
 			<Column name="ConnectorID" value="44964"/>
@@ -670014,24 +670297,6 @@
 			<Column name="Instance_ID" value="126220"/>
 			<Extension DiagramID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" ConnectorID="{840F1571-776C-4c94-A002-A763915BDA37}"/>
 		</Row>
-		<Row>
-			<Column name="DiagramID" value="11090"/>
-			<Column name="ConnectorID" value="44978"/>
-			<Column name="Geometry" value="EDGE=3;SX=1;SY=0;EX=1;EY=0;$LLB=CX=19:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LLT=CX=93:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LMT=;LMB=;LRT=CX=72:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=18:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;"/>
-			<Column name="Style" value="Mode=3;EOID=1BFB07AA;SOID=076EA774;Color=-1;LWidth=0;"/>
-			<Column name="Hidden" value="FALSE"/>
-			<Column name="Instance_ID" value="126224"/>
-			<Extension DiagramID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" ConnectorID="{A3A56A9B-2E94-4ecf-9108-7D988552A7DC}"/>
-		</Row>
-		<Row>
-			<Column name="DiagramID" value="11090"/>
-			<Column name="ConnectorID" value="44979"/>
-			<Column name="Geometry" value="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;"/>
-			<Column name="Style" value="Mode=3;EOID=4E120A5A;SOID=076EA774;Color=-1;LWidth=0;"/>
-			<Column name="Hidden" value="FALSE"/>
-			<Column name="Instance_ID" value="126223"/>
-			<Extension DiagramID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" ConnectorID="{2E6F7EDE-ECB3-4dc7-82A8-520D2D24C3FB}"/>
-		</Row>
 		<Row>
 			<Column name="DiagramID" value="11090"/>
 			<Column name="ConnectorID" value="44993"/>
@@ -670068,6 +670333,51 @@
 			<Column name="Instance_ID" value="126260"/>
 			<Extension DiagramID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" ConnectorID="{32241C18-AAB5-43fa-8FE2-44E84B38C423}"/>
 		</Row>
+		<Row>
+			<Column name="DiagramID" value="11090"/>
+			<Column name="ConnectorID" value="45108"/>
+			<Column name="Geometry" value="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=CX=18:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=CX=72:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LMT=;LMB=;LRT=CX=65:CY=15:OX=78:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=19:CY=15:OX=67:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;"/>
+			<Column name="Style" value="Mode=3;EOID=43503EDA;SOID=1BFB07AA;Color=-1;LWidth=0;"/>
+			<Column name="Hidden" value="FALSE"/>
+			<Column name="Instance_ID" value="126708"/>
+			<Extension DiagramID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" ConnectorID="{4382EDE9-0630-4b6f-B0EF-CBC5E33953CB}"/>
+		</Row>
+		<Row>
+			<Column name="DiagramID" value="11090"/>
+			<Column name="ConnectorID" value="45110"/>
+			<Column name="Geometry" value="SX=89;SY=34;EX=0;EY=0;EDGE=1;$LLB=CX=7:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=CX=70:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LMT=;LMB=;LRT=CX=120:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=18:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;"/>
+			<Column name="Style" value="Mode=3;EOID=ACF411C1;SOID=43503EDA;Color=-1;LWidth=0;"/>
+			<Column name="Hidden" value="FALSE"/>
+			<Column name="Instance_ID" value="126710"/>
+			<Extension DiagramID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" ConnectorID="{F3577B57-E05A-43e9-9AD5-178860CF29AF}"/>
+		</Row>
+		<Row>
+			<Column name="DiagramID" value="11090"/>
+			<Column name="ConnectorID" value="45111"/>
+			<Column name="Geometry" value="SX=-39;SY=0;EX=-39;EY=0;EDGE=1;$LLB=CX=19:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=CX=65:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LMT=;LMB=;LRT=CX=63:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=18:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;"/>
+			<Column name="Style" value="Mode=3;EOID=AB68FAF4;SOID=43503EDA;Color=-1;LWidth=0;"/>
+			<Column name="Hidden" value="FALSE"/>
+			<Column name="Instance_ID" value="126715"/>
+			<Extension DiagramID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" ConnectorID="{2ECDC3CD-019F-4579-98D0-20E31FCC9E7D}"/>
+		</Row>
+		<Row>
+			<Column name="DiagramID" value="11090"/>
+			<Column name="ConnectorID" value="45112"/>
+			<Column name="Geometry" value="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=CX=19:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=CX=65:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LMT=;LMB=;LRT=CX=100:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=19:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;"/>
+			<Column name="Style" value="Mode=3;EOID=53C85C1C;SOID=43503EDA;Color=-1;LWidth=0;"/>
+			<Column name="Hidden" value="FALSE"/>
+			<Column name="Instance_ID" value="126716"/>
+			<Extension DiagramID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" ConnectorID="{A52AF6F0-1A5B-4204-B1F3-3E8FD281E9FA}"/>
+		</Row>
+		<Row>
+			<Column name="DiagramID" value="11090"/>
+			<Column name="ConnectorID" value="45113"/>
+			<Column name="Geometry" value="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;"/>
+			<Column name="Style" value="Mode=3;EOID=E2E38BB2;SOID=ACF411C1;Color=-1;LWidth=0;"/>
+			<Column name="Hidden" value="FALSE"/>
+			<Column name="Instance_ID" value="126718"/>
+			<Extension DiagramID="{DA862859-91BA-477e-AFDE-4BEA8E327910}" ConnectorID="{660699D4-1763-4983-9841-AE1946F8DA5D}"/>
+		</Row>
 		<Row>
 			<Column name="DiagramID" value="11091"/>
 			<Column name="ConnectorID" value="16792"/>
@@ -672576,15 +672886,6 @@
 			<Column name="Instance_ID" value="126525"/>
 			<Extension DiagramID="{B0B80538-45BB-444b-9BA2-F7C1579B6739}" ConnectorID="{840F1571-776C-4c94-A002-A763915BDA37}"/>
 		</Row>
-		<Row>
-			<Column name="DiagramID" value="11105"/>
-			<Column name="ConnectorID" value="44978"/>
-			<Column name="Geometry" value="EDGE=3;SX=1;SY=0;EX=1;EY=0;$LLB=CX=19:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LLT=CX=93:CY=15:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LMT=;LMB=;LRT=CX=76:CY=15:OX=0:OY=0:HDN=1:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=22:CY=15:OX=0:OY=0:HDN=1:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;"/>
-			<Column name="Style" value="Mode=3;EOID=4D91458E;SOID=273F0BC4;Color=-1;LWidth=0;"/>
-			<Column name="Hidden" value="FALSE"/>
-			<Column name="Instance_ID" value="126531"/>
-			<Extension DiagramID="{B0B80538-45BB-444b-9BA2-F7C1579B6739}" ConnectorID="{A3A56A9B-2E94-4ecf-9108-7D988552A7DC}"/>
-		</Row>
 		<Row>
 			<Column name="DiagramID" value="11105"/>
 			<Column name="ConnectorID" value="44979"/>
@@ -922107,16 +922408,6 @@ GEZhUEsFBgAAAAABAAEAPgAAAHAJAAAAAA==
 			<Column name="Client" value="{FED13292-1658-4732-82E1-6DD3D974F8EB}"/>
 			<Column name="Supplier" value="&lt;none&gt;"/>
 		</Row>
-		<Row>
-			<Column name="XrefID" value="{7AEADF1D-42E6-4448-9168-E7E2FA961F1F}"/>
-			<Column name="Name" value="Stereotypes"/>
-			<Column name="Type" value="element property"/>
-			<Column name="Visibility" value="Public"/>
-			<Column name="Partition" value="0"/>
-			<Column name="Description" value="@STEREO;Name=enumeration;GUID={89162AAF-C7E6-4d3c-A102-5516F22896C6};@ENDSTEREO;"/>
-			<Column name="Client" value="{FED3D9B8-BD73-4dea-85A4-1556F72C59B7}"/>
-			<Column name="Supplier" value="&lt;none&gt;"/>
-		</Row>
 		<Row>
 			<Column name="XrefID" value="{5A46180A-F36F-4396-8E18-C75DA6D3F50B}"/>
 			<Column name="Name" value="CustomProperties"/>
@@ -928497,13 +928788,13 @@ GEZhUEsFBgAAAAABAAEAPgAAAHAJAAAAAA==
 			<Column name="Supplier" value="&lt;none&gt;"/>
 		</Row>
 		<Row>
-			<Column name="XrefID" value="{C85DE0AE-1EC6-4d34-A133-DEC4BBCDB61B}"/>
+			<Column name="XrefID" value="{7AEADF1D-42E6-4448-9168-E7E2FA961F1F}"/>
 			<Column name="Name" value="Stereotypes"/>
-			<Column name="Type" value="attribute property"/>
+			<Column name="Type" value="element property"/>
 			<Column name="Visibility" value="Public"/>
 			<Column name="Partition" value="0"/>
-			<Column name="Description" value="@STEREO;Name=enum;GUID={D6F69339-F039-40a4-93A5-E4FA5BFC5F69};@ENDSTEREO;"/>
-			<Column name="Client" value="{4B735140-B468-4e65-A97A-E4F94CF625C4}"/>
+			<Column name="Description" value="@STEREO;Name=enumeration;GUID={89162AAF-C7E6-4d3c-A102-5516F22896C6};@ENDSTEREO;"/>
+			<Column name="Client" value="{FED3D9B8-BD73-4dea-85A4-1556F72C59B7}"/>
 			<Column name="Supplier" value="&lt;none&gt;"/>
 		</Row>
 		<Row>
@@ -928620,6 +928911,16 @@ GEZhUEsFBgAAAAABAAEAPgAAAHAJAAAAAA==
 			<Column name="Client" value="{FFCF28A6-7F47-4970-A6D0-E39F622CC21A}"/>
 			<Column name="Supplier" value="&lt;none&gt;"/>
 		</Row>
+		<Row>
+			<Column name="XrefID" value="{C85DE0AE-1EC6-4d34-A133-DEC4BBCDB61B}"/>
+			<Column name="Name" value="Stereotypes"/>
+			<Column name="Type" value="attribute property"/>
+			<Column name="Visibility" value="Public"/>
+			<Column name="Partition" value="0"/>
+			<Column name="Description" value="@STEREO;Name=enum;GUID={D6F69339-F039-40a4-93A5-E4FA5BFC5F69};@ENDSTEREO;"/>
+			<Column name="Client" value="{4B735140-B468-4e65-A97A-E4F94CF625C4}"/>
+			<Column name="Supplier" value="&lt;none&gt;"/>
+		</Row>
 		<Row>
 			<Column name="XrefID" value="{1D4BBFB6-AB7B-4aba-A641-2033A5ABA2F9}"/>
 			<Column name="Name" value="Stereotypes"/>
@@ -940755,26 +941056,6 @@ GEZhUEsFBgAAAAABAAEAPgAAAHAJAAAAAA==
 			<Column name="Client" value="{E277A280-2EB7-4dcd-9964-E26FD79A88C2}"/>
 			<Column name="Supplier" value="&lt;none&gt;"/>
 		</Row>
-		<Row>
-			<Column name="XrefID" value="{A636E789-181B-471a-A399-DB8BF23DBA27}"/>
-			<Column name="Name" value="CustomProperties"/>
-			<Column name="Type" value="attribute property"/>
-			<Column name="Visibility" value="Public"/>
-			<Column name="Partition" value="0"/>
-			<Column name="Description" value="@PROP=@NAME=isID@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=0@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;"/>
-			<Column name="Client" value="{E278D34E-5008-4ba5-BA16-7116BC6725F5}"/>
-			<Column name="Supplier" value="&lt;none&gt;"/>
-		</Row>
-		<Row>
-			<Column name="XrefID" value="{51E88B3D-F434-4b30-B1E5-18FE18811FBD}"/>
-			<Column name="Name" value="Stereotypes"/>
-			<Column name="Type" value="attribute property"/>
-			<Column name="Visibility" value="Public"/>
-			<Column name="Partition" value="0"/>
-			<Column name="Description" value="@STEREO;Name=enum;GUID={62CC4671-4F53-4882-A67D-F239C69E0701};@ENDSTEREO;"/>
-			<Column name="Client" value="{E278D34E-5008-4ba5-BA16-7116BC6725F5}"/>
-			<Column name="Supplier" value="&lt;none&gt;"/>
-		</Row>
 		<Row>
 			<Column name="XrefID" value="{C3CDD5CD-3F48-4c23-B2AB-74BA24BC725A}"/>
 			<Column name="Name" value="Stereotypes"/>
@@ -944333,6 +944614,26 @@ GEZhUEsFBgAAAAABAAEAPgAAAHAJAAAAAA==
 			<Column name="Client" value="{2F025F5E-0E6E-46d0-993B-12FD2DAB66E5}"/>
 			<Column name="Supplier" value="&lt;none&gt;"/>
 		</Row>
+		<Row>
+			<Column name="XrefID" value="{A636E789-181B-471a-A399-DB8BF23DBA27}"/>
+			<Column name="Name" value="CustomProperties"/>
+			<Column name="Type" value="attribute property"/>
+			<Column name="Visibility" value="Public"/>
+			<Column name="Partition" value="0"/>
+			<Column name="Description" value="@PROP=@NAME=isID@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=0@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;"/>
+			<Column name="Client" value="{E278D34E-5008-4ba5-BA16-7116BC6725F5}"/>
+			<Column name="Supplier" value="&lt;none&gt;"/>
+		</Row>
+		<Row>
+			<Column name="XrefID" value="{51E88B3D-F434-4b30-B1E5-18FE18811FBD}"/>
+			<Column name="Name" value="Stereotypes"/>
+			<Column name="Type" value="attribute property"/>
+			<Column name="Visibility" value="Public"/>
+			<Column name="Partition" value="0"/>
+			<Column name="Description" value="@STEREO;Name=enum;GUID={62CC4671-4F53-4882-A67D-F239C69E0701};@ENDSTEREO;"/>
+			<Column name="Client" value="{E278D34E-5008-4ba5-BA16-7116BC6725F5}"/>
+			<Column name="Supplier" value="&lt;none&gt;"/>
+		</Row>
 		<Row>
 			<Column name="XrefID" value="{04A902EB-2955-4b84-A78C-BBEC074A7F46}"/>
 			<Column name="Name" value="Stereotypes"/>
@@ -978099,16 +978400,6 @@ GEZhUEsFBgAAAAABAAEAPgAAAHAJAAAAAA==
 			<Column name="Client" value="{C5699D2E-1512-435f-A9B4-CFF2FB1E331F}"/>
 			<Column name="Supplier" value="&lt;none&gt;"/>
 		</Row>
-		<Row>
-			<Column name="XrefID" value="{8B18F42F-95B0-409f-AE53-15C6325FEA4F}"/>
-			<Column name="Name" value="Stereotypes"/>
-			<Column name="Type" value="attribute property"/>
-			<Column name="Visibility" value="Public"/>
-			<Column name="Partition" value="0"/>
-			<Column name="Description" value="@STEREO;Name=enum;GUID={62CC4671-4F53-4882-A67D-F239C69E0701};@ENDSTEREO;"/>
-			<Column name="Client" value="{C5731FF5-5B94-4b0e-9C87-EBF1AF2BDE22}"/>
-			<Column name="Supplier" value="&lt;none&gt;"/>
-		</Row>
 		<Row>
 			<Column name="XrefID" value="{2F5B9D63-DFF2-41d0-BD3C-051E03FC3C2B}"/>
 			<Column name="Name" value="CustomProperties"/>
@@ -979915,6 +980206,16 @@ GEZhUEsFBgAAAAABAAEAPgAAAHAJAAAAAA==
 			<Column name="Client" value="{BBAF2E36-E868-4c4f-BFB9-00666ED78C08}"/>
 			<Column name="Supplier" value="&lt;none&gt;"/>
 		</Row>
+		<Row>
+			<Column name="XrefID" value="{8B18F42F-95B0-409f-AE53-15C6325FEA4F}"/>
+			<Column name="Name" value="Stereotypes"/>
+			<Column name="Type" value="attribute property"/>
+			<Column name="Visibility" value="Public"/>
+			<Column name="Partition" value="0"/>
+			<Column name="Description" value="@STEREO;Name=enum;GUID={62CC4671-4F53-4882-A67D-F239C69E0701};@ENDSTEREO;"/>
+			<Column name="Client" value="{C5731FF5-5B94-4b0e-9C87-EBF1AF2BDE22}"/>
+			<Column name="Supplier" value="&lt;none&gt;"/>
+		</Row>
 		<Row>
 			<Column name="XrefID" value="{D6CE25C0-DF9F-4d57-B78C-03D92ED4E5AB}"/>
 			<Column name="Name" value="CustomProperties"/>
@@ -994872,44 +995173,6 @@ GEZhUEsFBgAAAAABAAEAPgAAAHAJAAAAAA==
 			<Column name="Client" value="{5F23BDB7-8C52-4be9-BDFD-61927D2EA76C}"/>
 			<Column name="Supplier" value="&lt;none&gt;"/>
 		</Row>
-		<Row>
-			<Column name="XrefID" value="{0AF3F2A2-FF10-43ad-9461-75028099F4D0}"/>
-			<Column name="Name" value="CustomProperties"/>
-			<Column name="Type" value="connector property"/>
-			<Column name="Visibility" value="Public"/>
-			<Column name="Description" value="@PROP=@NAME=isDerived@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=false@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;"/>
-			<Column name="Client" value="{5FD8B251-F630-475d-9DE8-4E62B3FDAF21}"/>
-			<Column name="Supplier" value="&lt;none&gt;"/>
-		</Row>
-		<Row>
-			<Column name="XrefID" value="{CE6471DD-0BE2-4124-86BE-1C74616E5743}"/>
-			<Column name="Name" value="Stereotypes"/>
-			<Column name="Type" value="connector property"/>
-			<Column name="Visibility" value="Public"/>
-			<Column name="Partition" value="0"/>
-			<Column name="Description" value="@STEREO;Name=informative;GUID={FE464CAD-0ED0-49e3-83E2-792C6B4E62DB};@ENDSTEREO;"/>
-			<Column name="Client" value="{5FD8B251-F630-475d-9DE8-4E62B3FDAF21}"/>
-			<Column name="Supplier" value="&lt;none&gt;"/>
-		</Row>
-		<Row>
-			<Column name="XrefID" value="{980E7369-2BFC-482d-9E20-414B30DF47D5}"/>
-			<Column name="Name" value="CustomProperties"/>
-			<Column name="Type" value="connectorDestEnd property"/>
-			<Column name="Visibility" value="Public"/>
-			<Column name="Description" value="@PROP=@NAME=isDerivedUnion@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=false@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=isDerived@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=false@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=default@ENDNAME;@TYPE=String@ENDTYPE;@VALU=@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=isReadOnly@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=false@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=isComposite@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=aggregation@ENDNAME;@TYPE=AggregationKind@ENDTYPE;@VALU=none@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;"/>
-			<Column name="Client" value="{5FD8B251-F630-475d-9DE8-4E62B3FDAF21}"/>
-			<Column name="Supplier" value="&lt;none&gt;"/>
-		</Row>
-		<Row>
-			<Column name="XrefID" value="{DD82AE8D-CC90-47dd-BF68-3D84FC4E96F2}"/>
-			<Column name="Name" value="CustomProperties"/>
-			<Column name="Type" value="connectorDestEnd property"/>
-			<Column name="Visibility" value="Public"/>
-			<Column name="Partition" value="0"/>
-			<Column name="Description" value="@PROP=@NAME=isComposite@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=isDerivedUnion@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=false@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=default@ENDNAME;@TYPE=String@ENDTYPE;@VALU=@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=isReadOnly@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=false@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=isDerived@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=false@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=aggregation@ENDNAME;@TYPE=AggregationKind@ENDTYPE;@VALU=none@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;"/>
-			<Column name="Client" value="{606C8F33-4FFF-4ea5-A5B5-CEB460B07A57}"/>
-			<Column name="Supplier" value="&lt;none&gt;"/>
-		</Row>
 		<Row>
 			<Column name="XrefID" value="{F96032C0-3472-49e5-BD4F-007BDEF67651}"/>
 			<Column name="Name" value="CustomProperties"/>
@@ -999759,24 +1000022,6 @@ GEZhUEsFBgAAAAABAAEAPgAAAHAJAAAAAA==
 			<Column name="Client" value="{0D3D55D4-E8C4-4234-B9EF-7A3DEF3E7DDB}"/>
 			<Column name="Supplier" value="&lt;none&gt;"/>
 		</Row>
-		<Row>
-			<Column name="XrefID" value="{1A320004-43F3-4727-AD7B-231884672FA7}"/>
-			<Column name="Name" value="CustomProperties"/>
-			<Column name="Type" value="diagram properties"/>
-			<Column name="Visibility" value="Public"/>
-			<Column name="Partition" value="0"/>
-			<Column name="Description" value="DGS=On=0:CNT=8:W=120:H=40:SG=0:SGH=0:AEB=0:;AR=0;DCL=0;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;Swimlanes=locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;"/>
-			<Column name="Client" value="{0D729915-B951-4578-BC56-91B52D224B0F}"/>
-		</Row>
-		<Row>
-			<Column name="XrefID" value="{D1C7AA72-E4B2-473e-8BEF-42D32EDBAED1}"/>
-			<Column name="Name" value="CustomProperties"/>
-			<Column name="Type" value="diagram properties"/>
-			<Column name="Visibility" value="Public"/>
-			<Column name="Partition" value="0"/>
-			<Column name="Description" value="DGS=On=0:CNT=8:W=120:H=40:SG=0:SGH=0:AEB=0:;AR=0;DCL=0;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;Swimlanes=locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;"/>
-			<Column name="Client" value="{0DE51D36-4F82-40a0-AEFD-EC978F10E7F3}"/>
-		</Row>
 		<Row>
 			<Column name="XrefID" value="{88A6D50C-864B-4099-9926-EE132A46EBA4}"/>
 			<Column name="Name" value="CustomProperties"/>
@@ -1000582,6 +1000827,34 @@ GEZhUEsFBgAAAAABAAEAPgAAAHAJAAAAAA==
 			<Column name="Client" value="{5EF90CEC-DFE8-457f-B036-DBDAA36848CA}"/>
 			<Column name="Supplier" value="&lt;none&gt;"/>
 		</Row>
+		<Row>
+			<Column name="XrefID" value="{0AF3F2A2-FF10-43ad-9461-75028099F4D0}"/>
+			<Column name="Name" value="CustomProperties"/>
+			<Column name="Type" value="connector property"/>
+			<Column name="Visibility" value="Public"/>
+			<Column name="Description" value="@PROP=@NAME=isDerived@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=false@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;"/>
+			<Column name="Client" value="{5FD8B251-F630-475d-9DE8-4E62B3FDAF21}"/>
+			<Column name="Supplier" value="&lt;none&gt;"/>
+		</Row>
+		<Row>
+			<Column name="XrefID" value="{CE6471DD-0BE2-4124-86BE-1C74616E5743}"/>
+			<Column name="Name" value="Stereotypes"/>
+			<Column name="Type" value="connector property"/>
+			<Column name="Visibility" value="Public"/>
+			<Column name="Partition" value="0"/>
+			<Column name="Description" value="@STEREO;Name=informative;GUID={FE464CAD-0ED0-49e3-83E2-792C6B4E62DB};@ENDSTEREO;"/>
+			<Column name="Client" value="{5FD8B251-F630-475d-9DE8-4E62B3FDAF21}"/>
+			<Column name="Supplier" value="&lt;none&gt;"/>
+		</Row>
+		<Row>
+			<Column name="XrefID" value="{980E7369-2BFC-482d-9E20-414B30DF47D5}"/>
+			<Column name="Name" value="CustomProperties"/>
+			<Column name="Type" value="connectorDestEnd property"/>
+			<Column name="Visibility" value="Public"/>
+			<Column name="Description" value="@PROP=@NAME=isDerivedUnion@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=false@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=isDerived@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=false@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=default@ENDNAME;@TYPE=String@ENDTYPE;@VALU=@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=isReadOnly@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=false@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=isComposite@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=aggregation@ENDNAME;@TYPE=AggregationKind@ENDTYPE;@VALU=none@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;"/>
+			<Column name="Client" value="{5FD8B251-F630-475d-9DE8-4E62B3FDAF21}"/>
+			<Column name="Supplier" value="&lt;none&gt;"/>
+		</Row>
 		<Row>
 			<Column name="XrefID" value="{06C392E4-6722-4d33-9FE5-A582CF45DAB2}"/>
 			<Column name="Name" value="CustomProperties"/>
@@ -1000592,6 +1000865,16 @@ GEZhUEsFBgAAAAABAAEAPgAAAHAJAAAAAA==
 			<Column name="Client" value="{60544292-912D-4fc3-B923-E471CEA168D7}"/>
 			<Column name="Supplier" value="&lt;none&gt;"/>
 		</Row>
+		<Row>
+			<Column name="XrefID" value="{DD82AE8D-CC90-47dd-BF68-3D84FC4E96F2}"/>
+			<Column name="Name" value="CustomProperties"/>
+			<Column name="Type" value="connectorDestEnd property"/>
+			<Column name="Visibility" value="Public"/>
+			<Column name="Partition" value="0"/>
+			<Column name="Description" value="@PROP=@NAME=isComposite@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=isDerivedUnion@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=false@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=default@ENDNAME;@TYPE=String@ENDTYPE;@VALU=@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=isReadOnly@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=false@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=isDerived@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=false@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;@PROP=@NAME=aggregation@ENDNAME;@TYPE=AggregationKind@ENDTYPE;@VALU=none@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;"/>
+			<Column name="Client" value="{606C8F33-4FFF-4ea5-A5B5-CEB460B07A57}"/>
+			<Column name="Supplier" value="&lt;none&gt;"/>
+		</Row>
 		<Row>
 			<Column name="XrefID" value="{0F63CAE1-119C-4ef3-9CBA-50E49FF74DA8}"/>
 			<Column name="Name" value="CustomProperties"/>
@@ -1006832,6 +1007115,24 @@ GEZhUEsFBgAAAAABAAEAPgAAAHAJAAAAAA==
 			<Column name="Client" value="{FEA58AE6-6428-4541-9097-FEFB35D64AD7}"/>
 			<Column name="Supplier" value="&lt;none&gt;"/>
 		</Row>
+		<Row>
+			<Column name="XrefID" value="{1A320004-43F3-4727-AD7B-231884672FA7}"/>
+			<Column name="Name" value="CustomProperties"/>
+			<Column name="Type" value="diagram properties"/>
+			<Column name="Visibility" value="Public"/>
+			<Column name="Partition" value="0"/>
+			<Column name="Description" value="DGS=On=0:CNT=8:W=120:H=40:SG=0:SGH=0:AEB=0:;AR=0;DCL=0;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;Swimlanes=locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;"/>
+			<Column name="Client" value="{0D729915-B951-4578-BC56-91B52D224B0F}"/>
+		</Row>
+		<Row>
+			<Column name="XrefID" value="{D1C7AA72-E4B2-473e-8BEF-42D32EDBAED1}"/>
+			<Column name="Name" value="CustomProperties"/>
+			<Column name="Type" value="diagram properties"/>
+			<Column name="Visibility" value="Public"/>
+			<Column name="Partition" value="0"/>
+			<Column name="Description" value="DGS=On=0:CNT=8:W=120:H=40:SG=0:SGH=0:AEB=0:;AR=0;DCL=0;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;Swimlanes=locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;"/>
+			<Column name="Client" value="{0DE51D36-4F82-40a0-AEFD-EC978F10E7F3}"/>
+		</Row>
 		<Row>
 			<Column name="XrefID" value="{B74FFE2E-6DCF-4fa7-8E59-F5F57BDFCC72}"/>
 			<Column name="Name" value="MissingDiagramConstructs"/>
@@ -1007097,7 +1007398,7 @@ GEZhUEsFBgAAAAABAAEAPgAAAHAJAAAAAA==
 			<Column name="Type" value="diagram properties"/>
 			<Column name="Visibility" value="Public"/>
 			<Column name="Partition" value="0"/>
-			<Column name="Description" value="DGS=On=0:CNT=8:W=120:H=40:SG=0:SGH=0:AEB=0:;AR=0;DCL=0;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;Swimlanes=locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;"/>
+			<Column name="Description" value="DGS=On=0:CNT=8:W=120:H=40:SG=0:SGH=0:AEB=0:;AR=0;DCL=0;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;Swimlanes=locked=false;orientation=0;width=0;inbar=false;names=false;color=-1;bold=false;fcol=0;tcol=-1;ofCol=-1;ufCol=-1;hl=1;ufh=0;hh=0;cls=0;bw=0;hli=0;bro=0;SwimlaneFont=lfh:-10,lfw:0,lfi:0,lfu:0,lfs:0,lfface:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;"/>
 			<Column name="Client" value="{DA862859-91BA-477e-AFDE-4BEA8E327910}"/>
 		</Row>
 		<Row>
diff --git a/ravens/cim_tools/cim_conversion_template.json b/ravens/cim_tools/cim_conversion_template.json
old mode 100644
new mode 100755
index a636d81cd..1b126d2a3
--- a/ravens/cim_tools/cim_conversion_template.json
+++ b/ravens/cim_tools/cim_conversion_template.json
@@ -290,6 +290,21 @@
           "$primaryObjectHash": "IdentifiedObject.name",
           "$secondaryObjectHash": "IdentifiedObject.mRID",
           "properties": {
+            "EnergyArea.Equipments": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "$objectType": "reference",
+                "$referencePath": "PowerSystemResource/Equipment",
+                "$objectId": "Equipment"
+              },
+              "EnergyArea.EquivalentInjection": {
+                "$objectType": "reference",
+                "$objectId": "EquivalentInjection",
+                "type": "string",
+                "$referencePath": "PowerSystemResource/Equipment/ConductingEquipment/EquivalentEquipment/EquivalentInjection"
+              }
+            },
             "SubLoadArea": {
               "type": "object",
               "$objectType": "object",
@@ -2177,6 +2192,24 @@
                   "$objectType": "container",
                   "type": "object",
                   "properties": {
+                    "EnergyAreaConnector": {
+                      "type": "object",
+                      "$objectType": "object",
+                      "$objectId": "EnergyAreaConnector",
+                      "$primaryObjectHash": "IdentifiedObject.name",
+                      "$secondaryObjectHash": "IdentifiedObject.mRID",
+                      "properties": {
+                        "EnergyAreaConnector.EnergyAreas": {
+                          "type": "array",
+                          "items": {
+                            "type": "string",
+                            "$objectType": "reference",
+                            "$objectId": "EnergyArea",
+                            "$referencePath": "Group/EnergyArea"
+                          }
+                        }
+                      }
+                    },
                     "EquivalentInjection": {
                       "$objectType": "object",
                       "type": "object",