diff --git a/modeling/AVATAR/testReq.xml b/modeling/AVATAR/testReq.xml
index 0cdaa88b054e4274512a0fc862ecc2d311ce2b67..6c89d66248b064963e9264b807b70ad5081d332f 100644
--- a/modeling/AVATAR/testReq.xml
+++ b/modeling/AVATAR/testReq.xml
@@ -2,1768 +2,1592 @@
 
 <TURTLEGMODELING version="1.0beta">
 
-<Modeling type="Avatar Requirement" nameTab="AVATAR Requirements" >
-<AvatarRDPanel name="AVATAR RD" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0" >
-<COMPONENT type="5200" id="44" >
-<cdparam x="844" y="479" />
-<sizeparam width="200" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="Requirement" value="Requirement_0" />
+<Modeling type="AVATAR Design" nameTab="AVATAR Design" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
+<MainCode value="void __user_init() {"/>
+<MainCode value="}"/>
+<Optimized value="true" />
+<Validated value="" />
+<Ignored value="" />
+
+<CONNECTOR type="5002" id="2" >
+<cdparam x="321" y="567" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Block1 to Block0" value="" />
 <TGConnectingPoint num="0" id="1" />
-<TGConnectingPoint num="1" id="2" />
-<TGConnectingPoint num="2" id="3" />
-<TGConnectingPoint num="3" id="4" />
-<TGConnectingPoint num="4" id="5" />
-<TGConnectingPoint num="5" id="6" />
-<TGConnectingPoint num="6" id="7" />
-<TGConnectingPoint num="7" id="8" />
-<TGConnectingPoint num="8" id="9" />
-<TGConnectingPoint num="9" id="10" />
-<TGConnectingPoint num="10" id="11" />
-<TGConnectingPoint num="11" id="12" />
-<TGConnectingPoint num="12" id="13" />
-<TGConnectingPoint num="13" id="14" />
-<TGConnectingPoint num="14" id="15" />
-<TGConnectingPoint num="15" id="16" />
-<TGConnectingPoint num="16" id="17" />
-<TGConnectingPoint num="17" id="18" />
-<TGConnectingPoint num="18" id="19" />
-<TGConnectingPoint num="19" id="20" />
-<TGConnectingPoint num="20" id="21" />
-<TGConnectingPoint num="21" id="22" />
-<TGConnectingPoint num="22" id="23" />
-<TGConnectingPoint num="23" id="24" />
-<TGConnectingPoint num="24" id="25" />
-<TGConnectingPoint num="25" id="26" />
-<TGConnectingPoint num="26" id="27" />
-<TGConnectingPoint num="27" id="28" />
-<TGConnectingPoint num="28" id="29" />
-<TGConnectingPoint num="29" id="30" />
-<TGConnectingPoint num="30" id="31" />
-<TGConnectingPoint num="31" id="32" />
-<TGConnectingPoint num="32" id="33" />
-<TGConnectingPoint num="33" id="34" />
-<TGConnectingPoint num="34" id="35" />
-<TGConnectingPoint num="35" id="36" />
-<TGConnectingPoint num="36" id="37" />
-<TGConnectingPoint num="37" id="38" />
-<TGConnectingPoint num="38" id="39" />
-<TGConnectingPoint num="39" id="40" />
-<TGConnectingPoint num="40" id="41" />
-<TGConnectingPoint num="41" id="42" />
-<TGConnectingPoint num="42" id="43" />
+<P1  x="559" y="330" id="38" />
+<P2  x="560" y="377" id="96" />
+<AutomaticDrawing  data="true" />
 <extraparam>
-<textline data="Requirement description:" />
-<textline data="Double-click to edit" />
-<kind data="" />
-<criticality data="" />
-<reqType data="Requirement" color="-1773070" />
-<id data="0" />
-<satisfied data="false" />
-<verified data="false" />
-<attackTreeNode data="" />
-<violatedAction data="" />
-<referenceElements data="" />
+<isd value="in pushCoffeeButton()" />
+<oso value="out push()" />
+<FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="5002" id="4" >
+<cdparam x="275" y="114" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Block0 to Block0" value="" />
+<TGConnectingPoint num="0" id="3" />
+<P1  x="306" y="109" id="18" />
+<P2  x="445" y="108" id="92" />
+<AutomaticDrawing  data="true" />
+<extraparam>
+<iso value="in getCoin(int nbOfCoins)" />
+<osd value="out ejectCoin(int nbOfCoins)" />
+<isd value="in getCoin(int nbOfCoins)" />
+<oso value="out putCoin(int nbOfCoins)" />
+<FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="5002" id="6" >
+<cdparam x="623" y="565" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Block1 to Block0" value="" />
+<TGConnectingPoint num="0" id="5" />
+<P1  x="789" y="326" id="63" />
+<P2  x="790" y="377" id="97" />
+<AutomaticDrawing  data="true" />
+<extraparam>
+<isd value="in pushTeaButton()" />
+<oso value="out push()" />
+<FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
+</extraparam>
+</CONNECTOR>
+<COMPONENT type="5000" id="31" >
+<cdparam x="106" y="55" />
+<sizeparam width="200" height="218" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Block0" value="Wallet" />
+<TGConnectingPoint num="0" id="7" />
+<TGConnectingPoint num="1" id="8" />
+<TGConnectingPoint num="2" id="9" />
+<TGConnectingPoint num="3" id="10" />
+<TGConnectingPoint num="4" id="11" />
+<TGConnectingPoint num="5" id="12" />
+<TGConnectingPoint num="6" id="13" />
+<TGConnectingPoint num="7" id="14" />
+<TGConnectingPoint num="8" id="15" />
+<TGConnectingPoint num="9" id="16" />
+<TGConnectingPoint num="10" id="17" />
+<TGConnectingPoint num="11" id="18" />
+<TGConnectingPoint num="12" id="19" />
+<TGConnectingPoint num="13" id="20" />
+<TGConnectingPoint num="14" id="21" />
+<TGConnectingPoint num="15" id="22" />
+<TGConnectingPoint num="16" id="23" />
+<TGConnectingPoint num="17" id="24" />
+<TGConnectingPoint num="18" id="25" />
+<TGConnectingPoint num="19" id="26" />
+<TGConnectingPoint num="20" id="27" />
+<TGConnectingPoint num="21" id="28" />
+<TGConnectingPoint num="22" id="29" />
+<TGConnectingPoint num="23" id="30" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Attribute access="0" id="nbOfCoins" value="2" type="8" typeOther="" />
+<Attribute access="0" id="x" value="1" type="8" typeOther="" />
+<Attribute access="0" id="minUserDelay" value="50" type="8" typeOther="" />
+<Attribute access="0" id="maxUserDelay" value="70" type="8" typeOther="" />
+<Method value="contentOfWallet(int nbOfCoins)" />
+<Signal value="in getCoin(int nbOfCoins)" attached="true" />
+<Signal value="out putCoin(int nbOfCoins)" attached="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5207" id="60" >
-<cdparam x="727" y="252" />
-<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="107" minDesiredHeight="0" />
+<COMPONENT type="5000" id="106" >
+<cdparam x="445" y="19" />
+<sizeparam width="461" height="358" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="AvatarElementReference" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="45" />
-<TGConnectingPoint num="1" id="46" />
-<TGConnectingPoint num="2" id="47" />
-<TGConnectingPoint num="3" id="48" />
-<TGConnectingPoint num="4" id="49" />
-<TGConnectingPoint num="5" id="50" />
-<TGConnectingPoint num="6" id="51" />
-<TGConnectingPoint num="7" id="52" />
-<TGConnectingPoint num="8" id="53" />
-<TGConnectingPoint num="9" id="54" />
-<TGConnectingPoint num="10" id="55" />
-<TGConnectingPoint num="11" id="56" />
-<TGConnectingPoint num="12" id="57" />
-<TGConnectingPoint num="13" id="58" />
-<TGConnectingPoint num="14" id="59" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Block0" value="CoffeeMachine" />
+<TGConnectingPoint num="0" id="82" />
+<TGConnectingPoint num="1" id="83" />
+<TGConnectingPoint num="2" id="84" />
+<TGConnectingPoint num="3" id="85" />
+<TGConnectingPoint num="4" id="86" />
+<TGConnectingPoint num="5" id="87" />
+<TGConnectingPoint num="6" id="88" />
+<TGConnectingPoint num="7" id="89" />
+<TGConnectingPoint num="8" id="90" />
+<TGConnectingPoint num="9" id="91" />
+<TGConnectingPoint num="10" id="92" />
+<TGConnectingPoint num="11" id="93" />
+<TGConnectingPoint num="12" id="94" />
+<TGConnectingPoint num="13" id="95" />
+<TGConnectingPoint num="14" id="96" />
+<TGConnectingPoint num="15" id="97" />
+<TGConnectingPoint num="16" id="98" />
+<TGConnectingPoint num="17" id="99" />
+<TGConnectingPoint num="18" id="100" />
+<TGConnectingPoint num="19" id="101" />
+<TGConnectingPoint num="20" id="102" />
+<TGConnectingPoint num="21" id="103" />
+<TGConnectingPoint num="22" id="104" />
+<TGConnectingPoint num="23" id="105" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Attribute access="0" id="teaMinDelay" value="3" type="8" typeOther="" />
+<Attribute access="0" id="teaMaxDelay" value="8" type="8" typeOther="" />
+<Attribute access="0" id="coffeeMinDelay" value="5" type="8" typeOther="" />
+<Attribute access="0" id="coffeeMaxDelay" value="10" type="8" typeOther="" />
+<Attribute access="0" id="coinDelay" value="50" type="8" typeOther="" />
+<Attribute access="0" id="x" value="0" type="8" typeOther="" />
+<Attribute access="0" id="nbOfCoins" value="0" type="8" typeOther="" />
+<Method value="beverageReady()" />
+<Signal value="in pushCoffeeButton()" attached="true" />
+<Signal value="in pushTeaButton()" attached="true" />
+<Signal value="in getCoin(int nbOfCoins)" attached="true" />
+<Signal value="out ejectCoin(int nbOfCoins)" attached="true" />
+</extraparam>
 </COMPONENT>
+<SUBCOMPONENT type="5000" id="56" >
+<father id="106" num="0" />
+<cdparam x="464" y="228" />
+<sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
+<infoparam name="Block1" value="CoffeeButton" />
+<TGConnectingPoint num="0" id="32" />
+<TGConnectingPoint num="1" id="33" />
+<TGConnectingPoint num="2" id="34" />
+<TGConnectingPoint num="3" id="35" />
+<TGConnectingPoint num="4" id="36" />
+<TGConnectingPoint num="5" id="37" />
+<TGConnectingPoint num="6" id="38" />
+<TGConnectingPoint num="7" id="39" />
+<TGConnectingPoint num="8" id="40" />
+<TGConnectingPoint num="9" id="41" />
+<TGConnectingPoint num="10" id="42" />
+<TGConnectingPoint num="11" id="43" />
+<TGConnectingPoint num="12" id="44" />
+<TGConnectingPoint num="13" id="45" />
+<TGConnectingPoint num="14" id="46" />
+<TGConnectingPoint num="15" id="47" />
+<TGConnectingPoint num="16" id="48" />
+<TGConnectingPoint num="17" id="49" />
+<TGConnectingPoint num="18" id="50" />
+<TGConnectingPoint num="19" id="51" />
+<TGConnectingPoint num="20" id="52" />
+<TGConnectingPoint num="21" id="53" />
+<TGConnectingPoint num="22" id="54" />
+<TGConnectingPoint num="23" id="55" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
+<Signal value="out push()" attached="true" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5000" id="81" >
+<father id="106" num="1" />
+<cdparam x="695" y="224" />
+<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
+<infoparam name="Block1" value="TeaButton" />
+<TGConnectingPoint num="0" id="57" />
+<TGConnectingPoint num="1" id="58" />
+<TGConnectingPoint num="2" id="59" />
+<TGConnectingPoint num="3" id="60" />
+<TGConnectingPoint num="4" id="61" />
+<TGConnectingPoint num="5" id="62" />
+<TGConnectingPoint num="6" id="63" />
+<TGConnectingPoint num="7" id="64" />
+<TGConnectingPoint num="8" id="65" />
+<TGConnectingPoint num="9" id="66" />
+<TGConnectingPoint num="10" id="67" />
+<TGConnectingPoint num="11" id="68" />
+<TGConnectingPoint num="12" id="69" />
+<TGConnectingPoint num="13" id="70" />
+<TGConnectingPoint num="14" id="71" />
+<TGConnectingPoint num="15" id="72" />
+<TGConnectingPoint num="16" id="73" />
+<TGConnectingPoint num="17" id="74" />
+<TGConnectingPoint num="18" id="75" />
+<TGConnectingPoint num="19" id="76" />
+<TGConnectingPoint num="20" id="77" />
+<TGConnectingPoint num="21" id="78" />
+<TGConnectingPoint num="22" id="79" />
+<TGConnectingPoint num="23" id="80" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
+<Signal value="out push()" attached="true" />
+</extraparam>
+</SUBCOMPONENT>
 
-<COMPONENT type="5207" id="76" >
-<cdparam x="741" y="201" />
-<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="57" minDesiredHeight="0" />
+
+</AVATARBlockDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Wallet" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="113" >
+<cdparam x="516" y="264" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="112" />
+<P1  x="485" y="219" id="154" />
+<P2  x="485" y="275" id="165" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="111" >
+<father id="113" num="0" />
+<cdparam x="493" y="251" />
+<sizeparam width="161" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="AvatarElementReference" value="Wallet" />
-<TGConnectingPoint num="0" id="61" />
-<TGConnectingPoint num="1" id="62" />
-<TGConnectingPoint num="2" id="63" />
-<TGConnectingPoint num="3" id="64" />
-<TGConnectingPoint num="4" id="65" />
-<TGConnectingPoint num="5" id="66" />
-<TGConnectingPoint num="6" id="67" />
-<TGConnectingPoint num="7" id="68" />
-<TGConnectingPoint num="8" id="69" />
-<TGConnectingPoint num="9" id="70" />
-<TGConnectingPoint num="10" id="71" />
-<TGConnectingPoint num="11" id="72" />
-<TGConnectingPoint num="12" id="73" />
-<TGConnectingPoint num="13" id="74" />
-<TGConnectingPoint num="14" id="75" />
-</COMPONENT>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="107" />
+<TGConnectingPoint num="1" id="108" />
+<TGConnectingPoint num="2" id="109" />
+<TGConnectingPoint num="3" id="110" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="nbOfCoins = nbOfCoins + x" />
+<actions value="contentOfWallet(nbOfCoins)" />
+</extraparam>
+</SUBCOMPONENT>
 
-<COMPONENT type="5200" id="120" >
-<cdparam x="661" y="16" />
-<sizeparam width="278" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="59" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="120" >
+<cdparam x="382" y="165" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="119" />
+<P1  x="382" y="165" id="261" />
+<P2  x="485" y="189" id="153" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="118" >
+<father id="120" num="0" />
+<cdparam x="382" y="205" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="Requirement" value="req00" />
-<TGConnectingPoint num="0" id="77" />
-<TGConnectingPoint num="1" id="78" />
-<TGConnectingPoint num="2" id="79" />
-<TGConnectingPoint num="3" id="80" />
-<TGConnectingPoint num="4" id="81" />
-<TGConnectingPoint num="5" id="82" />
-<TGConnectingPoint num="6" id="83" />
-<TGConnectingPoint num="7" id="84" />
-<TGConnectingPoint num="8" id="85" />
-<TGConnectingPoint num="9" id="86" />
-<TGConnectingPoint num="10" id="87" />
-<TGConnectingPoint num="11" id="88" />
-<TGConnectingPoint num="12" id="89" />
-<TGConnectingPoint num="13" id="90" />
-<TGConnectingPoint num="14" id="91" />
-<TGConnectingPoint num="15" id="92" />
-<TGConnectingPoint num="16" id="93" />
-<TGConnectingPoint num="17" id="94" />
-<TGConnectingPoint num="18" id="95" />
-<TGConnectingPoint num="19" id="96" />
-<TGConnectingPoint num="20" id="97" />
-<TGConnectingPoint num="21" id="98" />
-<TGConnectingPoint num="22" id="99" />
-<TGConnectingPoint num="23" id="100" />
-<TGConnectingPoint num="24" id="101" />
-<TGConnectingPoint num="25" id="102" />
-<TGConnectingPoint num="26" id="103" />
-<TGConnectingPoint num="27" id="104" />
-<TGConnectingPoint num="28" id="105" />
-<TGConnectingPoint num="29" id="106" />
-<TGConnectingPoint num="30" id="107" />
-<TGConnectingPoint num="31" id="108" />
-<TGConnectingPoint num="32" id="109" />
-<TGConnectingPoint num="33" id="110" />
-<TGConnectingPoint num="34" id="111" />
-<TGConnectingPoint num="35" id="112" />
-<TGConnectingPoint num="36" id="113" />
-<TGConnectingPoint num="37" id="114" />
-<TGConnectingPoint num="38" id="115" />
-<TGConnectingPoint num="39" id="116" />
-<TGConnectingPoint num="40" id="117" />
-<TGConnectingPoint num="41" id="118" />
-<TGConnectingPoint num="42" id="119" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="114" />
+<TGConnectingPoint num="1" id="115" />
+<TGConnectingPoint num="2" id="116" />
+<TGConnectingPoint num="3" id="117" />
 <extraparam>
-<textline data="A coin not used within 50 seconds " />
-<textline data="must be ejected" />
-<kind data="Functional" />
-<criticality data="Low" />
-<reqType data="Requirement" color="-1773070" />
-<id data="0.1.1" />
-<satisfied data="false" />
-<verified data="false" />
-<attackTreeNode data="" />
-<violatedAction data="" />
-<referenceElements data="" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5200" id="164" >
-<cdparam x="46" y="491" />
-<sizeparam width="301" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="113" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="127" >
+<cdparam x="223" y="260" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="126" />
+<P1  x="251" y="231" id="143" />
+<P2  x="252" y="300" id="206" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="125" >
+<father id="127" num="0" />
+<cdparam x="175" y="246" />
+<sizeparam width="205" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="Requirement" value="Req_Availability" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="121" />
 <TGConnectingPoint num="1" id="122" />
 <TGConnectingPoint num="2" id="123" />
 <TGConnectingPoint num="3" id="124" />
-<TGConnectingPoint num="4" id="125" />
-<TGConnectingPoint num="5" id="126" />
-<TGConnectingPoint num="6" id="127" />
-<TGConnectingPoint num="7" id="128" />
-<TGConnectingPoint num="8" id="129" />
-<TGConnectingPoint num="9" id="130" />
-<TGConnectingPoint num="10" id="131" />
-<TGConnectingPoint num="11" id="132" />
-<TGConnectingPoint num="12" id="133" />
-<TGConnectingPoint num="13" id="134" />
-<TGConnectingPoint num="14" id="135" />
-<TGConnectingPoint num="15" id="136" />
-<TGConnectingPoint num="16" id="137" />
-<TGConnectingPoint num="17" id="138" />
-<TGConnectingPoint num="18" id="139" />
-<TGConnectingPoint num="19" id="140" />
-<TGConnectingPoint num="20" id="141" />
-<TGConnectingPoint num="21" id="142" />
-<TGConnectingPoint num="22" id="143" />
-<TGConnectingPoint num="23" id="144" />
-<TGConnectingPoint num="24" id="145" />
-<TGConnectingPoint num="25" id="146" />
-<TGConnectingPoint num="26" id="147" />
-<TGConnectingPoint num="27" id="148" />
-<TGConnectingPoint num="28" id="149" />
-<TGConnectingPoint num="29" id="150" />
-<TGConnectingPoint num="30" id="151" />
-<TGConnectingPoint num="31" id="152" />
-<TGConnectingPoint num="32" id="153" />
-<TGConnectingPoint num="33" id="154" />
-<TGConnectingPoint num="34" id="155" />
-<TGConnectingPoint num="35" id="156" />
-<TGConnectingPoint num="36" id="157" />
-<TGConnectingPoint num="37" id="158" />
-<TGConnectingPoint num="38" id="159" />
-<TGConnectingPoint num="39" id="160" />
-<TGConnectingPoint num="40" id="161" />
-<TGConnectingPoint num="41" id="162" />
-<TGConnectingPoint num="42" id="163" />
 <extraparam>
-<textline data="The availability of the machine shall be" />
-<textline data="no less than 99.99%" />
-<kind data="Functional" />
-<criticality data="Low" />
-<reqType data="Requirement" color="-1773070" />
-<id data="0.4" />
-<satisfied data="true" />
-<verified data="true" />
-<attackTreeNode data="" />
-<violatedAction data="" />
-<referenceElements data="" />
+<guard value="[ ]" />
+<afterMin value="minUserDelay" />
+<afterMax value="maxUserDelay" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="0.99" />
+<actions value="nbOfCoins = nbOfCoins - x" />
+<actions value="contentOfWallet(nbOfCoins)" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5200" id="208" >
-<cdparam x="10" y="182" />
-<sizeparam width="150" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="136" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="134" >
+<cdparam x="357" y="165" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="133" />
+<P1  x="357" y="165" id="260" />
+<P2  x="251" y="201" id="142" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="132" >
+<father id="134" num="0" />
+<cdparam x="220" y="174" />
+<sizeparam width="93" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="Requirement" value="Req_CoffeeMachine" />
-<TGConnectingPoint num="0" id="165" />
-<TGConnectingPoint num="1" id="166" />
-<TGConnectingPoint num="2" id="167" />
-<TGConnectingPoint num="3" id="168" />
-<TGConnectingPoint num="4" id="169" />
-<TGConnectingPoint num="5" id="170" />
-<TGConnectingPoint num="6" id="171" />
-<TGConnectingPoint num="7" id="172" />
-<TGConnectingPoint num="8" id="173" />
-<TGConnectingPoint num="9" id="174" />
-<TGConnectingPoint num="10" id="175" />
-<TGConnectingPoint num="11" id="176" />
-<TGConnectingPoint num="12" id="177" />
-<TGConnectingPoint num="13" id="178" />
-<TGConnectingPoint num="14" id="179" />
-<TGConnectingPoint num="15" id="180" />
-<TGConnectingPoint num="16" id="181" />
-<TGConnectingPoint num="17" id="182" />
-<TGConnectingPoint num="18" id="183" />
-<TGConnectingPoint num="19" id="184" />
-<TGConnectingPoint num="20" id="185" />
-<TGConnectingPoint num="21" id="186" />
-<TGConnectingPoint num="22" id="187" />
-<TGConnectingPoint num="23" id="188" />
-<TGConnectingPoint num="24" id="189" />
-<TGConnectingPoint num="25" id="190" />
-<TGConnectingPoint num="26" id="191" />
-<TGConnectingPoint num="27" id="192" />
-<TGConnectingPoint num="28" id="193" />
-<TGConnectingPoint num="29" id="194" />
-<TGConnectingPoint num="30" id="195" />
-<TGConnectingPoint num="31" id="196" />
-<TGConnectingPoint num="32" id="197" />
-<TGConnectingPoint num="33" id="198" />
-<TGConnectingPoint num="34" id="199" />
-<TGConnectingPoint num="35" id="200" />
-<TGConnectingPoint num="36" id="201" />
-<TGConnectingPoint num="37" id="202" />
-<TGConnectingPoint num="38" id="203" />
-<TGConnectingPoint num="39" id="204" />
-<TGConnectingPoint num="40" id="205" />
-<TGConnectingPoint num="41" id="206" />
-<TGConnectingPoint num="42" id="207" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="128" />
+<TGConnectingPoint num="1" id="129" />
+<TGConnectingPoint num="2" id="130" />
+<TGConnectingPoint num="3" id="131" />
 <extraparam>
-<textline data="Requirements of the coffee machine" />
-<kind data="Functional" />
-<criticality data="Low" />
-<reqType data="Requirement" color="-1773070" />
-<id data="0" />
-<satisfied data="false" />
-<verified data="false" />
-<attackTreeNode data="" />
-<violatedAction data="" />
-<referenceElements data="" />
+<guard value="[nbOfCoins &gt; 0]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5201" id="224" >
-<cdparam x="678" y="396" />
-<sizeparam width="171" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="158" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="141" >
+<cdparam x="369" y="115" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="140" />
+<P1  x="370" y="64" id="287" />
+<P2  x="370" y="135" id="247" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="139" >
+<father id="141" num="0" />
+<cdparam x="376" y="105" />
+<sizeparam width="156" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="AvatarProperty" value="BeverageDeliverProperty" />
-<TGConnectingPoint num="0" id="209" />
-<TGConnectingPoint num="1" id="210" />
-<TGConnectingPoint num="2" id="211" />
-<TGConnectingPoint num="3" id="212" />
-<TGConnectingPoint num="4" id="213" />
-<TGConnectingPoint num="5" id="214" />
-<TGConnectingPoint num="6" id="215" />
-<TGConnectingPoint num="7" id="216" />
-<TGConnectingPoint num="8" id="217" />
-<TGConnectingPoint num="9" id="218" />
-<TGConnectingPoint num="10" id="219" />
-<TGConnectingPoint num="11" id="220" />
-<TGConnectingPoint num="12" id="221" />
-<TGConnectingPoint num="13" id="222" />
-<TGConnectingPoint num="14" id="223" />
-</COMPONENT>
-
-<COMPONENT type="5201" id="240" >
-<cdparam x="628" y="308" />
-<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="128" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="135" />
+<TGConnectingPoint num="1" id="136" />
+<TGConnectingPoint num="2" id="137" />
+<TGConnectingPoint num="3" id="138" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="contentOfWallet(nbOfCoins)" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5103" id="152" >
+<cdparam x="217" y="206" />
+<sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="AvatarProperty" value="WalletCoinProperty" />
-<TGConnectingPoint num="0" id="225" />
-<TGConnectingPoint num="1" id="226" />
-<TGConnectingPoint num="2" id="227" />
-<TGConnectingPoint num="3" id="228" />
-<TGConnectingPoint num="4" id="229" />
-<TGConnectingPoint num="5" id="230" />
-<TGConnectingPoint num="6" id="231" />
-<TGConnectingPoint num="7" id="232" />
-<TGConnectingPoint num="8" id="233" />
-<TGConnectingPoint num="9" id="234" />
-<TGConnectingPoint num="10" id="235" />
-<TGConnectingPoint num="11" id="236" />
-<TGConnectingPoint num="12" id="237" />
-<TGConnectingPoint num="13" id="238" />
-<TGConnectingPoint num="14" id="239" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Send signal" value="putCoin(x)" />
+<TGConnectingPoint num="0" id="142" />
+<TGConnectingPoint num="1" id="143" />
+<TGConnectingPoint num="2" id="144" />
+<TGConnectingPoint num="3" id="145" />
+<TGConnectingPoint num="4" id="146" />
+<TGConnectingPoint num="5" id="147" />
+<TGConnectingPoint num="6" id="148" />
+<TGConnectingPoint num="7" id="149" />
+<TGConnectingPoint num="8" id="150" />
+<TGConnectingPoint num="9" id="151" />
 </COMPONENT>
 
-<COMPONENT type="5200" id="284" >
-<cdparam x="233" y="147" />
-<sizeparam width="271" height="104" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
+<COMPONENT type="5104" id="163" >
+<cdparam x="447" y="194" />
+<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="Requirement" value="req1" />
-<TGConnectingPoint num="0" id="241" />
-<TGConnectingPoint num="1" id="242" />
-<TGConnectingPoint num="2" id="243" />
-<TGConnectingPoint num="3" id="244" />
-<TGConnectingPoint num="4" id="245" />
-<TGConnectingPoint num="5" id="246" />
-<TGConnectingPoint num="6" id="247" />
-<TGConnectingPoint num="7" id="248" />
-<TGConnectingPoint num="8" id="249" />
-<TGConnectingPoint num="9" id="250" />
-<TGConnectingPoint num="10" id="251" />
-<TGConnectingPoint num="11" id="252" />
-<TGConnectingPoint num="12" id="253" />
-<TGConnectingPoint num="13" id="254" />
-<TGConnectingPoint num="14" id="255" />
-<TGConnectingPoint num="15" id="256" />
-<TGConnectingPoint num="16" id="257" />
-<TGConnectingPoint num="17" id="258" />
-<TGConnectingPoint num="18" id="259" />
-<TGConnectingPoint num="19" id="260" />
-<TGConnectingPoint num="20" id="261" />
-<TGConnectingPoint num="21" id="262" />
-<TGConnectingPoint num="22" id="263" />
-<TGConnectingPoint num="23" id="264" />
-<TGConnectingPoint num="24" id="265" />
-<TGConnectingPoint num="25" id="266" />
-<TGConnectingPoint num="26" id="267" />
-<TGConnectingPoint num="27" id="268" />
-<TGConnectingPoint num="28" id="269" />
-<TGConnectingPoint num="29" id="270" />
-<TGConnectingPoint num="30" id="271" />
-<TGConnectingPoint num="31" id="272" />
-<TGConnectingPoint num="32" id="273" />
-<TGConnectingPoint num="33" id="274" />
-<TGConnectingPoint num="34" id="275" />
-<TGConnectingPoint num="35" id="276" />
-<TGConnectingPoint num="36" id="277" />
-<TGConnectingPoint num="37" id="278" />
-<TGConnectingPoint num="38" id="279" />
-<TGConnectingPoint num="39" id="280" />
-<TGConnectingPoint num="40" id="281" />
-<TGConnectingPoint num="41" id="282" />
-<TGConnectingPoint num="42" id="283" />
-<extraparam>
-<textline data="A wallet must never contain a " />
-<textline data="negative number of coins" />
-<kind data="Functional" />
-<criticality data="Low" />
-<reqType data="SafetyRequirement" color="-1773070" />
-<id data="0.2" />
-<satisfied data="true" />
-<verified data="true" />
-<attackTreeNode data="" />
-<violatedAction data="" />
-<referenceElements data="" />
-</extraparam>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="Receive signal" value="getCoin(x)" />
+<TGConnectingPoint num="0" id="153" />
+<TGConnectingPoint num="1" id="154" />
+<TGConnectingPoint num="2" id="155" />
+<TGConnectingPoint num="3" id="156" />
+<TGConnectingPoint num="4" id="157" />
+<TGConnectingPoint num="5" id="158" />
+<TGConnectingPoint num="6" id="159" />
+<TGConnectingPoint num="7" id="160" />
+<TGConnectingPoint num="8" id="161" />
+<TGConnectingPoint num="9" id="162" />
 </COMPONENT>
 
-<COMPONENT type="5201" id="300" >
-<cdparam x="626" y="153" />
-<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="117" minDesiredHeight="0" />
+<COMPONENT type="5106" id="204" >
+<cdparam x="460" y="275" />
+<sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="AvatarProperty" value="OneCoinProperty" />
-<TGConnectingPoint num="0" id="285" />
-<TGConnectingPoint num="1" id="286" />
-<TGConnectingPoint num="2" id="287" />
-<TGConnectingPoint num="3" id="288" />
-<TGConnectingPoint num="4" id="289" />
-<TGConnectingPoint num="5" id="290" />
-<TGConnectingPoint num="6" id="291" />
-<TGConnectingPoint num="7" id="292" />
-<TGConnectingPoint num="8" id="293" />
-<TGConnectingPoint num="9" id="294" />
-<TGConnectingPoint num="10" id="295" />
-<TGConnectingPoint num="11" id="296" />
-<TGConnectingPoint num="12" id="297" />
-<TGConnectingPoint num="13" id="298" />
-<TGConnectingPoint num="14" id="299" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="main" />
+<TGConnectingPoint num="0" id="164" />
+<TGConnectingPoint num="1" id="165" />
+<TGConnectingPoint num="2" id="166" />
+<TGConnectingPoint num="3" id="167" />
+<TGConnectingPoint num="4" id="168" />
+<TGConnectingPoint num="5" id="169" />
+<TGConnectingPoint num="6" id="170" />
+<TGConnectingPoint num="7" id="171" />
+<TGConnectingPoint num="8" id="172" />
+<TGConnectingPoint num="9" id="173" />
+<TGConnectingPoint num="10" id="174" />
+<TGConnectingPoint num="11" id="175" />
+<TGConnectingPoint num="12" id="176" />
+<TGConnectingPoint num="13" id="177" />
+<TGConnectingPoint num="14" id="178" />
+<TGConnectingPoint num="15" id="179" />
+<TGConnectingPoint num="16" id="180" />
+<TGConnectingPoint num="17" id="181" />
+<TGConnectingPoint num="18" id="182" />
+<TGConnectingPoint num="19" id="183" />
+<TGConnectingPoint num="20" id="184" />
+<TGConnectingPoint num="21" id="185" />
+<TGConnectingPoint num="22" id="186" />
+<TGConnectingPoint num="23" id="187" />
+<TGConnectingPoint num="24" id="188" />
+<TGConnectingPoint num="25" id="189" />
+<TGConnectingPoint num="26" id="190" />
+<TGConnectingPoint num="27" id="191" />
+<TGConnectingPoint num="28" id="192" />
+<TGConnectingPoint num="29" id="193" />
+<TGConnectingPoint num="30" id="194" />
+<TGConnectingPoint num="31" id="195" />
+<TGConnectingPoint num="32" id="196" />
+<TGConnectingPoint num="33" id="197" />
+<TGConnectingPoint num="34" id="198" />
+<TGConnectingPoint num="35" id="199" />
+<TGConnectingPoint num="36" id="200" />
+<TGConnectingPoint num="37" id="201" />
+<TGConnectingPoint num="38" id="202" />
+<TGConnectingPoint num="39" id="203" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5200" id="344" >
-<cdparam x="192" y="15" />
-<sizeparam width="304" height="110" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="75" minDesiredHeight="0" />
+<COMPONENT type="5106" id="245" >
+<cdparam x="227" y="300" />
+<sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="Requirement" value="req3456" />
-<TGConnectingPoint num="0" id="301" />
-<TGConnectingPoint num="1" id="302" />
-<TGConnectingPoint num="2" id="303" />
-<TGConnectingPoint num="3" id="304" />
-<TGConnectingPoint num="4" id="305" />
-<TGConnectingPoint num="5" id="306" />
-<TGConnectingPoint num="6" id="307" />
-<TGConnectingPoint num="7" id="308" />
-<TGConnectingPoint num="8" id="309" />
-<TGConnectingPoint num="9" id="310" />
-<TGConnectingPoint num="10" id="311" />
-<TGConnectingPoint num="11" id="312" />
-<TGConnectingPoint num="12" id="313" />
-<TGConnectingPoint num="13" id="314" />
-<TGConnectingPoint num="14" id="315" />
-<TGConnectingPoint num="15" id="316" />
-<TGConnectingPoint num="16" id="317" />
-<TGConnectingPoint num="17" id="318" />
-<TGConnectingPoint num="18" id="319" />
-<TGConnectingPoint num="19" id="320" />
-<TGConnectingPoint num="20" id="321" />
-<TGConnectingPoint num="21" id="322" />
-<TGConnectingPoint num="22" id="323" />
-<TGConnectingPoint num="23" id="324" />
-<TGConnectingPoint num="24" id="325" />
-<TGConnectingPoint num="25" id="326" />
-<TGConnectingPoint num="26" id="327" />
-<TGConnectingPoint num="27" id="328" />
-<TGConnectingPoint num="28" id="329" />
-<TGConnectingPoint num="29" id="330" />
-<TGConnectingPoint num="30" id="331" />
-<TGConnectingPoint num="31" id="332" />
-<TGConnectingPoint num="32" id="333" />
-<TGConnectingPoint num="33" id="334" />
-<TGConnectingPoint num="34" id="335" />
-<TGConnectingPoint num="35" id="336" />
-<TGConnectingPoint num="36" id="337" />
-<TGConnectingPoint num="37" id="338" />
-<TGConnectingPoint num="38" id="339" />
-<TGConnectingPoint num="39" id="340" />
-<TGConnectingPoint num="40" id="341" />
-<TGConnectingPoint num="41" id="342" />
-<TGConnectingPoint num="42" id="343" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="main" />
+<TGConnectingPoint num="0" id="205" />
+<TGConnectingPoint num="1" id="206" />
+<TGConnectingPoint num="2" id="207" />
+<TGConnectingPoint num="3" id="208" />
+<TGConnectingPoint num="4" id="209" />
+<TGConnectingPoint num="5" id="210" />
+<TGConnectingPoint num="6" id="211" />
+<TGConnectingPoint num="7" id="212" />
+<TGConnectingPoint num="8" id="213" />
+<TGConnectingPoint num="9" id="214" />
+<TGConnectingPoint num="10" id="215" />
+<TGConnectingPoint num="11" id="216" />
+<TGConnectingPoint num="12" id="217" />
+<TGConnectingPoint num="13" id="218" />
+<TGConnectingPoint num="14" id="219" />
+<TGConnectingPoint num="15" id="220" />
+<TGConnectingPoint num="16" id="221" />
+<TGConnectingPoint num="17" id="222" />
+<TGConnectingPoint num="18" id="223" />
+<TGConnectingPoint num="19" id="224" />
+<TGConnectingPoint num="20" id="225" />
+<TGConnectingPoint num="21" id="226" />
+<TGConnectingPoint num="22" id="227" />
+<TGConnectingPoint num="23" id="228" />
+<TGConnectingPoint num="24" id="229" />
+<TGConnectingPoint num="25" id="230" />
+<TGConnectingPoint num="26" id="231" />
+<TGConnectingPoint num="27" id="232" />
+<TGConnectingPoint num="28" id="233" />
+<TGConnectingPoint num="29" id="234" />
+<TGConnectingPoint num="30" id="235" />
+<TGConnectingPoint num="31" id="236" />
+<TGConnectingPoint num="32" id="237" />
+<TGConnectingPoint num="33" id="238" />
+<TGConnectingPoint num="34" id="239" />
+<TGConnectingPoint num="35" id="240" />
+<TGConnectingPoint num="36" id="241" />
+<TGConnectingPoint num="37" id="242" />
+<TGConnectingPoint num="38" id="243" />
+<TGConnectingPoint num="39" id="244" />
 <extraparam>
-<textline data="The coffee machine never has one coin " />
-<textline data=" inserted more than 50 units of time" />
-<kind data="Functional" />
-<criticality data="Low" />
-<reqType data="AMSRequirement" color="-1773070" />
-<id data="0.1" />
-<satisfied data="false" />
-<verified data="true" />
-<attackTreeNode data="" />
-<violatedAction data="" />
-<referenceElements data="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5200" id="388" >
-<cdparam x="208" y="294" />
-<sizeparam width="357" height="174" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
+<COMPONENT type="5106" id="286" >
+<cdparam x="345" y="135" />
+<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="Requirement" value="req2" />
-<TGConnectingPoint num="0" id="345" />
-<TGConnectingPoint num="1" id="346" />
-<TGConnectingPoint num="2" id="347" />
-<TGConnectingPoint num="3" id="348" />
-<TGConnectingPoint num="4" id="349" />
-<TGConnectingPoint num="5" id="350" />
-<TGConnectingPoint num="6" id="351" />
-<TGConnectingPoint num="7" id="352" />
-<TGConnectingPoint num="8" id="353" />
-<TGConnectingPoint num="9" id="354" />
-<TGConnectingPoint num="10" id="355" />
-<TGConnectingPoint num="11" id="356" />
-<TGConnectingPoint num="12" id="357" />
-<TGConnectingPoint num="13" id="358" />
-<TGConnectingPoint num="14" id="359" />
-<TGConnectingPoint num="15" id="360" />
-<TGConnectingPoint num="16" id="361" />
-<TGConnectingPoint num="17" id="362" />
-<TGConnectingPoint num="18" id="363" />
-<TGConnectingPoint num="19" id="364" />
-<TGConnectingPoint num="20" id="365" />
-<TGConnectingPoint num="21" id="366" />
-<TGConnectingPoint num="22" id="367" />
-<TGConnectingPoint num="23" id="368" />
-<TGConnectingPoint num="24" id="369" />
-<TGConnectingPoint num="25" id="370" />
-<TGConnectingPoint num="26" id="371" />
-<TGConnectingPoint num="27" id="372" />
-<TGConnectingPoint num="28" id="373" />
-<TGConnectingPoint num="29" id="374" />
-<TGConnectingPoint num="30" id="375" />
-<TGConnectingPoint num="31" id="376" />
-<TGConnectingPoint num="32" id="377" />
-<TGConnectingPoint num="33" id="378" />
-<TGConnectingPoint num="34" id="379" />
-<TGConnectingPoint num="35" id="380" />
-<TGConnectingPoint num="36" id="381" />
-<TGConnectingPoint num="37" id="382" />
-<TGConnectingPoint num="38" id="383" />
-<TGConnectingPoint num="39" id="384" />
-<TGConnectingPoint num="40" id="385" />
-<TGConnectingPoint num="41" id="386" />
-<TGConnectingPoint num="42" id="387" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="main" />
+<TGConnectingPoint num="0" id="246" />
+<TGConnectingPoint num="1" id="247" />
+<TGConnectingPoint num="2" id="248" />
+<TGConnectingPoint num="3" id="249" />
+<TGConnectingPoint num="4" id="250" />
+<TGConnectingPoint num="5" id="251" />
+<TGConnectingPoint num="6" id="252" />
+<TGConnectingPoint num="7" id="253" />
+<TGConnectingPoint num="8" id="254" />
+<TGConnectingPoint num="9" id="255" />
+<TGConnectingPoint num="10" id="256" />
+<TGConnectingPoint num="11" id="257" />
+<TGConnectingPoint num="12" id="258" />
+<TGConnectingPoint num="13" id="259" />
+<TGConnectingPoint num="14" id="260" />
+<TGConnectingPoint num="15" id="261" />
+<TGConnectingPoint num="16" id="262" />
+<TGConnectingPoint num="17" id="263" />
+<TGConnectingPoint num="18" id="264" />
+<TGConnectingPoint num="19" id="265" />
+<TGConnectingPoint num="20" id="266" />
+<TGConnectingPoint num="21" id="267" />
+<TGConnectingPoint num="22" id="268" />
+<TGConnectingPoint num="23" id="269" />
+<TGConnectingPoint num="24" id="270" />
+<TGConnectingPoint num="25" id="271" />
+<TGConnectingPoint num="26" id="272" />
+<TGConnectingPoint num="27" id="273" />
+<TGConnectingPoint num="28" id="274" />
+<TGConnectingPoint num="29" id="275" />
+<TGConnectingPoint num="30" id="276" />
+<TGConnectingPoint num="31" id="277" />
+<TGConnectingPoint num="32" id="278" />
+<TGConnectingPoint num="33" id="279" />
+<TGConnectingPoint num="34" id="280" />
+<TGConnectingPoint num="35" id="281" />
+<TGConnectingPoint num="36" id="282" />
+<TGConnectingPoint num="37" id="283" />
+<TGConnectingPoint num="38" id="284" />
+<TGConnectingPoint num="39" id="285" />
 <extraparam>
-<textline data="When the application starts, if the wallet contains " />
-<textline data="at least 2 coins, then a beverage may be delivered. " />
-<textline data="On the contrary, if the wallet contains less than 2" />
-<textline data="coins, no beverage will be delivered by the" />
-<textline data="machine." />
-<kind data="Functional" />
-<criticality data="Low" />
-<reqType data="SecurityRequirement" color="-1773070" />
-<id data="0.3" />
-<satisfied data="true" />
-<verified data="true" />
-<attackTreeNode data="" />
-<violatedAction data="" />
-<referenceElements data="RefAttack" />
-<extraAttribute id="Hypothèse" value="le système ..." />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="5202" id="390" >
-<cdparam x="894" y="479" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<TGConnectingPoint num="0" id="389" />
-<P1  x="894" y="479" id="7" />
-<P2  x="939" y="106" id="82" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5202" id="392" >
-<cdparam x="800" y="136" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<TGConnectingPoint num="0" id="391" />
-<P1  x="800" y="136" id="87" />
-<P2  x="496" y="42" id="304" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5206" id="394" >
-<cdparam x="271" y="491" />
+<COMPONENT type="5100" id="288" >
+<cdparam x="363" y="44" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="287" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="CoffeeMachine" minX="10" maxX="1400" minY="10" maxY="1400" >
+<CONNECTOR type="118" id="289" >
+<cdparam x="372" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="&lt;&lt;refine&gt;&gt;" />
-<TGConnectingPoint num="0" id="393" />
-<P1  x="271" y="491" id="129" />
-<P2  x="297" y="468" id="354" />
-<AutomaticDrawing  data="true" />
+<infoparam name="connector" value="null" />
+<P1  x="412" y="82" id="565" />
+<P2  x="472" y="82" id="398" />
+<AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="5206" id="400" >
-<cdparam x="271" y="611" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="&lt;&lt;refine&gt;&gt;" />
-<TGConnectingPoint num="0" id="397" />
-<TGConnectingPoint num="1" id="398" />
-<TGConnectingPoint num="2" id="399" />
-<P1  x="271" y="611" id="132" />
-<P2  x="944" y="599" id="11" />
-<Point x="318" y="685" />
-<Point x="769" y="688" />
+<CONNECTOR type="5102" id="296" >
+<cdparam x="691" y="288" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="295" />
+<P1  x="699" y="289" id="451" />
+<P2  x="699" y="316" id="423" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="395" >
-<father id="400" num="0" />
-<cdparam x="318" y="685" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="396" >
-<father id="400" num="1" />
-<cdparam x="769" y="688" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="294" >
+<father id="296" num="0" />
+<cdparam x="691" y="328" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="290" />
+<TGConnectingPoint num="1" id="291" />
+<TGConnectingPoint num="2" id="292" />
+<TGConnectingPoint num="3" id="293" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5206" id="402" >
-<cdparam x="894" y="599" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="&lt;&lt;refine&gt;&gt;" />
-<TGConnectingPoint num="0" id="401" />
-<P1  x="894" y="599" id="10" />
-<P2  x="347" y="581" id="126" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5205" id="404" >
-<cdparam x="47" y="302" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="403" />
-<P1  x="47" y="302" id="174" />
-<P2  x="46" y="521" id="121" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5205" id="406" >
-<cdparam x="844" y="569" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="405" />
-<P1  x="844" y="569" id="3" />
-<P2  x="347" y="551" id="125" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5205" id="408" >
-<cdparam x="869" y="136" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="407" />
-<P1  x="869" y="136" id="88" />
-<P2  x="944" y="479" id="8" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5205" id="410" >
-<cdparam x="661" y="76" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="409" />
-<P1  x="661" y="76" id="78" />
-<P2  x="496" y="70" id="305" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5208" id="412" >
-<cdparam x="749" y="267" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="&lt;&lt;satisfy&gt;&gt;" />
-<TGConnectingPoint num="0" id="411" />
-<P1  x="727" y="267" id="46" />
-<P2  x="504" y="199" id="273" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5208" id="414" >
-<cdparam x="783" y="223" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="&lt;&lt;satisfy&gt;&gt;" />
-<TGConnectingPoint num="0" id="413" />
-<P1  x="741" y="223" id="63" />
-<P2  x="504" y="173" id="272" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5205" id="416" >
-<cdparam x="124" y="457" />
+<CONNECTOR type="5102" id="303" >
+<cdparam x="481" y="501" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="415" />
-<P1  x="121" y="491" id="127" />
-<P2  x="122" y="302" id="176" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<TGConnectingPoint num="0" id="302" />
+<P1  x="442" y="527" id="718" />
+<P2  x="323" y="748" id="579" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5205" id="418" >
-<cdparam x="244" y="315" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="301" >
+<father id="303" num="0" />
+<cdparam x="420" y="552" />
+<sizeparam width="85" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="297" />
+<TGConnectingPoint num="1" id="298" />
+<TGConnectingPoint num="2" id="299" />
+<TGConnectingPoint num="3" id="300" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="nbOfCoins = 0" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="310" >
+<cdparam x="555" y="559" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="417" />
-<P1  x="208" y="337" id="345" />
-<P2  x="160" y="272" id="170" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="309" />
+<P1  x="326" y="457" id="667" />
+<P2  x="442" y="497" id="717" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5205" id="420" >
-<cdparam x="249" y="199" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="308" >
+<father id="310" num="0" />
+<cdparam x="395" y="448" />
+<sizeparam width="94" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="304" />
+<TGConnectingPoint num="1" id="305" />
+<TGConnectingPoint num="2" id="306" />
+<TGConnectingPoint num="3" id="307" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="coinDelay" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="317" >
+<cdparam x="355" y="545" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="419" />
-<P1  x="233" y="199" id="242" />
-<P2  x="160" y="212" id="168" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<TGConnectingPoint num="0" id="316" />
+<P1  x="298" y="554" id="653" />
+<P2  x="289" y="748" id="571" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5205" id="422" >
-<cdparam x="237" y="98" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="315" >
+<father id="317" num="0" />
+<cdparam x="284" y="594" />
+<sizeparam width="228" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="311" />
+<TGConnectingPoint num="1" id="312" />
+<TGConnectingPoint num="2" id="313" />
+<TGConnectingPoint num="3" id="314" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="teaMinDelay" />
+<computeMax value="teaMaxDelay" />
+<probability value="" />
+<actions value="nbOfCoins = 0" />
+<actions value="beverageReady()" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="324" >
+<cdparam x="295" y="465" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<TGConnectingPoint num="0" id="421" />
-<P1  x="192" y="97" id="303" />
-<P2  x="122" y="182" id="173" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="323" />
+<P1  x="293" y="477" id="678" />
+<P2  x="298" y="524" id="652" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5203" id="424" >
-<cdparam x="538" y="537" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from AvatarProperty to Requirement" value="&lt;&lt;verify&gt;&gt;" />
-<TGConnectingPoint num="0" id="423" />
-<P1  x="678" y="411" id="210" />
-<P2  x="565" y="381" id="361" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5203" id="426" >
-<cdparam x="545" y="329" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from AvatarProperty to Requirement" value="&lt;&lt;verify&gt;&gt;" />
-<TGConnectingPoint num="0" id="425" />
-<P1  x="628" y="323" id="226" />
-<P2  x="504" y="199" id="257" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5203" id="428" >
-<cdparam x="563" y="148" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from AvatarProperty to Requirement" value="&lt;&lt;verify&gt;&gt;" />
-<TGConnectingPoint num="0" id="427" />
-<P1  x="626" y="168" id="286" />
-<P2  x="496" y="97" id="318" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-
-</AvatarRDPanel>
-
-<AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0000000000000004" >
-<CONNECTOR type="5312" id="430" >
-<cdparam x="582" y="248" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="429" />
-<P1  x="502" y="258" id="555" />
-<P2  x="502" y="334" id="443" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5310" id="436" >
-<cdparam x="247" y="616" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="433" />
-<TGConnectingPoint num="1" id="434" />
-<TGConnectingPoint num="2" id="435" />
-<P1  x="492" y="126" id="518" />
-<P2  x="492" y="209" id="559" />
-<Point x="467" y="147" />
-<Point x="467" y="192" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="431" >
-<father id="436" num="0" />
-<cdparam x="467" y="147" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="432" >
-<father id="436" num="1" />
-<cdparam x="467" y="192" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="322" >
+<father id="324" num="0" />
+<cdparam x="295" y="505" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="318" />
+<TGConnectingPoint num="1" id="319" />
+<TGConnectingPoint num="2" id="320" />
+<TGConnectingPoint num="3" id="321" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5311" id="438" >
-<cdparam x="280" y="200" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="437" />
-<P1  x="302" y="261" id="481" />
-<P2  x="361" y="261" id="456" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5312" id="440" >
-<cdparam x="473" y="190" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="439" />
-<P1  x="390" y="286" id="454" />
-<P2  x="390" y="331" id="448" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5311" id="442" >
-<cdparam x="276" y="190" />
+<CONNECTOR type="5102" id="331" >
+<cdparam x="148" y="549" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="441" />
-<P1  x="305" y="211" id="468" />
-<P2  x="361" y="211" id="455" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<TGConnectingPoint num="0" id="330" />
+<P1  x="126" y="554" id="707" />
+<P2  x="255" y="748" id="578" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR>
-<COMPONENT type="5308" id="447" >
-<cdparam x="446" y="334" />
-<sizeparam width="112" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="329" >
+<father id="331" num="0" />
+<cdparam x="32" y="587" />
+<sizeparam width="262" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
-<infoparam name="TGComponent" value="WalletCoinProperty" />
-<TGConnectingPoint num="0" id="443" />
-<TGConnectingPoint num="1" id="444" />
-<TGConnectingPoint num="2" id="445" />
-<TGConnectingPoint num="3" id="446" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="325" />
+<TGConnectingPoint num="1" id="326" />
+<TGConnectingPoint num="2" id="327" />
+<TGConnectingPoint num="3" id="328" />
 <extraparam>
-<liveness data="0" />
-<not data="false" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="coffeeMinDelay" />
+<computeMax value="coffeeMaxDelay" />
+<probability value="" />
+<actions value="nbOfCoins = 0" />
+<actions value="beverageReady()" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5308" id="452" >
-<cdparam x="340" y="331" />
-<sizeparam width="100" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="338" >
+<cdparam x="229" y="465" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="337" />
+<P1  x="227" y="477" id="677" />
+<P2  x="126" y="524" id="706" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="336" >
+<father id="338" num="0" />
+<cdparam x="229" y="505" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
-<infoparam name="TGComponent" value="oneCoinProperty" />
-<TGConnectingPoint num="0" id="448" />
-<TGConnectingPoint num="1" id="449" />
-<TGConnectingPoint num="2" id="450" />
-<TGConnectingPoint num="3" id="451" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="332" />
+<TGConnectingPoint num="1" id="333" />
+<TGConnectingPoint num="2" id="334" />
+<TGConnectingPoint num="3" id="335" />
 <extraparam>
-<liveness data="1" />
-<not data="true" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
 </extraparam>
-</COMPONENT>
-
-<COMPONENT type="5302" id="465" >
-<cdparam x="361" y="187" />
-<sizeparam width="59" height="99" minWidth="50" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
-<infoparam name="TGComponent" value="&gt;50" />
-<TGConnectingPoint num="0" id="453" />
-<TGConnectingPoint num="1" id="454" />
-<TGConnectingPoint num="2" id="455" />
-<TGConnectingPoint num="3" id="456" />
-<TGConnectingPoint num="4" id="457" />
-<TGConnectingPoint num="5" id="458" />
-<TGConnectingPoint num="6" id="459" />
-<TGConnectingPoint num="7" id="460" />
-<TGConnectingPoint num="8" id="461" />
-<TGConnectingPoint num="9" id="462" />
-<TGConnectingPoint num="10" id="463" />
-<TGConnectingPoint num="11" id="464" />
-</COMPONENT>
-
-<COMPONENT type="5300" id="516" >
-<cdparam x="150" y="142" />
-<sizeparam width="168" height="154" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
-<infoparam name="Block0" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="492" />
-<TGConnectingPoint num="1" id="493" />
-<TGConnectingPoint num="2" id="494" />
-<TGConnectingPoint num="3" id="495" />
-<TGConnectingPoint num="4" id="496" />
-<TGConnectingPoint num="5" id="497" />
-<TGConnectingPoint num="6" id="498" />
-<TGConnectingPoint num="7" id="499" />
-<TGConnectingPoint num="8" id="500" />
-<TGConnectingPoint num="9" id="501" />
-<TGConnectingPoint num="10" id="502" />
-<TGConnectingPoint num="11" id="503" />
-<TGConnectingPoint num="12" id="504" />
-<TGConnectingPoint num="13" id="505" />
-<TGConnectingPoint num="14" id="506" />
-<TGConnectingPoint num="15" id="507" />
-<TGConnectingPoint num="16" id="508" />
-<TGConnectingPoint num="17" id="509" />
-<TGConnectingPoint num="18" id="510" />
-<TGConnectingPoint num="19" id="511" />
-<TGConnectingPoint num="20" id="512" />
-<TGConnectingPoint num="21" id="513" />
-<TGConnectingPoint num="22" id="514" />
-<TGConnectingPoint num="23" id="515" />
-</COMPONENT>
-<SUBCOMPONENT type="5304" id="478" >
-<father id="516" num="0" />
-<cdparam x="166" y="191" />
-<sizeparam width="139" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="29" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
-<TGConnectingPoint num="0" id="466" />
-<TGConnectingPoint num="1" id="467" />
-<TGConnectingPoint num="2" id="468" />
-<TGConnectingPoint num="3" id="469" />
-<TGConnectingPoint num="4" id="470" />
-<TGConnectingPoint num="5" id="471" />
-<TGConnectingPoint num="6" id="472" />
-<TGConnectingPoint num="7" id="473" />
-<TGConnectingPoint num="8" id="474" />
-<TGConnectingPoint num="9" id="475" />
-<TGConnectingPoint num="10" id="476" />
-<TGConnectingPoint num="11" id="477" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="491" >
-<father id="516" num="1" />
-<cdparam x="154" y="241" />
-<sizeparam width="148" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="20" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
-<TGConnectingPoint num="0" id="479" />
-<TGConnectingPoint num="1" id="480" />
-<TGConnectingPoint num="2" id="481" />
-<TGConnectingPoint num="3" id="482" />
-<TGConnectingPoint num="4" id="483" />
-<TGConnectingPoint num="5" id="484" />
-<TGConnectingPoint num="6" id="485" />
-<TGConnectingPoint num="7" id="486" />
-<TGConnectingPoint num="8" id="487" />
-<TGConnectingPoint num="9" id="488" />
-<TGConnectingPoint num="10" id="489" />
-<TGConnectingPoint num="11" id="490" />
 </SUBCOMPONENT>
 
-<COMPONENT type="5300" id="554" >
-<cdparam x="459" y="61" />
-<sizeparam width="150" height="116" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
-<infoparam name="Block0" value="Wallet" />
-<TGConnectingPoint num="0" id="530" />
-<TGConnectingPoint num="1" id="531" />
-<TGConnectingPoint num="2" id="532" />
-<TGConnectingPoint num="3" id="533" />
-<TGConnectingPoint num="4" id="534" />
-<TGConnectingPoint num="5" id="535" />
-<TGConnectingPoint num="6" id="536" />
-<TGConnectingPoint num="7" id="537" />
-<TGConnectingPoint num="8" id="538" />
-<TGConnectingPoint num="9" id="539" />
-<TGConnectingPoint num="10" id="540" />
-<TGConnectingPoint num="11" id="541" />
-<TGConnectingPoint num="12" id="542" />
-<TGConnectingPoint num="13" id="543" />
-<TGConnectingPoint num="14" id="544" />
-<TGConnectingPoint num="15" id="545" />
-<TGConnectingPoint num="16" id="546" />
-<TGConnectingPoint num="17" id="547" />
-<TGConnectingPoint num="18" id="548" />
-<TGConnectingPoint num="19" id="549" />
-<TGConnectingPoint num="20" id="550" />
-<TGConnectingPoint num="21" id="551" />
-<TGConnectingPoint num="22" id="552" />
-<TGConnectingPoint num="23" id="553" />
-</COMPONENT>
-<SUBCOMPONENT type="5303" id="529" >
-<father id="554" num="0" />
-<cdparam x="492" y="102" />
-<sizeparam width="100" height="49" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="345" >
+<cdparam x="280" y="420" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="344" />
+<P1  x="261" y="421" id="704" />
+<P2  x="260" y="437" id="664" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="343" >
+<father id="345" num="0" />
+<cdparam x="280" y="460" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="50" minY="0" maxY="67" />
-<infoparam name="TGComponent" value="nbOfCoins" />
-<TGConnectingPoint num="0" id="517" />
-<TGConnectingPoint num="1" id="518" />
-<TGConnectingPoint num="2" id="519" />
-<TGConnectingPoint num="3" id="520" />
-<TGConnectingPoint num="4" id="521" />
-<TGConnectingPoint num="5" id="522" />
-<TGConnectingPoint num="6" id="523" />
-<TGConnectingPoint num="7" id="524" />
-<TGConnectingPoint num="8" id="525" />
-<TGConnectingPoint num="9" id="526" />
-<TGConnectingPoint num="10" id="527" />
-<TGConnectingPoint num="11" id="528" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="339" />
+<TGConnectingPoint num="1" id="340" />
+<TGConnectingPoint num="2" id="341" />
+<TGConnectingPoint num="3" id="342" />
 <extraparam>
-<Toggle value="" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5306" id="566" >
-<cdparam x="467" y="209" />
-<sizeparam width="100" height="49" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="352" >
+<cdparam x="667" y="346" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="351" />
+<P1  x="699" y="346" id="424" />
+<P2  x="699" y="381" id="612" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="350" >
+<father id="352" num="0" />
+<cdparam x="707" y="368" />
+<sizeparam width="85" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
-<infoparam name="TGComponent" value="nbOfCoins &gt;= 0" />
-<TGConnectingPoint num="0" id="555" />
-<TGConnectingPoint num="1" id="556" />
-<TGConnectingPoint num="2" id="557" />
-<TGConnectingPoint num="3" id="558" />
-<TGConnectingPoint num="4" id="559" />
-<TGConnectingPoint num="5" id="560" />
-<TGConnectingPoint num="6" id="561" />
-<TGConnectingPoint num="7" id="562" />
-<TGConnectingPoint num="8" id="563" />
-<TGConnectingPoint num="9" id="564" />
-<TGConnectingPoint num="10" id="565" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="346" />
+<TGConnectingPoint num="1" id="347" />
+<TGConnectingPoint num="2" id="348" />
+<TGConnectingPoint num="3" id="349" />
 <extraparam>
-<Toggle value="" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="nbOfCoins = 0" />
 </extraparam>
-</COMPONENT>
-
-
-</AvatarPDPanel>
+</SUBCOMPONENT>
 
-<AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="1400" zoom="1.0" >
-<CONNECTOR type="5312" id="568" >
-<cdparam x="580" y="547" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="567" />
-<P1  x="637" y="538" id="749" />
-<P2  x="632" y="563" id="600" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5312" id="570" >
-<cdparam x="506" y="493" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="569" />
-<P1  x="577" y="471" id="754" />
-<P2  x="617" y="498" id="742" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5312" id="572" >
-<cdparam x="694" y="460" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="571" />
-<P1  x="694" y="472" id="596" />
-<P2  x="657" y="498" id="744" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5311" id="578" >
-<cdparam x="581" y="133" />
+<CONNECTOR type="5102" id="359" >
+<cdparam x="348" y="228" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="575" />
-<TGConnectingPoint num="1" id="576" />
-<TGConnectingPoint num="2" id="577" />
-<P1  x="581" y="154" id="651" />
-<P2  x="546" y="305" id="721" />
-<Point x="518" y="154" />
-<Point x="518" y="305" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="358" />
+<P1  x="388" y="208" id="490" />
+<P2  x="649" y="264" id="448" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="573" >
-<father id="578" num="0" />
-<cdparam x="518" y="154" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="357" >
+<father id="359" num="0" />
+<cdparam x="411" y="206" />
+<sizeparam width="94" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="353" />
+<TGConnectingPoint num="1" id="354" />
+<TGConnectingPoint num="2" id="355" />
+<TGConnectingPoint num="3" id="356" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="coinDelay" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="0.1" />
+</extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="574" >
-<father id="578" num="1" />
-<cdparam x="518" y="305" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<CONNECTOR type="5102" id="366" >
+<cdparam x="243" y="319" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="365" />
+<P1  x="277" y="305" id="435" />
+<P2  x="311" y="372" id="729" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="364" >
+<father id="366" num="0" />
+<cdparam x="243" y="359" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="360" />
+<TGConnectingPoint num="1" id="361" />
+<TGConnectingPoint num="2" id="362" />
+<TGConnectingPoint num="3" id="363" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5311" id="582" >
-<cdparam x="631" y="143" />
+<CONNECTOR type="5102" id="373" >
+<cdparam x="270" y="224" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="580" />
-<TGConnectingPoint num="1" id="581" />
-<P1  x="631" y="164" id="646" />
-<P2  x="667" y="310" id="708" />
-<Point x="631" y="310" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="372" />
+<P1  x="270" y="228" id="500" />
+<P2  x="277" y="275" id="434" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="579" >
-<father id="582" num="0" />
-<cdparam x="631" y="310" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="371" >
+<father id="373" num="0" />
+<cdparam x="270" y="264" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="367" />
+<TGConnectingPoint num="1" id="368" />
+<TGConnectingPoint num="2" id="369" />
+<TGConnectingPoint num="3" id="370" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5312" id="584" >
-<cdparam x="695" y="396" />
+<CONNECTOR type="5102" id="380" >
+<cdparam x="309" y="160" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="583" />
-<P1  x="696" y="385" id="707" />
-<P2  x="694" y="417" id="595" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="379" />
+<P1  x="306" y="166" id="413" />
+<P2  x="309" y="188" id="487" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5310" id="588" >
-<cdparam x="877" y="168" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="586" />
-<TGConnectingPoint num="1" id="587" />
-<P1  x="721" y="158" id="657" />
-<P2  x="700" y="204" id="698" />
-<Point x="700" y="158" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="585" >
-<father id="588" num="0" />
-<cdparam x="700" y="158" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="378" >
+<father id="380" num="0" />
+<cdparam x="328" y="178" />
+<sizeparam width="161" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="point " value="null" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="374" />
+<TGConnectingPoint num="1" id="375" />
+<TGConnectingPoint num="2" id="376" />
+<TGConnectingPoint num="3" id="377" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+<actions value="nbOfCoins = nbOfCoins + x" />
+</extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5312" id="590" >
-<cdparam x="915" y="307" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="589" />
-<P1  x="710" y="254" id="694" />
-<P2  x="711" y="285" id="706" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5312" id="592" >
-<cdparam x="993" y="581" />
+<CONNECTOR type="5102" id="387" >
+<cdparam x="303" y="103" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="reg" />
-<TGConnectingPoint num="0" id="591" />
-<P1  x="576" y="385" id="720" />
-<P2  x="577" y="416" id="753" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="386" />
+<P1  x="302" y="102" id="535" />
+<P2  x="306" y="136" id="412" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="5311" id="594" >
-<cdparam x="426" y="264" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="385" >
+<father id="387" num="0" />
+<cdparam x="303" y="143" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="381" />
+<TGConnectingPoint num="1" id="382" />
+<TGConnectingPoint num="2" id="383" />
+<TGConnectingPoint num="3" id="384" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="394" >
+<cdparam x="303" y="40" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="593" />
-<P1  x="491" y="345" id="607" />
-<P2  x="546" y="345" id="725" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="393" />
+<P1  x="303" y="40" id="527" />
+<P2  x="302" y="62" id="530" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR>
-<COMPONENT type="5308" id="599" >
-<cdparam x="644" y="417" />
-<sizeparam width="100" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="392" >
+<father id="394" num="0" />
+<cdparam x="303" y="80" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="TGComponent" value="prop01" />
-<TGConnectingPoint num="0" id="595" />
-<TGConnectingPoint num="1" id="596" />
-<TGConnectingPoint num="2" id="597" />
-<TGConnectingPoint num="3" id="598" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="388" />
+<TGConnectingPoint num="1" id="389" />
+<TGConnectingPoint num="2" id="390" />
+<TGConnectingPoint num="3" id="391" />
 <extraparam>
-<liveness data="1" />
-<not data="false" />
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<probability value="" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5308" id="604" >
-<cdparam x="559" y="563" />
-<sizeparam width="146" height="54" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="411" >
+<cdparam x="472" y="75" />
+<sizeparam width="100" height="15" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="TGComponent" value="BeverageDeliverProperty" />
-<TGConnectingPoint num="0" id="600" />
-<TGConnectingPoint num="1" id="601" />
-<TGConnectingPoint num="2" id="602" />
-<TGConnectingPoint num="3" id="603" />
+<infoparam name="UML Note" value="Activity1.docx
+" />
+<TGConnectingPoint num="0" id="395" />
+<TGConnectingPoint num="1" id="396" />
+<TGConnectingPoint num="2" id="397" />
+<TGConnectingPoint num="3" id="398" />
+<TGConnectingPoint num="4" id="399" />
+<TGConnectingPoint num="5" id="400" />
+<TGConnectingPoint num="6" id="401" />
+<TGConnectingPoint num="7" id="402" />
+<TGConnectingPoint num="8" id="403" />
+<TGConnectingPoint num="9" id="404" />
+<TGConnectingPoint num="10" id="405" />
+<TGConnectingPoint num="11" id="406" />
+<TGConnectingPoint num="12" id="407" />
+<TGConnectingPoint num="13" id="408" />
+<TGConnectingPoint num="14" id="409" />
+<TGConnectingPoint num="15" id="410" />
 <extraparam>
-<liveness data="0" />
-<not data="false" />
+<Line value="Activity1.docx" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5300" id="642" >
-<cdparam x="372" y="227" />
-<sizeparam width="132" height="153" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="422" >
+<cdparam x="268" y="141" />
+<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="Block0" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="618" />
-<TGConnectingPoint num="1" id="619" />
-<TGConnectingPoint num="2" id="620" />
-<TGConnectingPoint num="3" id="621" />
-<TGConnectingPoint num="4" id="622" />
-<TGConnectingPoint num="5" id="623" />
-<TGConnectingPoint num="6" id="624" />
-<TGConnectingPoint num="7" id="625" />
-<TGConnectingPoint num="8" id="626" />
-<TGConnectingPoint num="9" id="627" />
-<TGConnectingPoint num="10" id="628" />
-<TGConnectingPoint num="11" id="629" />
-<TGConnectingPoint num="12" id="630" />
-<TGConnectingPoint num="13" id="631" />
-<TGConnectingPoint num="14" id="632" />
-<TGConnectingPoint num="15" id="633" />
-<TGConnectingPoint num="16" id="634" />
-<TGConnectingPoint num="17" id="635" />
-<TGConnectingPoint num="18" id="636" />
-<TGConnectingPoint num="19" id="637" />
-<TGConnectingPoint num="20" id="638" />
-<TGConnectingPoint num="21" id="639" />
-<TGConnectingPoint num="22" id="640" />
-<TGConnectingPoint num="23" id="641" />
+<infoparam name="Receive signal" value="getCoin(x)" />
+<TGConnectingPoint num="0" id="412" />
+<TGConnectingPoint num="1" id="413" />
+<TGConnectingPoint num="2" id="414" />
+<TGConnectingPoint num="3" id="415" />
+<TGConnectingPoint num="4" id="416" />
+<TGConnectingPoint num="5" id="417" />
+<TGConnectingPoint num="6" id="418" />
+<TGConnectingPoint num="7" id="419" />
+<TGConnectingPoint num="8" id="420" />
+<TGConnectingPoint num="9" id="421" />
 </COMPONENT>
-<SUBCOMPONENT type="5304" id="617" >
-<father id="642" num="0" />
-<cdparam x="391" y="326" />
-<sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="32" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="beverageReady" />
-<TGConnectingPoint num="0" id="605" />
-<TGConnectingPoint num="1" id="606" />
-<TGConnectingPoint num="2" id="607" />
-<TGConnectingPoint num="3" id="608" />
-<TGConnectingPoint num="4" id="609" />
-<TGConnectingPoint num="5" id="610" />
-<TGConnectingPoint num="6" id="611" />
-<TGConnectingPoint num="7" id="612" />
-<TGConnectingPoint num="8" id="613" />
-<TGConnectingPoint num="9" id="614" />
-<TGConnectingPoint num="10" id="615" />
-<TGConnectingPoint num="11" id="616" />
-</SUBCOMPONENT>
 
-<COMPONENT type="5300" id="693" >
-<cdparam x="563" y="78" />
-<sizeparam width="268" height="115" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="433" >
+<cdparam x="634" y="321" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="Block0" value="Wallet" />
-<TGConnectingPoint num="0" id="669" />
-<TGConnectingPoint num="1" id="670" />
-<TGConnectingPoint num="2" id="671" />
-<TGConnectingPoint num="3" id="672" />
-<TGConnectingPoint num="4" id="673" />
-<TGConnectingPoint num="5" id="674" />
-<TGConnectingPoint num="6" id="675" />
-<TGConnectingPoint num="7" id="676" />
-<TGConnectingPoint num="8" id="677" />
-<TGConnectingPoint num="9" id="678" />
-<TGConnectingPoint num="10" id="679" />
-<TGConnectingPoint num="11" id="680" />
-<TGConnectingPoint num="12" id="681" />
-<TGConnectingPoint num="13" id="682" />
-<TGConnectingPoint num="14" id="683" />
-<TGConnectingPoint num="15" id="684" />
-<TGConnectingPoint num="16" id="685" />
-<TGConnectingPoint num="17" id="686" />
-<TGConnectingPoint num="18" id="687" />
-<TGConnectingPoint num="19" id="688" />
-<TGConnectingPoint num="20" id="689" />
-<TGConnectingPoint num="21" id="690" />
-<TGConnectingPoint num="22" id="691" />
-<TGConnectingPoint num="23" id="692" />
+<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
+<TGConnectingPoint num="0" id="423" />
+<TGConnectingPoint num="1" id="424" />
+<TGConnectingPoint num="2" id="425" />
+<TGConnectingPoint num="3" id="426" />
+<TGConnectingPoint num="4" id="427" />
+<TGConnectingPoint num="5" id="428" />
+<TGConnectingPoint num="6" id="429" />
+<TGConnectingPoint num="7" id="430" />
+<TGConnectingPoint num="8" id="431" />
+<TGConnectingPoint num="9" id="432" />
 </COMPONENT>
-<SUBCOMPONENT type="5304" id="655" >
-<father id="693" num="0" />
-<cdparam x="581" y="125" />
-<sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
-<infoparam name="TGComponent" value="Start" />
-<TGConnectingPoint num="0" id="643" />
-<TGConnectingPoint num="1" id="644" />
-<TGConnectingPoint num="2" id="645" />
-<TGConnectingPoint num="3" id="646" />
-<TGConnectingPoint num="4" id="647" />
-<TGConnectingPoint num="5" id="648" />
-<TGConnectingPoint num="6" id="649" />
-<TGConnectingPoint num="7" id="650" />
-<TGConnectingPoint num="8" id="651" />
-<TGConnectingPoint num="9" id="652" />
-<TGConnectingPoint num="10" id="653" />
-<TGConnectingPoint num="11" id="654" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5303" id="668" >
-<father id="693" num="1" />
-<cdparam x="721" y="133" />
-<sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<COMPONENT type="5104" id="444" >
+<cdparam x="239" y="280" />
+<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" />
-<infoparam name="TGComponent" value="nbOfCoins" />
-<TGConnectingPoint num="0" id="656" />
-<TGConnectingPoint num="1" id="657" />
-<TGConnectingPoint num="2" id="658" />
-<TGConnectingPoint num="3" id="659" />
-<TGConnectingPoint num="4" id="660" />
-<TGConnectingPoint num="5" id="661" />
-<TGConnectingPoint num="6" id="662" />
-<TGConnectingPoint num="7" id="663" />
-<TGConnectingPoint num="8" id="664" />
-<TGConnectingPoint num="9" id="665" />
-<TGConnectingPoint num="10" id="666" />
-<TGConnectingPoint num="11" id="667" />
-<extraparam>
-<Toggle value="" />
-</extraparam>
-</SUBCOMPONENT>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="Receive signal" value="getCoin(x)" />
+<TGConnectingPoint num="0" id="434" />
+<TGConnectingPoint num="1" id="435" />
+<TGConnectingPoint num="2" id="436" />
+<TGConnectingPoint num="3" id="437" />
+<TGConnectingPoint num="4" id="438" />
+<TGConnectingPoint num="5" id="439" />
+<TGConnectingPoint num="6" id="440" />
+<TGConnectingPoint num="7" id="441" />
+<TGConnectingPoint num="8" id="442" />
+<TGConnectingPoint num="9" id="443" />
+<accessibility />
+</COMPONENT>
 
-<COMPONENT type="5306" id="705" >
-<cdparam x="675" y="204" />
-<sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="485" >
+<cdparam x="649" y="239" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="TGComponent" value="nbOfCoins &gt; 1" />
-<TGConnectingPoint num="0" id="694" />
-<TGConnectingPoint num="1" id="695" />
-<TGConnectingPoint num="2" id="696" />
-<TGConnectingPoint num="3" id="697" />
-<TGConnectingPoint num="4" id="698" />
-<TGConnectingPoint num="5" id="699" />
-<TGConnectingPoint num="6" id="700" />
-<TGConnectingPoint num="7" id="701" />
-<TGConnectingPoint num="8" id="702" />
-<TGConnectingPoint num="9" id="703" />
-<TGConnectingPoint num="10" id="704" />
+<infoparam name="state0" value="ejectState" />
+<TGConnectingPoint num="0" id="445" />
+<TGConnectingPoint num="1" id="446" />
+<TGConnectingPoint num="2" id="447" />
+<TGConnectingPoint num="3" id="448" />
+<TGConnectingPoint num="4" id="449" />
+<TGConnectingPoint num="5" id="450" />
+<TGConnectingPoint num="6" id="451" />
+<TGConnectingPoint num="7" id="452" />
+<TGConnectingPoint num="8" id="453" />
+<TGConnectingPoint num="9" id="454" />
+<TGConnectingPoint num="10" id="455" />
+<TGConnectingPoint num="11" id="456" />
+<TGConnectingPoint num="12" id="457" />
+<TGConnectingPoint num="13" id="458" />
+<TGConnectingPoint num="14" id="459" />
+<TGConnectingPoint num="15" id="460" />
+<TGConnectingPoint num="16" id="461" />
+<TGConnectingPoint num="17" id="462" />
+<TGConnectingPoint num="18" id="463" />
+<TGConnectingPoint num="19" id="464" />
+<TGConnectingPoint num="20" id="465" />
+<TGConnectingPoint num="21" id="466" />
+<TGConnectingPoint num="22" id="467" />
+<TGConnectingPoint num="23" id="468" />
+<TGConnectingPoint num="24" id="469" />
+<TGConnectingPoint num="25" id="470" />
+<TGConnectingPoint num="26" id="471" />
+<TGConnectingPoint num="27" id="472" />
+<TGConnectingPoint num="28" id="473" />
+<TGConnectingPoint num="29" id="474" />
+<TGConnectingPoint num="30" id="475" />
+<TGConnectingPoint num="31" id="476" />
+<TGConnectingPoint num="32" id="477" />
+<TGConnectingPoint num="33" id="478" />
+<TGConnectingPoint num="34" id="479" />
+<TGConnectingPoint num="35" id="480" />
+<TGConnectingPoint num="36" id="481" />
+<TGConnectingPoint num="37" id="482" />
+<TGConnectingPoint num="38" id="483" />
+<TGConnectingPoint num="39" id="484" />
 <extraparam>
-<Toggle value="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5302" id="718" >
-<cdparam x="667" y="285" />
-<sizeparam width="59" height="100" minWidth="50" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="526" >
+<cdparam x="231" y="188" />
+<sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="TGComponent" value="=0" />
-<TGConnectingPoint num="0" id="706" />
-<TGConnectingPoint num="1" id="707" />
-<TGConnectingPoint num="2" id="708" />
-<TGConnectingPoint num="3" id="709" />
-<TGConnectingPoint num="4" id="710" />
-<TGConnectingPoint num="5" id="711" />
-<TGConnectingPoint num="6" id="712" />
-<TGConnectingPoint num="7" id="713" />
-<TGConnectingPoint num="8" id="714" />
-<TGConnectingPoint num="9" id="715" />
-<TGConnectingPoint num="10" id="716" />
-<TGConnectingPoint num="11" id="717" />
+<infoparam name="state0" value="WaitingForSecondCoin" />
+<TGConnectingPoint num="0" id="486" />
+<TGConnectingPoint num="1" id="487" />
+<TGConnectingPoint num="2" id="488" />
+<TGConnectingPoint num="3" id="489" />
+<TGConnectingPoint num="4" id="490" />
+<TGConnectingPoint num="5" id="491" />
+<TGConnectingPoint num="6" id="492" />
+<TGConnectingPoint num="7" id="493" />
+<TGConnectingPoint num="8" id="494" />
+<TGConnectingPoint num="9" id="495" />
+<TGConnectingPoint num="10" id="496" />
+<TGConnectingPoint num="11" id="497" />
+<TGConnectingPoint num="12" id="498" />
+<TGConnectingPoint num="13" id="499" />
+<TGConnectingPoint num="14" id="500" />
+<TGConnectingPoint num="15" id="501" />
+<TGConnectingPoint num="16" id="502" />
+<TGConnectingPoint num="17" id="503" />
+<TGConnectingPoint num="18" id="504" />
+<TGConnectingPoint num="19" id="505" />
+<TGConnectingPoint num="20" id="506" />
+<TGConnectingPoint num="21" id="507" />
+<TGConnectingPoint num="22" id="508" />
+<TGConnectingPoint num="23" id="509" />
+<TGConnectingPoint num="24" id="510" />
+<TGConnectingPoint num="25" id="511" />
+<TGConnectingPoint num="26" id="512" />
+<TGConnectingPoint num="27" id="513" />
+<TGConnectingPoint num="28" id="514" />
+<TGConnectingPoint num="29" id="515" />
+<TGConnectingPoint num="30" id="516" />
+<TGConnectingPoint num="31" id="517" />
+<TGConnectingPoint num="32" id="518" />
+<TGConnectingPoint num="33" id="519" />
+<TGConnectingPoint num="34" id="520" />
+<TGConnectingPoint num="35" id="521" />
+<TGConnectingPoint num="36" id="522" />
+<TGConnectingPoint num="37" id="523" />
+<TGConnectingPoint num="38" id="524" />
+<TGConnectingPoint num="39" id="525" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5301" id="739" >
-<cdparam x="546" y="285" />
-<sizeparam width="60" height="100" minWidth="50" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5100" id="528" >
+<cdparam x="296" y="20" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="TGComponent" value="&lt;&lt;LS&gt;&gt;" />
-<TGConnectingPoint num="0" id="719" />
-<TGConnectingPoint num="1" id="720" />
-<TGConnectingPoint num="2" id="721" />
-<TGConnectingPoint num="3" id="722" />
-<TGConnectingPoint num="4" id="723" />
-<TGConnectingPoint num="5" id="724" />
-<TGConnectingPoint num="6" id="725" />
-<TGConnectingPoint num="7" id="726" />
-<TGConnectingPoint num="8" id="727" />
-<TGConnectingPoint num="9" id="728" />
-<TGConnectingPoint num="10" id="729" />
-<TGConnectingPoint num="11" id="730" />
-<TGConnectingPoint num="12" id="731" />
-<TGConnectingPoint num="13" id="732" />
-<TGConnectingPoint num="14" id="733" />
-<TGConnectingPoint num="15" id="734" />
-<TGConnectingPoint num="16" id="735" />
-<TGConnectingPoint num="17" id="736" />
-<TGConnectingPoint num="18" id="737" />
-<TGConnectingPoint num="19" id="738" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="527" />
 </COMPONENT>
 
-<COMPONENT type="5309" id="752" >
-<cdparam x="597" y="498" />
-<sizeparam width="80" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="569" >
+<cdparam x="192" y="62" />
+<sizeparam width="220" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="TGComponent" value="&lt;=&gt;" />
-<TGConnectingPoint num="0" id="740" />
-<TGConnectingPoint num="1" id="741" />
-<TGConnectingPoint num="2" id="742" />
-<TGConnectingPoint num="3" id="743" />
-<TGConnectingPoint num="4" id="744" />
-<TGConnectingPoint num="5" id="745" />
-<TGConnectingPoint num="6" id="746" />
-<TGConnectingPoint num="7" id="747" />
-<TGConnectingPoint num="8" id="748" />
-<TGConnectingPoint num="9" id="749" />
-<TGConnectingPoint num="10" id="750" />
-<TGConnectingPoint num="11" id="751" />
+<infoparam name="state0" value="WaitingForFirstCoin" />
+<TGConnectingPoint num="0" id="529" />
+<TGConnectingPoint num="1" id="530" />
+<TGConnectingPoint num="2" id="531" />
+<TGConnectingPoint num="3" id="532" />
+<TGConnectingPoint num="4" id="533" />
+<TGConnectingPoint num="5" id="534" />
+<TGConnectingPoint num="6" id="535" />
+<TGConnectingPoint num="7" id="536" />
+<TGConnectingPoint num="8" id="537" />
+<TGConnectingPoint num="9" id="538" />
+<TGConnectingPoint num="10" id="539" />
+<TGConnectingPoint num="11" id="540" />
+<TGConnectingPoint num="12" id="541" />
+<TGConnectingPoint num="13" id="542" />
+<TGConnectingPoint num="14" id="543" />
+<TGConnectingPoint num="15" id="544" />
+<TGConnectingPoint num="16" id="545" />
+<TGConnectingPoint num="17" id="546" />
+<TGConnectingPoint num="18" id="547" />
+<TGConnectingPoint num="19" id="548" />
+<TGConnectingPoint num="20" id="549" />
+<TGConnectingPoint num="21" id="550" />
+<TGConnectingPoint num="22" id="551" />
+<TGConnectingPoint num="23" id="552" />
+<TGConnectingPoint num="24" id="553" />
+<TGConnectingPoint num="25" id="554" />
+<TGConnectingPoint num="26" id="555" />
+<TGConnectingPoint num="27" id="556" />
+<TGConnectingPoint num="28" id="557" />
+<TGConnectingPoint num="29" id="558" />
+<TGConnectingPoint num="30" id="559" />
+<TGConnectingPoint num="31" id="560" />
+<TGConnectingPoint num="32" id="561" />
+<TGConnectingPoint num="33" id="562" />
+<TGConnectingPoint num="34" id="563" />
+<TGConnectingPoint num="35" id="564" />
+<TGConnectingPoint num="36" id="565" />
+<TGConnectingPoint num="37" id="566" />
+<TGConnectingPoint num="38" id="567" />
+<TGConnectingPoint num="39" id="568" />
+<latencyCheck />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5308" id="757" >
-<cdparam x="527" y="416" />
-<sizeparam width="100" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="610" >
+<cdparam x="221" y="748" />
+<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="TGComponent" value="prop02" />
-<TGConnectingPoint num="0" id="753" />
-<TGConnectingPoint num="1" id="754" />
-<TGConnectingPoint num="2" id="755" />
-<TGConnectingPoint num="3" id="756" />
+<infoparam name="state0" value="WaitingForFirstCoin" />
+<TGConnectingPoint num="0" id="570" />
+<TGConnectingPoint num="1" id="571" />
+<TGConnectingPoint num="2" id="572" />
+<TGConnectingPoint num="3" id="573" />
+<TGConnectingPoint num="4" id="574" />
+<TGConnectingPoint num="5" id="575" />
+<TGConnectingPoint num="6" id="576" />
+<TGConnectingPoint num="7" id="577" />
+<TGConnectingPoint num="8" id="578" />
+<TGConnectingPoint num="9" id="579" />
+<TGConnectingPoint num="10" id="580" />
+<TGConnectingPoint num="11" id="581" />
+<TGConnectingPoint num="12" id="582" />
+<TGConnectingPoint num="13" id="583" />
+<TGConnectingPoint num="14" id="584" />
+<TGConnectingPoint num="15" id="585" />
+<TGConnectingPoint num="16" id="586" />
+<TGConnectingPoint num="17" id="587" />
+<TGConnectingPoint num="18" id="588" />
+<TGConnectingPoint num="19" id="589" />
+<TGConnectingPoint num="20" id="590" />
+<TGConnectingPoint num="21" id="591" />
+<TGConnectingPoint num="22" id="592" />
+<TGConnectingPoint num="23" id="593" />
+<TGConnectingPoint num="24" id="594" />
+<TGConnectingPoint num="25" id="595" />
+<TGConnectingPoint num="26" id="596" />
+<TGConnectingPoint num="27" id="597" />
+<TGConnectingPoint num="28" id="598" />
+<TGConnectingPoint num="29" id="599" />
+<TGConnectingPoint num="30" id="600" />
+<TGConnectingPoint num="31" id="601" />
+<TGConnectingPoint num="32" id="602" />
+<TGConnectingPoint num="33" id="603" />
+<TGConnectingPoint num="34" id="604" />
+<TGConnectingPoint num="35" id="605" />
+<TGConnectingPoint num="36" id="606" />
+<TGConnectingPoint num="37" id="607" />
+<TGConnectingPoint num="38" id="608" />
+<TGConnectingPoint num="39" id="609" />
 <extraparam>
-<liveness data="1" />
-<not data="false" />
 </extraparam>
 </COMPONENT>
 
-
-</AvatarPDPanel>
-
-</Modeling>
-
-
-
-
-<Modeling type="AVATAR Design" nameTab="AVATAR Design" >
-<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<MainCode value="void __user_init() {"/>
-<MainCode value="}"/>
-<Optimized value="true" />
-<Validated value="" />
-<Ignored value="" />
-
-<CONNECTOR type="5002" id="759" >
-<cdparam x="321" y="567" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Block1 to Block0" value="" />
-<TGConnectingPoint num="0" id="758" />
-<P1  x="559" y="330" id="820" />
-<P2  x="560" y="377" id="853" />
-<AutomaticDrawing  data="true" />
-<extraparam>
-<isd value="in pushCoffeeButton()" />
-<oso value="out push()" />
-<FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="5002" id="761" >
-<cdparam x="275" y="114" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="760" />
-<P1  x="306" y="109" id="775" />
-<P2  x="445" y="108" id="849" />
-<AutomaticDrawing  data="true" />
-<extraparam>
-<iso value="in getCoin(int nbOfCoins)" />
-<osd value="out ejectCoin(int nbOfCoins)" />
-<isd value="in getCoin(int nbOfCoins)" />
-<oso value="out putCoin(int nbOfCoins)" />
-<FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
-</extraparam>
-</CONNECTOR>
-<CONNECTOR type="5002" id="763" >
-<cdparam x="623" y="565" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Block1 to Block0" value="" />
-<TGConnectingPoint num="0" id="762" />
-<P1  x="789" y="326" id="795" />
-<P2  x="790" y="377" id="854" />
-<AutomaticDrawing  data="true" />
-<extraparam>
-<isd value="in pushTeaButton()" />
-<oso value="out push()" />
-<FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" />
-</extraparam>
-</CONNECTOR>
-<COMPONENT type="5000" id="788" >
-<cdparam x="106" y="55" />
-<sizeparam width="200" height="218" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="651" >
+<cdparam x="631" y="381" />
+<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Block0" value="Wallet" />
-<TGConnectingPoint num="0" id="764" />
-<TGConnectingPoint num="1" id="765" />
-<TGConnectingPoint num="2" id="766" />
-<TGConnectingPoint num="3" id="767" />
-<TGConnectingPoint num="4" id="768" />
-<TGConnectingPoint num="5" id="769" />
-<TGConnectingPoint num="6" id="770" />
-<TGConnectingPoint num="7" id="771" />
-<TGConnectingPoint num="8" id="772" />
-<TGConnectingPoint num="9" id="773" />
-<TGConnectingPoint num="10" id="774" />
-<TGConnectingPoint num="11" id="775" />
-<TGConnectingPoint num="12" id="776" />
-<TGConnectingPoint num="13" id="777" />
-<TGConnectingPoint num="14" id="778" />
-<TGConnectingPoint num="15" id="779" />
-<TGConnectingPoint num="16" id="780" />
-<TGConnectingPoint num="17" id="781" />
-<TGConnectingPoint num="18" id="782" />
-<TGConnectingPoint num="19" id="783" />
-<TGConnectingPoint num="20" id="784" />
-<TGConnectingPoint num="21" id="785" />
-<TGConnectingPoint num="22" id="786" />
-<TGConnectingPoint num="23" id="787" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="WaitingForFirstCoin" />
+<TGConnectingPoint num="0" id="611" />
+<TGConnectingPoint num="1" id="612" />
+<TGConnectingPoint num="2" id="613" />
+<TGConnectingPoint num="3" id="614" />
+<TGConnectingPoint num="4" id="615" />
+<TGConnectingPoint num="5" id="616" />
+<TGConnectingPoint num="6" id="617" />
+<TGConnectingPoint num="7" id="618" />
+<TGConnectingPoint num="8" id="619" />
+<TGConnectingPoint num="9" id="620" />
+<TGConnectingPoint num="10" id="621" />
+<TGConnectingPoint num="11" id="622" />
+<TGConnectingPoint num="12" id="623" />
+<TGConnectingPoint num="13" id="624" />
+<TGConnectingPoint num="14" id="625" />
+<TGConnectingPoint num="15" id="626" />
+<TGConnectingPoint num="16" id="627" />
+<TGConnectingPoint num="17" id="628" />
+<TGConnectingPoint num="18" id="629" />
+<TGConnectingPoint num="19" id="630" />
+<TGConnectingPoint num="20" id="631" />
+<TGConnectingPoint num="21" id="632" />
+<TGConnectingPoint num="22" id="633" />
+<TGConnectingPoint num="23" id="634" />
+<TGConnectingPoint num="24" id="635" />
+<TGConnectingPoint num="25" id="636" />
+<TGConnectingPoint num="26" id="637" />
+<TGConnectingPoint num="27" id="638" />
+<TGConnectingPoint num="28" id="639" />
+<TGConnectingPoint num="29" id="640" />
+<TGConnectingPoint num="30" id="641" />
+<TGConnectingPoint num="31" id="642" />
+<TGConnectingPoint num="32" id="643" />
+<TGConnectingPoint num="33" id="644" />
+<TGConnectingPoint num="34" id="645" />
+<TGConnectingPoint num="35" id="646" />
+<TGConnectingPoint num="36" id="647" />
+<TGConnectingPoint num="37" id="648" />
+<TGConnectingPoint num="38" id="649" />
+<TGConnectingPoint num="39" id="650" />
 <extraparam>
-<blockType data="block" color="-4072719" />
-<CryptoBlock value="false" />
-<Attribute access="0" id="nbOfCoins" value="2" type="8" typeOther="" />
-<Attribute access="0" id="x" value="1" type="8" typeOther="" />
-<Attribute access="0" id="minUserDelay" value="50" type="8" typeOther="" />
-<Attribute access="0" id="maxUserDelay" value="70" type="8" typeOther="" />
-<Method value="contentOfWallet(int nbOfCoins)" />
-<Signal value="in getCoin(int nbOfCoins)" attached="true" />
-<Signal value="out putCoin(int nbOfCoins)" attached="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="863" >
-<cdparam x="445" y="19" />
-<sizeparam width="461" height="358" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="768" >
+<cdparam x="23" y="372" />
+<sizeparam width="577" height="354" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Block0" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="839" />
-<TGConnectingPoint num="1" id="840" />
-<TGConnectingPoint num="2" id="841" />
-<TGConnectingPoint num="3" id="842" />
-<TGConnectingPoint num="4" id="843" />
-<TGConnectingPoint num="5" id="844" />
-<TGConnectingPoint num="6" id="845" />
-<TGConnectingPoint num="7" id="846" />
-<TGConnectingPoint num="8" id="847" />
-<TGConnectingPoint num="9" id="848" />
-<TGConnectingPoint num="10" id="849" />
-<TGConnectingPoint num="11" id="850" />
-<TGConnectingPoint num="12" id="851" />
-<TGConnectingPoint num="13" id="852" />
-<TGConnectingPoint num="14" id="853" />
-<TGConnectingPoint num="15" id="854" />
-<TGConnectingPoint num="16" id="855" />
-<TGConnectingPoint num="17" id="856" />
-<TGConnectingPoint num="18" id="857" />
-<TGConnectingPoint num="19" id="858" />
-<TGConnectingPoint num="20" id="859" />
-<TGConnectingPoint num="21" id="860" />
-<TGConnectingPoint num="22" id="861" />
-<TGConnectingPoint num="23" id="862" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="Beverage" />
+<TGConnectingPoint num="0" id="728" />
+<TGConnectingPoint num="1" id="729" />
+<TGConnectingPoint num="2" id="730" />
+<TGConnectingPoint num="3" id="731" />
+<TGConnectingPoint num="4" id="732" />
+<TGConnectingPoint num="5" id="733" />
+<TGConnectingPoint num="6" id="734" />
+<TGConnectingPoint num="7" id="735" />
+<TGConnectingPoint num="8" id="736" />
+<TGConnectingPoint num="9" id="737" />
+<TGConnectingPoint num="10" id="738" />
+<TGConnectingPoint num="11" id="739" />
+<TGConnectingPoint num="12" id="740" />
+<TGConnectingPoint num="13" id="741" />
+<TGConnectingPoint num="14" id="742" />
+<TGConnectingPoint num="15" id="743" />
+<TGConnectingPoint num="16" id="744" />
+<TGConnectingPoint num="17" id="745" />
+<TGConnectingPoint num="18" id="746" />
+<TGConnectingPoint num="19" id="747" />
+<TGConnectingPoint num="20" id="748" />
+<TGConnectingPoint num="21" id="749" />
+<TGConnectingPoint num="22" id="750" />
+<TGConnectingPoint num="23" id="751" />
+<TGConnectingPoint num="24" id="752" />
+<TGConnectingPoint num="25" id="753" />
+<TGConnectingPoint num="26" id="754" />
+<TGConnectingPoint num="27" id="755" />
+<TGConnectingPoint num="28" id="756" />
+<TGConnectingPoint num="29" id="757" />
+<TGConnectingPoint num="30" id="758" />
+<TGConnectingPoint num="31" id="759" />
+<TGConnectingPoint num="32" id="760" />
+<TGConnectingPoint num="33" id="761" />
+<TGConnectingPoint num="34" id="762" />
+<TGConnectingPoint num="35" id="763" />
+<TGConnectingPoint num="36" id="764" />
+<TGConnectingPoint num="37" id="765" />
+<TGConnectingPoint num="38" id="766" />
+<TGConnectingPoint num="39" id="767" />
 <extraparam>
-<blockType data="block" color="-4072719" />
-<CryptoBlock value="false" />
-<Attribute access="0" id="teaMinDelay" value="3" type="8" typeOther="" />
-<Attribute access="0" id="teaMaxDelay" value="8" type="8" typeOther="" />
-<Attribute access="0" id="coffeeMinDelay" value="5" type="8" typeOther="" />
-<Attribute access="0" id="coffeeMaxDelay" value="10" type="8" typeOther="" />
-<Attribute access="0" id="coinDelay" value="50" type="8" typeOther="" />
-<Attribute access="0" id="x" value="0" type="8" typeOther="" />
-<Attribute access="0" id="nbOfCoins" value="0" type="8" typeOther="" />
-<Method value="beverageReady()" />
-<Signal value="in pushCoffeeButton()" attached="true" />
-<Signal value="in pushTeaButton()" attached="true" />
-<Signal value="in getCoin(int nbOfCoins)" attached="true" />
-<Signal value="out ejectCoin(int nbOfCoins)" attached="true" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="813" >
-<father id="863" num="0" />
-<cdparam x="695" y="224" />
-<sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5104" id="662" >
+<father id="768" num="0" />
+<cdparam x="242" y="529" />
+<sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
-<infoparam name="Block1" value="TeaButton" />
-<TGConnectingPoint num="0" id="789" />
-<TGConnectingPoint num="1" id="790" />
-<TGConnectingPoint num="2" id="791" />
-<TGConnectingPoint num="3" id="792" />
-<TGConnectingPoint num="4" id="793" />
-<TGConnectingPoint num="5" id="794" />
-<TGConnectingPoint num="6" id="795" />
-<TGConnectingPoint num="7" id="796" />
-<TGConnectingPoint num="8" id="797" />
-<TGConnectingPoint num="9" id="798" />
-<TGConnectingPoint num="10" id="799" />
-<TGConnectingPoint num="11" id="800" />
-<TGConnectingPoint num="12" id="801" />
-<TGConnectingPoint num="13" id="802" />
-<TGConnectingPoint num="14" id="803" />
-<TGConnectingPoint num="15" id="804" />
-<TGConnectingPoint num="16" id="805" />
-<TGConnectingPoint num="17" id="806" />
-<TGConnectingPoint num="18" id="807" />
-<TGConnectingPoint num="19" id="808" />
-<TGConnectingPoint num="20" id="809" />
-<TGConnectingPoint num="21" id="810" />
-<TGConnectingPoint num="22" id="811" />
-<TGConnectingPoint num="23" id="812" />
-<extraparam>
-<blockType data="block" color="-4072719" />
-<CryptoBlock value="false" />
-<Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
-<Signal value="out push()" attached="true" />
-</extraparam>
+<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushTeaButton()" />
+<TGConnectingPoint num="0" id="652" />
+<TGConnectingPoint num="1" id="653" />
+<TGConnectingPoint num="2" id="654" />
+<TGConnectingPoint num="3" id="655" />
+<TGConnectingPoint num="4" id="656" />
+<TGConnectingPoint num="5" id="657" />
+<TGConnectingPoint num="6" id="658" />
+<TGConnectingPoint num="7" id="659" />
+<TGConnectingPoint num="8" id="660" />
+<TGConnectingPoint num="9" id="661" />
+<accessibility />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="838" >
-<father id="863" num="1" />
-<cdparam x="464" y="228" />
-<sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5106" id="703" >
+<father id="768" num="1" />
+<cdparam x="194" y="437" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
-<infoparam name="Block1" value="CoffeeButton" />
-<TGConnectingPoint num="0" id="814" />
-<TGConnectingPoint num="1" id="815" />
-<TGConnectingPoint num="2" id="816" />
-<TGConnectingPoint num="3" id="817" />
-<TGConnectingPoint num="4" id="818" />
-<TGConnectingPoint num="5" id="819" />
-<TGConnectingPoint num="6" id="820" />
-<TGConnectingPoint num="7" id="821" />
-<TGConnectingPoint num="8" id="822" />
-<TGConnectingPoint num="9" id="823" />
-<TGConnectingPoint num="10" id="824" />
-<TGConnectingPoint num="11" id="825" />
-<TGConnectingPoint num="12" id="826" />
-<TGConnectingPoint num="13" id="827" />
-<TGConnectingPoint num="14" id="828" />
-<TGConnectingPoint num="15" id="829" />
-<TGConnectingPoint num="16" id="830" />
-<TGConnectingPoint num="17" id="831" />
-<TGConnectingPoint num="18" id="832" />
-<TGConnectingPoint num="19" id="833" />
-<TGConnectingPoint num="20" id="834" />
-<TGConnectingPoint num="21" id="835" />
-<TGConnectingPoint num="22" id="836" />
-<TGConnectingPoint num="23" id="837" />
+<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
+<infoparam name="state0" value="WaitingForSelection" />
+<TGConnectingPoint num="0" id="663" />
+<TGConnectingPoint num="1" id="664" />
+<TGConnectingPoint num="2" id="665" />
+<TGConnectingPoint num="3" id="666" />
+<TGConnectingPoint num="4" id="667" />
+<TGConnectingPoint num="5" id="668" />
+<TGConnectingPoint num="6" id="669" />
+<TGConnectingPoint num="7" id="670" />
+<TGConnectingPoint num="8" id="671" />
+<TGConnectingPoint num="9" id="672" />
+<TGConnectingPoint num="10" id="673" />
+<TGConnectingPoint num="11" id="674" />
+<TGConnectingPoint num="12" id="675" />
+<TGConnectingPoint num="13" id="676" />
+<TGConnectingPoint num="14" id="677" />
+<TGConnectingPoint num="15" id="678" />
+<TGConnectingPoint num="16" id="679" />
+<TGConnectingPoint num="17" id="680" />
+<TGConnectingPoint num="18" id="681" />
+<TGConnectingPoint num="19" id="682" />
+<TGConnectingPoint num="20" id="683" />
+<TGConnectingPoint num="21" id="684" />
+<TGConnectingPoint num="22" id="685" />
+<TGConnectingPoint num="23" id="686" />
+<TGConnectingPoint num="24" id="687" />
+<TGConnectingPoint num="25" id="688" />
+<TGConnectingPoint num="26" id="689" />
+<TGConnectingPoint num="27" id="690" />
+<TGConnectingPoint num="28" id="691" />
+<TGConnectingPoint num="29" id="692" />
+<TGConnectingPoint num="30" id="693" />
+<TGConnectingPoint num="31" id="694" />
+<TGConnectingPoint num="32" id="695" />
+<TGConnectingPoint num="33" id="696" />
+<TGConnectingPoint num="34" id="697" />
+<TGConnectingPoint num="35" id="698" />
+<TGConnectingPoint num="36" id="699" />
+<TGConnectingPoint num="37" id="700" />
+<TGConnectingPoint num="38" id="701" />
+<TGConnectingPoint num="39" id="702" />
+<latencyCheck />
 <extraparam>
-<blockType data="block" color="-4072719" />
-<CryptoBlock value="false" />
-<Attribute access="0" id="mechanicalDelay" value="10" type="8" typeOther="" />
-<Signal value="out push()" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
+<SUBCOMPONENT type="5100" id="705" >
+<father id="768" num="2" />
+<cdparam x="254" y="401" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="704" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5104" id="716" >
+<father id="768" num="3" />
+<cdparam x="63" y="529" />
+<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushCoffeeButton()" />
+<TGConnectingPoint num="0" id="706" />
+<TGConnectingPoint num="1" id="707" />
+<TGConnectingPoint num="2" id="708" />
+<TGConnectingPoint num="3" id="709" />
+<TGConnectingPoint num="4" id="710" />
+<TGConnectingPoint num="5" id="711" />
+<TGConnectingPoint num="6" id="712" />
+<TGConnectingPoint num="7" id="713" />
+<TGConnectingPoint num="8" id="714" />
+<TGConnectingPoint num="9" id="715" />
+<accessibility />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5103" id="727" >
+<father id="768" num="4" />
+<cdparam x="377" y="502" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
+<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
+<TGConnectingPoint num="0" id="717" />
+<TGConnectingPoint num="1" id="718" />
+<TGConnectingPoint num="2" id="719" />
+<TGConnectingPoint num="3" id="720" />
+<TGConnectingPoint num="4" id="721" />
+<TGConnectingPoint num="5" id="722" />
+<TGConnectingPoint num="6" id="723" />
+<TGConnectingPoint num="7" id="724" />
+<TGConnectingPoint num="8" id="725" />
+<TGConnectingPoint num="9" id="726" />
+<accessibility />
+</SUBCOMPONENT>
 
 
-</AVATARBlockDiagramPanel>
+</AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Wallet" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="870" >
-<cdparam x="516" y="264" />
+<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="775" >
+<cdparam x="363" y="193" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="869" />
-<P1  x="485" y="219" id="911" />
-<P2  x="485" y="275" id="922" />
+<TGConnectingPoint num="0" id="774" />
+<P1  x="363" y="204" id="791" />
+<P2  x="362" y="257" id="802" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="868" >
-<father id="870" num="0" />
-<cdparam x="493" y="251" />
-<sizeparam width="161" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="773" >
+<father id="775" num="0" />
+<cdparam x="380" y="228" />
+<sizeparam width="149" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="864" />
-<TGConnectingPoint num="1" id="865" />
-<TGConnectingPoint num="2" id="866" />
-<TGConnectingPoint num="3" id="867" />
+<TGConnectingPoint num="0" id="769" />
+<TGConnectingPoint num="1" id="770" />
+<TGConnectingPoint num="2" id="771" />
+<TGConnectingPoint num="3" id="772" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="" />
+<afterMin value="mechanicalDelay" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
 <probability value="" />
-<actions value="nbOfCoins = nbOfCoins + x" />
-<actions value="contentOfWallet(nbOfCoins)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="877" >
-<cdparam x="382" y="165" />
+<CONNECTOR type="5102" id="782" >
+<cdparam x="363" y="150" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="876" />
-<P1  x="382" y="165" id="1018" />
-<P2  x="485" y="189" id="910" />
+<TGConnectingPoint num="0" id="781" />
+<P1  x="363" y="150" id="848" />
+<P2  x="363" y="174" id="790" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="875" >
-<father id="877" num="0" />
-<cdparam x="382" y="205" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="780" >
+<father id="782" num="0" />
+<cdparam x="363" y="190" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="871" />
-<TGConnectingPoint num="1" id="872" />
-<TGConnectingPoint num="2" id="873" />
-<TGConnectingPoint num="3" id="874" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="884" >
-<cdparam x="223" y="260" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="883" />
-<P1  x="251" y="231" id="900" />
-<P2  x="252" y="300" id="963" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="882" >
-<father id="884" num="0" />
-<cdparam x="175" y="246" />
-<sizeparam width="205" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="878" />
-<TGConnectingPoint num="1" id="879" />
-<TGConnectingPoint num="2" id="880" />
-<TGConnectingPoint num="3" id="881" />
+<TGConnectingPoint num="0" id="776" />
+<TGConnectingPoint num="1" id="777" />
+<TGConnectingPoint num="2" id="778" />
+<TGConnectingPoint num="3" id="779" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="minUserDelay" />
-<afterMax value="maxUserDelay" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="0.99" />
-<actions value="nbOfCoins = nbOfCoins - x" />
-<actions value="contentOfWallet(nbOfCoins)" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="891" >
-<cdparam x="357" y="165" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="890" />
-<P1  x="357" y="165" id="1017" />
-<P2  x="251" y="201" id="899" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="889" >
-<father id="891" num="0" />
-<cdparam x="220" y="174" />
-<sizeparam width="93" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="885" />
-<TGConnectingPoint num="1" id="886" />
-<TGConnectingPoint num="2" id="887" />
-<TGConnectingPoint num="3" id="888" />
-<extraparam>
-<guard value="[nbOfCoins &gt; 0]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -1772,25 +1596,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="898" >
-<cdparam x="369" y="115" />
+<CONNECTOR type="5102" id="789" >
+<cdparam x="362" y="101" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="897" />
-<P1  x="370" y="64" id="1044" />
-<P2  x="370" y="135" id="1004" />
+<TGConnectingPoint num="0" id="788" />
+<P1  x="362" y="101" id="883" />
+<P2  x="363" y="120" id="843" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="896" >
-<father id="898" num="0" />
-<cdparam x="376" y="105" />
-<sizeparam width="156" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="787" >
+<father id="789" num="0" />
+<cdparam x="362" y="141" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="892" />
-<TGConnectingPoint num="1" id="893" />
-<TGConnectingPoint num="2" id="894" />
-<TGConnectingPoint num="3" id="895" />
+<TGConnectingPoint num="0" id="783" />
+<TGConnectingPoint num="1" id="784" />
+<TGConnectingPoint num="2" id="785" />
+<TGConnectingPoint num="3" id="786" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -1798,236 +1622,159 @@
 <computeMin value="" />
 <computeMax value="" />
 <probability value="" />
-<actions value="contentOfWallet(nbOfCoins)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="909" >
-<cdparam x="217" y="206" />
-<sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="putCoin(x)" />
-<TGConnectingPoint num="0" id="899" />
-<TGConnectingPoint num="1" id="900" />
-<TGConnectingPoint num="2" id="901" />
-<TGConnectingPoint num="3" id="902" />
-<TGConnectingPoint num="4" id="903" />
-<TGConnectingPoint num="5" id="904" />
-<TGConnectingPoint num="6" id="905" />
-<TGConnectingPoint num="7" id="906" />
-<TGConnectingPoint num="8" id="907" />
-<TGConnectingPoint num="9" id="908" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="920" >
-<cdparam x="447" y="194" />
-<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="910" />
-<TGConnectingPoint num="1" id="911" />
-<TGConnectingPoint num="2" id="912" />
-<TGConnectingPoint num="3" id="913" />
-<TGConnectingPoint num="4" id="914" />
-<TGConnectingPoint num="5" id="915" />
-<TGConnectingPoint num="6" id="916" />
-<TGConnectingPoint num="7" id="917" />
-<TGConnectingPoint num="8" id="918" />
-<TGConnectingPoint num="9" id="919" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="961" >
-<cdparam x="460" y="275" />
-<sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="800" >
+<cdparam x="338" y="179" />
+<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="921" />
-<TGConnectingPoint num="1" id="922" />
-<TGConnectingPoint num="2" id="923" />
-<TGConnectingPoint num="3" id="924" />
-<TGConnectingPoint num="4" id="925" />
-<TGConnectingPoint num="5" id="926" />
-<TGConnectingPoint num="6" id="927" />
-<TGConnectingPoint num="7" id="928" />
-<TGConnectingPoint num="8" id="929" />
-<TGConnectingPoint num="9" id="930" />
-<TGConnectingPoint num="10" id="931" />
-<TGConnectingPoint num="11" id="932" />
-<TGConnectingPoint num="12" id="933" />
-<TGConnectingPoint num="13" id="934" />
-<TGConnectingPoint num="14" id="935" />
-<TGConnectingPoint num="15" id="936" />
-<TGConnectingPoint num="16" id="937" />
-<TGConnectingPoint num="17" id="938" />
-<TGConnectingPoint num="18" id="939" />
-<TGConnectingPoint num="19" id="940" />
-<TGConnectingPoint num="20" id="941" />
-<TGConnectingPoint num="21" id="942" />
-<TGConnectingPoint num="22" id="943" />
-<TGConnectingPoint num="23" id="944" />
-<TGConnectingPoint num="24" id="945" />
-<TGConnectingPoint num="25" id="946" />
-<TGConnectingPoint num="26" id="947" />
-<TGConnectingPoint num="27" id="948" />
-<TGConnectingPoint num="28" id="949" />
-<TGConnectingPoint num="29" id="950" />
-<TGConnectingPoint num="30" id="951" />
-<TGConnectingPoint num="31" id="952" />
-<TGConnectingPoint num="32" id="953" />
-<TGConnectingPoint num="33" id="954" />
-<TGConnectingPoint num="34" id="955" />
-<TGConnectingPoint num="35" id="956" />
-<TGConnectingPoint num="36" id="957" />
-<TGConnectingPoint num="37" id="958" />
-<TGConnectingPoint num="38" id="959" />
-<TGConnectingPoint num="39" id="960" />
-<extraparam>
-</extraparam>
+<infoparam name="Send signal" value="push()" />
+<TGConnectingPoint num="0" id="790" />
+<TGConnectingPoint num="1" id="791" />
+<TGConnectingPoint num="2" id="792" />
+<TGConnectingPoint num="3" id="793" />
+<TGConnectingPoint num="4" id="794" />
+<TGConnectingPoint num="5" id="795" />
+<TGConnectingPoint num="6" id="796" />
+<TGConnectingPoint num="7" id="797" />
+<TGConnectingPoint num="8" id="798" />
+<TGConnectingPoint num="9" id="799" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1002" >
-<cdparam x="227" y="300" />
-<sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="841" >
+<cdparam x="337" y="257" />
+<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="962" />
-<TGConnectingPoint num="1" id="963" />
-<TGConnectingPoint num="2" id="964" />
-<TGConnectingPoint num="3" id="965" />
-<TGConnectingPoint num="4" id="966" />
-<TGConnectingPoint num="5" id="967" />
-<TGConnectingPoint num="6" id="968" />
-<TGConnectingPoint num="7" id="969" />
-<TGConnectingPoint num="8" id="970" />
-<TGConnectingPoint num="9" id="971" />
-<TGConnectingPoint num="10" id="972" />
-<TGConnectingPoint num="11" id="973" />
-<TGConnectingPoint num="12" id="974" />
-<TGConnectingPoint num="13" id="975" />
-<TGConnectingPoint num="14" id="976" />
-<TGConnectingPoint num="15" id="977" />
-<TGConnectingPoint num="16" id="978" />
-<TGConnectingPoint num="17" id="979" />
-<TGConnectingPoint num="18" id="980" />
-<TGConnectingPoint num="19" id="981" />
-<TGConnectingPoint num="20" id="982" />
-<TGConnectingPoint num="21" id="983" />
-<TGConnectingPoint num="22" id="984" />
-<TGConnectingPoint num="23" id="985" />
-<TGConnectingPoint num="24" id="986" />
-<TGConnectingPoint num="25" id="987" />
-<TGConnectingPoint num="26" id="988" />
-<TGConnectingPoint num="27" id="989" />
-<TGConnectingPoint num="28" id="990" />
-<TGConnectingPoint num="29" id="991" />
-<TGConnectingPoint num="30" id="992" />
-<TGConnectingPoint num="31" id="993" />
-<TGConnectingPoint num="32" id="994" />
-<TGConnectingPoint num="33" id="995" />
-<TGConnectingPoint num="34" id="996" />
-<TGConnectingPoint num="35" id="997" />
-<TGConnectingPoint num="36" id="998" />
-<TGConnectingPoint num="37" id="999" />
-<TGConnectingPoint num="38" id="1000" />
-<TGConnectingPoint num="39" id="1001" />
+<TGConnectingPoint num="0" id="801" />
+<TGConnectingPoint num="1" id="802" />
+<TGConnectingPoint num="2" id="803" />
+<TGConnectingPoint num="3" id="804" />
+<TGConnectingPoint num="4" id="805" />
+<TGConnectingPoint num="5" id="806" />
+<TGConnectingPoint num="6" id="807" />
+<TGConnectingPoint num="7" id="808" />
+<TGConnectingPoint num="8" id="809" />
+<TGConnectingPoint num="9" id="810" />
+<TGConnectingPoint num="10" id="811" />
+<TGConnectingPoint num="11" id="812" />
+<TGConnectingPoint num="12" id="813" />
+<TGConnectingPoint num="13" id="814" />
+<TGConnectingPoint num="14" id="815" />
+<TGConnectingPoint num="15" id="816" />
+<TGConnectingPoint num="16" id="817" />
+<TGConnectingPoint num="17" id="818" />
+<TGConnectingPoint num="18" id="819" />
+<TGConnectingPoint num="19" id="820" />
+<TGConnectingPoint num="20" id="821" />
+<TGConnectingPoint num="21" id="822" />
+<TGConnectingPoint num="22" id="823" />
+<TGConnectingPoint num="23" id="824" />
+<TGConnectingPoint num="24" id="825" />
+<TGConnectingPoint num="25" id="826" />
+<TGConnectingPoint num="26" id="827" />
+<TGConnectingPoint num="27" id="828" />
+<TGConnectingPoint num="28" id="829" />
+<TGConnectingPoint num="29" id="830" />
+<TGConnectingPoint num="30" id="831" />
+<TGConnectingPoint num="31" id="832" />
+<TGConnectingPoint num="32" id="833" />
+<TGConnectingPoint num="33" id="834" />
+<TGConnectingPoint num="34" id="835" />
+<TGConnectingPoint num="35" id="836" />
+<TGConnectingPoint num="36" id="837" />
+<TGConnectingPoint num="37" id="838" />
+<TGConnectingPoint num="38" id="839" />
+<TGConnectingPoint num="39" id="840" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1043" >
-<cdparam x="345" y="135" />
+<COMPONENT type="5106" id="882" >
+<cdparam x="338" y="120" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1003" />
-<TGConnectingPoint num="1" id="1004" />
-<TGConnectingPoint num="2" id="1005" />
-<TGConnectingPoint num="3" id="1006" />
-<TGConnectingPoint num="4" id="1007" />
-<TGConnectingPoint num="5" id="1008" />
-<TGConnectingPoint num="6" id="1009" />
-<TGConnectingPoint num="7" id="1010" />
-<TGConnectingPoint num="8" id="1011" />
-<TGConnectingPoint num="9" id="1012" />
-<TGConnectingPoint num="10" id="1013" />
-<TGConnectingPoint num="11" id="1014" />
-<TGConnectingPoint num="12" id="1015" />
-<TGConnectingPoint num="13" id="1016" />
-<TGConnectingPoint num="14" id="1017" />
-<TGConnectingPoint num="15" id="1018" />
-<TGConnectingPoint num="16" id="1019" />
-<TGConnectingPoint num="17" id="1020" />
-<TGConnectingPoint num="18" id="1021" />
-<TGConnectingPoint num="19" id="1022" />
-<TGConnectingPoint num="20" id="1023" />
-<TGConnectingPoint num="21" id="1024" />
-<TGConnectingPoint num="22" id="1025" />
-<TGConnectingPoint num="23" id="1026" />
-<TGConnectingPoint num="24" id="1027" />
-<TGConnectingPoint num="25" id="1028" />
-<TGConnectingPoint num="26" id="1029" />
-<TGConnectingPoint num="27" id="1030" />
-<TGConnectingPoint num="28" id="1031" />
-<TGConnectingPoint num="29" id="1032" />
-<TGConnectingPoint num="30" id="1033" />
-<TGConnectingPoint num="31" id="1034" />
-<TGConnectingPoint num="32" id="1035" />
-<TGConnectingPoint num="33" id="1036" />
-<TGConnectingPoint num="34" id="1037" />
-<TGConnectingPoint num="35" id="1038" />
-<TGConnectingPoint num="36" id="1039" />
-<TGConnectingPoint num="37" id="1040" />
-<TGConnectingPoint num="38" id="1041" />
-<TGConnectingPoint num="39" id="1042" />
+<TGConnectingPoint num="0" id="842" />
+<TGConnectingPoint num="1" id="843" />
+<TGConnectingPoint num="2" id="844" />
+<TGConnectingPoint num="3" id="845" />
+<TGConnectingPoint num="4" id="846" />
+<TGConnectingPoint num="5" id="847" />
+<TGConnectingPoint num="6" id="848" />
+<TGConnectingPoint num="7" id="849" />
+<TGConnectingPoint num="8" id="850" />
+<TGConnectingPoint num="9" id="851" />
+<TGConnectingPoint num="10" id="852" />
+<TGConnectingPoint num="11" id="853" />
+<TGConnectingPoint num="12" id="854" />
+<TGConnectingPoint num="13" id="855" />
+<TGConnectingPoint num="14" id="856" />
+<TGConnectingPoint num="15" id="857" />
+<TGConnectingPoint num="16" id="858" />
+<TGConnectingPoint num="17" id="859" />
+<TGConnectingPoint num="18" id="860" />
+<TGConnectingPoint num="19" id="861" />
+<TGConnectingPoint num="20" id="862" />
+<TGConnectingPoint num="21" id="863" />
+<TGConnectingPoint num="22" id="864" />
+<TGConnectingPoint num="23" id="865" />
+<TGConnectingPoint num="24" id="866" />
+<TGConnectingPoint num="25" id="867" />
+<TGConnectingPoint num="26" id="868" />
+<TGConnectingPoint num="27" id="869" />
+<TGConnectingPoint num="28" id="870" />
+<TGConnectingPoint num="29" id="871" />
+<TGConnectingPoint num="30" id="872" />
+<TGConnectingPoint num="31" id="873" />
+<TGConnectingPoint num="32" id="874" />
+<TGConnectingPoint num="33" id="875" />
+<TGConnectingPoint num="34" id="876" />
+<TGConnectingPoint num="35" id="877" />
+<TGConnectingPoint num="36" id="878" />
+<TGConnectingPoint num="37" id="879" />
+<TGConnectingPoint num="38" id="880" />
+<TGConnectingPoint num="39" id="881" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1045" >
-<cdparam x="363" y="44" />
+<COMPONENT type="5100" id="884" >
+<cdparam x="355" y="81" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1044" />
+<TGConnectingPoint num="0" id="883" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="CoffeeMachine" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="118" id="1046" >
-<cdparam x="372" y="83" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<P1  x="412" y="82" id="1322" />
-<P2  x="472" y="82" id="1155" />
-<AutomaticDrawing  data="false" />
-</CONNECTOR>
-<CONNECTOR type="5102" id="1053" >
-<cdparam x="691" y="288" />
+<AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="891" >
+<cdparam x="177" y="199" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1052" />
-<P1  x="699" y="289" id="1208" />
-<P2  x="699" y="316" id="1180" />
+<infoparam name="connector from start state to Send signal" value="null" />
+<TGConnectingPoint num="0" id="890" />
+<P1  x="340" y="233" id="1008" />
+<P2  x="353" y="252" id="997" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1051" >
-<father id="1053" num="0" />
-<cdparam x="691" y="328" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="889" >
+<father id="891" num="0" />
+<cdparam x="177" y="239" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1047" />
-<TGConnectingPoint num="1" id="1048" />
-<TGConnectingPoint num="2" id="1049" />
-<TGConnectingPoint num="3" id="1050" />
+<TGConnectingPoint num="0" id="885" />
+<TGConnectingPoint num="1" id="886" />
+<TGConnectingPoint num="2" id="887" />
+<TGConnectingPoint num="3" id="888" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2038,25 +1785,25 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1060" >
-<cdparam x="481" y="501" />
+<CONNECTOR type="5102" id="898" >
+<cdparam x="322" y="69" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="1059" />
-<P1  x="442" y="527" id="1410" />
-<P2  x="323" y="748" id="1336" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="897" />
+<P1  x="322" y="69" id="995" />
+<P2  x="323" y="88" id="955" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1058" >
-<father id="1060" num="0" />
-<cdparam x="420" y="552" />
-<sizeparam width="85" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="896" >
+<father id="898" num="0" />
+<cdparam x="322" y="109" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1054" />
-<TGConnectingPoint num="1" id="1055" />
-<TGConnectingPoint num="2" id="1056" />
-<TGConnectingPoint num="3" id="1057" />
+<TGConnectingPoint num="0" id="892" />
+<TGConnectingPoint num="1" id="893" />
+<TGConnectingPoint num="2" id="894" />
+<TGConnectingPoint num="3" id="895" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2064,32 +1811,31 @@
 <computeMin value="" />
 <computeMax value="" />
 <probability value="" />
-<actions value="nbOfCoins = 0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1067" >
-<cdparam x="555" y="559" />
+<CONNECTOR type="5102" id="905" >
+<cdparam x="377" y="144" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1066" />
-<P1  x="326" y="457" id="1437" />
-<P2  x="442" y="497" id="1409" />
+<TGConnectingPoint num="0" id="904" />
+<P1  x="323" y="118" id="960" />
+<P2  x="356" y="174" id="1011" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1065" >
-<father id="1067" num="0" />
-<cdparam x="395" y="448" />
-<sizeparam width="94" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="903" >
+<father id="905" num="0" />
+<cdparam x="377" y="184" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1061" />
-<TGConnectingPoint num="1" id="1062" />
-<TGConnectingPoint num="2" id="1063" />
-<TGConnectingPoint num="3" id="1064" />
+<TGConnectingPoint num="0" id="899" />
+<TGConnectingPoint num="1" id="900" />
+<TGConnectingPoint num="2" id="901" />
+<TGConnectingPoint num="3" id="902" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="coinDelay" />
+<afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
@@ -2097,1396 +1843,1701 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1074" >
-<cdparam x="355" y="545" />
+<CONNECTOR type="5102" id="912" >
+<cdparam x="377" y="187" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="1073" />
-<P1  x="298" y="554" id="1475" />
-<P2  x="289" y="748" id="1328" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="911" />
+<P1  x="353" y="282" id="998" />
+<P2  x="399" y="352" id="914" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1072" >
-<father id="1074" num="0" />
-<cdparam x="284" y="594" />
-<sizeparam width="228" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="910" >
+<father id="912" num="0" />
+<cdparam x="417" y="335" />
+<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1068" />
-<TGConnectingPoint num="1" id="1069" />
-<TGConnectingPoint num="2" id="1070" />
-<TGConnectingPoint num="3" id="1071" />
+<TGConnectingPoint num="0" id="906" />
+<TGConnectingPoint num="1" id="907" />
+<TGConnectingPoint num="2" id="908" />
+<TGConnectingPoint num="3" id="909" />
 <extraparam>
 <guard value="[ ]" />
-<afterMin value="" />
+<afterMin value="mechanicalDelay" />
 <afterMax value="" />
-<computeMin value="teaMinDelay" />
-<computeMax value="teaMaxDelay" />
+<computeMin value="" />
+<computeMax value="" />
 <probability value="" />
-<actions value="nbOfCoins = 0" />
-<actions value="beverageReady()" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1081" >
-<cdparam x="295" y="465" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1080" />
-<P1  x="293" y="477" id="1448" />
-<P2  x="298" y="524" id="1474" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1079" >
-<father id="1081" num="0" />
-<cdparam x="295" y="505" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="953" >
+<cdparam x="374" y="352" />
+<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1075" />
-<TGConnectingPoint num="1" id="1076" />
-<TGConnectingPoint num="2" id="1077" />
-<TGConnectingPoint num="3" id="1078" />
+<infoparam name="state0" value="main" />
+<TGConnectingPoint num="0" id="913" />
+<TGConnectingPoint num="1" id="914" />
+<TGConnectingPoint num="2" id="915" />
+<TGConnectingPoint num="3" id="916" />
+<TGConnectingPoint num="4" id="917" />
+<TGConnectingPoint num="5" id="918" />
+<TGConnectingPoint num="6" id="919" />
+<TGConnectingPoint num="7" id="920" />
+<TGConnectingPoint num="8" id="921" />
+<TGConnectingPoint num="9" id="922" />
+<TGConnectingPoint num="10" id="923" />
+<TGConnectingPoint num="11" id="924" />
+<TGConnectingPoint num="12" id="925" />
+<TGConnectingPoint num="13" id="926" />
+<TGConnectingPoint num="14" id="927" />
+<TGConnectingPoint num="15" id="928" />
+<TGConnectingPoint num="16" id="929" />
+<TGConnectingPoint num="17" id="930" />
+<TGConnectingPoint num="18" id="931" />
+<TGConnectingPoint num="19" id="932" />
+<TGConnectingPoint num="20" id="933" />
+<TGConnectingPoint num="21" id="934" />
+<TGConnectingPoint num="22" id="935" />
+<TGConnectingPoint num="23" id="936" />
+<TGConnectingPoint num="24" id="937" />
+<TGConnectingPoint num="25" id="938" />
+<TGConnectingPoint num="26" id="939" />
+<TGConnectingPoint num="27" id="940" />
+<TGConnectingPoint num="28" id="941" />
+<TGConnectingPoint num="29" id="942" />
+<TGConnectingPoint num="30" id="943" />
+<TGConnectingPoint num="31" id="944" />
+<TGConnectingPoint num="32" id="945" />
+<TGConnectingPoint num="33" id="946" />
+<TGConnectingPoint num="34" id="947" />
+<TGConnectingPoint num="35" id="948" />
+<TGConnectingPoint num="36" id="949" />
+<TGConnectingPoint num="37" id="950" />
+<TGConnectingPoint num="38" id="951" />
+<TGConnectingPoint num="39" id="952" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="1088" >
-<cdparam x="148" y="549" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="1087" />
-<P1  x="126" y="554" id="1421" />
-<P2  x="255" y="748" id="1335" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1086" >
-<father id="1088" num="0" />
-<cdparam x="32" y="587" />
-<sizeparam width="262" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="994" >
+<cdparam x="298" y="88" />
+<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1082" />
-<TGConnectingPoint num="1" id="1083" />
-<TGConnectingPoint num="2" id="1084" />
-<TGConnectingPoint num="3" id="1085" />
+<infoparam name="state0" value="main" />
+<TGConnectingPoint num="0" id="954" />
+<TGConnectingPoint num="1" id="955" />
+<TGConnectingPoint num="2" id="956" />
+<TGConnectingPoint num="3" id="957" />
+<TGConnectingPoint num="4" id="958" />
+<TGConnectingPoint num="5" id="959" />
+<TGConnectingPoint num="6" id="960" />
+<TGConnectingPoint num="7" id="961" />
+<TGConnectingPoint num="8" id="962" />
+<TGConnectingPoint num="9" id="963" />
+<TGConnectingPoint num="10" id="964" />
+<TGConnectingPoint num="11" id="965" />
+<TGConnectingPoint num="12" id="966" />
+<TGConnectingPoint num="13" id="967" />
+<TGConnectingPoint num="14" id="968" />
+<TGConnectingPoint num="15" id="969" />
+<TGConnectingPoint num="16" id="970" />
+<TGConnectingPoint num="17" id="971" />
+<TGConnectingPoint num="18" id="972" />
+<TGConnectingPoint num="19" id="973" />
+<TGConnectingPoint num="20" id="974" />
+<TGConnectingPoint num="21" id="975" />
+<TGConnectingPoint num="22" id="976" />
+<TGConnectingPoint num="23" id="977" />
+<TGConnectingPoint num="24" id="978" />
+<TGConnectingPoint num="25" id="979" />
+<TGConnectingPoint num="26" id="980" />
+<TGConnectingPoint num="27" id="981" />
+<TGConnectingPoint num="28" id="982" />
+<TGConnectingPoint num="29" id="983" />
+<TGConnectingPoint num="30" id="984" />
+<TGConnectingPoint num="31" id="985" />
+<TGConnectingPoint num="32" id="986" />
+<TGConnectingPoint num="33" id="987" />
+<TGConnectingPoint num="34" id="988" />
+<TGConnectingPoint num="35" id="989" />
+<TGConnectingPoint num="36" id="990" />
+<TGConnectingPoint num="37" id="991" />
+<TGConnectingPoint num="38" id="992" />
+<TGConnectingPoint num="39" id="993" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="coffeeMinDelay" />
-<computeMax value="coffeeMaxDelay" />
-<probability value="" />
-<actions value="nbOfCoins = 0" />
-<actions value="beverageReady()" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="1095" >
-<cdparam x="229" y="465" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1094" />
-<P1  x="227" y="477" id="1447" />
-<P2  x="126" y="524" id="1420" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1093" >
-<father id="1095" num="0" />
-<cdparam x="229" y="505" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5100" id="996" >
+<cdparam x="315" y="49" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1089" />
-<TGConnectingPoint num="1" id="1090" />
-<TGConnectingPoint num="2" id="1091" />
-<TGConnectingPoint num="3" id="1092" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="995" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1050" >
+<cdparam x="264" y="174" />
+<sizeparam width="184" height="130" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="state0" />
+<TGConnectingPoint num="0" id="1010" />
+<TGConnectingPoint num="1" id="1011" />
+<TGConnectingPoint num="2" id="1012" />
+<TGConnectingPoint num="3" id="1013" />
+<TGConnectingPoint num="4" id="1014" />
+<TGConnectingPoint num="5" id="1015" />
+<TGConnectingPoint num="6" id="1016" />
+<TGConnectingPoint num="7" id="1017" />
+<TGConnectingPoint num="8" id="1018" />
+<TGConnectingPoint num="9" id="1019" />
+<TGConnectingPoint num="10" id="1020" />
+<TGConnectingPoint num="11" id="1021" />
+<TGConnectingPoint num="12" id="1022" />
+<TGConnectingPoint num="13" id="1023" />
+<TGConnectingPoint num="14" id="1024" />
+<TGConnectingPoint num="15" id="1025" />
+<TGConnectingPoint num="16" id="1026" />
+<TGConnectingPoint num="17" id="1027" />
+<TGConnectingPoint num="18" id="1028" />
+<TGConnectingPoint num="19" id="1029" />
+<TGConnectingPoint num="20" id="1030" />
+<TGConnectingPoint num="21" id="1031" />
+<TGConnectingPoint num="22" id="1032" />
+<TGConnectingPoint num="23" id="1033" />
+<TGConnectingPoint num="24" id="1034" />
+<TGConnectingPoint num="25" id="1035" />
+<TGConnectingPoint num="26" id="1036" />
+<TGConnectingPoint num="27" id="1037" />
+<TGConnectingPoint num="28" id="1038" />
+<TGConnectingPoint num="29" id="1039" />
+<TGConnectingPoint num="30" id="1040" />
+<TGConnectingPoint num="31" id="1041" />
+<TGConnectingPoint num="32" id="1042" />
+<TGConnectingPoint num="33" id="1043" />
+<TGConnectingPoint num="34" id="1044" />
+<TGConnectingPoint num="35" id="1045" />
+<TGConnectingPoint num="36" id="1046" />
+<TGConnectingPoint num="37" id="1047" />
+<TGConnectingPoint num="38" id="1048" />
+<TGConnectingPoint num="39" id="1049" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
 </extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="5103" id="1007" >
+<father id="1050" num="0" />
+<cdparam x="330" y="257" />
+<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
+<infoparam name="Send signal" value="push()" />
+<TGConnectingPoint num="0" id="997" />
+<TGConnectingPoint num="1" id="998" />
+<TGConnectingPoint num="2" id="999" />
+<TGConnectingPoint num="3" id="1000" />
+<TGConnectingPoint num="4" id="1001" />
+<TGConnectingPoint num="5" id="1002" />
+<TGConnectingPoint num="6" id="1003" />
+<TGConnectingPoint num="7" id="1004" />
+<TGConnectingPoint num="8" id="1005" />
+<TGConnectingPoint num="9" id="1006" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5100" id="1009" >
+<father id="1050" num="1" />
+<cdparam x="333" y="213" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1008" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1102" >
-<cdparam x="280" y="420" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1101" />
-<P1  x="261" y="421" id="1431" />
-<P2  x="260" y="437" id="1434" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1100" >
-<father id="1102" num="0" />
-<cdparam x="280" y="460" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+</AVATARStateMachineDiagramPanel>
+
+</Modeling>
+
+
+
+
+<Modeling type="Avatar Requirement" nameTab="AVATAR Requirements" >
+<AvatarRDPanel name="AVATAR RD" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0" >
+<COMPONENT type="5208" id="1094" >
+<cdparam x="1110" y="115" />
+<sizeparam width="374" height="179" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1096" />
-<TGConnectingPoint num="1" id="1097" />
-<TGConnectingPoint num="2" id="1098" />
-<TGConnectingPoint num="3" id="1099" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="TGComponent" value="AVATAR RD::req2" />
+<TGConnectingPoint num="0" id="1051" />
+<TGConnectingPoint num="1" id="1052" />
+<TGConnectingPoint num="2" id="1053" />
+<TGConnectingPoint num="3" id="1054" />
+<TGConnectingPoint num="4" id="1055" />
+<TGConnectingPoint num="5" id="1056" />
+<TGConnectingPoint num="6" id="1057" />
+<TGConnectingPoint num="7" id="1058" />
+<TGConnectingPoint num="8" id="1059" />
+<TGConnectingPoint num="9" id="1060" />
+<TGConnectingPoint num="10" id="1061" />
+<TGConnectingPoint num="11" id="1062" />
+<TGConnectingPoint num="12" id="1063" />
+<TGConnectingPoint num="13" id="1064" />
+<TGConnectingPoint num="14" id="1065" />
+<TGConnectingPoint num="15" id="1066" />
+<TGConnectingPoint num="16" id="1067" />
+<TGConnectingPoint num="17" id="1068" />
+<TGConnectingPoint num="18" id="1069" />
+<TGConnectingPoint num="19" id="1070" />
+<TGConnectingPoint num="20" id="1071" />
+<TGConnectingPoint num="21" id="1072" />
+<TGConnectingPoint num="22" id="1073" />
+<TGConnectingPoint num="23" id="1074" />
+<TGConnectingPoint num="24" id="1075" />
+<TGConnectingPoint num="25" id="1076" />
+<TGConnectingPoint num="26" id="1077" />
+<TGConnectingPoint num="27" id="1078" />
+<TGConnectingPoint num="28" id="1079" />
+<TGConnectingPoint num="29" id="1080" />
+<TGConnectingPoint num="30" id="1081" />
+<TGConnectingPoint num="31" id="1082" />
+<TGConnectingPoint num="32" id="1083" />
+<TGConnectingPoint num="33" id="1084" />
+<TGConnectingPoint num="34" id="1085" />
+<TGConnectingPoint num="35" id="1086" />
+<TGConnectingPoint num="36" id="1087" />
+<TGConnectingPoint num="37" id="1088" />
+<TGConnectingPoint num="38" id="1089" />
+<TGConnectingPoint num="39" id="1090" />
+<TGConnectingPoint num="40" id="1091" />
+<TGConnectingPoint num="41" id="1092" />
+<TGConnectingPoint num="42" id="1093" />
+</COMPONENT>
+
+<COMPONENT type="5200" id="1138" >
+<cdparam x="844" y="479" />
+<sizeparam width="200" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="Requirement" value="Requirement_0" />
+<TGConnectingPoint num="0" id="1095" />
+<TGConnectingPoint num="1" id="1096" />
+<TGConnectingPoint num="2" id="1097" />
+<TGConnectingPoint num="3" id="1098" />
+<TGConnectingPoint num="4" id="1099" />
+<TGConnectingPoint num="5" id="1100" />
+<TGConnectingPoint num="6" id="1101" />
+<TGConnectingPoint num="7" id="1102" />
+<TGConnectingPoint num="8" id="1103" />
+<TGConnectingPoint num="9" id="1104" />
+<TGConnectingPoint num="10" id="1105" />
+<TGConnectingPoint num="11" id="1106" />
+<TGConnectingPoint num="12" id="1107" />
+<TGConnectingPoint num="13" id="1108" />
+<TGConnectingPoint num="14" id="1109" />
+<TGConnectingPoint num="15" id="1110" />
+<TGConnectingPoint num="16" id="1111" />
+<TGConnectingPoint num="17" id="1112" />
+<TGConnectingPoint num="18" id="1113" />
+<TGConnectingPoint num="19" id="1114" />
+<TGConnectingPoint num="20" id="1115" />
+<TGConnectingPoint num="21" id="1116" />
+<TGConnectingPoint num="22" id="1117" />
+<TGConnectingPoint num="23" id="1118" />
+<TGConnectingPoint num="24" id="1119" />
+<TGConnectingPoint num="25" id="1120" />
+<TGConnectingPoint num="26" id="1121" />
+<TGConnectingPoint num="27" id="1122" />
+<TGConnectingPoint num="28" id="1123" />
+<TGConnectingPoint num="29" id="1124" />
+<TGConnectingPoint num="30" id="1125" />
+<TGConnectingPoint num="31" id="1126" />
+<TGConnectingPoint num="32" id="1127" />
+<TGConnectingPoint num="33" id="1128" />
+<TGConnectingPoint num="34" id="1129" />
+<TGConnectingPoint num="35" id="1130" />
+<TGConnectingPoint num="36" id="1131" />
+<TGConnectingPoint num="37" id="1132" />
+<TGConnectingPoint num="38" id="1133" />
+<TGConnectingPoint num="39" id="1134" />
+<TGConnectingPoint num="40" id="1135" />
+<TGConnectingPoint num="41" id="1136" />
+<TGConnectingPoint num="42" id="1137" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<textline data="Requirement description:" />
+<textline data="Double-click to edit" />
+<kind data="" />
+<criticality data="" />
+<reqType data="Requirement" color="-1773070" />
+<id data="0" />
+<satisfied data="false" />
+<verified data="false" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="1109" >
-<cdparam x="667" y="346" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1108" />
-<P1  x="699" y="346" id="1181" />
-<P2  x="699" y="381" id="1369" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1107" >
-<father id="1109" num="0" />
-<cdparam x="707" y="368" />
-<sizeparam width="85" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5207" id="1154" >
+<cdparam x="727" y="252" />
+<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="107" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1103" />
-<TGConnectingPoint num="1" id="1104" />
-<TGConnectingPoint num="2" id="1105" />
-<TGConnectingPoint num="3" id="1106" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="AvatarElementReference" value="CoffeeMachine" />
+<TGConnectingPoint num="0" id="1139" />
+<TGConnectingPoint num="1" id="1140" />
+<TGConnectingPoint num="2" id="1141" />
+<TGConnectingPoint num="3" id="1142" />
+<TGConnectingPoint num="4" id="1143" />
+<TGConnectingPoint num="5" id="1144" />
+<TGConnectingPoint num="6" id="1145" />
+<TGConnectingPoint num="7" id="1146" />
+<TGConnectingPoint num="8" id="1147" />
+<TGConnectingPoint num="9" id="1148" />
+<TGConnectingPoint num="10" id="1149" />
+<TGConnectingPoint num="11" id="1150" />
+<TGConnectingPoint num="12" id="1151" />
+<TGConnectingPoint num="13" id="1152" />
+<TGConnectingPoint num="14" id="1153" />
+</COMPONENT>
+
+<COMPONENT type="5207" id="1170" >
+<cdparam x="741" y="201" />
+<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="57" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="AvatarElementReference" value="Wallet" />
+<TGConnectingPoint num="0" id="1155" />
+<TGConnectingPoint num="1" id="1156" />
+<TGConnectingPoint num="2" id="1157" />
+<TGConnectingPoint num="3" id="1158" />
+<TGConnectingPoint num="4" id="1159" />
+<TGConnectingPoint num="5" id="1160" />
+<TGConnectingPoint num="6" id="1161" />
+<TGConnectingPoint num="7" id="1162" />
+<TGConnectingPoint num="8" id="1163" />
+<TGConnectingPoint num="9" id="1164" />
+<TGConnectingPoint num="10" id="1165" />
+<TGConnectingPoint num="11" id="1166" />
+<TGConnectingPoint num="12" id="1167" />
+<TGConnectingPoint num="13" id="1168" />
+<TGConnectingPoint num="14" id="1169" />
+</COMPONENT>
+
+<COMPONENT type="5200" id="1214" >
+<cdparam x="661" y="16" />
+<sizeparam width="278" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="59" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="Requirement" value="req00" />
+<TGConnectingPoint num="0" id="1171" />
+<TGConnectingPoint num="1" id="1172" />
+<TGConnectingPoint num="2" id="1173" />
+<TGConnectingPoint num="3" id="1174" />
+<TGConnectingPoint num="4" id="1175" />
+<TGConnectingPoint num="5" id="1176" />
+<TGConnectingPoint num="6" id="1177" />
+<TGConnectingPoint num="7" id="1178" />
+<TGConnectingPoint num="8" id="1179" />
+<TGConnectingPoint num="9" id="1180" />
+<TGConnectingPoint num="10" id="1181" />
+<TGConnectingPoint num="11" id="1182" />
+<TGConnectingPoint num="12" id="1183" />
+<TGConnectingPoint num="13" id="1184" />
+<TGConnectingPoint num="14" id="1185" />
+<TGConnectingPoint num="15" id="1186" />
+<TGConnectingPoint num="16" id="1187" />
+<TGConnectingPoint num="17" id="1188" />
+<TGConnectingPoint num="18" id="1189" />
+<TGConnectingPoint num="19" id="1190" />
+<TGConnectingPoint num="20" id="1191" />
+<TGConnectingPoint num="21" id="1192" />
+<TGConnectingPoint num="22" id="1193" />
+<TGConnectingPoint num="23" id="1194" />
+<TGConnectingPoint num="24" id="1195" />
+<TGConnectingPoint num="25" id="1196" />
+<TGConnectingPoint num="26" id="1197" />
+<TGConnectingPoint num="27" id="1198" />
+<TGConnectingPoint num="28" id="1199" />
+<TGConnectingPoint num="29" id="1200" />
+<TGConnectingPoint num="30" id="1201" />
+<TGConnectingPoint num="31" id="1202" />
+<TGConnectingPoint num="32" id="1203" />
+<TGConnectingPoint num="33" id="1204" />
+<TGConnectingPoint num="34" id="1205" />
+<TGConnectingPoint num="35" id="1206" />
+<TGConnectingPoint num="36" id="1207" />
+<TGConnectingPoint num="37" id="1208" />
+<TGConnectingPoint num="38" id="1209" />
+<TGConnectingPoint num="39" id="1210" />
+<TGConnectingPoint num="40" id="1211" />
+<TGConnectingPoint num="41" id="1212" />
+<TGConnectingPoint num="42" id="1213" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="nbOfCoins = 0" />
+<textline data="A coin not used within 50 seconds " />
+<textline data="must be ejected" />
+<kind data="Functional" />
+<criticality data="Low" />
+<reqType data="Requirement" color="-1773070" />
+<id data="0.1.1" />
+<satisfied data="false" />
+<verified data="false" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="1116" >
-<cdparam x="348" y="228" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1115" />
-<P1  x="388" y="208" id="1247" />
-<P2  x="649" y="264" id="1205" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1114" >
-<father id="1116" num="0" />
-<cdparam x="411" y="206" />
-<sizeparam width="94" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5200" id="1258" >
+<cdparam x="46" y="491" />
+<sizeparam width="301" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="113" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1110" />
-<TGConnectingPoint num="1" id="1111" />
-<TGConnectingPoint num="2" id="1112" />
-<TGConnectingPoint num="3" id="1113" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="Requirement" value="Req_Availability" />
+<TGConnectingPoint num="0" id="1215" />
+<TGConnectingPoint num="1" id="1216" />
+<TGConnectingPoint num="2" id="1217" />
+<TGConnectingPoint num="3" id="1218" />
+<TGConnectingPoint num="4" id="1219" />
+<TGConnectingPoint num="5" id="1220" />
+<TGConnectingPoint num="6" id="1221" />
+<TGConnectingPoint num="7" id="1222" />
+<TGConnectingPoint num="8" id="1223" />
+<TGConnectingPoint num="9" id="1224" />
+<TGConnectingPoint num="10" id="1225" />
+<TGConnectingPoint num="11" id="1226" />
+<TGConnectingPoint num="12" id="1227" />
+<TGConnectingPoint num="13" id="1228" />
+<TGConnectingPoint num="14" id="1229" />
+<TGConnectingPoint num="15" id="1230" />
+<TGConnectingPoint num="16" id="1231" />
+<TGConnectingPoint num="17" id="1232" />
+<TGConnectingPoint num="18" id="1233" />
+<TGConnectingPoint num="19" id="1234" />
+<TGConnectingPoint num="20" id="1235" />
+<TGConnectingPoint num="21" id="1236" />
+<TGConnectingPoint num="22" id="1237" />
+<TGConnectingPoint num="23" id="1238" />
+<TGConnectingPoint num="24" id="1239" />
+<TGConnectingPoint num="25" id="1240" />
+<TGConnectingPoint num="26" id="1241" />
+<TGConnectingPoint num="27" id="1242" />
+<TGConnectingPoint num="28" id="1243" />
+<TGConnectingPoint num="29" id="1244" />
+<TGConnectingPoint num="30" id="1245" />
+<TGConnectingPoint num="31" id="1246" />
+<TGConnectingPoint num="32" id="1247" />
+<TGConnectingPoint num="33" id="1248" />
+<TGConnectingPoint num="34" id="1249" />
+<TGConnectingPoint num="35" id="1250" />
+<TGConnectingPoint num="36" id="1251" />
+<TGConnectingPoint num="37" id="1252" />
+<TGConnectingPoint num="38" id="1253" />
+<TGConnectingPoint num="39" id="1254" />
+<TGConnectingPoint num="40" id="1255" />
+<TGConnectingPoint num="41" id="1256" />
+<TGConnectingPoint num="42" id="1257" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="coinDelay" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="0.1" />
+<textline data="The availability of the machine shall be" />
+<textline data="no less than 99.99%" />
+<kind data="Functional" />
+<criticality data="Low" />
+<reqType data="Requirement" color="-1773070" />
+<id data="0.4" />
+<satisfied data="true" />
+<verified data="true" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="1123" >
-<cdparam x="243" y="319" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1122" />
-<P1  x="277" y="305" id="1192" />
-<P2  x="311" y="372" id="1486" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1121" >
-<father id="1123" num="0" />
-<cdparam x="243" y="359" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5200" id="1302" >
+<cdparam x="10" y="182" />
+<sizeparam width="150" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="136" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1117" />
-<TGConnectingPoint num="1" id="1118" />
-<TGConnectingPoint num="2" id="1119" />
-<TGConnectingPoint num="3" id="1120" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="Requirement" value="Req_CoffeeMachine" />
+<TGConnectingPoint num="0" id="1259" />
+<TGConnectingPoint num="1" id="1260" />
+<TGConnectingPoint num="2" id="1261" />
+<TGConnectingPoint num="3" id="1262" />
+<TGConnectingPoint num="4" id="1263" />
+<TGConnectingPoint num="5" id="1264" />
+<TGConnectingPoint num="6" id="1265" />
+<TGConnectingPoint num="7" id="1266" />
+<TGConnectingPoint num="8" id="1267" />
+<TGConnectingPoint num="9" id="1268" />
+<TGConnectingPoint num="10" id="1269" />
+<TGConnectingPoint num="11" id="1270" />
+<TGConnectingPoint num="12" id="1271" />
+<TGConnectingPoint num="13" id="1272" />
+<TGConnectingPoint num="14" id="1273" />
+<TGConnectingPoint num="15" id="1274" />
+<TGConnectingPoint num="16" id="1275" />
+<TGConnectingPoint num="17" id="1276" />
+<TGConnectingPoint num="18" id="1277" />
+<TGConnectingPoint num="19" id="1278" />
+<TGConnectingPoint num="20" id="1279" />
+<TGConnectingPoint num="21" id="1280" />
+<TGConnectingPoint num="22" id="1281" />
+<TGConnectingPoint num="23" id="1282" />
+<TGConnectingPoint num="24" id="1283" />
+<TGConnectingPoint num="25" id="1284" />
+<TGConnectingPoint num="26" id="1285" />
+<TGConnectingPoint num="27" id="1286" />
+<TGConnectingPoint num="28" id="1287" />
+<TGConnectingPoint num="29" id="1288" />
+<TGConnectingPoint num="30" id="1289" />
+<TGConnectingPoint num="31" id="1290" />
+<TGConnectingPoint num="32" id="1291" />
+<TGConnectingPoint num="33" id="1292" />
+<TGConnectingPoint num="34" id="1293" />
+<TGConnectingPoint num="35" id="1294" />
+<TGConnectingPoint num="36" id="1295" />
+<TGConnectingPoint num="37" id="1296" />
+<TGConnectingPoint num="38" id="1297" />
+<TGConnectingPoint num="39" id="1298" />
+<TGConnectingPoint num="40" id="1299" />
+<TGConnectingPoint num="41" id="1300" />
+<TGConnectingPoint num="42" id="1301" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<textline data="Requirements of the coffee machine" />
+<kind data="Functional" />
+<criticality data="Low" />
+<reqType data="Requirement" color="-1773070" />
+<id data="0" />
+<satisfied data="false" />
+<verified data="false" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="1130" >
-<cdparam x="270" y="224" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1129" />
-<P1  x="270" y="228" id="1257" />
-<P2  x="277" y="275" id="1191" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1128" >
-<father id="1130" num="0" />
-<cdparam x="270" y="264" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5201" id="1318" >
+<cdparam x="678" y="396" />
+<sizeparam width="171" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="158" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1124" />
-<TGConnectingPoint num="1" id="1125" />
-<TGConnectingPoint num="2" id="1126" />
-<TGConnectingPoint num="3" id="1127" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="AvatarProperty" value="BeverageDeliverProperty" />
+<TGConnectingPoint num="0" id="1303" />
+<TGConnectingPoint num="1" id="1304" />
+<TGConnectingPoint num="2" id="1305" />
+<TGConnectingPoint num="3" id="1306" />
+<TGConnectingPoint num="4" id="1307" />
+<TGConnectingPoint num="5" id="1308" />
+<TGConnectingPoint num="6" id="1309" />
+<TGConnectingPoint num="7" id="1310" />
+<TGConnectingPoint num="8" id="1311" />
+<TGConnectingPoint num="9" id="1312" />
+<TGConnectingPoint num="10" id="1313" />
+<TGConnectingPoint num="11" id="1314" />
+<TGConnectingPoint num="12" id="1315" />
+<TGConnectingPoint num="13" id="1316" />
+<TGConnectingPoint num="14" id="1317" />
+</COMPONENT>
+
+<COMPONENT type="5201" id="1334" >
+<cdparam x="628" y="308" />
+<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="128" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="AvatarProperty" value="WalletCoinProperty" />
+<TGConnectingPoint num="0" id="1319" />
+<TGConnectingPoint num="1" id="1320" />
+<TGConnectingPoint num="2" id="1321" />
+<TGConnectingPoint num="3" id="1322" />
+<TGConnectingPoint num="4" id="1323" />
+<TGConnectingPoint num="5" id="1324" />
+<TGConnectingPoint num="6" id="1325" />
+<TGConnectingPoint num="7" id="1326" />
+<TGConnectingPoint num="8" id="1327" />
+<TGConnectingPoint num="9" id="1328" />
+<TGConnectingPoint num="10" id="1329" />
+<TGConnectingPoint num="11" id="1330" />
+<TGConnectingPoint num="12" id="1331" />
+<TGConnectingPoint num="13" id="1332" />
+<TGConnectingPoint num="14" id="1333" />
+</COMPONENT>
+
+<COMPONENT type="5200" id="1378" >
+<cdparam x="233" y="147" />
+<sizeparam width="271" height="104" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="Requirement" value="req1" />
+<TGConnectingPoint num="0" id="1335" />
+<TGConnectingPoint num="1" id="1336" />
+<TGConnectingPoint num="2" id="1337" />
+<TGConnectingPoint num="3" id="1338" />
+<TGConnectingPoint num="4" id="1339" />
+<TGConnectingPoint num="5" id="1340" />
+<TGConnectingPoint num="6" id="1341" />
+<TGConnectingPoint num="7" id="1342" />
+<TGConnectingPoint num="8" id="1343" />
+<TGConnectingPoint num="9" id="1344" />
+<TGConnectingPoint num="10" id="1345" />
+<TGConnectingPoint num="11" id="1346" />
+<TGConnectingPoint num="12" id="1347" />
+<TGConnectingPoint num="13" id="1348" />
+<TGConnectingPoint num="14" id="1349" />
+<TGConnectingPoint num="15" id="1350" />
+<TGConnectingPoint num="16" id="1351" />
+<TGConnectingPoint num="17" id="1352" />
+<TGConnectingPoint num="18" id="1353" />
+<TGConnectingPoint num="19" id="1354" />
+<TGConnectingPoint num="20" id="1355" />
+<TGConnectingPoint num="21" id="1356" />
+<TGConnectingPoint num="22" id="1357" />
+<TGConnectingPoint num="23" id="1358" />
+<TGConnectingPoint num="24" id="1359" />
+<TGConnectingPoint num="25" id="1360" />
+<TGConnectingPoint num="26" id="1361" />
+<TGConnectingPoint num="27" id="1362" />
+<TGConnectingPoint num="28" id="1363" />
+<TGConnectingPoint num="29" id="1364" />
+<TGConnectingPoint num="30" id="1365" />
+<TGConnectingPoint num="31" id="1366" />
+<TGConnectingPoint num="32" id="1367" />
+<TGConnectingPoint num="33" id="1368" />
+<TGConnectingPoint num="34" id="1369" />
+<TGConnectingPoint num="35" id="1370" />
+<TGConnectingPoint num="36" id="1371" />
+<TGConnectingPoint num="37" id="1372" />
+<TGConnectingPoint num="38" id="1373" />
+<TGConnectingPoint num="39" id="1374" />
+<TGConnectingPoint num="40" id="1375" />
+<TGConnectingPoint num="41" id="1376" />
+<TGConnectingPoint num="42" id="1377" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<textline data="A wallet must never contain a " />
+<textline data="negative number of coins" />
+<kind data="Functional" />
+<criticality data="Low" />
+<reqType data="SafetyRequirement" color="-1773070" />
+<id data="0.2" />
+<satisfied data="true" />
+<verified data="true" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5201" id="1394" >
+<cdparam x="626" y="153" />
+<sizeparam width="150" height="30" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="117" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="AvatarProperty" value="OneCoinProperty" />
+<TGConnectingPoint num="0" id="1379" />
+<TGConnectingPoint num="1" id="1380" />
+<TGConnectingPoint num="2" id="1381" />
+<TGConnectingPoint num="3" id="1382" />
+<TGConnectingPoint num="4" id="1383" />
+<TGConnectingPoint num="5" id="1384" />
+<TGConnectingPoint num="6" id="1385" />
+<TGConnectingPoint num="7" id="1386" />
+<TGConnectingPoint num="8" id="1387" />
+<TGConnectingPoint num="9" id="1388" />
+<TGConnectingPoint num="10" id="1389" />
+<TGConnectingPoint num="11" id="1390" />
+<TGConnectingPoint num="12" id="1391" />
+<TGConnectingPoint num="13" id="1392" />
+<TGConnectingPoint num="14" id="1393" />
+</COMPONENT>
+
+<COMPONENT type="5200" id="1438" >
+<cdparam x="192" y="15" />
+<sizeparam width="304" height="110" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="75" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="Requirement" value="req3456" />
+<TGConnectingPoint num="0" id="1395" />
+<TGConnectingPoint num="1" id="1396" />
+<TGConnectingPoint num="2" id="1397" />
+<TGConnectingPoint num="3" id="1398" />
+<TGConnectingPoint num="4" id="1399" />
+<TGConnectingPoint num="5" id="1400" />
+<TGConnectingPoint num="6" id="1401" />
+<TGConnectingPoint num="7" id="1402" />
+<TGConnectingPoint num="8" id="1403" />
+<TGConnectingPoint num="9" id="1404" />
+<TGConnectingPoint num="10" id="1405" />
+<TGConnectingPoint num="11" id="1406" />
+<TGConnectingPoint num="12" id="1407" />
+<TGConnectingPoint num="13" id="1408" />
+<TGConnectingPoint num="14" id="1409" />
+<TGConnectingPoint num="15" id="1410" />
+<TGConnectingPoint num="16" id="1411" />
+<TGConnectingPoint num="17" id="1412" />
+<TGConnectingPoint num="18" id="1413" />
+<TGConnectingPoint num="19" id="1414" />
+<TGConnectingPoint num="20" id="1415" />
+<TGConnectingPoint num="21" id="1416" />
+<TGConnectingPoint num="22" id="1417" />
+<TGConnectingPoint num="23" id="1418" />
+<TGConnectingPoint num="24" id="1419" />
+<TGConnectingPoint num="25" id="1420" />
+<TGConnectingPoint num="26" id="1421" />
+<TGConnectingPoint num="27" id="1422" />
+<TGConnectingPoint num="28" id="1423" />
+<TGConnectingPoint num="29" id="1424" />
+<TGConnectingPoint num="30" id="1425" />
+<TGConnectingPoint num="31" id="1426" />
+<TGConnectingPoint num="32" id="1427" />
+<TGConnectingPoint num="33" id="1428" />
+<TGConnectingPoint num="34" id="1429" />
+<TGConnectingPoint num="35" id="1430" />
+<TGConnectingPoint num="36" id="1431" />
+<TGConnectingPoint num="37" id="1432" />
+<TGConnectingPoint num="38" id="1433" />
+<TGConnectingPoint num="39" id="1434" />
+<TGConnectingPoint num="40" id="1435" />
+<TGConnectingPoint num="41" id="1436" />
+<TGConnectingPoint num="42" id="1437" />
+<extraparam>
+<textline data="The coffee machine never has one coin " />
+<textline data=" inserted more than 50 units of time" />
+<kind data="Functional" />
+<criticality data="Low" />
+<reqType data="AMSRequirement" color="-1773070" />
+<id data="0.1" />
+<satisfied data="false" />
+<verified data="true" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5200" id="1482" >
+<cdparam x="208" y="294" />
+<sizeparam width="357" height="174" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="48" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="Requirement" value="req2" />
+<TGConnectingPoint num="0" id="1439" />
+<TGConnectingPoint num="1" id="1440" />
+<TGConnectingPoint num="2" id="1441" />
+<TGConnectingPoint num="3" id="1442" />
+<TGConnectingPoint num="4" id="1443" />
+<TGConnectingPoint num="5" id="1444" />
+<TGConnectingPoint num="6" id="1445" />
+<TGConnectingPoint num="7" id="1446" />
+<TGConnectingPoint num="8" id="1447" />
+<TGConnectingPoint num="9" id="1448" />
+<TGConnectingPoint num="10" id="1449" />
+<TGConnectingPoint num="11" id="1450" />
+<TGConnectingPoint num="12" id="1451" />
+<TGConnectingPoint num="13" id="1452" />
+<TGConnectingPoint num="14" id="1453" />
+<TGConnectingPoint num="15" id="1454" />
+<TGConnectingPoint num="16" id="1455" />
+<TGConnectingPoint num="17" id="1456" />
+<TGConnectingPoint num="18" id="1457" />
+<TGConnectingPoint num="19" id="1458" />
+<TGConnectingPoint num="20" id="1459" />
+<TGConnectingPoint num="21" id="1460" />
+<TGConnectingPoint num="22" id="1461" />
+<TGConnectingPoint num="23" id="1462" />
+<TGConnectingPoint num="24" id="1463" />
+<TGConnectingPoint num="25" id="1464" />
+<TGConnectingPoint num="26" id="1465" />
+<TGConnectingPoint num="27" id="1466" />
+<TGConnectingPoint num="28" id="1467" />
+<TGConnectingPoint num="29" id="1468" />
+<TGConnectingPoint num="30" id="1469" />
+<TGConnectingPoint num="31" id="1470" />
+<TGConnectingPoint num="32" id="1471" />
+<TGConnectingPoint num="33" id="1472" />
+<TGConnectingPoint num="34" id="1473" />
+<TGConnectingPoint num="35" id="1474" />
+<TGConnectingPoint num="36" id="1475" />
+<TGConnectingPoint num="37" id="1476" />
+<TGConnectingPoint num="38" id="1477" />
+<TGConnectingPoint num="39" id="1478" />
+<TGConnectingPoint num="40" id="1479" />
+<TGConnectingPoint num="41" id="1480" />
+<TGConnectingPoint num="42" id="1481" />
+<extraparam>
+<textline data="When the application starts, if the wallet contains " />
+<textline data="at least 2 coins, then a beverage may be delivered. " />
+<textline data="On the contrary, if the wallet contains less than 2" />
+<textline data="coins, no beverage will be delivered by the" />
+<textline data="machine." />
+<kind data="Functional" />
+<criticality data="Low" />
+<reqType data="SecurityRequirement" color="-1773070" />
+<id data="0.3" />
+<satisfied data="true" />
+<verified data="true" />
+<attackTreeNode data="" />
+<violatedAction data="" />
+<referenceElements data="RefAttack" />
+<extraAttribute id="Hypothèse" value="le système ..." />
 </extraparam>
+</COMPONENT>
+
+<CONNECTOR type="5202" id="1484" >
+<cdparam x="894" y="479" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="&lt;&lt;deriveReqt&gt;&gt;" />
+<TGConnectingPoint num="0" id="1483" />
+<P1  x="894" y="479" id="1101" />
+<P2  x="939" y="106" id="1176" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5202" id="1486" >
+<cdparam x="800" y="136" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="&lt;&lt;deriveReqt&gt;&gt;" />
+<TGConnectingPoint num="0" id="1485" />
+<P1  x="800" y="136" id="1181" />
+<P2  x="496" y="42" id="1398" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5206" id="1488" >
+<cdparam x="271" y="491" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="&lt;&lt;refine&gt;&gt;" />
+<TGConnectingPoint num="0" id="1487" />
+<P1  x="271" y="491" id="1223" />
+<P2  x="297" y="468" id="1448" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5206" id="1494" >
+<cdparam x="271" y="611" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="&lt;&lt;refine&gt;&gt;" />
+<TGConnectingPoint num="0" id="1491" />
+<TGConnectingPoint num="1" id="1492" />
+<TGConnectingPoint num="2" id="1493" />
+<P1  x="271" y="611" id="1226" />
+<P2  x="944" y="599" id="1105" />
+<Point x="318" y="685" />
+<Point x="769" y="688" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1489" >
+<father id="1494" num="0" />
+<cdparam x="318" y="685" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1490" >
+<father id="1494" num="1" />
+<cdparam x="769" y="688" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1137" >
-<cdparam x="309" y="160" />
+<CONNECTOR type="5206" id="1496" >
+<cdparam x="894" y="599" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="&lt;&lt;refine&gt;&gt;" />
+<TGConnectingPoint num="0" id="1495" />
+<P1  x="894" y="599" id="1104" />
+<P2  x="347" y="581" id="1220" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1498" >
+<cdparam x="47" y="302" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
+<TGConnectingPoint num="0" id="1497" />
+<P1  x="47" y="302" id="1268" />
+<P2  x="46" y="521" id="1215" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1500" >
+<cdparam x="844" y="569" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
+<TGConnectingPoint num="0" id="1499" />
+<P1  x="844" y="569" id="1097" />
+<P2  x="347" y="551" id="1219" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1502" >
+<cdparam x="869" y="136" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
+<TGConnectingPoint num="0" id="1501" />
+<P1  x="869" y="136" id="1182" />
+<P2  x="944" y="479" id="1102" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1504" >
+<cdparam x="661" y="76" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
+<TGConnectingPoint num="0" id="1503" />
+<P1  x="661" y="76" id="1172" />
+<P2  x="496" y="70" id="1399" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5208" id="1506" >
+<cdparam x="749" y="267" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="&lt;&lt;satisfy&gt;&gt;" />
+<TGConnectingPoint num="0" id="1505" />
+<P1  x="727" y="267" id="1140" />
+<P2  x="504" y="199" id="1367" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5208" id="1508" >
+<cdparam x="783" y="223" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="&lt;&lt;satisfy&gt;&gt;" />
+<TGConnectingPoint num="0" id="1507" />
+<P1  x="741" y="223" id="1157" />
+<P2  x="504" y="173" id="1366" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1510" >
+<cdparam x="124" y="457" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
+<TGConnectingPoint num="0" id="1509" />
+<P1  x="121" y="491" id="1221" />
+<P2  x="122" y="302" id="1270" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1512" >
+<cdparam x="244" y="315" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
+<TGConnectingPoint num="0" id="1511" />
+<P1  x="208" y="337" id="1439" />
+<P2  x="160" y="272" id="1264" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1514" >
+<cdparam x="249" y="199" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
+<TGConnectingPoint num="0" id="1513" />
+<P1  x="233" y="199" id="1336" />
+<P2  x="160" y="212" id="1262" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5205" id="1516" >
+<cdparam x="237" y="98" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
+<TGConnectingPoint num="0" id="1515" />
+<P1  x="192" y="97" id="1397" />
+<P2  x="122" y="182" id="1267" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5203" id="1518" >
+<cdparam x="538" y="537" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from AvatarProperty to Requirement" value="&lt;&lt;verify&gt;&gt;" />
+<TGConnectingPoint num="0" id="1517" />
+<P1  x="678" y="411" id="1304" />
+<P2  x="565" y="381" id="1455" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5203" id="1520" >
+<cdparam x="545" y="329" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from AvatarProperty to Requirement" value="&lt;&lt;verify&gt;&gt;" />
+<TGConnectingPoint num="0" id="1519" />
+<P1  x="628" y="323" id="1320" />
+<P2  x="504" y="199" id="1351" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5203" id="1522" >
+<cdparam x="563" y="148" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from AvatarProperty to Requirement" value="&lt;&lt;verify&gt;&gt;" />
+<TGConnectingPoint num="0" id="1521" />
+<P1  x="626" y="168" id="1380" />
+<P2  x="496" y="97" id="1412" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+
+</AvatarRDPanel>
+
+<AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0000000000000004" >
+<CONNECTOR type="5312" id="1524" >
+<cdparam x="582" y="248" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from TGComponent to TGComponent" value="reg" />
+<TGConnectingPoint num="0" id="1523" />
+<P1  x="503" y="258" id="1649" />
+<P2  x="507" y="334" id="1537" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5310" id="1530" >
+<cdparam x="247" y="616" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1136" />
-<P1  x="306" y="166" id="1170" />
-<P2  x="309" y="188" id="1244" />
+<infoparam name="connector from TGComponent to TGComponent" value="" />
+<TGConnectingPoint num="0" id="1527" />
+<TGConnectingPoint num="1" id="1528" />
+<TGConnectingPoint num="2" id="1529" />
+<P1  x="492" y="126" id="1612" />
+<P2  x="492" y="209" id="1653" />
+<Point x="467" y="147" />
+<Point x="467" y="192" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1135" >
-<father id="1137" num="0" />
-<cdparam x="328" y="178" />
-<sizeparam width="161" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1525" >
+<father id="1530" num="0" />
+<cdparam x="467" y="147" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1131" />
-<TGConnectingPoint num="1" id="1132" />
-<TGConnectingPoint num="2" id="1133" />
-<TGConnectingPoint num="3" id="1134" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="nbOfCoins = nbOfCoins + x" />
-</extraparam>
+<infoparam name="point " value="null" />
 </SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="1144" >
-<cdparam x="303" y="103" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1143" />
-<P1  x="302" y="102" id="1292" />
-<P2  x="306" y="136" id="1169" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1142" >
-<father id="1144" num="0" />
-<cdparam x="303" y="143" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="1526" >
+<father id="1530" num="1" />
+<cdparam x="467" y="192" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1138" />
-<TGConnectingPoint num="1" id="1139" />
-<TGConnectingPoint num="2" id="1140" />
-<TGConnectingPoint num="3" id="1141" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
+<infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1151" >
-<cdparam x="303" y="40" />
+<CONNECTOR type="5311" id="1532" >
+<cdparam x="280" y="200" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1150" />
-<P1  x="303" y="40" id="1284" />
-<P2  x="302" y="62" id="1287" />
+<infoparam name="connector from TGComponent to TGComponent" value="" />
+<TGConnectingPoint num="0" id="1531" />
+<P1  x="318" y="261" id="1562" />
+<P2  x="361" y="261" id="1550" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1149" >
-<father id="1151" num="0" />
-<cdparam x="303" y="80" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1145" />
-<TGConnectingPoint num="1" id="1146" />
-<TGConnectingPoint num="2" id="1147" />
-<TGConnectingPoint num="3" id="1148" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="301" id="1168" >
-<cdparam x="472" y="75" />
-<sizeparam width="100" height="15" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR>
+<CONNECTOR type="5312" id="1534" >
+<cdparam x="473" y="190" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from TGComponent to TGComponent" value="reg" />
+<TGConnectingPoint num="0" id="1533" />
+<P1  x="390" y="286" id="1548" />
+<P2  x="394" y="331" id="1542" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5311" id="1536" >
+<cdparam x="276" y="190" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from TGComponent to TGComponent" value="" />
+<TGConnectingPoint num="0" id="1535" />
+<P1  x="318" y="211" id="1575" />
+<P2  x="361" y="211" id="1549" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<COMPONENT type="5308" id="1541" >
+<cdparam x="446" y="334" />
+<sizeparam width="122" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="UML Note" value="Activity1.docx
-" />
-<TGConnectingPoint num="0" id="1152" />
-<TGConnectingPoint num="1" id="1153" />
-<TGConnectingPoint num="2" id="1154" />
-<TGConnectingPoint num="3" id="1155" />
-<TGConnectingPoint num="4" id="1156" />
-<TGConnectingPoint num="5" id="1157" />
-<TGConnectingPoint num="6" id="1158" />
-<TGConnectingPoint num="7" id="1159" />
-<TGConnectingPoint num="8" id="1160" />
-<TGConnectingPoint num="9" id="1161" />
-<TGConnectingPoint num="10" id="1162" />
-<TGConnectingPoint num="11" id="1163" />
-<TGConnectingPoint num="12" id="1164" />
-<TGConnectingPoint num="13" id="1165" />
-<TGConnectingPoint num="14" id="1166" />
-<TGConnectingPoint num="15" id="1167" />
+<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
+<infoparam name="TGComponent" value="WalletCoinProperty" />
+<TGConnectingPoint num="0" id="1537" />
+<TGConnectingPoint num="1" id="1538" />
+<TGConnectingPoint num="2" id="1539" />
+<TGConnectingPoint num="3" id="1540" />
 <extraparam>
-<Line value="Activity1.docx" />
+<liveness data="0" />
+<not data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="1179" >
-<cdparam x="268" y="141" />
-<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1169" />
-<TGConnectingPoint num="1" id="1170" />
-<TGConnectingPoint num="2" id="1171" />
-<TGConnectingPoint num="3" id="1172" />
-<TGConnectingPoint num="4" id="1173" />
-<TGConnectingPoint num="5" id="1174" />
-<TGConnectingPoint num="6" id="1175" />
-<TGConnectingPoint num="7" id="1176" />
-<TGConnectingPoint num="8" id="1177" />
-<TGConnectingPoint num="9" id="1178" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="1190" >
-<cdparam x="634" y="321" />
-<sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1180" />
-<TGConnectingPoint num="1" id="1181" />
-<TGConnectingPoint num="2" id="1182" />
-<TGConnectingPoint num="3" id="1183" />
-<TGConnectingPoint num="4" id="1184" />
-<TGConnectingPoint num="5" id="1185" />
-<TGConnectingPoint num="6" id="1186" />
-<TGConnectingPoint num="7" id="1187" />
-<TGConnectingPoint num="8" id="1188" />
-<TGConnectingPoint num="9" id="1189" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="1201" >
-<cdparam x="239" y="280" />
-<sizeparam width="76" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1191" />
-<TGConnectingPoint num="1" id="1192" />
-<TGConnectingPoint num="2" id="1193" />
-<TGConnectingPoint num="3" id="1194" />
-<TGConnectingPoint num="4" id="1195" />
-<TGConnectingPoint num="5" id="1196" />
-<TGConnectingPoint num="6" id="1197" />
-<TGConnectingPoint num="7" id="1198" />
-<TGConnectingPoint num="8" id="1199" />
-<TGConnectingPoint num="9" id="1200" />
-<accessibility />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1242" >
-<cdparam x="649" y="239" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5308" id="1546" >
+<cdparam x="340" y="331" />
+<sizeparam width="108" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="ejectState" />
-<TGConnectingPoint num="0" id="1202" />
-<TGConnectingPoint num="1" id="1203" />
-<TGConnectingPoint num="2" id="1204" />
-<TGConnectingPoint num="3" id="1205" />
-<TGConnectingPoint num="4" id="1206" />
-<TGConnectingPoint num="5" id="1207" />
-<TGConnectingPoint num="6" id="1208" />
-<TGConnectingPoint num="7" id="1209" />
-<TGConnectingPoint num="8" id="1210" />
-<TGConnectingPoint num="9" id="1211" />
-<TGConnectingPoint num="10" id="1212" />
-<TGConnectingPoint num="11" id="1213" />
-<TGConnectingPoint num="12" id="1214" />
-<TGConnectingPoint num="13" id="1215" />
-<TGConnectingPoint num="14" id="1216" />
-<TGConnectingPoint num="15" id="1217" />
-<TGConnectingPoint num="16" id="1218" />
-<TGConnectingPoint num="17" id="1219" />
-<TGConnectingPoint num="18" id="1220" />
-<TGConnectingPoint num="19" id="1221" />
-<TGConnectingPoint num="20" id="1222" />
-<TGConnectingPoint num="21" id="1223" />
-<TGConnectingPoint num="22" id="1224" />
-<TGConnectingPoint num="23" id="1225" />
-<TGConnectingPoint num="24" id="1226" />
-<TGConnectingPoint num="25" id="1227" />
-<TGConnectingPoint num="26" id="1228" />
-<TGConnectingPoint num="27" id="1229" />
-<TGConnectingPoint num="28" id="1230" />
-<TGConnectingPoint num="29" id="1231" />
-<TGConnectingPoint num="30" id="1232" />
-<TGConnectingPoint num="31" id="1233" />
-<TGConnectingPoint num="32" id="1234" />
-<TGConnectingPoint num="33" id="1235" />
-<TGConnectingPoint num="34" id="1236" />
-<TGConnectingPoint num="35" id="1237" />
-<TGConnectingPoint num="36" id="1238" />
-<TGConnectingPoint num="37" id="1239" />
-<TGConnectingPoint num="38" id="1240" />
-<TGConnectingPoint num="39" id="1241" />
+<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
+<infoparam name="TGComponent" value="oneCoinProperty" />
+<TGConnectingPoint num="0" id="1542" />
+<TGConnectingPoint num="1" id="1543" />
+<TGConnectingPoint num="2" id="1544" />
+<TGConnectingPoint num="3" id="1545" />
 <extraparam>
+<liveness data="1" />
+<not data="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1283" >
-<cdparam x="231" y="188" />
-<sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5302" id="1559" >
+<cdparam x="361" y="187" />
+<sizeparam width="59" height="99" minWidth="50" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="WaitingForSecondCoin" />
-<TGConnectingPoint num="0" id="1243" />
-<TGConnectingPoint num="1" id="1244" />
-<TGConnectingPoint num="2" id="1245" />
-<TGConnectingPoint num="3" id="1246" />
-<TGConnectingPoint num="4" id="1247" />
-<TGConnectingPoint num="5" id="1248" />
-<TGConnectingPoint num="6" id="1249" />
-<TGConnectingPoint num="7" id="1250" />
-<TGConnectingPoint num="8" id="1251" />
-<TGConnectingPoint num="9" id="1252" />
-<TGConnectingPoint num="10" id="1253" />
-<TGConnectingPoint num="11" id="1254" />
-<TGConnectingPoint num="12" id="1255" />
-<TGConnectingPoint num="13" id="1256" />
-<TGConnectingPoint num="14" id="1257" />
-<TGConnectingPoint num="15" id="1258" />
-<TGConnectingPoint num="16" id="1259" />
-<TGConnectingPoint num="17" id="1260" />
-<TGConnectingPoint num="18" id="1261" />
-<TGConnectingPoint num="19" id="1262" />
-<TGConnectingPoint num="20" id="1263" />
-<TGConnectingPoint num="21" id="1264" />
-<TGConnectingPoint num="22" id="1265" />
-<TGConnectingPoint num="23" id="1266" />
-<TGConnectingPoint num="24" id="1267" />
-<TGConnectingPoint num="25" id="1268" />
-<TGConnectingPoint num="26" id="1269" />
-<TGConnectingPoint num="27" id="1270" />
-<TGConnectingPoint num="28" id="1271" />
-<TGConnectingPoint num="29" id="1272" />
-<TGConnectingPoint num="30" id="1273" />
-<TGConnectingPoint num="31" id="1274" />
-<TGConnectingPoint num="32" id="1275" />
-<TGConnectingPoint num="33" id="1276" />
-<TGConnectingPoint num="34" id="1277" />
-<TGConnectingPoint num="35" id="1278" />
-<TGConnectingPoint num="36" id="1279" />
-<TGConnectingPoint num="37" id="1280" />
-<TGConnectingPoint num="38" id="1281" />
-<TGConnectingPoint num="39" id="1282" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
+<infoparam name="TGComponent" value="&gt;50" />
+<TGConnectingPoint num="0" id="1547" />
+<TGConnectingPoint num="1" id="1548" />
+<TGConnectingPoint num="2" id="1549" />
+<TGConnectingPoint num="3" id="1550" />
+<TGConnectingPoint num="4" id="1551" />
+<TGConnectingPoint num="5" id="1552" />
+<TGConnectingPoint num="6" id="1553" />
+<TGConnectingPoint num="7" id="1554" />
+<TGConnectingPoint num="8" id="1555" />
+<TGConnectingPoint num="9" id="1556" />
+<TGConnectingPoint num="10" id="1557" />
+<TGConnectingPoint num="11" id="1558" />
 </COMPONENT>
 
-<COMPONENT type="5100" id="1285" >
-<cdparam x="296" y="20" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5300" id="1610" >
+<cdparam x="150" y="142" />
+<sizeparam width="168" height="154" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1284" />
+<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
+<infoparam name="Block0" value="CoffeeMachine" />
+<TGConnectingPoint num="0" id="1586" />
+<TGConnectingPoint num="1" id="1587" />
+<TGConnectingPoint num="2" id="1588" />
+<TGConnectingPoint num="3" id="1589" />
+<TGConnectingPoint num="4" id="1590" />
+<TGConnectingPoint num="5" id="1591" />
+<TGConnectingPoint num="6" id="1592" />
+<TGConnectingPoint num="7" id="1593" />
+<TGConnectingPoint num="8" id="1594" />
+<TGConnectingPoint num="9" id="1595" />
+<TGConnectingPoint num="10" id="1596" />
+<TGConnectingPoint num="11" id="1597" />
+<TGConnectingPoint num="12" id="1598" />
+<TGConnectingPoint num="13" id="1599" />
+<TGConnectingPoint num="14" id="1600" />
+<TGConnectingPoint num="15" id="1601" />
+<TGConnectingPoint num="16" id="1602" />
+<TGConnectingPoint num="17" id="1603" />
+<TGConnectingPoint num="18" id="1604" />
+<TGConnectingPoint num="19" id="1605" />
+<TGConnectingPoint num="20" id="1606" />
+<TGConnectingPoint num="21" id="1607" />
+<TGConnectingPoint num="22" id="1608" />
+<TGConnectingPoint num="23" id="1609" />
 </COMPONENT>
-
-<COMPONENT type="5106" id="1326" >
-<cdparam x="192" y="62" />
-<sizeparam width="220" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5304" id="1572" >
+<father id="1610" num="0" />
+<cdparam x="154" y="241" />
+<sizeparam width="164" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1286" />
-<TGConnectingPoint num="1" id="1287" />
-<TGConnectingPoint num="2" id="1288" />
-<TGConnectingPoint num="3" id="1289" />
-<TGConnectingPoint num="4" id="1290" />
-<TGConnectingPoint num="5" id="1291" />
-<TGConnectingPoint num="6" id="1292" />
-<TGConnectingPoint num="7" id="1293" />
-<TGConnectingPoint num="8" id="1294" />
-<TGConnectingPoint num="9" id="1295" />
-<TGConnectingPoint num="10" id="1296" />
-<TGConnectingPoint num="11" id="1297" />
-<TGConnectingPoint num="12" id="1298" />
-<TGConnectingPoint num="13" id="1299" />
-<TGConnectingPoint num="14" id="1300" />
-<TGConnectingPoint num="15" id="1301" />
-<TGConnectingPoint num="16" id="1302" />
-<TGConnectingPoint num="17" id="1303" />
-<TGConnectingPoint num="18" id="1304" />
-<TGConnectingPoint num="19" id="1305" />
-<TGConnectingPoint num="20" id="1306" />
-<TGConnectingPoint num="21" id="1307" />
-<TGConnectingPoint num="22" id="1308" />
-<TGConnectingPoint num="23" id="1309" />
-<TGConnectingPoint num="24" id="1310" />
-<TGConnectingPoint num="25" id="1311" />
-<TGConnectingPoint num="26" id="1312" />
-<TGConnectingPoint num="27" id="1313" />
-<TGConnectingPoint num="28" id="1314" />
-<TGConnectingPoint num="29" id="1315" />
-<TGConnectingPoint num="30" id="1316" />
-<TGConnectingPoint num="31" id="1317" />
-<TGConnectingPoint num="32" id="1318" />
-<TGConnectingPoint num="33" id="1319" />
-<TGConnectingPoint num="34" id="1320" />
-<TGConnectingPoint num="35" id="1321" />
-<TGConnectingPoint num="36" id="1322" />
-<TGConnectingPoint num="37" id="1323" />
-<TGConnectingPoint num="38" id="1324" />
-<TGConnectingPoint num="39" id="1325" />
-<latencyCheck />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1367" >
-<cdparam x="221" y="748" />
-<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="0" maxX="4" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
+<TGConnectingPoint num="0" id="1560" />
+<TGConnectingPoint num="1" id="1561" />
+<TGConnectingPoint num="2" id="1562" />
+<TGConnectingPoint num="3" id="1563" />
+<TGConnectingPoint num="4" id="1564" />
+<TGConnectingPoint num="5" id="1565" />
+<TGConnectingPoint num="6" id="1566" />
+<TGConnectingPoint num="7" id="1567" />
+<TGConnectingPoint num="8" id="1568" />
+<TGConnectingPoint num="9" id="1569" />
+<TGConnectingPoint num="10" id="1570" />
+<TGConnectingPoint num="11" id="1571" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5304" id="1585" >
+<father id="1610" num="1" />
+<cdparam x="166" y="191" />
+<sizeparam width="152" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1327" />
-<TGConnectingPoint num="1" id="1328" />
-<TGConnectingPoint num="2" id="1329" />
-<TGConnectingPoint num="3" id="1330" />
-<TGConnectingPoint num="4" id="1331" />
-<TGConnectingPoint num="5" id="1332" />
-<TGConnectingPoint num="6" id="1333" />
-<TGConnectingPoint num="7" id="1334" />
-<TGConnectingPoint num="8" id="1335" />
-<TGConnectingPoint num="9" id="1336" />
-<TGConnectingPoint num="10" id="1337" />
-<TGConnectingPoint num="11" id="1338" />
-<TGConnectingPoint num="12" id="1339" />
-<TGConnectingPoint num="13" id="1340" />
-<TGConnectingPoint num="14" id="1341" />
-<TGConnectingPoint num="15" id="1342" />
-<TGConnectingPoint num="16" id="1343" />
-<TGConnectingPoint num="17" id="1344" />
-<TGConnectingPoint num="18" id="1345" />
-<TGConnectingPoint num="19" id="1346" />
-<TGConnectingPoint num="20" id="1347" />
-<TGConnectingPoint num="21" id="1348" />
-<TGConnectingPoint num="22" id="1349" />
-<TGConnectingPoint num="23" id="1350" />
-<TGConnectingPoint num="24" id="1351" />
-<TGConnectingPoint num="25" id="1352" />
-<TGConnectingPoint num="26" id="1353" />
-<TGConnectingPoint num="27" id="1354" />
-<TGConnectingPoint num="28" id="1355" />
-<TGConnectingPoint num="29" id="1356" />
-<TGConnectingPoint num="30" id="1357" />
-<TGConnectingPoint num="31" id="1358" />
-<TGConnectingPoint num="32" id="1359" />
-<TGConnectingPoint num="33" id="1360" />
-<TGConnectingPoint num="34" id="1361" />
-<TGConnectingPoint num="35" id="1362" />
-<TGConnectingPoint num="36" id="1363" />
-<TGConnectingPoint num="37" id="1364" />
-<TGConnectingPoint num="38" id="1365" />
-<TGConnectingPoint num="39" id="1366" />
-<extraparam>
-</extraparam>
-</COMPONENT>
+<cdrectangleparam minX="0" maxX="16" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
+<TGConnectingPoint num="0" id="1573" />
+<TGConnectingPoint num="1" id="1574" />
+<TGConnectingPoint num="2" id="1575" />
+<TGConnectingPoint num="3" id="1576" />
+<TGConnectingPoint num="4" id="1577" />
+<TGConnectingPoint num="5" id="1578" />
+<TGConnectingPoint num="6" id="1579" />
+<TGConnectingPoint num="7" id="1580" />
+<TGConnectingPoint num="8" id="1581" />
+<TGConnectingPoint num="9" id="1582" />
+<TGConnectingPoint num="10" id="1583" />
+<TGConnectingPoint num="11" id="1584" />
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="1408" >
-<cdparam x="631" y="381" />
-<sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5300" id="1648" >
+<cdparam x="459" y="61" />
+<sizeparam width="150" height="116" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1368" />
-<TGConnectingPoint num="1" id="1369" />
-<TGConnectingPoint num="2" id="1370" />
-<TGConnectingPoint num="3" id="1371" />
-<TGConnectingPoint num="4" id="1372" />
-<TGConnectingPoint num="5" id="1373" />
-<TGConnectingPoint num="6" id="1374" />
-<TGConnectingPoint num="7" id="1375" />
-<TGConnectingPoint num="8" id="1376" />
-<TGConnectingPoint num="9" id="1377" />
-<TGConnectingPoint num="10" id="1378" />
-<TGConnectingPoint num="11" id="1379" />
-<TGConnectingPoint num="12" id="1380" />
-<TGConnectingPoint num="13" id="1381" />
-<TGConnectingPoint num="14" id="1382" />
-<TGConnectingPoint num="15" id="1383" />
-<TGConnectingPoint num="16" id="1384" />
-<TGConnectingPoint num="17" id="1385" />
-<TGConnectingPoint num="18" id="1386" />
-<TGConnectingPoint num="19" id="1387" />
-<TGConnectingPoint num="20" id="1388" />
-<TGConnectingPoint num="21" id="1389" />
-<TGConnectingPoint num="22" id="1390" />
-<TGConnectingPoint num="23" id="1391" />
-<TGConnectingPoint num="24" id="1392" />
-<TGConnectingPoint num="25" id="1393" />
-<TGConnectingPoint num="26" id="1394" />
-<TGConnectingPoint num="27" id="1395" />
-<TGConnectingPoint num="28" id="1396" />
-<TGConnectingPoint num="29" id="1397" />
-<TGConnectingPoint num="30" id="1398" />
-<TGConnectingPoint num="31" id="1399" />
-<TGConnectingPoint num="32" id="1400" />
-<TGConnectingPoint num="33" id="1401" />
-<TGConnectingPoint num="34" id="1402" />
-<TGConnectingPoint num="35" id="1403" />
-<TGConnectingPoint num="36" id="1404" />
-<TGConnectingPoint num="37" id="1405" />
-<TGConnectingPoint num="38" id="1406" />
-<TGConnectingPoint num="39" id="1407" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
+<infoparam name="Block0" value="Wallet" />
+<TGConnectingPoint num="0" id="1624" />
+<TGConnectingPoint num="1" id="1625" />
+<TGConnectingPoint num="2" id="1626" />
+<TGConnectingPoint num="3" id="1627" />
+<TGConnectingPoint num="4" id="1628" />
+<TGConnectingPoint num="5" id="1629" />
+<TGConnectingPoint num="6" id="1630" />
+<TGConnectingPoint num="7" id="1631" />
+<TGConnectingPoint num="8" id="1632" />
+<TGConnectingPoint num="9" id="1633" />
+<TGConnectingPoint num="10" id="1634" />
+<TGConnectingPoint num="11" id="1635" />
+<TGConnectingPoint num="12" id="1636" />
+<TGConnectingPoint num="13" id="1637" />
+<TGConnectingPoint num="14" id="1638" />
+<TGConnectingPoint num="15" id="1639" />
+<TGConnectingPoint num="16" id="1640" />
+<TGConnectingPoint num="17" id="1641" />
+<TGConnectingPoint num="18" id="1642" />
+<TGConnectingPoint num="19" id="1643" />
+<TGConnectingPoint num="20" id="1644" />
+<TGConnectingPoint num="21" id="1645" />
+<TGConnectingPoint num="22" id="1646" />
+<TGConnectingPoint num="23" id="1647" />
 </COMPONENT>
-
-<COMPONENT type="5106" id="1525" >
-<cdparam x="23" y="372" />
-<sizeparam width="577" height="354" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5303" id="1623" >
+<father id="1648" num="0" />
+<cdparam x="492" y="102" />
+<sizeparam width="100" height="49" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="Beverage" />
-<TGConnectingPoint num="0" id="1485" />
-<TGConnectingPoint num="1" id="1486" />
-<TGConnectingPoint num="2" id="1487" />
-<TGConnectingPoint num="3" id="1488" />
-<TGConnectingPoint num="4" id="1489" />
-<TGConnectingPoint num="5" id="1490" />
-<TGConnectingPoint num="6" id="1491" />
-<TGConnectingPoint num="7" id="1492" />
-<TGConnectingPoint num="8" id="1493" />
-<TGConnectingPoint num="9" id="1494" />
-<TGConnectingPoint num="10" id="1495" />
-<TGConnectingPoint num="11" id="1496" />
-<TGConnectingPoint num="12" id="1497" />
-<TGConnectingPoint num="13" id="1498" />
-<TGConnectingPoint num="14" id="1499" />
-<TGConnectingPoint num="15" id="1500" />
-<TGConnectingPoint num="16" id="1501" />
-<TGConnectingPoint num="17" id="1502" />
-<TGConnectingPoint num="18" id="1503" />
-<TGConnectingPoint num="19" id="1504" />
-<TGConnectingPoint num="20" id="1505" />
-<TGConnectingPoint num="21" id="1506" />
-<TGConnectingPoint num="22" id="1507" />
-<TGConnectingPoint num="23" id="1508" />
-<TGConnectingPoint num="24" id="1509" />
-<TGConnectingPoint num="25" id="1510" />
-<TGConnectingPoint num="26" id="1511" />
-<TGConnectingPoint num="27" id="1512" />
-<TGConnectingPoint num="28" id="1513" />
-<TGConnectingPoint num="29" id="1514" />
-<TGConnectingPoint num="30" id="1515" />
-<TGConnectingPoint num="31" id="1516" />
-<TGConnectingPoint num="32" id="1517" />
-<TGConnectingPoint num="33" id="1518" />
-<TGConnectingPoint num="34" id="1519" />
-<TGConnectingPoint num="35" id="1520" />
-<TGConnectingPoint num="36" id="1521" />
-<TGConnectingPoint num="37" id="1522" />
-<TGConnectingPoint num="38" id="1523" />
-<TGConnectingPoint num="39" id="1524" />
+<cdrectangleparam minX="0" maxX="50" minY="0" maxY="67" />
+<infoparam name="TGComponent" value="nbOfCoins" />
+<TGConnectingPoint num="0" id="1611" />
+<TGConnectingPoint num="1" id="1612" />
+<TGConnectingPoint num="2" id="1613" />
+<TGConnectingPoint num="3" id="1614" />
+<TGConnectingPoint num="4" id="1615" />
+<TGConnectingPoint num="5" id="1616" />
+<TGConnectingPoint num="6" id="1617" />
+<TGConnectingPoint num="7" id="1618" />
+<TGConnectingPoint num="8" id="1619" />
+<TGConnectingPoint num="9" id="1620" />
+<TGConnectingPoint num="10" id="1621" />
+<TGConnectingPoint num="11" id="1622" />
 <extraparam>
+<Toggle value="" />
 </extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="5103" id="1419" >
-<father id="1525" num="0" />
-<cdparam x="377" y="502" />
-<sizeparam width="130" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
-<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1409" />
-<TGConnectingPoint num="1" id="1410" />
-<TGConnectingPoint num="2" id="1411" />
-<TGConnectingPoint num="3" id="1412" />
-<TGConnectingPoint num="4" id="1413" />
-<TGConnectingPoint num="5" id="1414" />
-<TGConnectingPoint num="6" id="1415" />
-<TGConnectingPoint num="7" id="1416" />
-<TGConnectingPoint num="8" id="1417" />
-<TGConnectingPoint num="9" id="1418" />
-<accessibility />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="1430" >
-<father id="1525" num="1" />
-<cdparam x="63" y="529" />
-<sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushCoffeeButton()" />
-<TGConnectingPoint num="0" id="1420" />
-<TGConnectingPoint num="1" id="1421" />
-<TGConnectingPoint num="2" id="1422" />
-<TGConnectingPoint num="3" id="1423" />
-<TGConnectingPoint num="4" id="1424" />
-<TGConnectingPoint num="5" id="1425" />
-<TGConnectingPoint num="6" id="1426" />
-<TGConnectingPoint num="7" id="1427" />
-<TGConnectingPoint num="8" id="1428" />
-<TGConnectingPoint num="9" id="1429" />
-<accessibility />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1432" >
-<father id="1525" num="2" />
-<cdparam x="254" y="401" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1431" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="1473" >
-<father id="1525" num="3" />
-<cdparam x="194" y="437" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<COMPONENT type="5306" id="1660" >
+<cdparam x="467" y="209" />
+<sizeparam width="103" height="49" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
-<infoparam name="state0" value="WaitingForSelection" />
-<TGConnectingPoint num="0" id="1433" />
-<TGConnectingPoint num="1" id="1434" />
-<TGConnectingPoint num="2" id="1435" />
-<TGConnectingPoint num="3" id="1436" />
-<TGConnectingPoint num="4" id="1437" />
-<TGConnectingPoint num="5" id="1438" />
-<TGConnectingPoint num="6" id="1439" />
-<TGConnectingPoint num="7" id="1440" />
-<TGConnectingPoint num="8" id="1441" />
-<TGConnectingPoint num="9" id="1442" />
-<TGConnectingPoint num="10" id="1443" />
-<TGConnectingPoint num="11" id="1444" />
-<TGConnectingPoint num="12" id="1445" />
-<TGConnectingPoint num="13" id="1446" />
-<TGConnectingPoint num="14" id="1447" />
-<TGConnectingPoint num="15" id="1448" />
-<TGConnectingPoint num="16" id="1449" />
-<TGConnectingPoint num="17" id="1450" />
-<TGConnectingPoint num="18" id="1451" />
-<TGConnectingPoint num="19" id="1452" />
-<TGConnectingPoint num="20" id="1453" />
-<TGConnectingPoint num="21" id="1454" />
-<TGConnectingPoint num="22" id="1455" />
-<TGConnectingPoint num="23" id="1456" />
-<TGConnectingPoint num="24" id="1457" />
-<TGConnectingPoint num="25" id="1458" />
-<TGConnectingPoint num="26" id="1459" />
-<TGConnectingPoint num="27" id="1460" />
-<TGConnectingPoint num="28" id="1461" />
-<TGConnectingPoint num="29" id="1462" />
-<TGConnectingPoint num="30" id="1463" />
-<TGConnectingPoint num="31" id="1464" />
-<TGConnectingPoint num="32" id="1465" />
-<TGConnectingPoint num="33" id="1466" />
-<TGConnectingPoint num="34" id="1467" />
-<TGConnectingPoint num="35" id="1468" />
-<TGConnectingPoint num="36" id="1469" />
-<TGConnectingPoint num="37" id="1470" />
-<TGConnectingPoint num="38" id="1471" />
-<TGConnectingPoint num="39" id="1472" />
-<latencyCheck />
+<cdrectangleparam minX="10" maxX="1401" minY="10" maxY="901" />
+<infoparam name="TGComponent" value="nbOfCoins &gt;= 0" />
+<TGConnectingPoint num="0" id="1649" />
+<TGConnectingPoint num="1" id="1650" />
+<TGConnectingPoint num="2" id="1651" />
+<TGConnectingPoint num="3" id="1652" />
+<TGConnectingPoint num="4" id="1653" />
+<TGConnectingPoint num="5" id="1654" />
+<TGConnectingPoint num="6" id="1655" />
+<TGConnectingPoint num="7" id="1656" />
+<TGConnectingPoint num="8" id="1657" />
+<TGConnectingPoint num="9" id="1658" />
+<TGConnectingPoint num="10" id="1659" />
 <extraparam>
+<Toggle value="" />
 </extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="1484" >
-<father id="1525" num="4" />
-<cdparam x="242" y="529" />
-<sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushTeaButton()" />
-<TGConnectingPoint num="0" id="1474" />
-<TGConnectingPoint num="1" id="1475" />
-<TGConnectingPoint num="2" id="1476" />
-<TGConnectingPoint num="3" id="1477" />
-<TGConnectingPoint num="4" id="1478" />
-<TGConnectingPoint num="5" id="1479" />
-<TGConnectingPoint num="6" id="1480" />
-<TGConnectingPoint num="7" id="1481" />
-<TGConnectingPoint num="8" id="1482" />
-<TGConnectingPoint num="9" id="1483" />
-<accessibility />
-</SUBCOMPONENT>
+</COMPONENT>
 
 
-</AVATARStateMachineDiagramPanel>
+</AvatarPDPanel>
 
-<AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1532" >
-<cdparam x="177" y="199" />
+<AvatarPDPanel name="AVATAR PD" minX="10" maxX="1400" minY="10" maxY="1400" zoom="1.0" >
+<CONNECTOR type="5312" id="1662" >
+<cdparam x="580" y="547" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1531" />
-<P1  x="340" y="233" id="1638" />
-<P2  x="353" y="252" id="1640" />
+<infoparam name="connector from TGComponent to TGComponent" value="reg" />
+<TGConnectingPoint num="0" id="1661" />
+<P1  x="637" y="538" id="1843" />
+<P2  x="638" y="563" id="1694" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1530" >
-<father id="1532" num="0" />
-<cdparam x="177" y="239" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1526" />
-<TGConnectingPoint num="1" id="1527" />
-<TGConnectingPoint num="2" id="1528" />
-<TGConnectingPoint num="3" id="1529" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="1539" >
-<cdparam x="322" y="69" />
+</CONNECTOR>
+<CONNECTOR type="5312" id="1664" >
+<cdparam x="506" y="493" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from TGComponent to TGComponent" value="reg" />
+<TGConnectingPoint num="0" id="1663" />
+<P1  x="577" y="471" id="1848" />
+<P2  x="617" y="498" id="1836" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5312" id="1666" >
+<cdparam x="694" y="460" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from TGComponent to TGComponent" value="reg" />
+<TGConnectingPoint num="0" id="1665" />
+<P1  x="694" y="472" id="1690" />
+<P2  x="657" y="498" id="1838" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5311" id="1672" >
+<cdparam x="581" y="133" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1538" />
-<P1  x="322" y="69" id="1636" />
-<P2  x="323" y="88" id="1596" />
+<infoparam name="connector from TGComponent to TGComponent" value="" />
+<TGConnectingPoint num="0" id="1669" />
+<TGConnectingPoint num="1" id="1670" />
+<TGConnectingPoint num="2" id="1671" />
+<P1  x="581" y="154" id="1758" />
+<P2  x="546" y="305" id="1815" />
+<Point x="518" y="154" />
+<Point x="518" y="305" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1537" >
-<father id="1539" num="0" />
-<cdparam x="322" y="109" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1667" >
+<father id="1672" num="0" />
+<cdparam x="518" y="154" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1533" />
-<TGConnectingPoint num="1" id="1534" />
-<TGConnectingPoint num="2" id="1535" />
-<TGConnectingPoint num="3" id="1536" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1668" >
+<father id="1672" num="1" />
+<cdparam x="518" y="305" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1546" >
-<cdparam x="377" y="144" />
+<CONNECTOR type="5311" id="1676" >
+<cdparam x="631" y="143" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1545" />
-<P1  x="323" y="118" id="1601" />
-<P2  x="356" y="174" id="1652" />
+<infoparam name="connector from TGComponent to TGComponent" value="" />
+<TGConnectingPoint num="0" id="1674" />
+<TGConnectingPoint num="1" id="1675" />
+<P1  x="631" y="164" id="1753" />
+<P2  x="667" y="310" id="1802" />
+<Point x="631" y="310" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1544" >
-<father id="1546" num="0" />
-<cdparam x="377" y="184" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1673" >
+<father id="1676" num="0" />
+<cdparam x="631" y="310" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1540" />
-<TGConnectingPoint num="1" id="1541" />
-<TGConnectingPoint num="2" id="1542" />
-<TGConnectingPoint num="3" id="1543" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
+<infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1553" >
-<cdparam x="377" y="187" />
+<CONNECTOR type="5312" id="1678" >
+<cdparam x="695" y="396" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1552" />
-<P1  x="353" y="282" id="1641" />
-<P2  x="399" y="352" id="1555" />
+<infoparam name="connector from TGComponent to TGComponent" value="reg" />
+<TGConnectingPoint num="0" id="1677" />
+<P1  x="696" y="385" id="1801" />
+<P2  x="694" y="417" id="1689" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1551" >
-<father id="1553" num="0" />
-<cdparam x="417" y="335" />
-<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR>
+<CONNECTOR type="5310" id="1682" >
+<cdparam x="877" y="168" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from TGComponent to TGComponent" value="" />
+<TGConnectingPoint num="0" id="1680" />
+<TGConnectingPoint num="1" id="1681" />
+<P1  x="721" y="158" id="1738" />
+<P2  x="700" y="204" id="1792" />
+<Point x="700" y="158" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1679" >
+<father id="1682" num="0" />
+<cdparam x="700" y="158" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1547" />
-<TGConnectingPoint num="1" id="1548" />
-<TGConnectingPoint num="2" id="1549" />
-<TGConnectingPoint num="3" id="1550" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="mechanicalDelay" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
+<infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="1594" >
-<cdparam x="374" y="352" />
-<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5312" id="1684" >
+<cdparam x="915" y="307" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from TGComponent to TGComponent" value="reg" />
+<TGConnectingPoint num="0" id="1683" />
+<P1  x="710" y="254" id="1788" />
+<P2  x="711" y="285" id="1800" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5312" id="1686" >
+<cdparam x="993" y="581" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from TGComponent to TGComponent" value="reg" />
+<TGConnectingPoint num="0" id="1685" />
+<P1  x="576" y="385" id="1814" />
+<P2  x="577" y="416" id="1847" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="5311" id="1688" >
+<cdparam x="426" y="264" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from TGComponent to TGComponent" value="" />
+<TGConnectingPoint num="0" id="1687" />
+<P1  x="492" y="345" id="1701" />
+<P2  x="546" y="345" id="1819" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<COMPONENT type="5308" id="1693" >
+<cdparam x="644" y="417" />
+<sizeparam width="100" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1554" />
-<TGConnectingPoint num="1" id="1555" />
-<TGConnectingPoint num="2" id="1556" />
-<TGConnectingPoint num="3" id="1557" />
-<TGConnectingPoint num="4" id="1558" />
-<TGConnectingPoint num="5" id="1559" />
-<TGConnectingPoint num="6" id="1560" />
-<TGConnectingPoint num="7" id="1561" />
-<TGConnectingPoint num="8" id="1562" />
-<TGConnectingPoint num="9" id="1563" />
-<TGConnectingPoint num="10" id="1564" />
-<TGConnectingPoint num="11" id="1565" />
-<TGConnectingPoint num="12" id="1566" />
-<TGConnectingPoint num="13" id="1567" />
-<TGConnectingPoint num="14" id="1568" />
-<TGConnectingPoint num="15" id="1569" />
-<TGConnectingPoint num="16" id="1570" />
-<TGConnectingPoint num="17" id="1571" />
-<TGConnectingPoint num="18" id="1572" />
-<TGConnectingPoint num="19" id="1573" />
-<TGConnectingPoint num="20" id="1574" />
-<TGConnectingPoint num="21" id="1575" />
-<TGConnectingPoint num="22" id="1576" />
-<TGConnectingPoint num="23" id="1577" />
-<TGConnectingPoint num="24" id="1578" />
-<TGConnectingPoint num="25" id="1579" />
-<TGConnectingPoint num="26" id="1580" />
-<TGConnectingPoint num="27" id="1581" />
-<TGConnectingPoint num="28" id="1582" />
-<TGConnectingPoint num="29" id="1583" />
-<TGConnectingPoint num="30" id="1584" />
-<TGConnectingPoint num="31" id="1585" />
-<TGConnectingPoint num="32" id="1586" />
-<TGConnectingPoint num="33" id="1587" />
-<TGConnectingPoint num="34" id="1588" />
-<TGConnectingPoint num="35" id="1589" />
-<TGConnectingPoint num="36" id="1590" />
-<TGConnectingPoint num="37" id="1591" />
-<TGConnectingPoint num="38" id="1592" />
-<TGConnectingPoint num="39" id="1593" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="TGComponent" value="prop01" />
+<TGConnectingPoint num="0" id="1689" />
+<TGConnectingPoint num="1" id="1690" />
+<TGConnectingPoint num="2" id="1691" />
+<TGConnectingPoint num="3" id="1692" />
 <extraparam>
+<liveness data="1" />
+<not data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1635" >
-<cdparam x="298" y="88" />
-<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5308" id="1698" >
+<cdparam x="559" y="563" />
+<sizeparam width="158" height="54" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1595" />
-<TGConnectingPoint num="1" id="1596" />
-<TGConnectingPoint num="2" id="1597" />
-<TGConnectingPoint num="3" id="1598" />
-<TGConnectingPoint num="4" id="1599" />
-<TGConnectingPoint num="5" id="1600" />
-<TGConnectingPoint num="6" id="1601" />
-<TGConnectingPoint num="7" id="1602" />
-<TGConnectingPoint num="8" id="1603" />
-<TGConnectingPoint num="9" id="1604" />
-<TGConnectingPoint num="10" id="1605" />
-<TGConnectingPoint num="11" id="1606" />
-<TGConnectingPoint num="12" id="1607" />
-<TGConnectingPoint num="13" id="1608" />
-<TGConnectingPoint num="14" id="1609" />
-<TGConnectingPoint num="15" id="1610" />
-<TGConnectingPoint num="16" id="1611" />
-<TGConnectingPoint num="17" id="1612" />
-<TGConnectingPoint num="18" id="1613" />
-<TGConnectingPoint num="19" id="1614" />
-<TGConnectingPoint num="20" id="1615" />
-<TGConnectingPoint num="21" id="1616" />
-<TGConnectingPoint num="22" id="1617" />
-<TGConnectingPoint num="23" id="1618" />
-<TGConnectingPoint num="24" id="1619" />
-<TGConnectingPoint num="25" id="1620" />
-<TGConnectingPoint num="26" id="1621" />
-<TGConnectingPoint num="27" id="1622" />
-<TGConnectingPoint num="28" id="1623" />
-<TGConnectingPoint num="29" id="1624" />
-<TGConnectingPoint num="30" id="1625" />
-<TGConnectingPoint num="31" id="1626" />
-<TGConnectingPoint num="32" id="1627" />
-<TGConnectingPoint num="33" id="1628" />
-<TGConnectingPoint num="34" id="1629" />
-<TGConnectingPoint num="35" id="1630" />
-<TGConnectingPoint num="36" id="1631" />
-<TGConnectingPoint num="37" id="1632" />
-<TGConnectingPoint num="38" id="1633" />
-<TGConnectingPoint num="39" id="1634" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="TGComponent" value="BeverageDeliverProperty" />
+<TGConnectingPoint num="0" id="1694" />
+<TGConnectingPoint num="1" id="1695" />
+<TGConnectingPoint num="2" id="1696" />
+<TGConnectingPoint num="3" id="1697" />
 <extraparam>
+<liveness data="0" />
+<not data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1637" >
-<cdparam x="315" y="49" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1636" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1691" >
-<cdparam x="264" y="174" />
-<sizeparam width="184" height="130" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5300" id="1736" >
+<cdparam x="372" y="227" />
+<sizeparam width="132" height="153" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="state0" />
-<TGConnectingPoint num="0" id="1651" />
-<TGConnectingPoint num="1" id="1652" />
-<TGConnectingPoint num="2" id="1653" />
-<TGConnectingPoint num="3" id="1654" />
-<TGConnectingPoint num="4" id="1655" />
-<TGConnectingPoint num="5" id="1656" />
-<TGConnectingPoint num="6" id="1657" />
-<TGConnectingPoint num="7" id="1658" />
-<TGConnectingPoint num="8" id="1659" />
-<TGConnectingPoint num="9" id="1660" />
-<TGConnectingPoint num="10" id="1661" />
-<TGConnectingPoint num="11" id="1662" />
-<TGConnectingPoint num="12" id="1663" />
-<TGConnectingPoint num="13" id="1664" />
-<TGConnectingPoint num="14" id="1665" />
-<TGConnectingPoint num="15" id="1666" />
-<TGConnectingPoint num="16" id="1667" />
-<TGConnectingPoint num="17" id="1668" />
-<TGConnectingPoint num="18" id="1669" />
-<TGConnectingPoint num="19" id="1670" />
-<TGConnectingPoint num="20" id="1671" />
-<TGConnectingPoint num="21" id="1672" />
-<TGConnectingPoint num="22" id="1673" />
-<TGConnectingPoint num="23" id="1674" />
-<TGConnectingPoint num="24" id="1675" />
-<TGConnectingPoint num="25" id="1676" />
-<TGConnectingPoint num="26" id="1677" />
-<TGConnectingPoint num="27" id="1678" />
-<TGConnectingPoint num="28" id="1679" />
-<TGConnectingPoint num="29" id="1680" />
-<TGConnectingPoint num="30" id="1681" />
-<TGConnectingPoint num="31" id="1682" />
-<TGConnectingPoint num="32" id="1683" />
-<TGConnectingPoint num="33" id="1684" />
-<TGConnectingPoint num="34" id="1685" />
-<TGConnectingPoint num="35" id="1686" />
-<TGConnectingPoint num="36" id="1687" />
-<TGConnectingPoint num="37" id="1688" />
-<TGConnectingPoint num="38" id="1689" />
-<TGConnectingPoint num="39" id="1690" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="Block0" value="CoffeeMachine" />
+<TGConnectingPoint num="0" id="1712" />
+<TGConnectingPoint num="1" id="1713" />
+<TGConnectingPoint num="2" id="1714" />
+<TGConnectingPoint num="3" id="1715" />
+<TGConnectingPoint num="4" id="1716" />
+<TGConnectingPoint num="5" id="1717" />
+<TGConnectingPoint num="6" id="1718" />
+<TGConnectingPoint num="7" id="1719" />
+<TGConnectingPoint num="8" id="1720" />
+<TGConnectingPoint num="9" id="1721" />
+<TGConnectingPoint num="10" id="1722" />
+<TGConnectingPoint num="11" id="1723" />
+<TGConnectingPoint num="12" id="1724" />
+<TGConnectingPoint num="13" id="1725" />
+<TGConnectingPoint num="14" id="1726" />
+<TGConnectingPoint num="15" id="1727" />
+<TGConnectingPoint num="16" id="1728" />
+<TGConnectingPoint num="17" id="1729" />
+<TGConnectingPoint num="18" id="1730" />
+<TGConnectingPoint num="19" id="1731" />
+<TGConnectingPoint num="20" id="1732" />
+<TGConnectingPoint num="21" id="1733" />
+<TGConnectingPoint num="22" id="1734" />
+<TGConnectingPoint num="23" id="1735" />
 </COMPONENT>
-<SUBCOMPONENT type="5100" id="1639" >
-<father id="1691" num="0" />
-<cdparam x="333" y="213" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1638" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="1650" >
-<father id="1691" num="1" />
-<cdparam x="330" y="257" />
-<sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5304" id="1711" >
+<father id="1736" num="0" />
+<cdparam x="391" y="326" />
+<sizeparam width="101" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
-<infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="1640" />
-<TGConnectingPoint num="1" id="1641" />
-<TGConnectingPoint num="2" id="1642" />
-<TGConnectingPoint num="3" id="1643" />
-<TGConnectingPoint num="4" id="1644" />
-<TGConnectingPoint num="5" id="1645" />
-<TGConnectingPoint num="6" id="1646" />
-<TGConnectingPoint num="7" id="1647" />
-<TGConnectingPoint num="8" id="1648" />
-<TGConnectingPoint num="9" id="1649" />
+<cdrectangleparam minX="0" maxX="31" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="beverageReady" />
+<TGConnectingPoint num="0" id="1699" />
+<TGConnectingPoint num="1" id="1700" />
+<TGConnectingPoint num="2" id="1701" />
+<TGConnectingPoint num="3" id="1702" />
+<TGConnectingPoint num="4" id="1703" />
+<TGConnectingPoint num="5" id="1704" />
+<TGConnectingPoint num="6" id="1705" />
+<TGConnectingPoint num="7" id="1706" />
+<TGConnectingPoint num="8" id="1707" />
+<TGConnectingPoint num="9" id="1708" />
+<TGConnectingPoint num="10" id="1709" />
+<TGConnectingPoint num="11" id="1710" />
 </SUBCOMPONENT>
 
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1698" >
-<cdparam x="363" y="193" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1697" />
-<P1  x="363" y="204" id="1714" />
-<P2  x="362" y="257" id="1725" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1696" >
-<father id="1698" num="0" />
-<cdparam x="380" y="228" />
-<sizeparam width="149" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5300" id="1787" >
+<cdparam x="563" y="78" />
+<sizeparam width="268" height="115" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1692" />
-<TGConnectingPoint num="1" id="1693" />
-<TGConnectingPoint num="2" id="1694" />
-<TGConnectingPoint num="3" id="1695" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="Block0" value="Wallet" />
+<TGConnectingPoint num="0" id="1763" />
+<TGConnectingPoint num="1" id="1764" />
+<TGConnectingPoint num="2" id="1765" />
+<TGConnectingPoint num="3" id="1766" />
+<TGConnectingPoint num="4" id="1767" />
+<TGConnectingPoint num="5" id="1768" />
+<TGConnectingPoint num="6" id="1769" />
+<TGConnectingPoint num="7" id="1770" />
+<TGConnectingPoint num="8" id="1771" />
+<TGConnectingPoint num="9" id="1772" />
+<TGConnectingPoint num="10" id="1773" />
+<TGConnectingPoint num="11" id="1774" />
+<TGConnectingPoint num="12" id="1775" />
+<TGConnectingPoint num="13" id="1776" />
+<TGConnectingPoint num="14" id="1777" />
+<TGConnectingPoint num="15" id="1778" />
+<TGConnectingPoint num="16" id="1779" />
+<TGConnectingPoint num="17" id="1780" />
+<TGConnectingPoint num="18" id="1781" />
+<TGConnectingPoint num="19" id="1782" />
+<TGConnectingPoint num="20" id="1783" />
+<TGConnectingPoint num="21" id="1784" />
+<TGConnectingPoint num="22" id="1785" />
+<TGConnectingPoint num="23" id="1786" />
+</COMPONENT>
+<SUBCOMPONENT type="5303" id="1749" >
+<father id="1787" num="0" />
+<cdparam x="721" y="133" />
+<sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" />
+<infoparam name="TGComponent" value="nbOfCoins" />
+<TGConnectingPoint num="0" id="1737" />
+<TGConnectingPoint num="1" id="1738" />
+<TGConnectingPoint num="2" id="1739" />
+<TGConnectingPoint num="3" id="1740" />
+<TGConnectingPoint num="4" id="1741" />
+<TGConnectingPoint num="5" id="1742" />
+<TGConnectingPoint num="6" id="1743" />
+<TGConnectingPoint num="7" id="1744" />
+<TGConnectingPoint num="8" id="1745" />
+<TGConnectingPoint num="9" id="1746" />
+<TGConnectingPoint num="10" id="1747" />
+<TGConnectingPoint num="11" id="1748" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="mechanicalDelay" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<Toggle value="" />
 </extraparam>
 </SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="1705" >
-<cdparam x="363" y="150" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1704" />
-<P1  x="363" y="150" id="1771" />
-<P2  x="363" y="174" id="1713" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1703" >
-<father id="1705" num="0" />
-<cdparam x="363" y="190" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5304" id="1762" >
+<father id="1787" num="1" />
+<cdparam x="581" y="125" />
+<sizeparam width="100" height="39" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1699" />
-<TGConnectingPoint num="1" id="1700" />
-<TGConnectingPoint num="2" id="1701" />
-<TGConnectingPoint num="3" id="1702" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-</extraparam>
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
+<infoparam name="TGComponent" value="Start" />
+<TGConnectingPoint num="0" id="1750" />
+<TGConnectingPoint num="1" id="1751" />
+<TGConnectingPoint num="2" id="1752" />
+<TGConnectingPoint num="3" id="1753" />
+<TGConnectingPoint num="4" id="1754" />
+<TGConnectingPoint num="5" id="1755" />
+<TGConnectingPoint num="6" id="1756" />
+<TGConnectingPoint num="7" id="1757" />
+<TGConnectingPoint num="8" id="1758" />
+<TGConnectingPoint num="9" id="1759" />
+<TGConnectingPoint num="10" id="1760" />
+<TGConnectingPoint num="11" id="1761" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1712" >
-<cdparam x="362" y="101" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1711" />
-<P1  x="362" y="101" id="1806" />
-<P2  x="363" y="120" id="1766" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1710" >
-<father id="1712" num="0" />
-<cdparam x="362" y="141" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5306" id="1799" >
+<cdparam x="675" y="204" />
+<sizeparam width="100" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1706" />
-<TGConnectingPoint num="1" id="1707" />
-<TGConnectingPoint num="2" id="1708" />
-<TGConnectingPoint num="3" id="1709" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="TGComponent" value="nbOfCoins &gt; 1" />
+<TGConnectingPoint num="0" id="1788" />
+<TGConnectingPoint num="1" id="1789" />
+<TGConnectingPoint num="2" id="1790" />
+<TGConnectingPoint num="3" id="1791" />
+<TGConnectingPoint num="4" id="1792" />
+<TGConnectingPoint num="5" id="1793" />
+<TGConnectingPoint num="6" id="1794" />
+<TGConnectingPoint num="7" id="1795" />
+<TGConnectingPoint num="8" id="1796" />
+<TGConnectingPoint num="9" id="1797" />
+<TGConnectingPoint num="10" id="1798" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<Toggle value="" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<COMPONENT type="5103" id="1723" >
-<cdparam x="338" y="179" />
-<sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5302" id="1812" >
+<cdparam x="667" y="285" />
+<sizeparam width="59" height="100" minWidth="50" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="1713" />
-<TGConnectingPoint num="1" id="1714" />
-<TGConnectingPoint num="2" id="1715" />
-<TGConnectingPoint num="3" id="1716" />
-<TGConnectingPoint num="4" id="1717" />
-<TGConnectingPoint num="5" id="1718" />
-<TGConnectingPoint num="6" id="1719" />
-<TGConnectingPoint num="7" id="1720" />
-<TGConnectingPoint num="8" id="1721" />
-<TGConnectingPoint num="9" id="1722" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="TGComponent" value="=0" />
+<TGConnectingPoint num="0" id="1800" />
+<TGConnectingPoint num="1" id="1801" />
+<TGConnectingPoint num="2" id="1802" />
+<TGConnectingPoint num="3" id="1803" />
+<TGConnectingPoint num="4" id="1804" />
+<TGConnectingPoint num="5" id="1805" />
+<TGConnectingPoint num="6" id="1806" />
+<TGConnectingPoint num="7" id="1807" />
+<TGConnectingPoint num="8" id="1808" />
+<TGConnectingPoint num="9" id="1809" />
+<TGConnectingPoint num="10" id="1810" />
+<TGConnectingPoint num="11" id="1811" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1764" >
-<cdparam x="337" y="257" />
-<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5301" id="1833" >
+<cdparam x="546" y="285" />
+<sizeparam width="60" height="100" minWidth="50" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1724" />
-<TGConnectingPoint num="1" id="1725" />
-<TGConnectingPoint num="2" id="1726" />
-<TGConnectingPoint num="3" id="1727" />
-<TGConnectingPoint num="4" id="1728" />
-<TGConnectingPoint num="5" id="1729" />
-<TGConnectingPoint num="6" id="1730" />
-<TGConnectingPoint num="7" id="1731" />
-<TGConnectingPoint num="8" id="1732" />
-<TGConnectingPoint num="9" id="1733" />
-<TGConnectingPoint num="10" id="1734" />
-<TGConnectingPoint num="11" id="1735" />
-<TGConnectingPoint num="12" id="1736" />
-<TGConnectingPoint num="13" id="1737" />
-<TGConnectingPoint num="14" id="1738" />
-<TGConnectingPoint num="15" id="1739" />
-<TGConnectingPoint num="16" id="1740" />
-<TGConnectingPoint num="17" id="1741" />
-<TGConnectingPoint num="18" id="1742" />
-<TGConnectingPoint num="19" id="1743" />
-<TGConnectingPoint num="20" id="1744" />
-<TGConnectingPoint num="21" id="1745" />
-<TGConnectingPoint num="22" id="1746" />
-<TGConnectingPoint num="23" id="1747" />
-<TGConnectingPoint num="24" id="1748" />
-<TGConnectingPoint num="25" id="1749" />
-<TGConnectingPoint num="26" id="1750" />
-<TGConnectingPoint num="27" id="1751" />
-<TGConnectingPoint num="28" id="1752" />
-<TGConnectingPoint num="29" id="1753" />
-<TGConnectingPoint num="30" id="1754" />
-<TGConnectingPoint num="31" id="1755" />
-<TGConnectingPoint num="32" id="1756" />
-<TGConnectingPoint num="33" id="1757" />
-<TGConnectingPoint num="34" id="1758" />
-<TGConnectingPoint num="35" id="1759" />
-<TGConnectingPoint num="36" id="1760" />
-<TGConnectingPoint num="37" id="1761" />
-<TGConnectingPoint num="38" id="1762" />
-<TGConnectingPoint num="39" id="1763" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="TGComponent" value="&lt;&lt;LS&gt;&gt;" />
+<TGConnectingPoint num="0" id="1813" />
+<TGConnectingPoint num="1" id="1814" />
+<TGConnectingPoint num="2" id="1815" />
+<TGConnectingPoint num="3" id="1816" />
+<TGConnectingPoint num="4" id="1817" />
+<TGConnectingPoint num="5" id="1818" />
+<TGConnectingPoint num="6" id="1819" />
+<TGConnectingPoint num="7" id="1820" />
+<TGConnectingPoint num="8" id="1821" />
+<TGConnectingPoint num="9" id="1822" />
+<TGConnectingPoint num="10" id="1823" />
+<TGConnectingPoint num="11" id="1824" />
+<TGConnectingPoint num="12" id="1825" />
+<TGConnectingPoint num="13" id="1826" />
+<TGConnectingPoint num="14" id="1827" />
+<TGConnectingPoint num="15" id="1828" />
+<TGConnectingPoint num="16" id="1829" />
+<TGConnectingPoint num="17" id="1830" />
+<TGConnectingPoint num="18" id="1831" />
+<TGConnectingPoint num="19" id="1832" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1805" >
-<cdparam x="338" y="120" />
-<sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5309" id="1846" >
+<cdparam x="597" y="498" />
+<sizeparam width="80" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1765" />
-<TGConnectingPoint num="1" id="1766" />
-<TGConnectingPoint num="2" id="1767" />
-<TGConnectingPoint num="3" id="1768" />
-<TGConnectingPoint num="4" id="1769" />
-<TGConnectingPoint num="5" id="1770" />
-<TGConnectingPoint num="6" id="1771" />
-<TGConnectingPoint num="7" id="1772" />
-<TGConnectingPoint num="8" id="1773" />
-<TGConnectingPoint num="9" id="1774" />
-<TGConnectingPoint num="10" id="1775" />
-<TGConnectingPoint num="11" id="1776" />
-<TGConnectingPoint num="12" id="1777" />
-<TGConnectingPoint num="13" id="1778" />
-<TGConnectingPoint num="14" id="1779" />
-<TGConnectingPoint num="15" id="1780" />
-<TGConnectingPoint num="16" id="1781" />
-<TGConnectingPoint num="17" id="1782" />
-<TGConnectingPoint num="18" id="1783" />
-<TGConnectingPoint num="19" id="1784" />
-<TGConnectingPoint num="20" id="1785" />
-<TGConnectingPoint num="21" id="1786" />
-<TGConnectingPoint num="22" id="1787" />
-<TGConnectingPoint num="23" id="1788" />
-<TGConnectingPoint num="24" id="1789" />
-<TGConnectingPoint num="25" id="1790" />
-<TGConnectingPoint num="26" id="1791" />
-<TGConnectingPoint num="27" id="1792" />
-<TGConnectingPoint num="28" id="1793" />
-<TGConnectingPoint num="29" id="1794" />
-<TGConnectingPoint num="30" id="1795" />
-<TGConnectingPoint num="31" id="1796" />
-<TGConnectingPoint num="32" id="1797" />
-<TGConnectingPoint num="33" id="1798" />
-<TGConnectingPoint num="34" id="1799" />
-<TGConnectingPoint num="35" id="1800" />
-<TGConnectingPoint num="36" id="1801" />
-<TGConnectingPoint num="37" id="1802" />
-<TGConnectingPoint num="38" id="1803" />
-<TGConnectingPoint num="39" id="1804" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="TGComponent" value="&lt;=&gt;" />
+<TGConnectingPoint num="0" id="1834" />
+<TGConnectingPoint num="1" id="1835" />
+<TGConnectingPoint num="2" id="1836" />
+<TGConnectingPoint num="3" id="1837" />
+<TGConnectingPoint num="4" id="1838" />
+<TGConnectingPoint num="5" id="1839" />
+<TGConnectingPoint num="6" id="1840" />
+<TGConnectingPoint num="7" id="1841" />
+<TGConnectingPoint num="8" id="1842" />
+<TGConnectingPoint num="9" id="1843" />
+<TGConnectingPoint num="10" id="1844" />
+<TGConnectingPoint num="11" id="1845" />
 </COMPONENT>
 
-<COMPONENT type="5100" id="1807" >
-<cdparam x="355" y="81" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5308" id="1851" >
+<cdparam x="527" y="416" />
+<sizeparam width="100" height="55" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1806" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="TGComponent" value="prop02" />
+<TGConnectingPoint num="0" id="1847" />
+<TGConnectingPoint num="1" id="1848" />
+<TGConnectingPoint num="2" id="1849" />
+<TGConnectingPoint num="3" id="1850" />
+<extraparam>
+<liveness data="1" />
+<not data="false" />
+</extraparam>
 </COMPONENT>
 
 
-</AVATARStateMachineDiagramPanel>
+</AvatarPDPanel>
 
 </Modeling>
 
diff --git a/modeling/SysMLSec/DSE_KDP.xml b/modeling/SysMLSec/DSE_KDP.xml
index d4c141f53df11f420158993f5cb4bba93957d274..80704bb9788a27aa2d0473c6b7b34453daeed588 100644
--- a/modeling/SysMLSec/DSE_KDP.xml
+++ b/modeling/SysMLSec/DSE_KDP.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<TURTLEGMODELING version="0.98-beta3">
+<TURTLEGMODELING version="1.0beta">
 
 <Modeling type="Requirement" nameTab="General Requirements" >
 <TRequirementDiagramPanel name="AvailabilityRequirements" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0000000000000002" >
-<COMPONENT type="900" id="2394" >
+<COMPONENT type="900" id="32" >
 <cdparam x="470" y="532" />
 <sizeparam width="333" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="317" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
 <infoparam name="Requirement" value="EnsureHighestAvalabilityForHighestPriorityFunctions" />
-<TGConnectingPoint num="0" id="2363" />
-<TGConnectingPoint num="1" id="2364" />
-<TGConnectingPoint num="2" id="2365" />
-<TGConnectingPoint num="3" id="2366" />
-<TGConnectingPoint num="4" id="2367" />
-<TGConnectingPoint num="5" id="2368" />
-<TGConnectingPoint num="6" id="2369" />
-<TGConnectingPoint num="7" id="2370" />
-<TGConnectingPoint num="8" id="2371" />
-<TGConnectingPoint num="9" id="2372" />
-<TGConnectingPoint num="10" id="2373" />
-<TGConnectingPoint num="11" id="2374" />
-<TGConnectingPoint num="12" id="2375" />
-<TGConnectingPoint num="13" id="2376" />
-<TGConnectingPoint num="14" id="2377" />
-<TGConnectingPoint num="15" id="2378" />
-<TGConnectingPoint num="16" id="2379" />
-<TGConnectingPoint num="17" id="2380" />
-<TGConnectingPoint num="18" id="2381" />
-<TGConnectingPoint num="19" id="2382" />
-<TGConnectingPoint num="20" id="2383" />
-<TGConnectingPoint num="21" id="2384" />
-<TGConnectingPoint num="22" id="2385" />
-<TGConnectingPoint num="23" id="2386" />
-<TGConnectingPoint num="24" id="2387" />
-<TGConnectingPoint num="25" id="2388" />
-<TGConnectingPoint num="26" id="2389" />
-<TGConnectingPoint num="27" id="2390" />
-<TGConnectingPoint num="28" id="2391" />
-<TGConnectingPoint num="29" id="2392" />
-<TGConnectingPoint num="30" id="2393" />
+<TGConnectingPoint num="0" id="1" />
+<TGConnectingPoint num="1" id="2" />
+<TGConnectingPoint num="2" id="3" />
+<TGConnectingPoint num="3" id="4" />
+<TGConnectingPoint num="4" id="5" />
+<TGConnectingPoint num="5" id="6" />
+<TGConnectingPoint num="6" id="7" />
+<TGConnectingPoint num="7" id="8" />
+<TGConnectingPoint num="8" id="9" />
+<TGConnectingPoint num="9" id="10" />
+<TGConnectingPoint num="10" id="11" />
+<TGConnectingPoint num="11" id="12" />
+<TGConnectingPoint num="12" id="13" />
+<TGConnectingPoint num="13" id="14" />
+<TGConnectingPoint num="14" id="15" />
+<TGConnectingPoint num="15" id="16" />
+<TGConnectingPoint num="16" id="17" />
+<TGConnectingPoint num="17" id="18" />
+<TGConnectingPoint num="18" id="19" />
+<TGConnectingPoint num="19" id="20" />
+<TGConnectingPoint num="20" id="21" />
+<TGConnectingPoint num="21" id="22" />
+<TGConnectingPoint num="22" id="23" />
+<TGConnectingPoint num="23" id="24" />
+<TGConnectingPoint num="24" id="25" />
+<TGConnectingPoint num="25" id="26" />
+<TGConnectingPoint num="26" id="27" />
+<TGConnectingPoint num="27" id="28" />
+<TGConnectingPoint num="28" id="29" />
+<TGConnectingPoint num="29" id="30" />
+<TGConnectingPoint num="30" id="31" />
 <extraparam>
 <type data="0" />
 <textline data="Requirement description:" />
@@ -55,43 +55,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2426" >
+<COMPONENT type="900" id="64" >
 <cdparam x="196" y="535" />
 <sizeparam width="213" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="196" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
 <infoparam name="Requirement" value="EnsureAvailabilityRadioMedium" />
-<TGConnectingPoint num="0" id="2395" />
-<TGConnectingPoint num="1" id="2396" />
-<TGConnectingPoint num="2" id="2397" />
-<TGConnectingPoint num="3" id="2398" />
-<TGConnectingPoint num="4" id="2399" />
-<TGConnectingPoint num="5" id="2400" />
-<TGConnectingPoint num="6" id="2401" />
-<TGConnectingPoint num="7" id="2402" />
-<TGConnectingPoint num="8" id="2403" />
-<TGConnectingPoint num="9" id="2404" />
-<TGConnectingPoint num="10" id="2405" />
-<TGConnectingPoint num="11" id="2406" />
-<TGConnectingPoint num="12" id="2407" />
-<TGConnectingPoint num="13" id="2408" />
-<TGConnectingPoint num="14" id="2409" />
-<TGConnectingPoint num="15" id="2410" />
-<TGConnectingPoint num="16" id="2411" />
-<TGConnectingPoint num="17" id="2412" />
-<TGConnectingPoint num="18" id="2413" />
-<TGConnectingPoint num="19" id="2414" />
-<TGConnectingPoint num="20" id="2415" />
-<TGConnectingPoint num="21" id="2416" />
-<TGConnectingPoint num="22" id="2417" />
-<TGConnectingPoint num="23" id="2418" />
-<TGConnectingPoint num="24" id="2419" />
-<TGConnectingPoint num="25" id="2420" />
-<TGConnectingPoint num="26" id="2421" />
-<TGConnectingPoint num="27" id="2422" />
-<TGConnectingPoint num="28" id="2423" />
-<TGConnectingPoint num="29" id="2424" />
-<TGConnectingPoint num="30" id="2425" />
+<TGConnectingPoint num="0" id="33" />
+<TGConnectingPoint num="1" id="34" />
+<TGConnectingPoint num="2" id="35" />
+<TGConnectingPoint num="3" id="36" />
+<TGConnectingPoint num="4" id="37" />
+<TGConnectingPoint num="5" id="38" />
+<TGConnectingPoint num="6" id="39" />
+<TGConnectingPoint num="7" id="40" />
+<TGConnectingPoint num="8" id="41" />
+<TGConnectingPoint num="9" id="42" />
+<TGConnectingPoint num="10" id="43" />
+<TGConnectingPoint num="11" id="44" />
+<TGConnectingPoint num="12" id="45" />
+<TGConnectingPoint num="13" id="46" />
+<TGConnectingPoint num="14" id="47" />
+<TGConnectingPoint num="15" id="48" />
+<TGConnectingPoint num="16" id="49" />
+<TGConnectingPoint num="17" id="50" />
+<TGConnectingPoint num="18" id="51" />
+<TGConnectingPoint num="19" id="52" />
+<TGConnectingPoint num="20" id="53" />
+<TGConnectingPoint num="21" id="54" />
+<TGConnectingPoint num="22" id="55" />
+<TGConnectingPoint num="23" id="56" />
+<TGConnectingPoint num="24" id="57" />
+<TGConnectingPoint num="25" id="58" />
+<TGConnectingPoint num="26" id="59" />
+<TGConnectingPoint num="27" id="60" />
+<TGConnectingPoint num="28" id="61" />
+<TGConnectingPoint num="29" id="62" />
+<TGConnectingPoint num="30" id="63" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -106,43 +106,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2458" >
+<COMPONENT type="900" id="96" >
 <cdparam x="764" y="331" />
 <sizeparam width="310" height="102" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="288" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
 <infoparam name="Requirement" value="EnsureExternalCommunicationDeviceAvailability" />
-<TGConnectingPoint num="0" id="2427" />
-<TGConnectingPoint num="1" id="2428" />
-<TGConnectingPoint num="2" id="2429" />
-<TGConnectingPoint num="3" id="2430" />
-<TGConnectingPoint num="4" id="2431" />
-<TGConnectingPoint num="5" id="2432" />
-<TGConnectingPoint num="6" id="2433" />
-<TGConnectingPoint num="7" id="2434" />
-<TGConnectingPoint num="8" id="2435" />
-<TGConnectingPoint num="9" id="2436" />
-<TGConnectingPoint num="10" id="2437" />
-<TGConnectingPoint num="11" id="2438" />
-<TGConnectingPoint num="12" id="2439" />
-<TGConnectingPoint num="13" id="2440" />
-<TGConnectingPoint num="14" id="2441" />
-<TGConnectingPoint num="15" id="2442" />
-<TGConnectingPoint num="16" id="2443" />
-<TGConnectingPoint num="17" id="2444" />
-<TGConnectingPoint num="18" id="2445" />
-<TGConnectingPoint num="19" id="2446" />
-<TGConnectingPoint num="20" id="2447" />
-<TGConnectingPoint num="21" id="2448" />
-<TGConnectingPoint num="22" id="2449" />
-<TGConnectingPoint num="23" id="2450" />
-<TGConnectingPoint num="24" id="2451" />
-<TGConnectingPoint num="25" id="2452" />
-<TGConnectingPoint num="26" id="2453" />
-<TGConnectingPoint num="27" id="2454" />
-<TGConnectingPoint num="28" id="2455" />
-<TGConnectingPoint num="29" id="2456" />
-<TGConnectingPoint num="30" id="2457" />
+<TGConnectingPoint num="0" id="65" />
+<TGConnectingPoint num="1" id="66" />
+<TGConnectingPoint num="2" id="67" />
+<TGConnectingPoint num="3" id="68" />
+<TGConnectingPoint num="4" id="69" />
+<TGConnectingPoint num="5" id="70" />
+<TGConnectingPoint num="6" id="71" />
+<TGConnectingPoint num="7" id="72" />
+<TGConnectingPoint num="8" id="73" />
+<TGConnectingPoint num="9" id="74" />
+<TGConnectingPoint num="10" id="75" />
+<TGConnectingPoint num="11" id="76" />
+<TGConnectingPoint num="12" id="77" />
+<TGConnectingPoint num="13" id="78" />
+<TGConnectingPoint num="14" id="79" />
+<TGConnectingPoint num="15" id="80" />
+<TGConnectingPoint num="16" id="81" />
+<TGConnectingPoint num="17" id="82" />
+<TGConnectingPoint num="18" id="83" />
+<TGConnectingPoint num="19" id="84" />
+<TGConnectingPoint num="20" id="85" />
+<TGConnectingPoint num="21" id="86" />
+<TGConnectingPoint num="22" id="87" />
+<TGConnectingPoint num="23" id="88" />
+<TGConnectingPoint num="24" id="89" />
+<TGConnectingPoint num="25" id="90" />
+<TGConnectingPoint num="26" id="91" />
+<TGConnectingPoint num="27" id="92" />
+<TGConnectingPoint num="28" id="93" />
+<TGConnectingPoint num="29" id="94" />
+<TGConnectingPoint num="30" id="95" />
 <extraparam>
 <type data="2" />
 <textline data="Communication buffer overflow" />
@@ -156,43 +156,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2490" >
+<COMPONENT type="900" id="128" >
 <cdparam x="527" y="329" />
 <sizeparam width="181" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="144" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
 <infoparam name="Requirement" value="EnsureRAMAvailability" />
-<TGConnectingPoint num="0" id="2459" />
-<TGConnectingPoint num="1" id="2460" />
-<TGConnectingPoint num="2" id="2461" />
-<TGConnectingPoint num="3" id="2462" />
-<TGConnectingPoint num="4" id="2463" />
-<TGConnectingPoint num="5" id="2464" />
-<TGConnectingPoint num="6" id="2465" />
-<TGConnectingPoint num="7" id="2466" />
-<TGConnectingPoint num="8" id="2467" />
-<TGConnectingPoint num="9" id="2468" />
-<TGConnectingPoint num="10" id="2469" />
-<TGConnectingPoint num="11" id="2470" />
-<TGConnectingPoint num="12" id="2471" />
-<TGConnectingPoint num="13" id="2472" />
-<TGConnectingPoint num="14" id="2473" />
-<TGConnectingPoint num="15" id="2474" />
-<TGConnectingPoint num="16" id="2475" />
-<TGConnectingPoint num="17" id="2476" />
-<TGConnectingPoint num="18" id="2477" />
-<TGConnectingPoint num="19" id="2478" />
-<TGConnectingPoint num="20" id="2479" />
-<TGConnectingPoint num="21" id="2480" />
-<TGConnectingPoint num="22" id="2481" />
-<TGConnectingPoint num="23" id="2482" />
-<TGConnectingPoint num="24" id="2483" />
-<TGConnectingPoint num="25" id="2484" />
-<TGConnectingPoint num="26" id="2485" />
-<TGConnectingPoint num="27" id="2486" />
-<TGConnectingPoint num="28" id="2487" />
-<TGConnectingPoint num="29" id="2488" />
-<TGConnectingPoint num="30" id="2489" />
+<TGConnectingPoint num="0" id="97" />
+<TGConnectingPoint num="1" id="98" />
+<TGConnectingPoint num="2" id="99" />
+<TGConnectingPoint num="3" id="100" />
+<TGConnectingPoint num="4" id="101" />
+<TGConnectingPoint num="5" id="102" />
+<TGConnectingPoint num="6" id="103" />
+<TGConnectingPoint num="7" id="104" />
+<TGConnectingPoint num="8" id="105" />
+<TGConnectingPoint num="9" id="106" />
+<TGConnectingPoint num="10" id="107" />
+<TGConnectingPoint num="11" id="108" />
+<TGConnectingPoint num="12" id="109" />
+<TGConnectingPoint num="13" id="110" />
+<TGConnectingPoint num="14" id="111" />
+<TGConnectingPoint num="15" id="112" />
+<TGConnectingPoint num="16" id="113" />
+<TGConnectingPoint num="17" id="114" />
+<TGConnectingPoint num="18" id="115" />
+<TGConnectingPoint num="19" id="116" />
+<TGConnectingPoint num="20" id="117" />
+<TGConnectingPoint num="21" id="118" />
+<TGConnectingPoint num="22" id="119" />
+<TGConnectingPoint num="23" id="120" />
+<TGConnectingPoint num="24" id="121" />
+<TGConnectingPoint num="25" id="122" />
+<TGConnectingPoint num="26" id="123" />
+<TGConnectingPoint num="27" id="124" />
+<TGConnectingPoint num="28" id="125" />
+<TGConnectingPoint num="29" id="126" />
+<TGConnectingPoint num="30" id="127" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -207,43 +207,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2522" >
+<COMPONENT type="900" id="160" >
 <cdparam x="303" y="331" />
 <sizeparam width="181" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="145" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
 <infoparam name="Requirement" value="EnsureCPUAvailability" />
-<TGConnectingPoint num="0" id="2491" />
-<TGConnectingPoint num="1" id="2492" />
-<TGConnectingPoint num="2" id="2493" />
-<TGConnectingPoint num="3" id="2494" />
-<TGConnectingPoint num="4" id="2495" />
-<TGConnectingPoint num="5" id="2496" />
-<TGConnectingPoint num="6" id="2497" />
-<TGConnectingPoint num="7" id="2498" />
-<TGConnectingPoint num="8" id="2499" />
-<TGConnectingPoint num="9" id="2500" />
-<TGConnectingPoint num="10" id="2501" />
-<TGConnectingPoint num="11" id="2502" />
-<TGConnectingPoint num="12" id="2503" />
-<TGConnectingPoint num="13" id="2504" />
-<TGConnectingPoint num="14" id="2505" />
-<TGConnectingPoint num="15" id="2506" />
-<TGConnectingPoint num="16" id="2507" />
-<TGConnectingPoint num="17" id="2508" />
-<TGConnectingPoint num="18" id="2509" />
-<TGConnectingPoint num="19" id="2510" />
-<TGConnectingPoint num="20" id="2511" />
-<TGConnectingPoint num="21" id="2512" />
-<TGConnectingPoint num="22" id="2513" />
-<TGConnectingPoint num="23" id="2514" />
-<TGConnectingPoint num="24" id="2515" />
-<TGConnectingPoint num="25" id="2516" />
-<TGConnectingPoint num="26" id="2517" />
-<TGConnectingPoint num="27" id="2518" />
-<TGConnectingPoint num="28" id="2519" />
-<TGConnectingPoint num="29" id="2520" />
-<TGConnectingPoint num="30" id="2521" />
+<TGConnectingPoint num="0" id="129" />
+<TGConnectingPoint num="1" id="130" />
+<TGConnectingPoint num="2" id="131" />
+<TGConnectingPoint num="3" id="132" />
+<TGConnectingPoint num="4" id="133" />
+<TGConnectingPoint num="5" id="134" />
+<TGConnectingPoint num="6" id="135" />
+<TGConnectingPoint num="7" id="136" />
+<TGConnectingPoint num="8" id="137" />
+<TGConnectingPoint num="9" id="138" />
+<TGConnectingPoint num="10" id="139" />
+<TGConnectingPoint num="11" id="140" />
+<TGConnectingPoint num="12" id="141" />
+<TGConnectingPoint num="13" id="142" />
+<TGConnectingPoint num="14" id="143" />
+<TGConnectingPoint num="15" id="144" />
+<TGConnectingPoint num="16" id="145" />
+<TGConnectingPoint num="17" id="146" />
+<TGConnectingPoint num="18" id="147" />
+<TGConnectingPoint num="19" id="148" />
+<TGConnectingPoint num="20" id="149" />
+<TGConnectingPoint num="21" id="150" />
+<TGConnectingPoint num="22" id="151" />
+<TGConnectingPoint num="23" id="152" />
+<TGConnectingPoint num="24" id="153" />
+<TGConnectingPoint num="25" id="154" />
+<TGConnectingPoint num="26" id="155" />
+<TGConnectingPoint num="27" id="156" />
+<TGConnectingPoint num="28" id="157" />
+<TGConnectingPoint num="29" id="158" />
+<TGConnectingPoint num="30" id="159" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -258,43 +258,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2554" >
+<COMPONENT type="900" id="192" >
 <cdparam x="72" y="334" />
 <sizeparam width="181" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="141" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
 <infoparam name="Requirement" value="EnsureBusAvailability" />
-<TGConnectingPoint num="0" id="2523" />
-<TGConnectingPoint num="1" id="2524" />
-<TGConnectingPoint num="2" id="2525" />
-<TGConnectingPoint num="3" id="2526" />
-<TGConnectingPoint num="4" id="2527" />
-<TGConnectingPoint num="5" id="2528" />
-<TGConnectingPoint num="6" id="2529" />
-<TGConnectingPoint num="7" id="2530" />
-<TGConnectingPoint num="8" id="2531" />
-<TGConnectingPoint num="9" id="2532" />
-<TGConnectingPoint num="10" id="2533" />
-<TGConnectingPoint num="11" id="2534" />
-<TGConnectingPoint num="12" id="2535" />
-<TGConnectingPoint num="13" id="2536" />
-<TGConnectingPoint num="14" id="2537" />
-<TGConnectingPoint num="15" id="2538" />
-<TGConnectingPoint num="16" id="2539" />
-<TGConnectingPoint num="17" id="2540" />
-<TGConnectingPoint num="18" id="2541" />
-<TGConnectingPoint num="19" id="2542" />
-<TGConnectingPoint num="20" id="2543" />
-<TGConnectingPoint num="21" id="2544" />
-<TGConnectingPoint num="22" id="2545" />
-<TGConnectingPoint num="23" id="2546" />
-<TGConnectingPoint num="24" id="2547" />
-<TGConnectingPoint num="25" id="2548" />
-<TGConnectingPoint num="26" id="2549" />
-<TGConnectingPoint num="27" id="2550" />
-<TGConnectingPoint num="28" id="2551" />
-<TGConnectingPoint num="29" id="2552" />
-<TGConnectingPoint num="30" id="2553" />
+<TGConnectingPoint num="0" id="161" />
+<TGConnectingPoint num="1" id="162" />
+<TGConnectingPoint num="2" id="163" />
+<TGConnectingPoint num="3" id="164" />
+<TGConnectingPoint num="4" id="165" />
+<TGConnectingPoint num="5" id="166" />
+<TGConnectingPoint num="6" id="167" />
+<TGConnectingPoint num="7" id="168" />
+<TGConnectingPoint num="8" id="169" />
+<TGConnectingPoint num="9" id="170" />
+<TGConnectingPoint num="10" id="171" />
+<TGConnectingPoint num="11" id="172" />
+<TGConnectingPoint num="12" id="173" />
+<TGConnectingPoint num="13" id="174" />
+<TGConnectingPoint num="14" id="175" />
+<TGConnectingPoint num="15" id="176" />
+<TGConnectingPoint num="16" id="177" />
+<TGConnectingPoint num="17" id="178" />
+<TGConnectingPoint num="18" id="179" />
+<TGConnectingPoint num="19" id="180" />
+<TGConnectingPoint num="20" id="181" />
+<TGConnectingPoint num="21" id="182" />
+<TGConnectingPoint num="22" id="183" />
+<TGConnectingPoint num="23" id="184" />
+<TGConnectingPoint num="24" id="185" />
+<TGConnectingPoint num="25" id="186" />
+<TGConnectingPoint num="26" id="187" />
+<TGConnectingPoint num="27" id="188" />
+<TGConnectingPoint num="28" id="189" />
+<TGConnectingPoint num="29" id="190" />
+<TGConnectingPoint num="30" id="191" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -309,43 +309,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2586" >
+<COMPONENT type="900" id="224" >
 <cdparam x="467" y="123" />
 <sizeparam width="181" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="164" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="901" />
 <infoparam name="Requirement" value="EnsureAvailabilityOfECUs" />
-<TGConnectingPoint num="0" id="2555" />
-<TGConnectingPoint num="1" id="2556" />
-<TGConnectingPoint num="2" id="2557" />
-<TGConnectingPoint num="3" id="2558" />
-<TGConnectingPoint num="4" id="2559" />
-<TGConnectingPoint num="5" id="2560" />
-<TGConnectingPoint num="6" id="2561" />
-<TGConnectingPoint num="7" id="2562" />
-<TGConnectingPoint num="8" id="2563" />
-<TGConnectingPoint num="9" id="2564" />
-<TGConnectingPoint num="10" id="2565" />
-<TGConnectingPoint num="11" id="2566" />
-<TGConnectingPoint num="12" id="2567" />
-<TGConnectingPoint num="13" id="2568" />
-<TGConnectingPoint num="14" id="2569" />
-<TGConnectingPoint num="15" id="2570" />
-<TGConnectingPoint num="16" id="2571" />
-<TGConnectingPoint num="17" id="2572" />
-<TGConnectingPoint num="18" id="2573" />
-<TGConnectingPoint num="19" id="2574" />
-<TGConnectingPoint num="20" id="2575" />
-<TGConnectingPoint num="21" id="2576" />
-<TGConnectingPoint num="22" id="2577" />
-<TGConnectingPoint num="23" id="2578" />
-<TGConnectingPoint num="24" id="2579" />
-<TGConnectingPoint num="25" id="2580" />
-<TGConnectingPoint num="26" id="2581" />
-<TGConnectingPoint num="27" id="2582" />
-<TGConnectingPoint num="28" id="2583" />
-<TGConnectingPoint num="29" id="2584" />
-<TGConnectingPoint num="30" id="2585" />
+<TGConnectingPoint num="0" id="193" />
+<TGConnectingPoint num="1" id="194" />
+<TGConnectingPoint num="2" id="195" />
+<TGConnectingPoint num="3" id="196" />
+<TGConnectingPoint num="4" id="197" />
+<TGConnectingPoint num="5" id="198" />
+<TGConnectingPoint num="6" id="199" />
+<TGConnectingPoint num="7" id="200" />
+<TGConnectingPoint num="8" id="201" />
+<TGConnectingPoint num="9" id="202" />
+<TGConnectingPoint num="10" id="203" />
+<TGConnectingPoint num="11" id="204" />
+<TGConnectingPoint num="12" id="205" />
+<TGConnectingPoint num="13" id="206" />
+<TGConnectingPoint num="14" id="207" />
+<TGConnectingPoint num="15" id="208" />
+<TGConnectingPoint num="16" id="209" />
+<TGConnectingPoint num="17" id="210" />
+<TGConnectingPoint num="18" id="211" />
+<TGConnectingPoint num="19" id="212" />
+<TGConnectingPoint num="20" id="213" />
+<TGConnectingPoint num="21" id="214" />
+<TGConnectingPoint num="22" id="215" />
+<TGConnectingPoint num="23" id="216" />
+<TGConnectingPoint num="24" id="217" />
+<TGConnectingPoint num="25" id="218" />
+<TGConnectingPoint num="26" id="219" />
+<TGConnectingPoint num="27" id="220" />
+<TGConnectingPoint num="28" id="221" />
+<TGConnectingPoint num="29" id="222" />
+<TGConnectingPoint num="30" id="223" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -360,79 +360,79 @@
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="129" id="2587" >
+<CONNECTOR type="129" id="225" >
 <cdparam x="889" y="343" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="841" y="331" id="2433" />
-<P2  x="557" y="237" id="2581" />
+<P1  x="841" y="331" id="71" />
+<P2  x="557" y="237" id="219" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="2588" >
+<CONNECTOR type="129" id="226" >
 <cdparam x="669" y="337" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="617" y="329" id="2466" />
-<P2  x="557" y="237" id="2580" />
+<P1  x="617" y="329" id="104" />
+<P2  x="557" y="237" id="218" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="2589" >
+<CONNECTOR type="129" id="227" >
 <cdparam x="440" y="335" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="393" y="331" id="2498" />
-<P2  x="557" y="237" id="2565" />
+<P1  x="393" y="331" id="136" />
+<P2  x="557" y="237" id="203" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="2590" >
+<CONNECTOR type="129" id="228" >
 <cdparam x="160" y="332" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="162" y="334" id="2530" />
-<P2  x="557" y="237" id="2579" />
+<P1  x="162" y="334" id="168" />
+<P2  x="557" y="237" id="217" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TRequirementDiagramPanel>
 
 <TRequirementDiagramPanel name="Privacy requirements" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<COMPONENT type="900" id="2622" >
+<COMPONENT type="900" id="260" >
 <cdparam x="658" y="137" />
 <sizeparam width="351" height="150" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="259" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Requirement" value="ControlledAccessToEServiceMessageData" />
-<TGConnectingPoint num="0" id="2591" />
-<TGConnectingPoint num="1" id="2592" />
-<TGConnectingPoint num="2" id="2593" />
-<TGConnectingPoint num="3" id="2594" />
-<TGConnectingPoint num="4" id="2595" />
-<TGConnectingPoint num="5" id="2596" />
-<TGConnectingPoint num="6" id="2597" />
-<TGConnectingPoint num="7" id="2598" />
-<TGConnectingPoint num="8" id="2599" />
-<TGConnectingPoint num="9" id="2600" />
-<TGConnectingPoint num="10" id="2601" />
-<TGConnectingPoint num="11" id="2602" />
-<TGConnectingPoint num="12" id="2603" />
-<TGConnectingPoint num="13" id="2604" />
-<TGConnectingPoint num="14" id="2605" />
-<TGConnectingPoint num="15" id="2606" />
-<TGConnectingPoint num="16" id="2607" />
-<TGConnectingPoint num="17" id="2608" />
-<TGConnectingPoint num="18" id="2609" />
-<TGConnectingPoint num="19" id="2610" />
-<TGConnectingPoint num="20" id="2611" />
-<TGConnectingPoint num="21" id="2612" />
-<TGConnectingPoint num="22" id="2613" />
-<TGConnectingPoint num="23" id="2614" />
-<TGConnectingPoint num="24" id="2615" />
-<TGConnectingPoint num="25" id="2616" />
-<TGConnectingPoint num="26" id="2617" />
-<TGConnectingPoint num="27" id="2618" />
-<TGConnectingPoint num="28" id="2619" />
-<TGConnectingPoint num="29" id="2620" />
-<TGConnectingPoint num="30" id="2621" />
+<TGConnectingPoint num="0" id="229" />
+<TGConnectingPoint num="1" id="230" />
+<TGConnectingPoint num="2" id="231" />
+<TGConnectingPoint num="3" id="232" />
+<TGConnectingPoint num="4" id="233" />
+<TGConnectingPoint num="5" id="234" />
+<TGConnectingPoint num="6" id="235" />
+<TGConnectingPoint num="7" id="236" />
+<TGConnectingPoint num="8" id="237" />
+<TGConnectingPoint num="9" id="238" />
+<TGConnectingPoint num="10" id="239" />
+<TGConnectingPoint num="11" id="240" />
+<TGConnectingPoint num="12" id="241" />
+<TGConnectingPoint num="13" id="242" />
+<TGConnectingPoint num="14" id="243" />
+<TGConnectingPoint num="15" id="244" />
+<TGConnectingPoint num="16" id="245" />
+<TGConnectingPoint num="17" id="246" />
+<TGConnectingPoint num="18" id="247" />
+<TGConnectingPoint num="19" id="248" />
+<TGConnectingPoint num="20" id="249" />
+<TGConnectingPoint num="21" id="250" />
+<TGConnectingPoint num="22" id="251" />
+<TGConnectingPoint num="23" id="252" />
+<TGConnectingPoint num="24" id="253" />
+<TGConnectingPoint num="25" id="254" />
+<TGConnectingPoint num="26" id="255" />
+<TGConnectingPoint num="27" id="256" />
+<TGConnectingPoint num="28" id="257" />
+<TGConnectingPoint num="29" id="258" />
+<TGConnectingPoint num="30" id="259" />
 <extraparam>
 <type data="2" />
 <textline data="An EServiceMessage is a message sent from a car to" />
@@ -451,43 +451,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2654" >
+<COMPONENT type="900" id="292" >
 <cdparam x="462" y="472" />
 <sizeparam width="299" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="271" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Requirement" value="UnlikableDriverIdentificationBetweenServices" />
-<TGConnectingPoint num="0" id="2623" />
-<TGConnectingPoint num="1" id="2624" />
-<TGConnectingPoint num="2" id="2625" />
-<TGConnectingPoint num="3" id="2626" />
-<TGConnectingPoint num="4" id="2627" />
-<TGConnectingPoint num="5" id="2628" />
-<TGConnectingPoint num="6" id="2629" />
-<TGConnectingPoint num="7" id="2630" />
-<TGConnectingPoint num="8" id="2631" />
-<TGConnectingPoint num="9" id="2632" />
-<TGConnectingPoint num="10" id="2633" />
-<TGConnectingPoint num="11" id="2634" />
-<TGConnectingPoint num="12" id="2635" />
-<TGConnectingPoint num="13" id="2636" />
-<TGConnectingPoint num="14" id="2637" />
-<TGConnectingPoint num="15" id="2638" />
-<TGConnectingPoint num="16" id="2639" />
-<TGConnectingPoint num="17" id="2640" />
-<TGConnectingPoint num="18" id="2641" />
-<TGConnectingPoint num="19" id="2642" />
-<TGConnectingPoint num="20" id="2643" />
-<TGConnectingPoint num="21" id="2644" />
-<TGConnectingPoint num="22" id="2645" />
-<TGConnectingPoint num="23" id="2646" />
-<TGConnectingPoint num="24" id="2647" />
-<TGConnectingPoint num="25" id="2648" />
-<TGConnectingPoint num="26" id="2649" />
-<TGConnectingPoint num="27" id="2650" />
-<TGConnectingPoint num="28" id="2651" />
-<TGConnectingPoint num="29" id="2652" />
-<TGConnectingPoint num="30" id="2653" />
+<TGConnectingPoint num="0" id="261" />
+<TGConnectingPoint num="1" id="262" />
+<TGConnectingPoint num="2" id="263" />
+<TGConnectingPoint num="3" id="264" />
+<TGConnectingPoint num="4" id="265" />
+<TGConnectingPoint num="5" id="266" />
+<TGConnectingPoint num="6" id="267" />
+<TGConnectingPoint num="7" id="268" />
+<TGConnectingPoint num="8" id="269" />
+<TGConnectingPoint num="9" id="270" />
+<TGConnectingPoint num="10" id="271" />
+<TGConnectingPoint num="11" id="272" />
+<TGConnectingPoint num="12" id="273" />
+<TGConnectingPoint num="13" id="274" />
+<TGConnectingPoint num="14" id="275" />
+<TGConnectingPoint num="15" id="276" />
+<TGConnectingPoint num="16" id="277" />
+<TGConnectingPoint num="17" id="278" />
+<TGConnectingPoint num="18" id="279" />
+<TGConnectingPoint num="19" id="280" />
+<TGConnectingPoint num="20" id="281" />
+<TGConnectingPoint num="21" id="282" />
+<TGConnectingPoint num="22" id="283" />
+<TGConnectingPoint num="23" id="284" />
+<TGConnectingPoint num="24" id="285" />
+<TGConnectingPoint num="25" id="286" />
+<TGConnectingPoint num="26" id="287" />
+<TGConnectingPoint num="27" id="288" />
+<TGConnectingPoint num="28" id="289" />
+<TGConnectingPoint num="29" id="290" />
+<TGConnectingPoint num="30" id="291" />
 <extraparam>
 <type data="2" />
 <textline data="Prevent two different services from linking " />
@@ -502,43 +502,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2686" >
+<COMPONENT type="900" id="324" >
 <cdparam x="248" y="159" />
 <sizeparam width="309" height="126" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="155" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Requirement" value="UserDrivenPrivacyPolicy" />
-<TGConnectingPoint num="0" id="2655" />
-<TGConnectingPoint num="1" id="2656" />
-<TGConnectingPoint num="2" id="2657" />
-<TGConnectingPoint num="3" id="2658" />
-<TGConnectingPoint num="4" id="2659" />
-<TGConnectingPoint num="5" id="2660" />
-<TGConnectingPoint num="6" id="2661" />
-<TGConnectingPoint num="7" id="2662" />
-<TGConnectingPoint num="8" id="2663" />
-<TGConnectingPoint num="9" id="2664" />
-<TGConnectingPoint num="10" id="2665" />
-<TGConnectingPoint num="11" id="2666" />
-<TGConnectingPoint num="12" id="2667" />
-<TGConnectingPoint num="13" id="2668" />
-<TGConnectingPoint num="14" id="2669" />
-<TGConnectingPoint num="15" id="2670" />
-<TGConnectingPoint num="16" id="2671" />
-<TGConnectingPoint num="17" id="2672" />
-<TGConnectingPoint num="18" id="2673" />
-<TGConnectingPoint num="19" id="2674" />
-<TGConnectingPoint num="20" id="2675" />
-<TGConnectingPoint num="21" id="2676" />
-<TGConnectingPoint num="22" id="2677" />
-<TGConnectingPoint num="23" id="2678" />
-<TGConnectingPoint num="24" id="2679" />
-<TGConnectingPoint num="25" id="2680" />
-<TGConnectingPoint num="26" id="2681" />
-<TGConnectingPoint num="27" id="2682" />
-<TGConnectingPoint num="28" id="2683" />
-<TGConnectingPoint num="29" id="2684" />
-<TGConnectingPoint num="30" id="2685" />
+<TGConnectingPoint num="0" id="293" />
+<TGConnectingPoint num="1" id="294" />
+<TGConnectingPoint num="2" id="295" />
+<TGConnectingPoint num="3" id="296" />
+<TGConnectingPoint num="4" id="297" />
+<TGConnectingPoint num="5" id="298" />
+<TGConnectingPoint num="6" id="299" />
+<TGConnectingPoint num="7" id="300" />
+<TGConnectingPoint num="8" id="301" />
+<TGConnectingPoint num="9" id="302" />
+<TGConnectingPoint num="10" id="303" />
+<TGConnectingPoint num="11" id="304" />
+<TGConnectingPoint num="12" id="305" />
+<TGConnectingPoint num="13" id="306" />
+<TGConnectingPoint num="14" id="307" />
+<TGConnectingPoint num="15" id="308" />
+<TGConnectingPoint num="16" id="309" />
+<TGConnectingPoint num="17" id="310" />
+<TGConnectingPoint num="18" id="311" />
+<TGConnectingPoint num="19" id="312" />
+<TGConnectingPoint num="20" id="313" />
+<TGConnectingPoint num="21" id="314" />
+<TGConnectingPoint num="22" id="315" />
+<TGConnectingPoint num="23" id="316" />
+<TGConnectingPoint num="24" id="317" />
+<TGConnectingPoint num="25" id="318" />
+<TGConnectingPoint num="26" id="319" />
+<TGConnectingPoint num="27" id="320" />
+<TGConnectingPoint num="28" id="321" />
+<TGConnectingPoint num="29" id="322" />
+<TGConnectingPoint num="30" id="323" />
 <extraparam>
 <type data="2" />
 <textline data="Users shall be able to settle disclosure of" />
@@ -554,43 +554,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2718" >
+<COMPONENT type="900" id="356" >
 <cdparam x="771" y="474" />
 <sizeparam width="247" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="228" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Requirement" value="UnlinkableTimeOrderingOfMessages" />
-<TGConnectingPoint num="0" id="2687" />
-<TGConnectingPoint num="1" id="2688" />
-<TGConnectingPoint num="2" id="2689" />
-<TGConnectingPoint num="3" id="2690" />
-<TGConnectingPoint num="4" id="2691" />
-<TGConnectingPoint num="5" id="2692" />
-<TGConnectingPoint num="6" id="2693" />
-<TGConnectingPoint num="7" id="2694" />
-<TGConnectingPoint num="8" id="2695" />
-<TGConnectingPoint num="9" id="2696" />
-<TGConnectingPoint num="10" id="2697" />
-<TGConnectingPoint num="11" id="2698" />
-<TGConnectingPoint num="12" id="2699" />
-<TGConnectingPoint num="13" id="2700" />
-<TGConnectingPoint num="14" id="2701" />
-<TGConnectingPoint num="15" id="2702" />
-<TGConnectingPoint num="16" id="2703" />
-<TGConnectingPoint num="17" id="2704" />
-<TGConnectingPoint num="18" id="2705" />
-<TGConnectingPoint num="19" id="2706" />
-<TGConnectingPoint num="20" id="2707" />
-<TGConnectingPoint num="21" id="2708" />
-<TGConnectingPoint num="22" id="2709" />
-<TGConnectingPoint num="23" id="2710" />
-<TGConnectingPoint num="24" id="2711" />
-<TGConnectingPoint num="25" id="2712" />
-<TGConnectingPoint num="26" id="2713" />
-<TGConnectingPoint num="27" id="2714" />
-<TGConnectingPoint num="28" id="2715" />
-<TGConnectingPoint num="29" id="2716" />
-<TGConnectingPoint num="30" id="2717" />
+<TGConnectingPoint num="0" id="325" />
+<TGConnectingPoint num="1" id="326" />
+<TGConnectingPoint num="2" id="327" />
+<TGConnectingPoint num="3" id="328" />
+<TGConnectingPoint num="4" id="329" />
+<TGConnectingPoint num="5" id="330" />
+<TGConnectingPoint num="6" id="331" />
+<TGConnectingPoint num="7" id="332" />
+<TGConnectingPoint num="8" id="333" />
+<TGConnectingPoint num="9" id="334" />
+<TGConnectingPoint num="10" id="335" />
+<TGConnectingPoint num="11" id="336" />
+<TGConnectingPoint num="12" id="337" />
+<TGConnectingPoint num="13" id="338" />
+<TGConnectingPoint num="14" id="339" />
+<TGConnectingPoint num="15" id="340" />
+<TGConnectingPoint num="16" id="341" />
+<TGConnectingPoint num="17" id="342" />
+<TGConnectingPoint num="18" id="343" />
+<TGConnectingPoint num="19" id="344" />
+<TGConnectingPoint num="20" id="345" />
+<TGConnectingPoint num="21" id="346" />
+<TGConnectingPoint num="22" id="347" />
+<TGConnectingPoint num="23" id="348" />
+<TGConnectingPoint num="24" id="349" />
+<TGConnectingPoint num="25" id="350" />
+<TGConnectingPoint num="26" id="351" />
+<TGConnectingPoint num="27" id="352" />
+<TGConnectingPoint num="28" id="353" />
+<TGConnectingPoint num="29" id="354" />
+<TGConnectingPoint num="30" id="355" />
 <extraparam>
 <type data="2" />
 <textline data="Prevent or limit the possibility " />
@@ -606,43 +606,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2750" >
+<COMPONENT type="900" id="388" >
 <cdparam x="455" y="296" />
 <sizeparam width="339" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="219" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Requirement" value="EServiceCriticalMessageUnlikability" />
-<TGConnectingPoint num="0" id="2719" />
-<TGConnectingPoint num="1" id="2720" />
-<TGConnectingPoint num="2" id="2721" />
-<TGConnectingPoint num="3" id="2722" />
-<TGConnectingPoint num="4" id="2723" />
-<TGConnectingPoint num="5" id="2724" />
-<TGConnectingPoint num="6" id="2725" />
-<TGConnectingPoint num="7" id="2726" />
-<TGConnectingPoint num="8" id="2727" />
-<TGConnectingPoint num="9" id="2728" />
-<TGConnectingPoint num="10" id="2729" />
-<TGConnectingPoint num="11" id="2730" />
-<TGConnectingPoint num="12" id="2731" />
-<TGConnectingPoint num="13" id="2732" />
-<TGConnectingPoint num="14" id="2733" />
-<TGConnectingPoint num="15" id="2734" />
-<TGConnectingPoint num="16" id="2735" />
-<TGConnectingPoint num="17" id="2736" />
-<TGConnectingPoint num="18" id="2737" />
-<TGConnectingPoint num="19" id="2738" />
-<TGConnectingPoint num="20" id="2739" />
-<TGConnectingPoint num="21" id="2740" />
-<TGConnectingPoint num="22" id="2741" />
-<TGConnectingPoint num="23" id="2742" />
-<TGConnectingPoint num="24" id="2743" />
-<TGConnectingPoint num="25" id="2744" />
-<TGConnectingPoint num="26" id="2745" />
-<TGConnectingPoint num="27" id="2746" />
-<TGConnectingPoint num="28" id="2747" />
-<TGConnectingPoint num="29" id="2748" />
-<TGConnectingPoint num="30" id="2749" />
+<TGConnectingPoint num="0" id="357" />
+<TGConnectingPoint num="1" id="358" />
+<TGConnectingPoint num="2" id="359" />
+<TGConnectingPoint num="3" id="360" />
+<TGConnectingPoint num="4" id="361" />
+<TGConnectingPoint num="5" id="362" />
+<TGConnectingPoint num="6" id="363" />
+<TGConnectingPoint num="7" id="364" />
+<TGConnectingPoint num="8" id="365" />
+<TGConnectingPoint num="9" id="366" />
+<TGConnectingPoint num="10" id="367" />
+<TGConnectingPoint num="11" id="368" />
+<TGConnectingPoint num="12" id="369" />
+<TGConnectingPoint num="13" id="370" />
+<TGConnectingPoint num="14" id="371" />
+<TGConnectingPoint num="15" id="372" />
+<TGConnectingPoint num="16" id="373" />
+<TGConnectingPoint num="17" id="374" />
+<TGConnectingPoint num="18" id="375" />
+<TGConnectingPoint num="19" id="376" />
+<TGConnectingPoint num="20" id="377" />
+<TGConnectingPoint num="21" id="378" />
+<TGConnectingPoint num="22" id="379" />
+<TGConnectingPoint num="23" id="380" />
+<TGConnectingPoint num="24" id="381" />
+<TGConnectingPoint num="25" id="382" />
+<TGConnectingPoint num="26" id="383" />
+<TGConnectingPoint num="27" id="384" />
+<TGConnectingPoint num="28" id="385" />
+<TGConnectingPoint num="29" id="386" />
+<TGConnectingPoint num="30" id="387" />
 <extraparam>
 <type data="2" />
 <textline data="Prevent some critical messages, for instance, " />
@@ -659,43 +659,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2782" >
+<COMPONENT type="900" id="420" >
 <cdparam x="259" y="471" />
 <sizeparam width="189" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="163" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Requirement" value="Car2XMessageAnonymity" />
-<TGConnectingPoint num="0" id="2751" />
-<TGConnectingPoint num="1" id="2752" />
-<TGConnectingPoint num="2" id="2753" />
-<TGConnectingPoint num="3" id="2754" />
-<TGConnectingPoint num="4" id="2755" />
-<TGConnectingPoint num="5" id="2756" />
-<TGConnectingPoint num="6" id="2757" />
-<TGConnectingPoint num="7" id="2758" />
-<TGConnectingPoint num="8" id="2759" />
-<TGConnectingPoint num="9" id="2760" />
-<TGConnectingPoint num="10" id="2761" />
-<TGConnectingPoint num="11" id="2762" />
-<TGConnectingPoint num="12" id="2763" />
-<TGConnectingPoint num="13" id="2764" />
-<TGConnectingPoint num="14" id="2765" />
-<TGConnectingPoint num="15" id="2766" />
-<TGConnectingPoint num="16" id="2767" />
-<TGConnectingPoint num="17" id="2768" />
-<TGConnectingPoint num="18" id="2769" />
-<TGConnectingPoint num="19" id="2770" />
-<TGConnectingPoint num="20" id="2771" />
-<TGConnectingPoint num="21" id="2772" />
-<TGConnectingPoint num="22" id="2773" />
-<TGConnectingPoint num="23" id="2774" />
-<TGConnectingPoint num="24" id="2775" />
-<TGConnectingPoint num="25" id="2776" />
-<TGConnectingPoint num="26" id="2777" />
-<TGConnectingPoint num="27" id="2778" />
-<TGConnectingPoint num="28" id="2779" />
-<TGConnectingPoint num="29" id="2780" />
-<TGConnectingPoint num="30" id="2781" />
+<TGConnectingPoint num="0" id="389" />
+<TGConnectingPoint num="1" id="390" />
+<TGConnectingPoint num="2" id="391" />
+<TGConnectingPoint num="3" id="392" />
+<TGConnectingPoint num="4" id="393" />
+<TGConnectingPoint num="5" id="394" />
+<TGConnectingPoint num="6" id="395" />
+<TGConnectingPoint num="7" id="396" />
+<TGConnectingPoint num="8" id="397" />
+<TGConnectingPoint num="9" id="398" />
+<TGConnectingPoint num="10" id="399" />
+<TGConnectingPoint num="11" id="400" />
+<TGConnectingPoint num="12" id="401" />
+<TGConnectingPoint num="13" id="402" />
+<TGConnectingPoint num="14" id="403" />
+<TGConnectingPoint num="15" id="404" />
+<TGConnectingPoint num="16" id="405" />
+<TGConnectingPoint num="17" id="406" />
+<TGConnectingPoint num="18" id="407" />
+<TGConnectingPoint num="19" id="408" />
+<TGConnectingPoint num="20" id="409" />
+<TGConnectingPoint num="21" id="410" />
+<TGConnectingPoint num="22" id="411" />
+<TGConnectingPoint num="23" id="412" />
+<TGConnectingPoint num="24" id="413" />
+<TGConnectingPoint num="25" id="414" />
+<TGConnectingPoint num="26" id="415" />
+<TGConnectingPoint num="27" id="416" />
+<TGConnectingPoint num="28" id="417" />
+<TGConnectingPoint num="29" id="418" />
+<TGConnectingPoint num="30" id="419" />
 <extraparam>
 <type data="2" />
 <textline data="The sending of a critical message should not " />
@@ -712,43 +712,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2814" >
+<COMPONENT type="900" id="452" >
 <cdparam x="524" y="66" />
 <sizeparam width="201" height="52" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="131" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Requirement" value="ProtectDriverPrivacy" />
-<TGConnectingPoint num="0" id="2783" />
-<TGConnectingPoint num="1" id="2784" />
-<TGConnectingPoint num="2" id="2785" />
-<TGConnectingPoint num="3" id="2786" />
-<TGConnectingPoint num="4" id="2787" />
-<TGConnectingPoint num="5" id="2788" />
-<TGConnectingPoint num="6" id="2789" />
-<TGConnectingPoint num="7" id="2790" />
-<TGConnectingPoint num="8" id="2791" />
-<TGConnectingPoint num="9" id="2792" />
-<TGConnectingPoint num="10" id="2793" />
-<TGConnectingPoint num="11" id="2794" />
-<TGConnectingPoint num="12" id="2795" />
-<TGConnectingPoint num="13" id="2796" />
-<TGConnectingPoint num="14" id="2797" />
-<TGConnectingPoint num="15" id="2798" />
-<TGConnectingPoint num="16" id="2799" />
-<TGConnectingPoint num="17" id="2800" />
-<TGConnectingPoint num="18" id="2801" />
-<TGConnectingPoint num="19" id="2802" />
-<TGConnectingPoint num="20" id="2803" />
-<TGConnectingPoint num="21" id="2804" />
-<TGConnectingPoint num="22" id="2805" />
-<TGConnectingPoint num="23" id="2806" />
-<TGConnectingPoint num="24" id="2807" />
-<TGConnectingPoint num="25" id="2808" />
-<TGConnectingPoint num="26" id="2809" />
-<TGConnectingPoint num="27" id="2810" />
-<TGConnectingPoint num="28" id="2811" />
-<TGConnectingPoint num="29" id="2812" />
-<TGConnectingPoint num="30" id="2813" />
+<TGConnectingPoint num="0" id="421" />
+<TGConnectingPoint num="1" id="422" />
+<TGConnectingPoint num="2" id="423" />
+<TGConnectingPoint num="3" id="424" />
+<TGConnectingPoint num="4" id="425" />
+<TGConnectingPoint num="5" id="426" />
+<TGConnectingPoint num="6" id="427" />
+<TGConnectingPoint num="7" id="428" />
+<TGConnectingPoint num="8" id="429" />
+<TGConnectingPoint num="9" id="430" />
+<TGConnectingPoint num="10" id="431" />
+<TGConnectingPoint num="11" id="432" />
+<TGConnectingPoint num="12" id="433" />
+<TGConnectingPoint num="13" id="434" />
+<TGConnectingPoint num="14" id="435" />
+<TGConnectingPoint num="15" id="436" />
+<TGConnectingPoint num="16" id="437" />
+<TGConnectingPoint num="17" id="438" />
+<TGConnectingPoint num="18" id="439" />
+<TGConnectingPoint num="19" id="440" />
+<TGConnectingPoint num="20" id="441" />
+<TGConnectingPoint num="21" id="442" />
+<TGConnectingPoint num="22" id="443" />
+<TGConnectingPoint num="23" id="444" />
+<TGConnectingPoint num="24" id="445" />
+<TGConnectingPoint num="25" id="446" />
+<TGConnectingPoint num="26" id="447" />
+<TGConnectingPoint num="27" id="448" />
+<TGConnectingPoint num="28" id="449" />
+<TGConnectingPoint num="29" id="450" />
+<TGConnectingPoint num="30" id="451" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -763,40 +763,40 @@
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="129" id="2815" >
+<CONNECTOR type="129" id="453" >
 <cdparam x="1026" y="495" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="832" y="474" id="2693" />
-<P2  x="709" y="410" id="2730" />
+<P1  x="832" y="474" id="331" />
+<P2  x="709" y="410" id="368" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="2816" >
+<CONNECTOR type="129" id="454" >
 <cdparam x="729" y="493" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="611" y="472" id="2630" />
-<P2  x="624" y="410" id="2729" />
+<P1  x="611" y="472" id="268" />
+<P2  x="624" y="410" id="367" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="2817" >
+<CONNECTOR type="129" id="455" >
 <cdparam x="384" y="463" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="400" y="471" id="2759" />
-<P2  x="539" y="410" id="2728" />
+<P1  x="400" y="471" id="397" />
+<P2  x="539" y="410" id="366" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="2819" >
+<CONNECTOR type="129" id="457" >
 <cdparam x="828" y="134" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="833" y="137" id="2598" />
-<P2  x="725" y="92" id="2787" />
+<P1  x="833" y="137" id="236" />
+<P2  x="725" y="92" id="425" />
 <Point x="833" y="92" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2818" >
-<father id="2819" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="456" >
+<father id="457" num="0" />
 <cdparam x="833" y="92" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -804,24 +804,24 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="129" id="2820" >
+<CONNECTOR type="129" id="458" >
 <cdparam x="586" y="326" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="624" y="296" id="2726" />
-<P2  x="624" y="118" id="2793" />
+<P1  x="624" y="296" id="364" />
+<P2  x="624" y="118" id="431" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="2822" >
+<CONNECTOR type="129" id="460" >
 <cdparam x="413" y="167" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="402" y="159" id="2662" />
-<P2  x="524" y="105" id="2785" />
+<P1  x="402" y="159" id="300" />
+<P2  x="524" y="105" id="423" />
 <Point x="451" y="105" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2821" >
-<father id="2822" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="459" >
+<father id="460" num="0" />
 <cdparam x="451" y="105" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -833,70 +833,70 @@
 </TRequirementDiagramPanel>
 
 <TRequirementDiagramPanel name="Fake commands requirements" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0" >
-<COMPONENT type="901" id="2838" >
+<COMPONENT type="901" id="476" >
 <cdparam x="66" y="670" />
 <sizeparam width="484" height="66" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="165" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="RequirementObserver" value="PreventHeadUnitSpoofing" />
-<TGConnectingPoint num="0" id="2823" />
-<TGConnectingPoint num="1" id="2824" />
-<TGConnectingPoint num="2" id="2825" />
-<TGConnectingPoint num="3" id="2826" />
-<TGConnectingPoint num="4" id="2827" />
-<TGConnectingPoint num="5" id="2828" />
-<TGConnectingPoint num="6" id="2829" />
-<TGConnectingPoint num="7" id="2830" />
-<TGConnectingPoint num="8" id="2831" />
-<TGConnectingPoint num="9" id="2832" />
-<TGConnectingPoint num="10" id="2833" />
-<TGConnectingPoint num="11" id="2834" />
-<TGConnectingPoint num="12" id="2835" />
-<TGConnectingPoint num="13" id="2836" />
-<TGConnectingPoint num="14" id="2837" />
+<TGConnectingPoint num="0" id="461" />
+<TGConnectingPoint num="1" id="462" />
+<TGConnectingPoint num="2" id="463" />
+<TGConnectingPoint num="3" id="464" />
+<TGConnectingPoint num="4" id="465" />
+<TGConnectingPoint num="5" id="466" />
+<TGConnectingPoint num="6" id="467" />
+<TGConnectingPoint num="7" id="468" />
+<TGConnectingPoint num="8" id="469" />
+<TGConnectingPoint num="9" id="470" />
+<TGConnectingPoint num="10" id="471" />
+<TGConnectingPoint num="11" id="472" />
+<TGConnectingPoint num="12" id="473" />
+<TGConnectingPoint num="13" id="474" />
+<TGConnectingPoint num="14" id="475" />
 <extraparam>
 <diagramText data="EmergencyBrake message may be sent by HU pretending to be CU" />
 <violated data="noAction" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2870" >
+<COMPONENT type="900" id="508" >
 <cdparam x="1400" y="524" />
 <sizeparam width="201" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="190" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="FlashingCommandFreshness" />
-<TGConnectingPoint num="0" id="2839" />
-<TGConnectingPoint num="1" id="2840" />
-<TGConnectingPoint num="2" id="2841" />
-<TGConnectingPoint num="3" id="2842" />
-<TGConnectingPoint num="4" id="2843" />
-<TGConnectingPoint num="5" id="2844" />
-<TGConnectingPoint num="6" id="2845" />
-<TGConnectingPoint num="7" id="2846" />
-<TGConnectingPoint num="8" id="2847" />
-<TGConnectingPoint num="9" id="2848" />
-<TGConnectingPoint num="10" id="2849" />
-<TGConnectingPoint num="11" id="2850" />
-<TGConnectingPoint num="12" id="2851" />
-<TGConnectingPoint num="13" id="2852" />
-<TGConnectingPoint num="14" id="2853" />
-<TGConnectingPoint num="15" id="2854" />
-<TGConnectingPoint num="16" id="2855" />
-<TGConnectingPoint num="17" id="2856" />
-<TGConnectingPoint num="18" id="2857" />
-<TGConnectingPoint num="19" id="2858" />
-<TGConnectingPoint num="20" id="2859" />
-<TGConnectingPoint num="21" id="2860" />
-<TGConnectingPoint num="22" id="2861" />
-<TGConnectingPoint num="23" id="2862" />
-<TGConnectingPoint num="24" id="2863" />
-<TGConnectingPoint num="25" id="2864" />
-<TGConnectingPoint num="26" id="2865" />
-<TGConnectingPoint num="27" id="2866" />
-<TGConnectingPoint num="28" id="2867" />
-<TGConnectingPoint num="29" id="2868" />
-<TGConnectingPoint num="30" id="2869" />
+<TGConnectingPoint num="0" id="477" />
+<TGConnectingPoint num="1" id="478" />
+<TGConnectingPoint num="2" id="479" />
+<TGConnectingPoint num="3" id="480" />
+<TGConnectingPoint num="4" id="481" />
+<TGConnectingPoint num="5" id="482" />
+<TGConnectingPoint num="6" id="483" />
+<TGConnectingPoint num="7" id="484" />
+<TGConnectingPoint num="8" id="485" />
+<TGConnectingPoint num="9" id="486" />
+<TGConnectingPoint num="10" id="487" />
+<TGConnectingPoint num="11" id="488" />
+<TGConnectingPoint num="12" id="489" />
+<TGConnectingPoint num="13" id="490" />
+<TGConnectingPoint num="14" id="491" />
+<TGConnectingPoint num="15" id="492" />
+<TGConnectingPoint num="16" id="493" />
+<TGConnectingPoint num="17" id="494" />
+<TGConnectingPoint num="18" id="495" />
+<TGConnectingPoint num="19" id="496" />
+<TGConnectingPoint num="20" id="497" />
+<TGConnectingPoint num="21" id="498" />
+<TGConnectingPoint num="22" id="499" />
+<TGConnectingPoint num="23" id="500" />
+<TGConnectingPoint num="24" id="501" />
+<TGConnectingPoint num="25" id="502" />
+<TGConnectingPoint num="26" id="503" />
+<TGConnectingPoint num="27" id="504" />
+<TGConnectingPoint num="28" id="505" />
+<TGConnectingPoint num="29" id="506" />
+<TGConnectingPoint num="30" id="507" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -911,43 +911,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2902" >
+<COMPONENT type="900" id="540" >
 <cdparam x="1197" y="521" />
 <sizeparam width="181" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="95" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="CodeIntegrity" />
-<TGConnectingPoint num="0" id="2871" />
-<TGConnectingPoint num="1" id="2872" />
-<TGConnectingPoint num="2" id="2873" />
-<TGConnectingPoint num="3" id="2874" />
-<TGConnectingPoint num="4" id="2875" />
-<TGConnectingPoint num="5" id="2876" />
-<TGConnectingPoint num="6" id="2877" />
-<TGConnectingPoint num="7" id="2878" />
-<TGConnectingPoint num="8" id="2879" />
-<TGConnectingPoint num="9" id="2880" />
-<TGConnectingPoint num="10" id="2881" />
-<TGConnectingPoint num="11" id="2882" />
-<TGConnectingPoint num="12" id="2883" />
-<TGConnectingPoint num="13" id="2884" />
-<TGConnectingPoint num="14" id="2885" />
-<TGConnectingPoint num="15" id="2886" />
-<TGConnectingPoint num="16" id="2887" />
-<TGConnectingPoint num="17" id="2888" />
-<TGConnectingPoint num="18" id="2889" />
-<TGConnectingPoint num="19" id="2890" />
-<TGConnectingPoint num="20" id="2891" />
-<TGConnectingPoint num="21" id="2892" />
-<TGConnectingPoint num="22" id="2893" />
-<TGConnectingPoint num="23" id="2894" />
-<TGConnectingPoint num="24" id="2895" />
-<TGConnectingPoint num="25" id="2896" />
-<TGConnectingPoint num="26" id="2897" />
-<TGConnectingPoint num="27" id="2898" />
-<TGConnectingPoint num="28" id="2899" />
-<TGConnectingPoint num="29" id="2900" />
-<TGConnectingPoint num="30" id="2901" />
+<TGConnectingPoint num="0" id="509" />
+<TGConnectingPoint num="1" id="510" />
+<TGConnectingPoint num="2" id="511" />
+<TGConnectingPoint num="3" id="512" />
+<TGConnectingPoint num="4" id="513" />
+<TGConnectingPoint num="5" id="514" />
+<TGConnectingPoint num="6" id="515" />
+<TGConnectingPoint num="7" id="516" />
+<TGConnectingPoint num="8" id="517" />
+<TGConnectingPoint num="9" id="518" />
+<TGConnectingPoint num="10" id="519" />
+<TGConnectingPoint num="11" id="520" />
+<TGConnectingPoint num="12" id="521" />
+<TGConnectingPoint num="13" id="522" />
+<TGConnectingPoint num="14" id="523" />
+<TGConnectingPoint num="15" id="524" />
+<TGConnectingPoint num="16" id="525" />
+<TGConnectingPoint num="17" id="526" />
+<TGConnectingPoint num="18" id="527" />
+<TGConnectingPoint num="19" id="528" />
+<TGConnectingPoint num="20" id="529" />
+<TGConnectingPoint num="21" id="530" />
+<TGConnectingPoint num="22" id="531" />
+<TGConnectingPoint num="23" id="532" />
+<TGConnectingPoint num="24" id="533" />
+<TGConnectingPoint num="25" id="534" />
+<TGConnectingPoint num="26" id="535" />
+<TGConnectingPoint num="27" id="536" />
+<TGConnectingPoint num="28" id="537" />
+<TGConnectingPoint num="29" id="538" />
+<TGConnectingPoint num="30" id="539" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -962,43 +962,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2934" >
+<COMPONENT type="900" id="572" >
 <cdparam x="992" y="521" />
 <sizeparam width="197" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="163" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="CodeOriginAuthentication" />
-<TGConnectingPoint num="0" id="2903" />
-<TGConnectingPoint num="1" id="2904" />
-<TGConnectingPoint num="2" id="2905" />
-<TGConnectingPoint num="3" id="2906" />
-<TGConnectingPoint num="4" id="2907" />
-<TGConnectingPoint num="5" id="2908" />
-<TGConnectingPoint num="6" id="2909" />
-<TGConnectingPoint num="7" id="2910" />
-<TGConnectingPoint num="8" id="2911" />
-<TGConnectingPoint num="9" id="2912" />
-<TGConnectingPoint num="10" id="2913" />
-<TGConnectingPoint num="11" id="2914" />
-<TGConnectingPoint num="12" id="2915" />
-<TGConnectingPoint num="13" id="2916" />
-<TGConnectingPoint num="14" id="2917" />
-<TGConnectingPoint num="15" id="2918" />
-<TGConnectingPoint num="16" id="2919" />
-<TGConnectingPoint num="17" id="2920" />
-<TGConnectingPoint num="18" id="2921" />
-<TGConnectingPoint num="19" id="2922" />
-<TGConnectingPoint num="20" id="2923" />
-<TGConnectingPoint num="21" id="2924" />
-<TGConnectingPoint num="22" id="2925" />
-<TGConnectingPoint num="23" id="2926" />
-<TGConnectingPoint num="24" id="2927" />
-<TGConnectingPoint num="25" id="2928" />
-<TGConnectingPoint num="26" id="2929" />
-<TGConnectingPoint num="27" id="2930" />
-<TGConnectingPoint num="28" id="2931" />
-<TGConnectingPoint num="29" id="2932" />
-<TGConnectingPoint num="30" id="2933" />
+<TGConnectingPoint num="0" id="541" />
+<TGConnectingPoint num="1" id="542" />
+<TGConnectingPoint num="2" id="543" />
+<TGConnectingPoint num="3" id="544" />
+<TGConnectingPoint num="4" id="545" />
+<TGConnectingPoint num="5" id="546" />
+<TGConnectingPoint num="6" id="547" />
+<TGConnectingPoint num="7" id="548" />
+<TGConnectingPoint num="8" id="549" />
+<TGConnectingPoint num="9" id="550" />
+<TGConnectingPoint num="10" id="551" />
+<TGConnectingPoint num="11" id="552" />
+<TGConnectingPoint num="12" id="553" />
+<TGConnectingPoint num="13" id="554" />
+<TGConnectingPoint num="14" id="555" />
+<TGConnectingPoint num="15" id="556" />
+<TGConnectingPoint num="16" id="557" />
+<TGConnectingPoint num="17" id="558" />
+<TGConnectingPoint num="18" id="559" />
+<TGConnectingPoint num="19" id="560" />
+<TGConnectingPoint num="20" id="561" />
+<TGConnectingPoint num="21" id="562" />
+<TGConnectingPoint num="22" id="563" />
+<TGConnectingPoint num="23" id="564" />
+<TGConnectingPoint num="24" id="565" />
+<TGConnectingPoint num="25" id="566" />
+<TGConnectingPoint num="26" id="567" />
+<TGConnectingPoint num="27" id="568" />
+<TGConnectingPoint num="28" id="569" />
+<TGConnectingPoint num="29" id="570" />
+<TGConnectingPoint num="30" id="571" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -1013,43 +1013,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2966" >
+<COMPONENT type="900" id="604" >
 <cdparam x="1189" y="342" />
 <sizeparam width="196" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="181" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="ProtectECUFlashingProcess" />
-<TGConnectingPoint num="0" id="2935" />
-<TGConnectingPoint num="1" id="2936" />
-<TGConnectingPoint num="2" id="2937" />
-<TGConnectingPoint num="3" id="2938" />
-<TGConnectingPoint num="4" id="2939" />
-<TGConnectingPoint num="5" id="2940" />
-<TGConnectingPoint num="6" id="2941" />
-<TGConnectingPoint num="7" id="2942" />
-<TGConnectingPoint num="8" id="2943" />
-<TGConnectingPoint num="9" id="2944" />
-<TGConnectingPoint num="10" id="2945" />
-<TGConnectingPoint num="11" id="2946" />
-<TGConnectingPoint num="12" id="2947" />
-<TGConnectingPoint num="13" id="2948" />
-<TGConnectingPoint num="14" id="2949" />
-<TGConnectingPoint num="15" id="2950" />
-<TGConnectingPoint num="16" id="2951" />
-<TGConnectingPoint num="17" id="2952" />
-<TGConnectingPoint num="18" id="2953" />
-<TGConnectingPoint num="19" id="2954" />
-<TGConnectingPoint num="20" id="2955" />
-<TGConnectingPoint num="21" id="2956" />
-<TGConnectingPoint num="22" id="2957" />
-<TGConnectingPoint num="23" id="2958" />
-<TGConnectingPoint num="24" id="2959" />
-<TGConnectingPoint num="25" id="2960" />
-<TGConnectingPoint num="26" id="2961" />
-<TGConnectingPoint num="27" id="2962" />
-<TGConnectingPoint num="28" id="2963" />
-<TGConnectingPoint num="29" id="2964" />
-<TGConnectingPoint num="30" id="2965" />
+<TGConnectingPoint num="0" id="573" />
+<TGConnectingPoint num="1" id="574" />
+<TGConnectingPoint num="2" id="575" />
+<TGConnectingPoint num="3" id="576" />
+<TGConnectingPoint num="4" id="577" />
+<TGConnectingPoint num="5" id="578" />
+<TGConnectingPoint num="6" id="579" />
+<TGConnectingPoint num="7" id="580" />
+<TGConnectingPoint num="8" id="581" />
+<TGConnectingPoint num="9" id="582" />
+<TGConnectingPoint num="10" id="583" />
+<TGConnectingPoint num="11" id="584" />
+<TGConnectingPoint num="12" id="585" />
+<TGConnectingPoint num="13" id="586" />
+<TGConnectingPoint num="14" id="587" />
+<TGConnectingPoint num="15" id="588" />
+<TGConnectingPoint num="16" id="589" />
+<TGConnectingPoint num="17" id="590" />
+<TGConnectingPoint num="18" id="591" />
+<TGConnectingPoint num="19" id="592" />
+<TGConnectingPoint num="20" id="593" />
+<TGConnectingPoint num="21" id="594" />
+<TGConnectingPoint num="22" id="595" />
+<TGConnectingPoint num="23" id="596" />
+<TGConnectingPoint num="24" id="597" />
+<TGConnectingPoint num="25" id="598" />
+<TGConnectingPoint num="26" id="599" />
+<TGConnectingPoint num="27" id="600" />
+<TGConnectingPoint num="28" id="601" />
+<TGConnectingPoint num="29" id="602" />
+<TGConnectingPoint num="30" id="603" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -1064,43 +1064,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="2998" >
+<COMPONENT type="900" id="636" >
 <cdparam x="31" y="517" />
 <sizeparam width="315" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="194" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="AuthenticationOfFunctionalPath" />
-<TGConnectingPoint num="0" id="2967" />
-<TGConnectingPoint num="1" id="2968" />
-<TGConnectingPoint num="2" id="2969" />
-<TGConnectingPoint num="3" id="2970" />
-<TGConnectingPoint num="4" id="2971" />
-<TGConnectingPoint num="5" id="2972" />
-<TGConnectingPoint num="6" id="2973" />
-<TGConnectingPoint num="7" id="2974" />
-<TGConnectingPoint num="8" id="2975" />
-<TGConnectingPoint num="9" id="2976" />
-<TGConnectingPoint num="10" id="2977" />
-<TGConnectingPoint num="11" id="2978" />
-<TGConnectingPoint num="12" id="2979" />
-<TGConnectingPoint num="13" id="2980" />
-<TGConnectingPoint num="14" id="2981" />
-<TGConnectingPoint num="15" id="2982" />
-<TGConnectingPoint num="16" id="2983" />
-<TGConnectingPoint num="17" id="2984" />
-<TGConnectingPoint num="18" id="2985" />
-<TGConnectingPoint num="19" id="2986" />
-<TGConnectingPoint num="20" id="2987" />
-<TGConnectingPoint num="21" id="2988" />
-<TGConnectingPoint num="22" id="2989" />
-<TGConnectingPoint num="23" id="2990" />
-<TGConnectingPoint num="24" id="2991" />
-<TGConnectingPoint num="25" id="2992" />
-<TGConnectingPoint num="26" id="2993" />
-<TGConnectingPoint num="27" id="2994" />
-<TGConnectingPoint num="28" id="2995" />
-<TGConnectingPoint num="29" id="2996" />
-<TGConnectingPoint num="30" id="2997" />
+<TGConnectingPoint num="0" id="605" />
+<TGConnectingPoint num="1" id="606" />
+<TGConnectingPoint num="2" id="607" />
+<TGConnectingPoint num="3" id="608" />
+<TGConnectingPoint num="4" id="609" />
+<TGConnectingPoint num="5" id="610" />
+<TGConnectingPoint num="6" id="611" />
+<TGConnectingPoint num="7" id="612" />
+<TGConnectingPoint num="8" id="613" />
+<TGConnectingPoint num="9" id="614" />
+<TGConnectingPoint num="10" id="615" />
+<TGConnectingPoint num="11" id="616" />
+<TGConnectingPoint num="12" id="617" />
+<TGConnectingPoint num="13" id="618" />
+<TGConnectingPoint num="14" id="619" />
+<TGConnectingPoint num="15" id="620" />
+<TGConnectingPoint num="16" id="621" />
+<TGConnectingPoint num="17" id="622" />
+<TGConnectingPoint num="18" id="623" />
+<TGConnectingPoint num="19" id="624" />
+<TGConnectingPoint num="20" id="625" />
+<TGConnectingPoint num="21" id="626" />
+<TGConnectingPoint num="22" id="627" />
+<TGConnectingPoint num="23" id="628" />
+<TGConnectingPoint num="24" id="629" />
+<TGConnectingPoint num="25" id="630" />
+<TGConnectingPoint num="26" id="631" />
+<TGConnectingPoint num="27" id="632" />
+<TGConnectingPoint num="28" id="633" />
+<TGConnectingPoint num="29" id="634" />
+<TGConnectingPoint num="30" id="635" />
 <extraparam>
 <type data="2" />
 <textline data="This includes the authentication of functions," />
@@ -1115,43 +1115,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3030" >
+<COMPONENT type="900" id="668" >
 <cdparam x="649" y="361" />
 <sizeparam width="314" height="114" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="272" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="PreventReplacementOfChipsOnLocalBusses" />
-<TGConnectingPoint num="0" id="2999" />
-<TGConnectingPoint num="1" id="3000" />
-<TGConnectingPoint num="2" id="3001" />
-<TGConnectingPoint num="3" id="3002" />
-<TGConnectingPoint num="4" id="3003" />
-<TGConnectingPoint num="5" id="3004" />
-<TGConnectingPoint num="6" id="3005" />
-<TGConnectingPoint num="7" id="3006" />
-<TGConnectingPoint num="8" id="3007" />
-<TGConnectingPoint num="9" id="3008" />
-<TGConnectingPoint num="10" id="3009" />
-<TGConnectingPoint num="11" id="3010" />
-<TGConnectingPoint num="12" id="3011" />
-<TGConnectingPoint num="13" id="3012" />
-<TGConnectingPoint num="14" id="3013" />
-<TGConnectingPoint num="15" id="3014" />
-<TGConnectingPoint num="16" id="3015" />
-<TGConnectingPoint num="17" id="3016" />
-<TGConnectingPoint num="18" id="3017" />
-<TGConnectingPoint num="19" id="3018" />
-<TGConnectingPoint num="20" id="3019" />
-<TGConnectingPoint num="21" id="3020" />
-<TGConnectingPoint num="22" id="3021" />
-<TGConnectingPoint num="23" id="3022" />
-<TGConnectingPoint num="24" id="3023" />
-<TGConnectingPoint num="25" id="3024" />
-<TGConnectingPoint num="26" id="3025" />
-<TGConnectingPoint num="27" id="3026" />
-<TGConnectingPoint num="28" id="3027" />
-<TGConnectingPoint num="29" id="3028" />
-<TGConnectingPoint num="30" id="3029" />
+<TGConnectingPoint num="0" id="637" />
+<TGConnectingPoint num="1" id="638" />
+<TGConnectingPoint num="2" id="639" />
+<TGConnectingPoint num="3" id="640" />
+<TGConnectingPoint num="4" id="641" />
+<TGConnectingPoint num="5" id="642" />
+<TGConnectingPoint num="6" id="643" />
+<TGConnectingPoint num="7" id="644" />
+<TGConnectingPoint num="8" id="645" />
+<TGConnectingPoint num="9" id="646" />
+<TGConnectingPoint num="10" id="647" />
+<TGConnectingPoint num="11" id="648" />
+<TGConnectingPoint num="12" id="649" />
+<TGConnectingPoint num="13" id="650" />
+<TGConnectingPoint num="14" id="651" />
+<TGConnectingPoint num="15" id="652" />
+<TGConnectingPoint num="16" id="653" />
+<TGConnectingPoint num="17" id="654" />
+<TGConnectingPoint num="18" id="655" />
+<TGConnectingPoint num="19" id="656" />
+<TGConnectingPoint num="20" id="657" />
+<TGConnectingPoint num="21" id="658" />
+<TGConnectingPoint num="22" id="659" />
+<TGConnectingPoint num="23" id="660" />
+<TGConnectingPoint num="24" id="661" />
+<TGConnectingPoint num="25" id="662" />
+<TGConnectingPoint num="26" id="663" />
+<TGConnectingPoint num="27" id="664" />
+<TGConnectingPoint num="28" id="665" />
+<TGConnectingPoint num="29" id="666" />
+<TGConnectingPoint num="30" id="667" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -1166,43 +1166,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3062" >
+<COMPONENT type="900" id="700" >
 <cdparam x="372" y="363" />
 <sizeparam width="239" height="102" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="186" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="PreventManInTheMiddleAttack" />
-<TGConnectingPoint num="0" id="3031" />
-<TGConnectingPoint num="1" id="3032" />
-<TGConnectingPoint num="2" id="3033" />
-<TGConnectingPoint num="3" id="3034" />
-<TGConnectingPoint num="4" id="3035" />
-<TGConnectingPoint num="5" id="3036" />
-<TGConnectingPoint num="6" id="3037" />
-<TGConnectingPoint num="7" id="3038" />
-<TGConnectingPoint num="8" id="3039" />
-<TGConnectingPoint num="9" id="3040" />
-<TGConnectingPoint num="10" id="3041" />
-<TGConnectingPoint num="11" id="3042" />
-<TGConnectingPoint num="12" id="3043" />
-<TGConnectingPoint num="13" id="3044" />
-<TGConnectingPoint num="14" id="3045" />
-<TGConnectingPoint num="15" id="3046" />
-<TGConnectingPoint num="16" id="3047" />
-<TGConnectingPoint num="17" id="3048" />
-<TGConnectingPoint num="18" id="3049" />
-<TGConnectingPoint num="19" id="3050" />
-<TGConnectingPoint num="20" id="3051" />
-<TGConnectingPoint num="21" id="3052" />
-<TGConnectingPoint num="22" id="3053" />
-<TGConnectingPoint num="23" id="3054" />
-<TGConnectingPoint num="24" id="3055" />
-<TGConnectingPoint num="25" id="3056" />
-<TGConnectingPoint num="26" id="3057" />
-<TGConnectingPoint num="27" id="3058" />
-<TGConnectingPoint num="28" id="3059" />
-<TGConnectingPoint num="29" id="3060" />
-<TGConnectingPoint num="30" id="3061" />
+<TGConnectingPoint num="0" id="669" />
+<TGConnectingPoint num="1" id="670" />
+<TGConnectingPoint num="2" id="671" />
+<TGConnectingPoint num="3" id="672" />
+<TGConnectingPoint num="4" id="673" />
+<TGConnectingPoint num="5" id="674" />
+<TGConnectingPoint num="6" id="675" />
+<TGConnectingPoint num="7" id="676" />
+<TGConnectingPoint num="8" id="677" />
+<TGConnectingPoint num="9" id="678" />
+<TGConnectingPoint num="10" id="679" />
+<TGConnectingPoint num="11" id="680" />
+<TGConnectingPoint num="12" id="681" />
+<TGConnectingPoint num="13" id="682" />
+<TGConnectingPoint num="14" id="683" />
+<TGConnectingPoint num="15" id="684" />
+<TGConnectingPoint num="16" id="685" />
+<TGConnectingPoint num="17" id="686" />
+<TGConnectingPoint num="18" id="687" />
+<TGConnectingPoint num="19" id="688" />
+<TGConnectingPoint num="20" id="689" />
+<TGConnectingPoint num="21" id="690" />
+<TGConnectingPoint num="22" id="691" />
+<TGConnectingPoint num="23" id="692" />
+<TGConnectingPoint num="24" id="693" />
+<TGConnectingPoint num="25" id="694" />
+<TGConnectingPoint num="26" id="695" />
+<TGConnectingPoint num="27" id="696" />
+<TGConnectingPoint num="28" id="697" />
+<TGConnectingPoint num="29" id="698" />
+<TGConnectingPoint num="30" id="699" />
 <extraparam>
 <type data="2" />
 <textline data="Internal attack" />
@@ -1216,43 +1216,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3094" >
+<COMPONENT type="900" id="732" >
 <cdparam x="354" y="518" />
 <sizeparam width="275" height="117" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="247" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="MessageFreshnessAlongFunctionalPath" />
-<TGConnectingPoint num="0" id="3063" />
-<TGConnectingPoint num="1" id="3064" />
-<TGConnectingPoint num="2" id="3065" />
-<TGConnectingPoint num="3" id="3066" />
-<TGConnectingPoint num="4" id="3067" />
-<TGConnectingPoint num="5" id="3068" />
-<TGConnectingPoint num="6" id="3069" />
-<TGConnectingPoint num="7" id="3070" />
-<TGConnectingPoint num="8" id="3071" />
-<TGConnectingPoint num="9" id="3072" />
-<TGConnectingPoint num="10" id="3073" />
-<TGConnectingPoint num="11" id="3074" />
-<TGConnectingPoint num="12" id="3075" />
-<TGConnectingPoint num="13" id="3076" />
-<TGConnectingPoint num="14" id="3077" />
-<TGConnectingPoint num="15" id="3078" />
-<TGConnectingPoint num="16" id="3079" />
-<TGConnectingPoint num="17" id="3080" />
-<TGConnectingPoint num="18" id="3081" />
-<TGConnectingPoint num="19" id="3082" />
-<TGConnectingPoint num="20" id="3083" />
-<TGConnectingPoint num="21" id="3084" />
-<TGConnectingPoint num="22" id="3085" />
-<TGConnectingPoint num="23" id="3086" />
-<TGConnectingPoint num="24" id="3087" />
-<TGConnectingPoint num="25" id="3088" />
-<TGConnectingPoint num="26" id="3089" />
-<TGConnectingPoint num="27" id="3090" />
-<TGConnectingPoint num="28" id="3091" />
-<TGConnectingPoint num="29" id="3092" />
-<TGConnectingPoint num="30" id="3093" />
+<TGConnectingPoint num="0" id="701" />
+<TGConnectingPoint num="1" id="702" />
+<TGConnectingPoint num="2" id="703" />
+<TGConnectingPoint num="3" id="704" />
+<TGConnectingPoint num="4" id="705" />
+<TGConnectingPoint num="5" id="706" />
+<TGConnectingPoint num="6" id="707" />
+<TGConnectingPoint num="7" id="708" />
+<TGConnectingPoint num="8" id="709" />
+<TGConnectingPoint num="9" id="710" />
+<TGConnectingPoint num="10" id="711" />
+<TGConnectingPoint num="11" id="712" />
+<TGConnectingPoint num="12" id="713" />
+<TGConnectingPoint num="13" id="714" />
+<TGConnectingPoint num="14" id="715" />
+<TGConnectingPoint num="15" id="716" />
+<TGConnectingPoint num="16" id="717" />
+<TGConnectingPoint num="17" id="718" />
+<TGConnectingPoint num="18" id="719" />
+<TGConnectingPoint num="19" id="720" />
+<TGConnectingPoint num="20" id="721" />
+<TGConnectingPoint num="21" id="722" />
+<TGConnectingPoint num="22" id="723" />
+<TGConnectingPoint num="23" id="724" />
+<TGConnectingPoint num="24" id="725" />
+<TGConnectingPoint num="25" id="726" />
+<TGConnectingPoint num="26" id="727" />
+<TGConnectingPoint num="27" id="728" />
+<TGConnectingPoint num="28" id="729" />
+<TGConnectingPoint num="29" id="730" />
+<TGConnectingPoint num="30" id="731" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -1267,43 +1267,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3126" >
+<COMPONENT type="900" id="764" >
 <cdparam x="637" y="518" />
 <sizeparam width="319" height="116" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="292" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="IntegrityOfMessageAttributesAlongFunctionalPath" />
-<TGConnectingPoint num="0" id="3095" />
-<TGConnectingPoint num="1" id="3096" />
-<TGConnectingPoint num="2" id="3097" />
-<TGConnectingPoint num="3" id="3098" />
-<TGConnectingPoint num="4" id="3099" />
-<TGConnectingPoint num="5" id="3100" />
-<TGConnectingPoint num="6" id="3101" />
-<TGConnectingPoint num="7" id="3102" />
-<TGConnectingPoint num="8" id="3103" />
-<TGConnectingPoint num="9" id="3104" />
-<TGConnectingPoint num="10" id="3105" />
-<TGConnectingPoint num="11" id="3106" />
-<TGConnectingPoint num="12" id="3107" />
-<TGConnectingPoint num="13" id="3108" />
-<TGConnectingPoint num="14" id="3109" />
-<TGConnectingPoint num="15" id="3110" />
-<TGConnectingPoint num="16" id="3111" />
-<TGConnectingPoint num="17" id="3112" />
-<TGConnectingPoint num="18" id="3113" />
-<TGConnectingPoint num="19" id="3114" />
-<TGConnectingPoint num="20" id="3115" />
-<TGConnectingPoint num="21" id="3116" />
-<TGConnectingPoint num="22" id="3117" />
-<TGConnectingPoint num="23" id="3118" />
-<TGConnectingPoint num="24" id="3119" />
-<TGConnectingPoint num="25" id="3120" />
-<TGConnectingPoint num="26" id="3121" />
-<TGConnectingPoint num="27" id="3122" />
-<TGConnectingPoint num="28" id="3123" />
-<TGConnectingPoint num="29" id="3124" />
-<TGConnectingPoint num="30" id="3125" />
+<TGConnectingPoint num="0" id="733" />
+<TGConnectingPoint num="1" id="734" />
+<TGConnectingPoint num="2" id="735" />
+<TGConnectingPoint num="3" id="736" />
+<TGConnectingPoint num="4" id="737" />
+<TGConnectingPoint num="5" id="738" />
+<TGConnectingPoint num="6" id="739" />
+<TGConnectingPoint num="7" id="740" />
+<TGConnectingPoint num="8" id="741" />
+<TGConnectingPoint num="9" id="742" />
+<TGConnectingPoint num="10" id="743" />
+<TGConnectingPoint num="11" id="744" />
+<TGConnectingPoint num="12" id="745" />
+<TGConnectingPoint num="13" id="746" />
+<TGConnectingPoint num="14" id="747" />
+<TGConnectingPoint num="15" id="748" />
+<TGConnectingPoint num="16" id="749" />
+<TGConnectingPoint num="17" id="750" />
+<TGConnectingPoint num="18" id="751" />
+<TGConnectingPoint num="19" id="752" />
+<TGConnectingPoint num="20" id="753" />
+<TGConnectingPoint num="21" id="754" />
+<TGConnectingPoint num="22" id="755" />
+<TGConnectingPoint num="23" id="756" />
+<TGConnectingPoint num="24" id="757" />
+<TGConnectingPoint num="25" id="758" />
+<TGConnectingPoint num="26" id="759" />
+<TGConnectingPoint num="27" id="760" />
+<TGConnectingPoint num="28" id="761" />
+<TGConnectingPoint num="29" id="762" />
+<TGConnectingPoint num="30" id="763" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -1318,43 +1318,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3158" >
+<COMPONENT type="900" id="796" >
 <cdparam x="667" y="175" />
 <sizeparam width="278" height="113" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="196" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="PreventSendingFakeCommand" />
-<TGConnectingPoint num="0" id="3127" />
-<TGConnectingPoint num="1" id="3128" />
-<TGConnectingPoint num="2" id="3129" />
-<TGConnectingPoint num="3" id="3130" />
-<TGConnectingPoint num="4" id="3131" />
-<TGConnectingPoint num="5" id="3132" />
-<TGConnectingPoint num="6" id="3133" />
-<TGConnectingPoint num="7" id="3134" />
-<TGConnectingPoint num="8" id="3135" />
-<TGConnectingPoint num="9" id="3136" />
-<TGConnectingPoint num="10" id="3137" />
-<TGConnectingPoint num="11" id="3138" />
-<TGConnectingPoint num="12" id="3139" />
-<TGConnectingPoint num="13" id="3140" />
-<TGConnectingPoint num="14" id="3141" />
-<TGConnectingPoint num="15" id="3142" />
-<TGConnectingPoint num="16" id="3143" />
-<TGConnectingPoint num="17" id="3144" />
-<TGConnectingPoint num="18" id="3145" />
-<TGConnectingPoint num="19" id="3146" />
-<TGConnectingPoint num="20" id="3147" />
-<TGConnectingPoint num="21" id="3148" />
-<TGConnectingPoint num="22" id="3149" />
-<TGConnectingPoint num="23" id="3150" />
-<TGConnectingPoint num="24" id="3151" />
-<TGConnectingPoint num="25" id="3152" />
-<TGConnectingPoint num="26" id="3153" />
-<TGConnectingPoint num="27" id="3154" />
-<TGConnectingPoint num="28" id="3155" />
-<TGConnectingPoint num="29" id="3156" />
-<TGConnectingPoint num="30" id="3157" />
+<TGConnectingPoint num="0" id="765" />
+<TGConnectingPoint num="1" id="766" />
+<TGConnectingPoint num="2" id="767" />
+<TGConnectingPoint num="3" id="768" />
+<TGConnectingPoint num="4" id="769" />
+<TGConnectingPoint num="5" id="770" />
+<TGConnectingPoint num="6" id="771" />
+<TGConnectingPoint num="7" id="772" />
+<TGConnectingPoint num="8" id="773" />
+<TGConnectingPoint num="9" id="774" />
+<TGConnectingPoint num="10" id="775" />
+<TGConnectingPoint num="11" id="776" />
+<TGConnectingPoint num="12" id="777" />
+<TGConnectingPoint num="13" id="778" />
+<TGConnectingPoint num="14" id="779" />
+<TGConnectingPoint num="15" id="780" />
+<TGConnectingPoint num="16" id="781" />
+<TGConnectingPoint num="17" id="782" />
+<TGConnectingPoint num="18" id="783" />
+<TGConnectingPoint num="19" id="784" />
+<TGConnectingPoint num="20" id="785" />
+<TGConnectingPoint num="21" id="786" />
+<TGConnectingPoint num="22" id="787" />
+<TGConnectingPoint num="23" id="788" />
+<TGConnectingPoint num="24" id="789" />
+<TGConnectingPoint num="25" id="790" />
+<TGConnectingPoint num="26" id="791" />
+<TGConnectingPoint num="27" id="792" />
+<TGConnectingPoint num="28" id="793" />
+<TGConnectingPoint num="29" id="794" />
+<TGConnectingPoint num="30" id="795" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -1369,16 +1369,16 @@
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="129" id="3160" >
+<CONNECTOR type="129" id="798" >
 <cdparam x="501" y="293" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="491" y="363" id="3038" />
-<P2  x="806" y="288" id="3152" />
+<P1  x="491" y="363" id="676" />
+<P2  x="806" y="288" id="790" />
 <Point x="683" y="316" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3159" >
-<father id="3160" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="797" >
+<father id="798" num="0" />
 <cdparam x="683" y="316" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1386,16 +1386,16 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="129" id="3162" >
+<CONNECTOR type="129" id="800" >
 <cdparam x="1219" y="296" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="1238" y="342" id="2941" />
-<P2  x="806" y="288" id="3151" />
+<P1  x="1238" y="342" id="579" />
+<P2  x="806" y="288" id="789" />
 <Point x="919" y="330" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3161" >
-<father id="3162" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="799" >
+<father id="800" num="0" />
 <cdparam x="919" y="330" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1403,111 +1403,111 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="120" id="3163" >
+<CONNECTOR type="120" id="801" >
 <cdparam x="301" y="736" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from RequirementObserver to Requirement" value="&lt;&lt;verify&gt;&gt;" />
-<P1  x="187" y="670" id="2829" />
-<P2  x="188" y="631" id="2989" />
+<P1  x="187" y="670" id="467" />
+<P2  x="188" y="631" id="627" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="3164" >
+<CONNECTOR type="129" id="802" >
 <cdparam x="1387" y="520" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="1450" y="524" id="2845" />
-<P2  x="1336" y="456" id="2946" />
+<P1  x="1450" y="524" id="483" />
+<P2  x="1336" y="456" id="584" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="3165" >
+<CONNECTOR type="129" id="803" >
 <cdparam x="1200" y="520" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="1287" y="521" id="2878" />
-<P2  x="1287" y="456" id="2945" />
+<P1  x="1287" y="521" id="516" />
+<P2  x="1287" y="456" id="583" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="3166" >
+<CONNECTOR type="129" id="804" >
 <cdparam x="970" y="520" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="1090" y="521" id="2910" />
-<P2  x="1238" y="456" id="2944" />
+<P1  x="1090" y="521" id="548" />
+<P2  x="1238" y="456" id="582" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="3167" >
+<CONNECTOR type="129" id="805" >
 <cdparam x="890" y="296" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="806" y="361" id="3006" />
-<P2  x="806" y="288" id="3137" />
+<P1  x="806" y="361" id="644" />
+<P2  x="806" y="288" id="775" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="3168" >
+<CONNECTOR type="129" id="806" >
 <cdparam x="675" y="521" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="716" y="518" id="3101" />
-<P2  x="491" y="465" id="3055" />
+<P1  x="716" y="518" id="739" />
+<P2  x="491" y="465" id="693" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="3169" >
+<CONNECTOR type="129" id="807" >
 <cdparam x="501" y="522" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="491" y="518" id="3070" />
-<P2  x="491" y="465" id="3041" />
+<P1  x="491" y="518" id="708" />
+<P2  x="491" y="465" id="679" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="3170" >
+<CONNECTOR type="129" id="808" >
 <cdparam x="269" y="520" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="188" y="517" id="2974" />
-<P2  x="491" y="465" id="3056" />
+<P1  x="188" y="517" id="612" />
+<P2  x="491" y="465" id="694" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TRequirementDiagramPanel>
 
 <TRequirementDiagramPanel name="Environment related requirements" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0" >
-<COMPONENT type="900" id="3202" >
+<COMPONENT type="900" id="840" >
 <cdparam x="796" y="171" />
 <sizeparam width="325" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="221" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="EnvironmentRelatedDataFreshness" />
-<TGConnectingPoint num="0" id="3171" />
-<TGConnectingPoint num="1" id="3172" />
-<TGConnectingPoint num="2" id="3173" />
-<TGConnectingPoint num="3" id="3174" />
-<TGConnectingPoint num="4" id="3175" />
-<TGConnectingPoint num="5" id="3176" />
-<TGConnectingPoint num="6" id="3177" />
-<TGConnectingPoint num="7" id="3178" />
-<TGConnectingPoint num="8" id="3179" />
-<TGConnectingPoint num="9" id="3180" />
-<TGConnectingPoint num="10" id="3181" />
-<TGConnectingPoint num="11" id="3182" />
-<TGConnectingPoint num="12" id="3183" />
-<TGConnectingPoint num="13" id="3184" />
-<TGConnectingPoint num="14" id="3185" />
-<TGConnectingPoint num="15" id="3186" />
-<TGConnectingPoint num="16" id="3187" />
-<TGConnectingPoint num="17" id="3188" />
-<TGConnectingPoint num="18" id="3189" />
-<TGConnectingPoint num="19" id="3190" />
-<TGConnectingPoint num="20" id="3191" />
-<TGConnectingPoint num="21" id="3192" />
-<TGConnectingPoint num="22" id="3193" />
-<TGConnectingPoint num="23" id="3194" />
-<TGConnectingPoint num="24" id="3195" />
-<TGConnectingPoint num="25" id="3196" />
-<TGConnectingPoint num="26" id="3197" />
-<TGConnectingPoint num="27" id="3198" />
-<TGConnectingPoint num="28" id="3199" />
-<TGConnectingPoint num="29" id="3200" />
-<TGConnectingPoint num="30" id="3201" />
+<TGConnectingPoint num="0" id="809" />
+<TGConnectingPoint num="1" id="810" />
+<TGConnectingPoint num="2" id="811" />
+<TGConnectingPoint num="3" id="812" />
+<TGConnectingPoint num="4" id="813" />
+<TGConnectingPoint num="5" id="814" />
+<TGConnectingPoint num="6" id="815" />
+<TGConnectingPoint num="7" id="816" />
+<TGConnectingPoint num="8" id="817" />
+<TGConnectingPoint num="9" id="818" />
+<TGConnectingPoint num="10" id="819" />
+<TGConnectingPoint num="11" id="820" />
+<TGConnectingPoint num="12" id="821" />
+<TGConnectingPoint num="13" id="822" />
+<TGConnectingPoint num="14" id="823" />
+<TGConnectingPoint num="15" id="824" />
+<TGConnectingPoint num="16" id="825" />
+<TGConnectingPoint num="17" id="826" />
+<TGConnectingPoint num="18" id="827" />
+<TGConnectingPoint num="19" id="828" />
+<TGConnectingPoint num="20" id="829" />
+<TGConnectingPoint num="21" id="830" />
+<TGConnectingPoint num="22" id="831" />
+<TGConnectingPoint num="23" id="832" />
+<TGConnectingPoint num="24" id="833" />
+<TGConnectingPoint num="25" id="834" />
+<TGConnectingPoint num="26" id="835" />
+<TGConnectingPoint num="27" id="836" />
+<TGConnectingPoint num="28" id="837" />
+<TGConnectingPoint num="29" id="838" />
+<TGConnectingPoint num="30" id="839" />
 <extraparam>
 <type data="2" />
 <textline data="It is already ensured for internal events in the " />
@@ -1524,43 +1524,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3234" >
+<COMPONENT type="900" id="872" >
 <cdparam x="469" y="184" />
 <sizeparam width="302" height="96" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="197" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="AuthenticatingMessageSources" />
-<TGConnectingPoint num="0" id="3203" />
-<TGConnectingPoint num="1" id="3204" />
-<TGConnectingPoint num="2" id="3205" />
-<TGConnectingPoint num="3" id="3206" />
-<TGConnectingPoint num="4" id="3207" />
-<TGConnectingPoint num="5" id="3208" />
-<TGConnectingPoint num="6" id="3209" />
-<TGConnectingPoint num="7" id="3210" />
-<TGConnectingPoint num="8" id="3211" />
-<TGConnectingPoint num="9" id="3212" />
-<TGConnectingPoint num="10" id="3213" />
-<TGConnectingPoint num="11" id="3214" />
-<TGConnectingPoint num="12" id="3215" />
-<TGConnectingPoint num="13" id="3216" />
-<TGConnectingPoint num="14" id="3217" />
-<TGConnectingPoint num="15" id="3218" />
-<TGConnectingPoint num="16" id="3219" />
-<TGConnectingPoint num="17" id="3220" />
-<TGConnectingPoint num="18" id="3221" />
-<TGConnectingPoint num="19" id="3222" />
-<TGConnectingPoint num="20" id="3223" />
-<TGConnectingPoint num="21" id="3224" />
-<TGConnectingPoint num="22" id="3225" />
-<TGConnectingPoint num="23" id="3226" />
-<TGConnectingPoint num="24" id="3227" />
-<TGConnectingPoint num="25" id="3228" />
-<TGConnectingPoint num="26" id="3229" />
-<TGConnectingPoint num="27" id="3230" />
-<TGConnectingPoint num="28" id="3231" />
-<TGConnectingPoint num="29" id="3232" />
-<TGConnectingPoint num="30" id="3233" />
+<TGConnectingPoint num="0" id="841" />
+<TGConnectingPoint num="1" id="842" />
+<TGConnectingPoint num="2" id="843" />
+<TGConnectingPoint num="3" id="844" />
+<TGConnectingPoint num="4" id="845" />
+<TGConnectingPoint num="5" id="846" />
+<TGConnectingPoint num="6" id="847" />
+<TGConnectingPoint num="7" id="848" />
+<TGConnectingPoint num="8" id="849" />
+<TGConnectingPoint num="9" id="850" />
+<TGConnectingPoint num="10" id="851" />
+<TGConnectingPoint num="11" id="852" />
+<TGConnectingPoint num="12" id="853" />
+<TGConnectingPoint num="13" id="854" />
+<TGConnectingPoint num="14" id="855" />
+<TGConnectingPoint num="15" id="856" />
+<TGConnectingPoint num="16" id="857" />
+<TGConnectingPoint num="17" id="858" />
+<TGConnectingPoint num="18" id="859" />
+<TGConnectingPoint num="19" id="860" />
+<TGConnectingPoint num="20" id="861" />
+<TGConnectingPoint num="21" id="862" />
+<TGConnectingPoint num="22" id="863" />
+<TGConnectingPoint num="23" id="864" />
+<TGConnectingPoint num="24" id="865" />
+<TGConnectingPoint num="25" id="866" />
+<TGConnectingPoint num="26" id="867" />
+<TGConnectingPoint num="27" id="868" />
+<TGConnectingPoint num="28" id="869" />
+<TGConnectingPoint num="29" id="870" />
+<TGConnectingPoint num="30" id="871" />
 <extraparam>
 <type data="2" />
 <textline data="Authenticating changes sent from other cars" />
@@ -1575,43 +1575,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3266" >
+<COMPONENT type="900" id="904" >
 <cdparam x="516" y="67" />
 <sizeparam width="482" height="82" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="379" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="PreventMaliciousModificationsOnTheEnvironmentRepresentation" />
-<TGConnectingPoint num="0" id="3235" />
-<TGConnectingPoint num="1" id="3236" />
-<TGConnectingPoint num="2" id="3237" />
-<TGConnectingPoint num="3" id="3238" />
-<TGConnectingPoint num="4" id="3239" />
-<TGConnectingPoint num="5" id="3240" />
-<TGConnectingPoint num="6" id="3241" />
-<TGConnectingPoint num="7" id="3242" />
-<TGConnectingPoint num="8" id="3243" />
-<TGConnectingPoint num="9" id="3244" />
-<TGConnectingPoint num="10" id="3245" />
-<TGConnectingPoint num="11" id="3246" />
-<TGConnectingPoint num="12" id="3247" />
-<TGConnectingPoint num="13" id="3248" />
-<TGConnectingPoint num="14" id="3249" />
-<TGConnectingPoint num="15" id="3250" />
-<TGConnectingPoint num="16" id="3251" />
-<TGConnectingPoint num="17" id="3252" />
-<TGConnectingPoint num="18" id="3253" />
-<TGConnectingPoint num="19" id="3254" />
-<TGConnectingPoint num="20" id="3255" />
-<TGConnectingPoint num="21" id="3256" />
-<TGConnectingPoint num="22" id="3257" />
-<TGConnectingPoint num="23" id="3258" />
-<TGConnectingPoint num="24" id="3259" />
-<TGConnectingPoint num="25" id="3260" />
-<TGConnectingPoint num="26" id="3261" />
-<TGConnectingPoint num="27" id="3262" />
-<TGConnectingPoint num="28" id="3263" />
-<TGConnectingPoint num="29" id="3264" />
-<TGConnectingPoint num="30" id="3265" />
+<TGConnectingPoint num="0" id="873" />
+<TGConnectingPoint num="1" id="874" />
+<TGConnectingPoint num="2" id="875" />
+<TGConnectingPoint num="3" id="876" />
+<TGConnectingPoint num="4" id="877" />
+<TGConnectingPoint num="5" id="878" />
+<TGConnectingPoint num="6" id="879" />
+<TGConnectingPoint num="7" id="880" />
+<TGConnectingPoint num="8" id="881" />
+<TGConnectingPoint num="9" id="882" />
+<TGConnectingPoint num="10" id="883" />
+<TGConnectingPoint num="11" id="884" />
+<TGConnectingPoint num="12" id="885" />
+<TGConnectingPoint num="13" id="886" />
+<TGConnectingPoint num="14" id="887" />
+<TGConnectingPoint num="15" id="888" />
+<TGConnectingPoint num="16" id="889" />
+<TGConnectingPoint num="17" id="890" />
+<TGConnectingPoint num="18" id="891" />
+<TGConnectingPoint num="19" id="892" />
+<TGConnectingPoint num="20" id="893" />
+<TGConnectingPoint num="21" id="894" />
+<TGConnectingPoint num="22" id="895" />
+<TGConnectingPoint num="23" id="896" />
+<TGConnectingPoint num="24" id="897" />
+<TGConnectingPoint num="25" id="898" />
+<TGConnectingPoint num="26" id="899" />
+<TGConnectingPoint num="27" id="900" />
+<TGConnectingPoint num="28" id="901" />
+<TGConnectingPoint num="29" id="902" />
+<TGConnectingPoint num="30" id="903" />
 <extraparam>
 <type data="2" />
 <textline data="Try to prevent attackerscfrom feeding wrong information to gateways" />
@@ -1625,43 +1625,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3298" >
+<COMPONENT type="900" id="936" >
 <cdparam x="461" y="311" />
 <sizeparam width="321" height="99" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="184" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="EnforceTrustedAuthentication" />
-<TGConnectingPoint num="0" id="3267" />
-<TGConnectingPoint num="1" id="3268" />
-<TGConnectingPoint num="2" id="3269" />
-<TGConnectingPoint num="3" id="3270" />
-<TGConnectingPoint num="4" id="3271" />
-<TGConnectingPoint num="5" id="3272" />
-<TGConnectingPoint num="6" id="3273" />
-<TGConnectingPoint num="7" id="3274" />
-<TGConnectingPoint num="8" id="3275" />
-<TGConnectingPoint num="9" id="3276" />
-<TGConnectingPoint num="10" id="3277" />
-<TGConnectingPoint num="11" id="3278" />
-<TGConnectingPoint num="12" id="3279" />
-<TGConnectingPoint num="13" id="3280" />
-<TGConnectingPoint num="14" id="3281" />
-<TGConnectingPoint num="15" id="3282" />
-<TGConnectingPoint num="16" id="3283" />
-<TGConnectingPoint num="17" id="3284" />
-<TGConnectingPoint num="18" id="3285" />
-<TGConnectingPoint num="19" id="3286" />
-<TGConnectingPoint num="20" id="3287" />
-<TGConnectingPoint num="21" id="3288" />
-<TGConnectingPoint num="22" id="3289" />
-<TGConnectingPoint num="23" id="3290" />
-<TGConnectingPoint num="24" id="3291" />
-<TGConnectingPoint num="25" id="3292" />
-<TGConnectingPoint num="26" id="3293" />
-<TGConnectingPoint num="27" id="3294" />
-<TGConnectingPoint num="28" id="3295" />
-<TGConnectingPoint num="29" id="3296" />
-<TGConnectingPoint num="30" id="3297" />
+<TGConnectingPoint num="0" id="905" />
+<TGConnectingPoint num="1" id="906" />
+<TGConnectingPoint num="2" id="907" />
+<TGConnectingPoint num="3" id="908" />
+<TGConnectingPoint num="4" id="909" />
+<TGConnectingPoint num="5" id="910" />
+<TGConnectingPoint num="6" id="911" />
+<TGConnectingPoint num="7" id="912" />
+<TGConnectingPoint num="8" id="913" />
+<TGConnectingPoint num="9" id="914" />
+<TGConnectingPoint num="10" id="915" />
+<TGConnectingPoint num="11" id="916" />
+<TGConnectingPoint num="12" id="917" />
+<TGConnectingPoint num="13" id="918" />
+<TGConnectingPoint num="14" id="919" />
+<TGConnectingPoint num="15" id="920" />
+<TGConnectingPoint num="16" id="921" />
+<TGConnectingPoint num="17" id="922" />
+<TGConnectingPoint num="18" id="923" />
+<TGConnectingPoint num="19" id="924" />
+<TGConnectingPoint num="20" id="925" />
+<TGConnectingPoint num="21" id="926" />
+<TGConnectingPoint num="22" id="927" />
+<TGConnectingPoint num="23" id="928" />
+<TGConnectingPoint num="24" id="929" />
+<TGConnectingPoint num="25" id="930" />
+<TGConnectingPoint num="26" id="931" />
+<TGConnectingPoint num="27" id="932" />
+<TGConnectingPoint num="28" id="933" />
+<TGConnectingPoint num="29" id="934" />
+<TGConnectingPoint num="30" id="935" />
 <extraparam>
 <type data="0" />
 <textline data="Roots of trust for authentication should not be" />
@@ -1676,43 +1676,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3330" >
+<COMPONENT type="900" id="968" >
 <cdparam x="822" y="330" />
 <sizeparam width="275" height="75" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="240" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Requirement" value="EnforceCorrectAndUpdatedTimeSource" />
-<TGConnectingPoint num="0" id="3299" />
-<TGConnectingPoint num="1" id="3300" />
-<TGConnectingPoint num="2" id="3301" />
-<TGConnectingPoint num="3" id="3302" />
-<TGConnectingPoint num="4" id="3303" />
-<TGConnectingPoint num="5" id="3304" />
-<TGConnectingPoint num="6" id="3305" />
-<TGConnectingPoint num="7" id="3306" />
-<TGConnectingPoint num="8" id="3307" />
-<TGConnectingPoint num="9" id="3308" />
-<TGConnectingPoint num="10" id="3309" />
-<TGConnectingPoint num="11" id="3310" />
-<TGConnectingPoint num="12" id="3311" />
-<TGConnectingPoint num="13" id="3312" />
-<TGConnectingPoint num="14" id="3313" />
-<TGConnectingPoint num="15" id="3314" />
-<TGConnectingPoint num="16" id="3315" />
-<TGConnectingPoint num="17" id="3316" />
-<TGConnectingPoint num="18" id="3317" />
-<TGConnectingPoint num="19" id="3318" />
-<TGConnectingPoint num="20" id="3319" />
-<TGConnectingPoint num="21" id="3320" />
-<TGConnectingPoint num="22" id="3321" />
-<TGConnectingPoint num="23" id="3322" />
-<TGConnectingPoint num="24" id="3323" />
-<TGConnectingPoint num="25" id="3324" />
-<TGConnectingPoint num="26" id="3325" />
-<TGConnectingPoint num="27" id="3326" />
-<TGConnectingPoint num="28" id="3327" />
-<TGConnectingPoint num="29" id="3328" />
-<TGConnectingPoint num="30" id="3329" />
+<TGConnectingPoint num="0" id="937" />
+<TGConnectingPoint num="1" id="938" />
+<TGConnectingPoint num="2" id="939" />
+<TGConnectingPoint num="3" id="940" />
+<TGConnectingPoint num="4" id="941" />
+<TGConnectingPoint num="5" id="942" />
+<TGConnectingPoint num="6" id="943" />
+<TGConnectingPoint num="7" id="944" />
+<TGConnectingPoint num="8" id="945" />
+<TGConnectingPoint num="9" id="946" />
+<TGConnectingPoint num="10" id="947" />
+<TGConnectingPoint num="11" id="948" />
+<TGConnectingPoint num="12" id="949" />
+<TGConnectingPoint num="13" id="950" />
+<TGConnectingPoint num="14" id="951" />
+<TGConnectingPoint num="15" id="952" />
+<TGConnectingPoint num="16" id="953" />
+<TGConnectingPoint num="17" id="954" />
+<TGConnectingPoint num="18" id="955" />
+<TGConnectingPoint num="19" id="956" />
+<TGConnectingPoint num="20" id="957" />
+<TGConnectingPoint num="21" id="958" />
+<TGConnectingPoint num="22" id="959" />
+<TGConnectingPoint num="23" id="960" />
+<TGConnectingPoint num="24" id="961" />
+<TGConnectingPoint num="25" id="962" />
+<TGConnectingPoint num="26" id="963" />
+<TGConnectingPoint num="27" id="964" />
+<TGConnectingPoint num="28" id="965" />
+<TGConnectingPoint num="29" id="966" />
+<TGConnectingPoint num="30" id="967" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -1727,36 +1727,36 @@
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="129" id="3331" >
+<CONNECTOR type="129" id="969" >
 <cdparam x="567" y="211" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="620" y="184" id="3210" />
-<P2  x="636" y="149" id="3244" />
+<P1  x="620" y="184" id="848" />
+<P2  x="636" y="149" id="882" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="119" id="3332" >
+<CONNECTOR type="119" id="970" >
 <cdparam x="1421" y="528" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<P1  x="959" y="330" id="3306" />
-<P2  x="958" y="291" id="3181" />
+<P1  x="959" y="330" id="944" />
+<P2  x="958" y="291" id="819" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="119" id="3333" >
+<CONNECTOR type="119" id="971" >
 <cdparam x="571" y="425" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<P1  x="621" y="311" id="3274" />
-<P2  x="620" y="280" id="3213" />
+<P1  x="621" y="311" id="912" />
+<P2  x="620" y="280" id="851" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="3334" >
+<CONNECTOR type="129" id="972" >
 <cdparam x="1192" y="279" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="958" y="171" id="3178" />
-<P2  x="877" y="149" id="3246" />
+<P1  x="958" y="171" id="816" />
+<P2  x="877" y="149" id="884" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
@@ -1769,70 +1769,70 @@
 
 <Modeling type="Requirement" nameTab="Reqs of Local Danger Warning" >
 <TRequirementDiagramPanel name="Requirement diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<COMPONENT type="901" id="3612" >
+<COMPONENT type="901" id="988" >
 <cdparam x="523" y="741" />
 <sizeparam width="200" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="120" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="RequirementObserver" value="DisplayAvailability" />
-<TGConnectingPoint num="0" id="3597" />
-<TGConnectingPoint num="1" id="3598" />
-<TGConnectingPoint num="2" id="3599" />
-<TGConnectingPoint num="3" id="3600" />
-<TGConnectingPoint num="4" id="3601" />
-<TGConnectingPoint num="5" id="3602" />
-<TGConnectingPoint num="6" id="3603" />
-<TGConnectingPoint num="7" id="3604" />
-<TGConnectingPoint num="8" id="3605" />
-<TGConnectingPoint num="9" id="3606" />
-<TGConnectingPoint num="10" id="3607" />
-<TGConnectingPoint num="11" id="3608" />
-<TGConnectingPoint num="12" id="3609" />
-<TGConnectingPoint num="13" id="3610" />
-<TGConnectingPoint num="14" id="3611" />
+<TGConnectingPoint num="0" id="973" />
+<TGConnectingPoint num="1" id="974" />
+<TGConnectingPoint num="2" id="975" />
+<TGConnectingPoint num="3" id="976" />
+<TGConnectingPoint num="4" id="977" />
+<TGConnectingPoint num="5" id="978" />
+<TGConnectingPoint num="6" id="979" />
+<TGConnectingPoint num="7" id="980" />
+<TGConnectingPoint num="8" id="981" />
+<TGConnectingPoint num="9" id="982" />
+<TGConnectingPoint num="10" id="983" />
+<TGConnectingPoint num="11" id="984" />
+<TGConnectingPoint num="12" id="985" />
+<TGConnectingPoint num="13" id="986" />
+<TGConnectingPoint num="14" id="987" />
 <extraparam>
 <diagramText data="" />
 <violated data="noAction" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3644" >
+<COMPONENT type="900" id="1020" >
 <cdparam x="502" y="540" />
 <sizeparam width="200" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="164" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Requirement" value="EnsureAvailabilityOfECUs" />
-<TGConnectingPoint num="0" id="3613" />
-<TGConnectingPoint num="1" id="3614" />
-<TGConnectingPoint num="2" id="3615" />
-<TGConnectingPoint num="3" id="3616" />
-<TGConnectingPoint num="4" id="3617" />
-<TGConnectingPoint num="5" id="3618" />
-<TGConnectingPoint num="6" id="3619" />
-<TGConnectingPoint num="7" id="3620" />
-<TGConnectingPoint num="8" id="3621" />
-<TGConnectingPoint num="9" id="3622" />
-<TGConnectingPoint num="10" id="3623" />
-<TGConnectingPoint num="11" id="3624" />
-<TGConnectingPoint num="12" id="3625" />
-<TGConnectingPoint num="13" id="3626" />
-<TGConnectingPoint num="14" id="3627" />
-<TGConnectingPoint num="15" id="3628" />
-<TGConnectingPoint num="16" id="3629" />
-<TGConnectingPoint num="17" id="3630" />
-<TGConnectingPoint num="18" id="3631" />
-<TGConnectingPoint num="19" id="3632" />
-<TGConnectingPoint num="20" id="3633" />
-<TGConnectingPoint num="21" id="3634" />
-<TGConnectingPoint num="22" id="3635" />
-<TGConnectingPoint num="23" id="3636" />
-<TGConnectingPoint num="24" id="3637" />
-<TGConnectingPoint num="25" id="3638" />
-<TGConnectingPoint num="26" id="3639" />
-<TGConnectingPoint num="27" id="3640" />
-<TGConnectingPoint num="28" id="3641" />
-<TGConnectingPoint num="29" id="3642" />
-<TGConnectingPoint num="30" id="3643" />
+<TGConnectingPoint num="0" id="989" />
+<TGConnectingPoint num="1" id="990" />
+<TGConnectingPoint num="2" id="991" />
+<TGConnectingPoint num="3" id="992" />
+<TGConnectingPoint num="4" id="993" />
+<TGConnectingPoint num="5" id="994" />
+<TGConnectingPoint num="6" id="995" />
+<TGConnectingPoint num="7" id="996" />
+<TGConnectingPoint num="8" id="997" />
+<TGConnectingPoint num="9" id="998" />
+<TGConnectingPoint num="10" id="999" />
+<TGConnectingPoint num="11" id="1000" />
+<TGConnectingPoint num="12" id="1001" />
+<TGConnectingPoint num="13" id="1002" />
+<TGConnectingPoint num="14" id="1003" />
+<TGConnectingPoint num="15" id="1004" />
+<TGConnectingPoint num="16" id="1005" />
+<TGConnectingPoint num="17" id="1006" />
+<TGConnectingPoint num="18" id="1007" />
+<TGConnectingPoint num="19" id="1008" />
+<TGConnectingPoint num="20" id="1009" />
+<TGConnectingPoint num="21" id="1010" />
+<TGConnectingPoint num="22" id="1011" />
+<TGConnectingPoint num="23" id="1012" />
+<TGConnectingPoint num="24" id="1013" />
+<TGConnectingPoint num="25" id="1014" />
+<TGConnectingPoint num="26" id="1015" />
+<TGConnectingPoint num="27" id="1016" />
+<TGConnectingPoint num="28" id="1017" />
+<TGConnectingPoint num="29" id="1018" />
+<TGConnectingPoint num="30" id="1019" />
 <extraparam>
 <type data="0" />
 <textline data="Requirement description:" />
@@ -1847,97 +1847,97 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="901" id="3660" >
+<COMPONENT type="901" id="1036" >
 <cdparam x="112" y="312" />
 <sizeparam width="443" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="391" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="RequirementObserver" value="PreventSendingFakeCooperativeAwarenessMessageToDSRCRxTx" />
-<TGConnectingPoint num="0" id="3645" />
-<TGConnectingPoint num="1" id="3646" />
-<TGConnectingPoint num="2" id="3647" />
-<TGConnectingPoint num="3" id="3648" />
-<TGConnectingPoint num="4" id="3649" />
-<TGConnectingPoint num="5" id="3650" />
-<TGConnectingPoint num="6" id="3651" />
-<TGConnectingPoint num="7" id="3652" />
-<TGConnectingPoint num="8" id="3653" />
-<TGConnectingPoint num="9" id="3654" />
-<TGConnectingPoint num="10" id="3655" />
-<TGConnectingPoint num="11" id="3656" />
-<TGConnectingPoint num="12" id="3657" />
-<TGConnectingPoint num="13" id="3658" />
-<TGConnectingPoint num="14" id="3659" />
+<TGConnectingPoint num="0" id="1021" />
+<TGConnectingPoint num="1" id="1022" />
+<TGConnectingPoint num="2" id="1023" />
+<TGConnectingPoint num="3" id="1024" />
+<TGConnectingPoint num="4" id="1025" />
+<TGConnectingPoint num="5" id="1026" />
+<TGConnectingPoint num="6" id="1027" />
+<TGConnectingPoint num="7" id="1028" />
+<TGConnectingPoint num="8" id="1029" />
+<TGConnectingPoint num="9" id="1030" />
+<TGConnectingPoint num="10" id="1031" />
+<TGConnectingPoint num="11" id="1032" />
+<TGConnectingPoint num="12" id="1033" />
+<TGConnectingPoint num="13" id="1034" />
+<TGConnectingPoint num="14" id="1035" />
 <extraparam>
 <diagramText data="no diagram" />
 <violated data="noAction" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="901" id="3676" >
+<COMPONENT type="901" id="1052" >
 <cdparam x="663" y="316" />
 <sizeparam width="554" height="120" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="408" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="RequirementObserver" value="PreventSendFakeLocalDangerWarningCommandToBEM_Instruments" />
-<TGConnectingPoint num="0" id="3661" />
-<TGConnectingPoint num="1" id="3662" />
-<TGConnectingPoint num="2" id="3663" />
-<TGConnectingPoint num="3" id="3664" />
-<TGConnectingPoint num="4" id="3665" />
-<TGConnectingPoint num="5" id="3666" />
-<TGConnectingPoint num="6" id="3667" />
-<TGConnectingPoint num="7" id="3668" />
-<TGConnectingPoint num="8" id="3669" />
-<TGConnectingPoint num="9" id="3670" />
-<TGConnectingPoint num="10" id="3671" />
-<TGConnectingPoint num="11" id="3672" />
-<TGConnectingPoint num="12" id="3673" />
-<TGConnectingPoint num="13" id="3674" />
-<TGConnectingPoint num="14" id="3675" />
+<TGConnectingPoint num="0" id="1037" />
+<TGConnectingPoint num="1" id="1038" />
+<TGConnectingPoint num="2" id="1039" />
+<TGConnectingPoint num="3" id="1040" />
+<TGConnectingPoint num="4" id="1041" />
+<TGConnectingPoint num="5" id="1042" />
+<TGConnectingPoint num="6" id="1043" />
+<TGConnectingPoint num="7" id="1044" />
+<TGConnectingPoint num="8" id="1045" />
+<TGConnectingPoint num="9" id="1046" />
+<TGConnectingPoint num="10" id="1047" />
+<TGConnectingPoint num="11" id="1048" />
+<TGConnectingPoint num="12" id="1049" />
+<TGConnectingPoint num="13" id="1050" />
+<TGConnectingPoint num="14" id="1051" />
 <extraparam>
 <diagramText data="i.e. prevent sending of doDisplay command to BEM_Instruments" />
 <violated data="noAction" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3708" >
+<COMPONENT type="900" id="1084" >
 <cdparam x="591" y="75" />
 <sizeparam width="282" height="138" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="196" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Requirement" value="PreventSendingFakeCommand" />
-<TGConnectingPoint num="0" id="3677" />
-<TGConnectingPoint num="1" id="3678" />
-<TGConnectingPoint num="2" id="3679" />
-<TGConnectingPoint num="3" id="3680" />
-<TGConnectingPoint num="4" id="3681" />
-<TGConnectingPoint num="5" id="3682" />
-<TGConnectingPoint num="6" id="3683" />
-<TGConnectingPoint num="7" id="3684" />
-<TGConnectingPoint num="8" id="3685" />
-<TGConnectingPoint num="9" id="3686" />
-<TGConnectingPoint num="10" id="3687" />
-<TGConnectingPoint num="11" id="3688" />
-<TGConnectingPoint num="12" id="3689" />
-<TGConnectingPoint num="13" id="3690" />
-<TGConnectingPoint num="14" id="3691" />
-<TGConnectingPoint num="15" id="3692" />
-<TGConnectingPoint num="16" id="3693" />
-<TGConnectingPoint num="17" id="3694" />
-<TGConnectingPoint num="18" id="3695" />
-<TGConnectingPoint num="19" id="3696" />
-<TGConnectingPoint num="20" id="3697" />
-<TGConnectingPoint num="21" id="3698" />
-<TGConnectingPoint num="22" id="3699" />
-<TGConnectingPoint num="23" id="3700" />
-<TGConnectingPoint num="24" id="3701" />
-<TGConnectingPoint num="25" id="3702" />
-<TGConnectingPoint num="26" id="3703" />
-<TGConnectingPoint num="27" id="3704" />
-<TGConnectingPoint num="28" id="3705" />
-<TGConnectingPoint num="29" id="3706" />
-<TGConnectingPoint num="30" id="3707" />
+<TGConnectingPoint num="0" id="1053" />
+<TGConnectingPoint num="1" id="1054" />
+<TGConnectingPoint num="2" id="1055" />
+<TGConnectingPoint num="3" id="1056" />
+<TGConnectingPoint num="4" id="1057" />
+<TGConnectingPoint num="5" id="1058" />
+<TGConnectingPoint num="6" id="1059" />
+<TGConnectingPoint num="7" id="1060" />
+<TGConnectingPoint num="8" id="1061" />
+<TGConnectingPoint num="9" id="1062" />
+<TGConnectingPoint num="10" id="1063" />
+<TGConnectingPoint num="11" id="1064" />
+<TGConnectingPoint num="12" id="1065" />
+<TGConnectingPoint num="13" id="1066" />
+<TGConnectingPoint num="14" id="1067" />
+<TGConnectingPoint num="15" id="1068" />
+<TGConnectingPoint num="16" id="1069" />
+<TGConnectingPoint num="17" id="1070" />
+<TGConnectingPoint num="18" id="1071" />
+<TGConnectingPoint num="19" id="1072" />
+<TGConnectingPoint num="20" id="1073" />
+<TGConnectingPoint num="21" id="1074" />
+<TGConnectingPoint num="22" id="1075" />
+<TGConnectingPoint num="23" id="1076" />
+<TGConnectingPoint num="24" id="1077" />
+<TGConnectingPoint num="25" id="1078" />
+<TGConnectingPoint num="26" id="1079" />
+<TGConnectingPoint num="27" id="1080" />
+<TGConnectingPoint num="28" id="1081" />
+<TGConnectingPoint num="29" id="1082" />
+<TGConnectingPoint num="30" id="1083" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -1952,28 +1952,28 @@
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="120" id="3709" >
+<CONNECTOR type="120" id="1085" >
 <cdparam x="620" y="759" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from RequirementObserver to Requirement" value="&lt;&lt;verify&gt;&gt;" />
-<P1  x="623" y="741" id="3604" />
-<P2  x="602" y="660" id="3635" />
+<P1  x="623" y="741" id="980" />
+<P2  x="602" y="660" id="1011" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="120" id="3710" >
+<CONNECTOR type="120" id="1086" >
 <cdparam x="333" y="312" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from RequirementObserver to Requirement" value="&lt;&lt;verify&gt;&gt;" />
-<P1  x="333" y="312" id="3652" />
-<P2  x="591" y="178" id="3691" />
+<P1  x="333" y="312" id="1028" />
+<P2  x="591" y="178" id="1067" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="120" id="3711" >
+<CONNECTOR type="120" id="1087" >
 <cdparam x="755" y="258" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from RequirementObserver to Requirement" value="&lt;&lt;verify&gt;&gt;" />
-<P1  x="940" y="316" id="3668" />
-<P2  x="732" y="213" id="3699" />
+<P1  x="940" y="316" id="1044" />
+<P2  x="732" y="213" id="1075" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
@@ -1986,43 +1986,43 @@
 
 <Modeling type="Requirement" nameTab="Reqs of Flashing per OBD Use Case" >
 <TRequirementDiagramPanel name="Requirement diagram" minX="10" maxX="1900" minY="10" maxY="1900" zoom="1.0000000000000007" >
-<COMPONENT type="900" id="3366" >
+<COMPONENT type="900" id="1119" >
 <cdparam x="702" y="236" />
 <sizeparam width="262" height="85" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="224" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
 <infoparam name="Requirement" value="ControlledAccessToReadFromFlash" />
-<TGConnectingPoint num="0" id="3335" />
-<TGConnectingPoint num="1" id="3336" />
-<TGConnectingPoint num="2" id="3337" />
-<TGConnectingPoint num="3" id="3338" />
-<TGConnectingPoint num="4" id="3339" />
-<TGConnectingPoint num="5" id="3340" />
-<TGConnectingPoint num="6" id="3341" />
-<TGConnectingPoint num="7" id="3342" />
-<TGConnectingPoint num="8" id="3343" />
-<TGConnectingPoint num="9" id="3344" />
-<TGConnectingPoint num="10" id="3345" />
-<TGConnectingPoint num="11" id="3346" />
-<TGConnectingPoint num="12" id="3347" />
-<TGConnectingPoint num="13" id="3348" />
-<TGConnectingPoint num="14" id="3349" />
-<TGConnectingPoint num="15" id="3350" />
-<TGConnectingPoint num="16" id="3351" />
-<TGConnectingPoint num="17" id="3352" />
-<TGConnectingPoint num="18" id="3353" />
-<TGConnectingPoint num="19" id="3354" />
-<TGConnectingPoint num="20" id="3355" />
-<TGConnectingPoint num="21" id="3356" />
-<TGConnectingPoint num="22" id="3357" />
-<TGConnectingPoint num="23" id="3358" />
-<TGConnectingPoint num="24" id="3359" />
-<TGConnectingPoint num="25" id="3360" />
-<TGConnectingPoint num="26" id="3361" />
-<TGConnectingPoint num="27" id="3362" />
-<TGConnectingPoint num="28" id="3363" />
-<TGConnectingPoint num="29" id="3364" />
-<TGConnectingPoint num="30" id="3365" />
+<TGConnectingPoint num="0" id="1088" />
+<TGConnectingPoint num="1" id="1089" />
+<TGConnectingPoint num="2" id="1090" />
+<TGConnectingPoint num="3" id="1091" />
+<TGConnectingPoint num="4" id="1092" />
+<TGConnectingPoint num="5" id="1093" />
+<TGConnectingPoint num="6" id="1094" />
+<TGConnectingPoint num="7" id="1095" />
+<TGConnectingPoint num="8" id="1096" />
+<TGConnectingPoint num="9" id="1097" />
+<TGConnectingPoint num="10" id="1098" />
+<TGConnectingPoint num="11" id="1099" />
+<TGConnectingPoint num="12" id="1100" />
+<TGConnectingPoint num="13" id="1101" />
+<TGConnectingPoint num="14" id="1102" />
+<TGConnectingPoint num="15" id="1103" />
+<TGConnectingPoint num="16" id="1104" />
+<TGConnectingPoint num="17" id="1105" />
+<TGConnectingPoint num="18" id="1106" />
+<TGConnectingPoint num="19" id="1107" />
+<TGConnectingPoint num="20" id="1108" />
+<TGConnectingPoint num="21" id="1109" />
+<TGConnectingPoint num="22" id="1110" />
+<TGConnectingPoint num="23" id="1111" />
+<TGConnectingPoint num="24" id="1112" />
+<TGConnectingPoint num="25" id="1113" />
+<TGConnectingPoint num="26" id="1114" />
+<TGConnectingPoint num="27" id="1115" />
+<TGConnectingPoint num="28" id="1116" />
+<TGConnectingPoint num="29" id="1117" />
+<TGConnectingPoint num="30" id="1118" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -2037,43 +2037,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3398" >
+<COMPONENT type="900" id="1151" >
 <cdparam x="975" y="117" />
 <sizeparam width="243" height="87" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="215" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
 <infoparam name="Requirement" value="FirmwareAuthenticatedByCarMaker" />
-<TGConnectingPoint num="0" id="3367" />
-<TGConnectingPoint num="1" id="3368" />
-<TGConnectingPoint num="2" id="3369" />
-<TGConnectingPoint num="3" id="3370" />
-<TGConnectingPoint num="4" id="3371" />
-<TGConnectingPoint num="5" id="3372" />
-<TGConnectingPoint num="6" id="3373" />
-<TGConnectingPoint num="7" id="3374" />
-<TGConnectingPoint num="8" id="3375" />
-<TGConnectingPoint num="9" id="3376" />
-<TGConnectingPoint num="10" id="3377" />
-<TGConnectingPoint num="11" id="3378" />
-<TGConnectingPoint num="12" id="3379" />
-<TGConnectingPoint num="13" id="3380" />
-<TGConnectingPoint num="14" id="3381" />
-<TGConnectingPoint num="15" id="3382" />
-<TGConnectingPoint num="16" id="3383" />
-<TGConnectingPoint num="17" id="3384" />
-<TGConnectingPoint num="18" id="3385" />
-<TGConnectingPoint num="19" id="3386" />
-<TGConnectingPoint num="20" id="3387" />
-<TGConnectingPoint num="21" id="3388" />
-<TGConnectingPoint num="22" id="3389" />
-<TGConnectingPoint num="23" id="3390" />
-<TGConnectingPoint num="24" id="3391" />
-<TGConnectingPoint num="25" id="3392" />
-<TGConnectingPoint num="26" id="3393" />
-<TGConnectingPoint num="27" id="3394" />
-<TGConnectingPoint num="28" id="3395" />
-<TGConnectingPoint num="29" id="3396" />
-<TGConnectingPoint num="30" id="3397" />
+<TGConnectingPoint num="0" id="1120" />
+<TGConnectingPoint num="1" id="1121" />
+<TGConnectingPoint num="2" id="1122" />
+<TGConnectingPoint num="3" id="1123" />
+<TGConnectingPoint num="4" id="1124" />
+<TGConnectingPoint num="5" id="1125" />
+<TGConnectingPoint num="6" id="1126" />
+<TGConnectingPoint num="7" id="1127" />
+<TGConnectingPoint num="8" id="1128" />
+<TGConnectingPoint num="9" id="1129" />
+<TGConnectingPoint num="10" id="1130" />
+<TGConnectingPoint num="11" id="1131" />
+<TGConnectingPoint num="12" id="1132" />
+<TGConnectingPoint num="13" id="1133" />
+<TGConnectingPoint num="14" id="1134" />
+<TGConnectingPoint num="15" id="1135" />
+<TGConnectingPoint num="16" id="1136" />
+<TGConnectingPoint num="17" id="1137" />
+<TGConnectingPoint num="18" id="1138" />
+<TGConnectingPoint num="19" id="1139" />
+<TGConnectingPoint num="20" id="1140" />
+<TGConnectingPoint num="21" id="1141" />
+<TGConnectingPoint num="22" id="1142" />
+<TGConnectingPoint num="23" id="1143" />
+<TGConnectingPoint num="24" id="1144" />
+<TGConnectingPoint num="25" id="1145" />
+<TGConnectingPoint num="26" id="1146" />
+<TGConnectingPoint num="27" id="1147" />
+<TGConnectingPoint num="28" id="1148" />
+<TGConnectingPoint num="29" id="1149" />
+<TGConnectingPoint num="30" id="1150" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -2088,43 +2088,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3430" >
+<COMPONENT type="900" id="1183" >
 <cdparam x="442" y="61" />
 <sizeparam width="417" height="113" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="208" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
 <infoparam name="Requirement" value="ControlledAccessToFlashMemory" />
-<TGConnectingPoint num="0" id="3399" />
-<TGConnectingPoint num="1" id="3400" />
-<TGConnectingPoint num="2" id="3401" />
-<TGConnectingPoint num="3" id="3402" />
-<TGConnectingPoint num="4" id="3403" />
-<TGConnectingPoint num="5" id="3404" />
-<TGConnectingPoint num="6" id="3405" />
-<TGConnectingPoint num="7" id="3406" />
-<TGConnectingPoint num="8" id="3407" />
-<TGConnectingPoint num="9" id="3408" />
-<TGConnectingPoint num="10" id="3409" />
-<TGConnectingPoint num="11" id="3410" />
-<TGConnectingPoint num="12" id="3411" />
-<TGConnectingPoint num="13" id="3412" />
-<TGConnectingPoint num="14" id="3413" />
-<TGConnectingPoint num="15" id="3414" />
-<TGConnectingPoint num="16" id="3415" />
-<TGConnectingPoint num="17" id="3416" />
-<TGConnectingPoint num="18" id="3417" />
-<TGConnectingPoint num="19" id="3418" />
-<TGConnectingPoint num="20" id="3419" />
-<TGConnectingPoint num="21" id="3420" />
-<TGConnectingPoint num="22" id="3421" />
-<TGConnectingPoint num="23" id="3422" />
-<TGConnectingPoint num="24" id="3423" />
-<TGConnectingPoint num="25" id="3424" />
-<TGConnectingPoint num="26" id="3425" />
-<TGConnectingPoint num="27" id="3426" />
-<TGConnectingPoint num="28" id="3427" />
-<TGConnectingPoint num="29" id="3428" />
-<TGConnectingPoint num="30" id="3429" />
+<TGConnectingPoint num="0" id="1152" />
+<TGConnectingPoint num="1" id="1153" />
+<TGConnectingPoint num="2" id="1154" />
+<TGConnectingPoint num="3" id="1155" />
+<TGConnectingPoint num="4" id="1156" />
+<TGConnectingPoint num="5" id="1157" />
+<TGConnectingPoint num="6" id="1158" />
+<TGConnectingPoint num="7" id="1159" />
+<TGConnectingPoint num="8" id="1160" />
+<TGConnectingPoint num="9" id="1161" />
+<TGConnectingPoint num="10" id="1162" />
+<TGConnectingPoint num="11" id="1163" />
+<TGConnectingPoint num="12" id="1164" />
+<TGConnectingPoint num="13" id="1165" />
+<TGConnectingPoint num="14" id="1166" />
+<TGConnectingPoint num="15" id="1167" />
+<TGConnectingPoint num="16" id="1168" />
+<TGConnectingPoint num="17" id="1169" />
+<TGConnectingPoint num="18" id="1170" />
+<TGConnectingPoint num="19" id="1171" />
+<TGConnectingPoint num="20" id="1172" />
+<TGConnectingPoint num="21" id="1173" />
+<TGConnectingPoint num="22" id="1174" />
+<TGConnectingPoint num="23" id="1175" />
+<TGConnectingPoint num="24" id="1176" />
+<TGConnectingPoint num="25" id="1177" />
+<TGConnectingPoint num="26" id="1178" />
+<TGConnectingPoint num="27" id="1179" />
+<TGConnectingPoint num="28" id="1180" />
+<TGConnectingPoint num="29" id="1181" />
+<TGConnectingPoint num="30" id="1182" />
 <extraparam>
 <type data="2" />
 <textline data="Flash memory should be paired with their ECU" />
@@ -2139,43 +2139,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3462" >
+<COMPONENT type="900" id="1215" >
 <cdparam x="389" y="237" />
 <sizeparam width="267" height="85" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="229" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
 <infoparam name="Requirement" value="ControlledAccessToFlashingFunction" />
-<TGConnectingPoint num="0" id="3431" />
-<TGConnectingPoint num="1" id="3432" />
-<TGConnectingPoint num="2" id="3433" />
-<TGConnectingPoint num="3" id="3434" />
-<TGConnectingPoint num="4" id="3435" />
-<TGConnectingPoint num="5" id="3436" />
-<TGConnectingPoint num="6" id="3437" />
-<TGConnectingPoint num="7" id="3438" />
-<TGConnectingPoint num="8" id="3439" />
-<TGConnectingPoint num="9" id="3440" />
-<TGConnectingPoint num="10" id="3441" />
-<TGConnectingPoint num="11" id="3442" />
-<TGConnectingPoint num="12" id="3443" />
-<TGConnectingPoint num="13" id="3444" />
-<TGConnectingPoint num="14" id="3445" />
-<TGConnectingPoint num="15" id="3446" />
-<TGConnectingPoint num="16" id="3447" />
-<TGConnectingPoint num="17" id="3448" />
-<TGConnectingPoint num="18" id="3449" />
-<TGConnectingPoint num="19" id="3450" />
-<TGConnectingPoint num="20" id="3451" />
-<TGConnectingPoint num="21" id="3452" />
-<TGConnectingPoint num="22" id="3453" />
-<TGConnectingPoint num="23" id="3454" />
-<TGConnectingPoint num="24" id="3455" />
-<TGConnectingPoint num="25" id="3456" />
-<TGConnectingPoint num="26" id="3457" />
-<TGConnectingPoint num="27" id="3458" />
-<TGConnectingPoint num="28" id="3459" />
-<TGConnectingPoint num="29" id="3460" />
-<TGConnectingPoint num="30" id="3461" />
+<TGConnectingPoint num="0" id="1184" />
+<TGConnectingPoint num="1" id="1185" />
+<TGConnectingPoint num="2" id="1186" />
+<TGConnectingPoint num="3" id="1187" />
+<TGConnectingPoint num="4" id="1188" />
+<TGConnectingPoint num="5" id="1189" />
+<TGConnectingPoint num="6" id="1190" />
+<TGConnectingPoint num="7" id="1191" />
+<TGConnectingPoint num="8" id="1192" />
+<TGConnectingPoint num="9" id="1193" />
+<TGConnectingPoint num="10" id="1194" />
+<TGConnectingPoint num="11" id="1195" />
+<TGConnectingPoint num="12" id="1196" />
+<TGConnectingPoint num="13" id="1197" />
+<TGConnectingPoint num="14" id="1198" />
+<TGConnectingPoint num="15" id="1199" />
+<TGConnectingPoint num="16" id="1200" />
+<TGConnectingPoint num="17" id="1201" />
+<TGConnectingPoint num="18" id="1202" />
+<TGConnectingPoint num="19" id="1203" />
+<TGConnectingPoint num="20" id="1204" />
+<TGConnectingPoint num="21" id="1205" />
+<TGConnectingPoint num="22" id="1206" />
+<TGConnectingPoint num="23" id="1207" />
+<TGConnectingPoint num="24" id="1208" />
+<TGConnectingPoint num="25" id="1209" />
+<TGConnectingPoint num="26" id="1210" />
+<TGConnectingPoint num="27" id="1211" />
+<TGConnectingPoint num="28" id="1212" />
+<TGConnectingPoint num="29" id="1213" />
+<TGConnectingPoint num="30" id="1214" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -2190,43 +2190,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3494" >
+<COMPONENT type="900" id="1247" >
 <cdparam x="1096" y="232" />
 <sizeparam width="216" height="83" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="190" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
 <infoparam name="Requirement" value="ConfidentialityOfFirmwareData" />
-<TGConnectingPoint num="0" id="3463" />
-<TGConnectingPoint num="1" id="3464" />
-<TGConnectingPoint num="2" id="3465" />
-<TGConnectingPoint num="3" id="3466" />
-<TGConnectingPoint num="4" id="3467" />
-<TGConnectingPoint num="5" id="3468" />
-<TGConnectingPoint num="6" id="3469" />
-<TGConnectingPoint num="7" id="3470" />
-<TGConnectingPoint num="8" id="3471" />
-<TGConnectingPoint num="9" id="3472" />
-<TGConnectingPoint num="10" id="3473" />
-<TGConnectingPoint num="11" id="3474" />
-<TGConnectingPoint num="12" id="3475" />
-<TGConnectingPoint num="13" id="3476" />
-<TGConnectingPoint num="14" id="3477" />
-<TGConnectingPoint num="15" id="3478" />
-<TGConnectingPoint num="16" id="3479" />
-<TGConnectingPoint num="17" id="3480" />
-<TGConnectingPoint num="18" id="3481" />
-<TGConnectingPoint num="19" id="3482" />
-<TGConnectingPoint num="20" id="3483" />
-<TGConnectingPoint num="21" id="3484" />
-<TGConnectingPoint num="22" id="3485" />
-<TGConnectingPoint num="23" id="3486" />
-<TGConnectingPoint num="24" id="3487" />
-<TGConnectingPoint num="25" id="3488" />
-<TGConnectingPoint num="26" id="3489" />
-<TGConnectingPoint num="27" id="3490" />
-<TGConnectingPoint num="28" id="3491" />
-<TGConnectingPoint num="29" id="3492" />
-<TGConnectingPoint num="30" id="3493" />
+<TGConnectingPoint num="0" id="1216" />
+<TGConnectingPoint num="1" id="1217" />
+<TGConnectingPoint num="2" id="1218" />
+<TGConnectingPoint num="3" id="1219" />
+<TGConnectingPoint num="4" id="1220" />
+<TGConnectingPoint num="5" id="1221" />
+<TGConnectingPoint num="6" id="1222" />
+<TGConnectingPoint num="7" id="1223" />
+<TGConnectingPoint num="8" id="1224" />
+<TGConnectingPoint num="9" id="1225" />
+<TGConnectingPoint num="10" id="1226" />
+<TGConnectingPoint num="11" id="1227" />
+<TGConnectingPoint num="12" id="1228" />
+<TGConnectingPoint num="13" id="1229" />
+<TGConnectingPoint num="14" id="1230" />
+<TGConnectingPoint num="15" id="1231" />
+<TGConnectingPoint num="16" id="1232" />
+<TGConnectingPoint num="17" id="1233" />
+<TGConnectingPoint num="18" id="1234" />
+<TGConnectingPoint num="19" id="1235" />
+<TGConnectingPoint num="20" id="1236" />
+<TGConnectingPoint num="21" id="1237" />
+<TGConnectingPoint num="22" id="1238" />
+<TGConnectingPoint num="23" id="1239" />
+<TGConnectingPoint num="24" id="1240" />
+<TGConnectingPoint num="25" id="1241" />
+<TGConnectingPoint num="26" id="1242" />
+<TGConnectingPoint num="27" id="1243" />
+<TGConnectingPoint num="28" id="1244" />
+<TGConnectingPoint num="29" id="1245" />
+<TGConnectingPoint num="30" id="1246" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -2241,43 +2241,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3526" >
+<COMPONENT type="900" id="1279" >
 <cdparam x="1069" y="358" />
 <sizeparam width="223" height="86" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="204" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
 <infoparam name="Requirement" value="ConfidentialityOfFirmwareUpdate" />
-<TGConnectingPoint num="0" id="3495" />
-<TGConnectingPoint num="1" id="3496" />
-<TGConnectingPoint num="2" id="3497" />
-<TGConnectingPoint num="3" id="3498" />
-<TGConnectingPoint num="4" id="3499" />
-<TGConnectingPoint num="5" id="3500" />
-<TGConnectingPoint num="6" id="3501" />
-<TGConnectingPoint num="7" id="3502" />
-<TGConnectingPoint num="8" id="3503" />
-<TGConnectingPoint num="9" id="3504" />
-<TGConnectingPoint num="10" id="3505" />
-<TGConnectingPoint num="11" id="3506" />
-<TGConnectingPoint num="12" id="3507" />
-<TGConnectingPoint num="13" id="3508" />
-<TGConnectingPoint num="14" id="3509" />
-<TGConnectingPoint num="15" id="3510" />
-<TGConnectingPoint num="16" id="3511" />
-<TGConnectingPoint num="17" id="3512" />
-<TGConnectingPoint num="18" id="3513" />
-<TGConnectingPoint num="19" id="3514" />
-<TGConnectingPoint num="20" id="3515" />
-<TGConnectingPoint num="21" id="3516" />
-<TGConnectingPoint num="22" id="3517" />
-<TGConnectingPoint num="23" id="3518" />
-<TGConnectingPoint num="24" id="3519" />
-<TGConnectingPoint num="25" id="3520" />
-<TGConnectingPoint num="26" id="3521" />
-<TGConnectingPoint num="27" id="3522" />
-<TGConnectingPoint num="28" id="3523" />
-<TGConnectingPoint num="29" id="3524" />
-<TGConnectingPoint num="30" id="3525" />
+<TGConnectingPoint num="0" id="1248" />
+<TGConnectingPoint num="1" id="1249" />
+<TGConnectingPoint num="2" id="1250" />
+<TGConnectingPoint num="3" id="1251" />
+<TGConnectingPoint num="4" id="1252" />
+<TGConnectingPoint num="5" id="1253" />
+<TGConnectingPoint num="6" id="1254" />
+<TGConnectingPoint num="7" id="1255" />
+<TGConnectingPoint num="8" id="1256" />
+<TGConnectingPoint num="9" id="1257" />
+<TGConnectingPoint num="10" id="1258" />
+<TGConnectingPoint num="11" id="1259" />
+<TGConnectingPoint num="12" id="1260" />
+<TGConnectingPoint num="13" id="1261" />
+<TGConnectingPoint num="14" id="1262" />
+<TGConnectingPoint num="15" id="1263" />
+<TGConnectingPoint num="16" id="1264" />
+<TGConnectingPoint num="17" id="1265" />
+<TGConnectingPoint num="18" id="1266" />
+<TGConnectingPoint num="19" id="1267" />
+<TGConnectingPoint num="20" id="1268" />
+<TGConnectingPoint num="21" id="1269" />
+<TGConnectingPoint num="22" id="1270" />
+<TGConnectingPoint num="23" id="1271" />
+<TGConnectingPoint num="24" id="1272" />
+<TGConnectingPoint num="25" id="1273" />
+<TGConnectingPoint num="26" id="1274" />
+<TGConnectingPoint num="27" id="1275" />
+<TGConnectingPoint num="28" id="1276" />
+<TGConnectingPoint num="29" id="1277" />
+<TGConnectingPoint num="30" id="1278" />
 <extraparam>
 <type data="2" />
 <textline data="Requirement description:" />
@@ -2292,43 +2292,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3558" >
+<COMPONENT type="900" id="1311" >
 <cdparam x="369" y="392" />
 <sizeparam width="308" height="121" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="95" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
 <infoparam name="Requirement" value="CodeIntegrity" />
-<TGConnectingPoint num="0" id="3527" />
-<TGConnectingPoint num="1" id="3528" />
-<TGConnectingPoint num="2" id="3529" />
-<TGConnectingPoint num="3" id="3530" />
-<TGConnectingPoint num="4" id="3531" />
-<TGConnectingPoint num="5" id="3532" />
-<TGConnectingPoint num="6" id="3533" />
-<TGConnectingPoint num="7" id="3534" />
-<TGConnectingPoint num="8" id="3535" />
-<TGConnectingPoint num="9" id="3536" />
-<TGConnectingPoint num="10" id="3537" />
-<TGConnectingPoint num="11" id="3538" />
-<TGConnectingPoint num="12" id="3539" />
-<TGConnectingPoint num="13" id="3540" />
-<TGConnectingPoint num="14" id="3541" />
-<TGConnectingPoint num="15" id="3542" />
-<TGConnectingPoint num="16" id="3543" />
-<TGConnectingPoint num="17" id="3544" />
-<TGConnectingPoint num="18" id="3545" />
-<TGConnectingPoint num="19" id="3546" />
-<TGConnectingPoint num="20" id="3547" />
-<TGConnectingPoint num="21" id="3548" />
-<TGConnectingPoint num="22" id="3549" />
-<TGConnectingPoint num="23" id="3550" />
-<TGConnectingPoint num="24" id="3551" />
-<TGConnectingPoint num="25" id="3552" />
-<TGConnectingPoint num="26" id="3553" />
-<TGConnectingPoint num="27" id="3554" />
-<TGConnectingPoint num="28" id="3555" />
-<TGConnectingPoint num="29" id="3556" />
-<TGConnectingPoint num="30" id="3557" />
+<TGConnectingPoint num="0" id="1280" />
+<TGConnectingPoint num="1" id="1281" />
+<TGConnectingPoint num="2" id="1282" />
+<TGConnectingPoint num="3" id="1283" />
+<TGConnectingPoint num="4" id="1284" />
+<TGConnectingPoint num="5" id="1285" />
+<TGConnectingPoint num="6" id="1286" />
+<TGConnectingPoint num="7" id="1287" />
+<TGConnectingPoint num="8" id="1288" />
+<TGConnectingPoint num="9" id="1289" />
+<TGConnectingPoint num="10" id="1290" />
+<TGConnectingPoint num="11" id="1291" />
+<TGConnectingPoint num="12" id="1292" />
+<TGConnectingPoint num="13" id="1293" />
+<TGConnectingPoint num="14" id="1294" />
+<TGConnectingPoint num="15" id="1295" />
+<TGConnectingPoint num="16" id="1296" />
+<TGConnectingPoint num="17" id="1297" />
+<TGConnectingPoint num="18" id="1298" />
+<TGConnectingPoint num="19" id="1299" />
+<TGConnectingPoint num="20" id="1300" />
+<TGConnectingPoint num="21" id="1301" />
+<TGConnectingPoint num="22" id="1302" />
+<TGConnectingPoint num="23" id="1303" />
+<TGConnectingPoint num="24" id="1304" />
+<TGConnectingPoint num="25" id="1305" />
+<TGConnectingPoint num="26" id="1306" />
+<TGConnectingPoint num="27" id="1307" />
+<TGConnectingPoint num="28" id="1308" />
+<TGConnectingPoint num="29" id="1309" />
+<TGConnectingPoint num="30" id="1310" />
 <extraparam>
 <type data="2" />
 <textline data="the firmware update integrity should be protected" />
@@ -2346,43 +2346,43 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="900" id="3590" >
+<COMPONENT type="900" id="1343" >
 <cdparam x="778" y="347" />
 <sizeparam width="280" height="100" minWidth="1" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="169" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1901" minY="10" maxY="1901" />
 <infoparam name="Requirement" value="IntegrityOfFirmwareUpdate" />
-<TGConnectingPoint num="0" id="3559" />
-<TGConnectingPoint num="1" id="3560" />
-<TGConnectingPoint num="2" id="3561" />
-<TGConnectingPoint num="3" id="3562" />
-<TGConnectingPoint num="4" id="3563" />
-<TGConnectingPoint num="5" id="3564" />
-<TGConnectingPoint num="6" id="3565" />
-<TGConnectingPoint num="7" id="3566" />
-<TGConnectingPoint num="8" id="3567" />
-<TGConnectingPoint num="9" id="3568" />
-<TGConnectingPoint num="10" id="3569" />
-<TGConnectingPoint num="11" id="3570" />
-<TGConnectingPoint num="12" id="3571" />
-<TGConnectingPoint num="13" id="3572" />
-<TGConnectingPoint num="14" id="3573" />
-<TGConnectingPoint num="15" id="3574" />
-<TGConnectingPoint num="16" id="3575" />
-<TGConnectingPoint num="17" id="3576" />
-<TGConnectingPoint num="18" id="3577" />
-<TGConnectingPoint num="19" id="3578" />
-<TGConnectingPoint num="20" id="3579" />
-<TGConnectingPoint num="21" id="3580" />
-<TGConnectingPoint num="22" id="3581" />
-<TGConnectingPoint num="23" id="3582" />
-<TGConnectingPoint num="24" id="3583" />
-<TGConnectingPoint num="25" id="3584" />
-<TGConnectingPoint num="26" id="3585" />
-<TGConnectingPoint num="27" id="3586" />
-<TGConnectingPoint num="28" id="3587" />
-<TGConnectingPoint num="29" id="3588" />
-<TGConnectingPoint num="30" id="3589" />
+<TGConnectingPoint num="0" id="1312" />
+<TGConnectingPoint num="1" id="1313" />
+<TGConnectingPoint num="2" id="1314" />
+<TGConnectingPoint num="3" id="1315" />
+<TGConnectingPoint num="4" id="1316" />
+<TGConnectingPoint num="5" id="1317" />
+<TGConnectingPoint num="6" id="1318" />
+<TGConnectingPoint num="7" id="1319" />
+<TGConnectingPoint num="8" id="1320" />
+<TGConnectingPoint num="9" id="1321" />
+<TGConnectingPoint num="10" id="1322" />
+<TGConnectingPoint num="11" id="1323" />
+<TGConnectingPoint num="12" id="1324" />
+<TGConnectingPoint num="13" id="1325" />
+<TGConnectingPoint num="14" id="1326" />
+<TGConnectingPoint num="15" id="1327" />
+<TGConnectingPoint num="16" id="1328" />
+<TGConnectingPoint num="17" id="1329" />
+<TGConnectingPoint num="18" id="1330" />
+<TGConnectingPoint num="19" id="1331" />
+<TGConnectingPoint num="20" id="1332" />
+<TGConnectingPoint num="21" id="1333" />
+<TGConnectingPoint num="22" id="1334" />
+<TGConnectingPoint num="23" id="1335" />
+<TGConnectingPoint num="24" id="1336" />
+<TGConnectingPoint num="25" id="1337" />
+<TGConnectingPoint num="26" id="1338" />
+<TGConnectingPoint num="27" id="1339" />
+<TGConnectingPoint num="28" id="1340" />
+<TGConnectingPoint num="29" id="1341" />
+<TGConnectingPoint num="30" id="1342" />
 <extraparam>
 <type data="2" />
 <textline data="This refers to the normal completion of the" />
@@ -2398,52 +2398,52 @@
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="119" id="3591" >
+<CONNECTOR type="119" id="1344" >
 <cdparam x="1192" y="424" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<P1  x="964" y="278" id="3339" />
-<P2  x="1096" y="252" id="3463" />
+<P1  x="964" y="278" id="1092" />
+<P2  x="1096" y="252" id="1216" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="119" id="3592" >
+<CONNECTOR type="119" id="1345" >
 <cdparam x="1140" y="702" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<P1  x="1236" y="358" id="3503" />
-<P2  x="1204" y="315" id="3473" />
+<P1  x="1236" y="358" id="1256" />
+<P2  x="1204" y="315" id="1226" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="119" id="3593" >
+<CONNECTOR type="119" id="1346" >
 <cdparam x="732" y="791" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<P1  x="778" y="422" id="3561" />
-<P2  x="677" y="422" id="3530" />
+<P1  x="778" y="422" id="1314" />
+<P2  x="677" y="422" id="1283" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="119" id="3594" >
+<CONNECTOR type="119" id="1347" >
 <cdparam x="658" y="429" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<P1  x="522" y="322" id="3441" />
-<P2  x="523" y="392" id="3534" />
+<P1  x="522" y="322" id="1194" />
+<P2  x="523" y="392" id="1287" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="3595" >
+<CONNECTOR type="129" id="1348" >
 <cdparam x="1192" y="304" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="833" y="236" id="3342" />
-<P2  x="650" y="174" id="3423" />
+<P1  x="833" y="236" id="1095" />
+<P2  x="650" y="174" id="1176" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="129" id="3596" >
+<CONNECTOR type="129" id="1349" >
 <cdparam x="770" y="308" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Requirement to Requirement" value="&lt;&lt;composition&gt;&gt;" />
-<P1  x="522" y="237" id="3438" />
-<P2  x="650" y="174" id="3409" />
+<P1  x="522" y="237" id="1191" />
+<P2  x="650" y="174" id="1162" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
@@ -2456,81 +2456,81 @@
 
 <Modeling type="AttackTree" nameTab="Attack Trees" >
 <AttackTreeDiagramPanel name="Attack Tree" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<CONNECTOR type="133" id="2" >
+<CONNECTOR type="133" id="1351" >
 <cdparam x="923" y="482" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="1" />
-<P1  x="938" y="534" id="244" />
-<P2  x="866" y="534" id="237" />
+<TGConnectingPoint num="0" id="1350" />
+<P1  x="938" y="534" id="1563" />
+<P2  x="866" y="534" id="1594" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="4" >
+<CONNECTOR type="133" id="1353" >
 <cdparam x="677" y="168" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="3" />
-<P1  x="772" y="275" id="152" />
-<P2  x="772" y="211" id="41" />
+<TGConnectingPoint num="0" id="1352" />
+<P1  x="772" y="275" id="1549" />
+<P2  x="776" y="211" id="1402" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="6" >
+<CONNECTOR type="133" id="1355" >
 <cdparam x="802" y="302" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="4" />
-<TGConnectingPoint num="0" id="5" />
-<P1  x="965" y="312" id="26" />
-<P2  x="847" y="312" id="161" />
+<TGConnectingPoint num="0" id="1354" />
+<P1  x="965" y="312" id="1375" />
+<P2  x="847" y="312" id="1558" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="8" >
+<CONNECTOR type="133" id="1357" >
 <cdparam x="800" y="638" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="7" />
-<P1  x="753" y="522" id="234" />
-<P2  x="753" y="491" id="214" />
+<TGConnectingPoint num="0" id="1356" />
+<P1  x="753" y="522" id="1591" />
+<P2  x="753" y="491" id="1635" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="10" >
+<CONNECTOR type="133" id="1359" >
 <cdparam x="711" y="741" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="9" />
-<P1  x="664" y="466" id="219" />
-<P2  x="716" y="466" id="205" />
+<TGConnectingPoint num="0" id="1358" />
+<P1  x="675" y="466" id="1602" />
+<P2  x="716" y="466" id="1626" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="12" >
+<CONNECTOR type="133" id="1361" >
 <cdparam x="678" y="630" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="11" />
-<P1  x="679" y="601" id="53" />
-<P2  x="716" y="547" id="231" />
+<TGConnectingPoint num="0" id="1360" />
+<P1  x="693" y="601" id="1426" />
+<P2  x="716" y="547" id="1588" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="14" >
+<CONNECTOR type="133" id="1363" >
 <cdparam x="920" y="646" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="13" />
-<P1  x="903" y="623" id="114" />
-<P2  x="866" y="547" id="232" />
+<TGConnectingPoint num="0" id="1362" />
+<P1  x="910" y="623" id="1499" />
+<P2  x="866" y="547" id="1589" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="18" >
+<CONNECTOR type="133" id="1367" >
 <cdparam x="804" y="529" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="16" />
-<TGConnectingPoint num="1" id="17" />
-<P1  x="753" y="441" id="208" />
-<P2  x="617" y="332" id="189" />
+<TGConnectingPoint num="0" id="1365" />
+<TGConnectingPoint num="1" id="1366" />
+<P1  x="753" y="441" id="1629" />
+<P2  x="629" y="332" id="1674" />
 <Point x="617" y="410" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="15" >
-<father id="18" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1364" >
+<father id="1367" num="0" />
 <cdparam x="617" y="410" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2538,444 +2538,552 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="133" id="20" >
+<CONNECTOR type="133" id="1369" >
 <cdparam x="1062" y="461" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="2" />
-<TGConnectingPoint num="0" id="19" />
-<P1  x="734" y="344" id="191" />
-<P2  x="734" y="325" id="162" />
+<TGConnectingPoint num="0" id="1368" />
+<P1  x="742" y="344" id="1638" />
+<P2  x="734" y="325" id="1559" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="22" >
+<CONNECTOR type="133" id="1371" >
 <cdparam x="841" y="463" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="1" />
-<TGConnectingPoint num="0" id="21" />
-<P1  x="656" y="312" id="180" />
-<P2  x="697" y="312" id="160" />
+<TGConnectingPoint num="0" id="1370" />
+<P1  x="672" y="312" id="1665" />
+<P2  x="697" y="312" id="1557" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="24" >
+<CONNECTOR type="133" id="1373" >
 <cdparam x="639" y="270" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="3" />
-<TGConnectingPoint num="0" id="23" />
-<P1  x="1018" y="387" id="170" />
-<P2  x="772" y="325" id="155" />
+<TGConnectingPoint num="0" id="1372" />
+<P1  x="1023" y="387" id="1693" />
+<P2  x="772" y="325" id="1552" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<COMPONENT type="1401" id="37" >
+<COMPONENT type="1401" id="1398" >
 <cdparam x="965" y="292" />
 <sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="TGComponent" value="Start_engine" />
-<TGConnectingPoint num="0" id="25" />
-<TGConnectingPoint num="1" id="26" />
-<TGConnectingPoint num="2" id="27" />
-<TGConnectingPoint num="3" id="28" />
-<TGConnectingPoint num="4" id="29" />
-<TGConnectingPoint num="5" id="30" />
-<TGConnectingPoint num="6" id="31" />
-<TGConnectingPoint num="7" id="32" />
-<TGConnectingPoint num="8" id="33" />
-<TGConnectingPoint num="9" id="34" />
-<TGConnectingPoint num="10" id="35" />
-<TGConnectingPoint num="11" id="36" />
+<TGConnectingPoint num="0" id="1374" />
+<TGConnectingPoint num="1" id="1375" />
+<TGConnectingPoint num="2" id="1376" />
+<TGConnectingPoint num="3" id="1377" />
+<TGConnectingPoint num="4" id="1378" />
+<TGConnectingPoint num="5" id="1379" />
+<TGConnectingPoint num="6" id="1380" />
+<TGConnectingPoint num="7" id="1381" />
+<TGConnectingPoint num="8" id="1382" />
+<TGConnectingPoint num="9" id="1383" />
+<TGConnectingPoint num="10" id="1384" />
+<TGConnectingPoint num="11" id="1385" />
+<TGConnectingPoint num="12" id="1386" />
+<TGConnectingPoint num="13" id="1387" />
+<TGConnectingPoint num="14" id="1388" />
+<TGConnectingPoint num="15" id="1389" />
+<TGConnectingPoint num="16" id="1390" />
+<TGConnectingPoint num="17" id="1391" />
+<TGConnectingPoint num="18" id="1392" />
+<TGConnectingPoint num="19" id="1393" />
+<TGConnectingPoint num="20" id="1394" />
+<TGConnectingPoint num="21" id="1395" />
+<TGConnectingPoint num="22" id="1396" />
+<TGConnectingPoint num="23" id="1397" />
 <extraparam>
 <info description="blah blah blah" root="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1401" id="50" >
+<COMPONENT type="1401" id="1423" >
 <cdparam x="711" y="171" />
-<sizeparam width="122" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="130" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="TGComponent" value="Steal_Car" />
-<TGConnectingPoint num="0" id="38" />
-<TGConnectingPoint num="1" id="39" />
-<TGConnectingPoint num="2" id="40" />
-<TGConnectingPoint num="3" id="41" />
-<TGConnectingPoint num="4" id="42" />
-<TGConnectingPoint num="5" id="43" />
-<TGConnectingPoint num="6" id="44" />
-<TGConnectingPoint num="7" id="45" />
-<TGConnectingPoint num="8" id="46" />
-<TGConnectingPoint num="9" id="47" />
-<TGConnectingPoint num="10" id="48" />
-<TGConnectingPoint num="11" id="49" />
+<TGConnectingPoint num="0" id="1399" />
+<TGConnectingPoint num="1" id="1400" />
+<TGConnectingPoint num="2" id="1401" />
+<TGConnectingPoint num="3" id="1402" />
+<TGConnectingPoint num="4" id="1403" />
+<TGConnectingPoint num="5" id="1404" />
+<TGConnectingPoint num="6" id="1405" />
+<TGConnectingPoint num="7" id="1406" />
+<TGConnectingPoint num="8" id="1407" />
+<TGConnectingPoint num="9" id="1408" />
+<TGConnectingPoint num="10" id="1409" />
+<TGConnectingPoint num="11" id="1410" />
+<TGConnectingPoint num="12" id="1411" />
+<TGConnectingPoint num="13" id="1412" />
+<TGConnectingPoint num="14" id="1413" />
+<TGConnectingPoint num="15" id="1414" />
+<TGConnectingPoint num="16" id="1415" />
+<TGConnectingPoint num="17" id="1416" />
+<TGConnectingPoint num="18" id="1417" />
+<TGConnectingPoint num="19" id="1418" />
+<TGConnectingPoint num="20" id="1419" />
+<TGConnectingPoint num="21" id="1420" />
+<TGConnectingPoint num="22" id="1421" />
+<TGConnectingPoint num="23" id="1422" />
 <accessibility />
 <extraparam>
 <info description="blah blah blah" root="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1400" id="88" >
+<COMPONENT type="1400" id="1473" >
 <cdparam x="522" y="534" />
 <sizeparam width="171" height="127" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block1" value="Bluetooth" />
-<TGConnectingPoint num="0" id="64" />
-<TGConnectingPoint num="1" id="65" />
-<TGConnectingPoint num="2" id="66" />
-<TGConnectingPoint num="3" id="67" />
-<TGConnectingPoint num="4" id="68" />
-<TGConnectingPoint num="5" id="69" />
-<TGConnectingPoint num="6" id="70" />
-<TGConnectingPoint num="7" id="71" />
-<TGConnectingPoint num="8" id="72" />
-<TGConnectingPoint num="9" id="73" />
-<TGConnectingPoint num="10" id="74" />
-<TGConnectingPoint num="11" id="75" />
-<TGConnectingPoint num="12" id="76" />
-<TGConnectingPoint num="13" id="77" />
-<TGConnectingPoint num="14" id="78" />
-<TGConnectingPoint num="15" id="79" />
-<TGConnectingPoint num="16" id="80" />
-<TGConnectingPoint num="17" id="81" />
-<TGConnectingPoint num="18" id="82" />
-<TGConnectingPoint num="19" id="83" />
-<TGConnectingPoint num="20" id="84" />
-<TGConnectingPoint num="21" id="85" />
-<TGConnectingPoint num="22" id="86" />
-<TGConnectingPoint num="23" id="87" />
-</COMPONENT>
-<SUBCOMPONENT type="1401" id="63" >
-<father id="88" num="0" />
-<cdparam x="537" y="581" />
-<sizeparam width="142" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TGConnectingPoint num="0" id="1449" />
+<TGConnectingPoint num="1" id="1450" />
+<TGConnectingPoint num="2" id="1451" />
+<TGConnectingPoint num="3" id="1452" />
+<TGConnectingPoint num="4" id="1453" />
+<TGConnectingPoint num="5" id="1454" />
+<TGConnectingPoint num="6" id="1455" />
+<TGConnectingPoint num="7" id="1456" />
+<TGConnectingPoint num="8" id="1457" />
+<TGConnectingPoint num="9" id="1458" />
+<TGConnectingPoint num="10" id="1459" />
+<TGConnectingPoint num="11" id="1460" />
+<TGConnectingPoint num="12" id="1461" />
+<TGConnectingPoint num="13" id="1462" />
+<TGConnectingPoint num="14" id="1463" />
+<TGConnectingPoint num="15" id="1464" />
+<TGConnectingPoint num="16" id="1465" />
+<TGConnectingPoint num="17" id="1466" />
+<TGConnectingPoint num="18" id="1467" />
+<TGConnectingPoint num="19" id="1468" />
+<TGConnectingPoint num="20" id="1469" />
+<TGConnectingPoint num="21" id="1470" />
+<TGConnectingPoint num="22" id="1471" />
+<TGConnectingPoint num="23" id="1472" />
+</COMPONENT>
+<SUBCOMPONENT type="1401" id="1448" >
+<father id="1473" num="0" />
+<cdparam x="535" y="581" />
+<sizeparam width="158" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="29" minY="0" maxY="87" />
+<cdrectangleparam minX="0" maxX="13" minY="0" maxY="87" />
 <infoparam name="TGComponent" value="Connect_to_Bluetooth" />
-<TGConnectingPoint num="0" id="51" />
-<TGConnectingPoint num="1" id="52" />
-<TGConnectingPoint num="2" id="53" />
-<TGConnectingPoint num="3" id="54" />
-<TGConnectingPoint num="4" id="55" />
-<TGConnectingPoint num="5" id="56" />
-<TGConnectingPoint num="6" id="57" />
-<TGConnectingPoint num="7" id="58" />
-<TGConnectingPoint num="8" id="59" />
-<TGConnectingPoint num="9" id="60" />
-<TGConnectingPoint num="10" id="61" />
-<TGConnectingPoint num="11" id="62" />
+<TGConnectingPoint num="0" id="1424" />
+<TGConnectingPoint num="1" id="1425" />
+<TGConnectingPoint num="2" id="1426" />
+<TGConnectingPoint num="3" id="1427" />
+<TGConnectingPoint num="4" id="1428" />
+<TGConnectingPoint num="5" id="1429" />
+<TGConnectingPoint num="6" id="1430" />
+<TGConnectingPoint num="7" id="1431" />
+<TGConnectingPoint num="8" id="1432" />
+<TGConnectingPoint num="9" id="1433" />
+<TGConnectingPoint num="10" id="1434" />
+<TGConnectingPoint num="11" id="1435" />
+<TGConnectingPoint num="12" id="1436" />
+<TGConnectingPoint num="13" id="1437" />
+<TGConnectingPoint num="14" id="1438" />
+<TGConnectingPoint num="15" id="1439" />
+<TGConnectingPoint num="16" id="1440" />
+<TGConnectingPoint num="17" id="1441" />
+<TGConnectingPoint num="18" id="1442" />
+<TGConnectingPoint num="19" id="1443" />
+<TGConnectingPoint num="20" id="1444" />
+<TGConnectingPoint num="21" id="1445" />
+<TGConnectingPoint num="22" id="1446" />
+<TGConnectingPoint num="23" id="1447" />
 <extraparam>
 <info description="blah blah blah" root="false" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1400" id="113" >
+<COMPONENT type="1400" id="1498" >
 <cdparam x="503" y="496" />
 <sizeparam width="201" height="179" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="HeadUnit" />
-<TGConnectingPoint num="0" id="89" />
-<TGConnectingPoint num="1" id="90" />
-<TGConnectingPoint num="2" id="91" />
-<TGConnectingPoint num="3" id="92" />
-<TGConnectingPoint num="4" id="93" />
-<TGConnectingPoint num="5" id="94" />
-<TGConnectingPoint num="6" id="95" />
-<TGConnectingPoint num="7" id="96" />
-<TGConnectingPoint num="8" id="97" />
-<TGConnectingPoint num="9" id="98" />
-<TGConnectingPoint num="10" id="99" />
-<TGConnectingPoint num="11" id="100" />
-<TGConnectingPoint num="12" id="101" />
-<TGConnectingPoint num="13" id="102" />
-<TGConnectingPoint num="14" id="103" />
-<TGConnectingPoint num="15" id="104" />
-<TGConnectingPoint num="16" id="105" />
-<TGConnectingPoint num="17" id="106" />
-<TGConnectingPoint num="18" id="107" />
-<TGConnectingPoint num="19" id="108" />
-<TGConnectingPoint num="20" id="109" />
-<TGConnectingPoint num="21" id="110" />
-<TGConnectingPoint num="22" id="111" />
-<TGConnectingPoint num="23" id="112" />
-</COMPONENT>
-
-<COMPONENT type="1400" id="151" >
+<TGConnectingPoint num="0" id="1474" />
+<TGConnectingPoint num="1" id="1475" />
+<TGConnectingPoint num="2" id="1476" />
+<TGConnectingPoint num="3" id="1477" />
+<TGConnectingPoint num="4" id="1478" />
+<TGConnectingPoint num="5" id="1479" />
+<TGConnectingPoint num="6" id="1480" />
+<TGConnectingPoint num="7" id="1481" />
+<TGConnectingPoint num="8" id="1482" />
+<TGConnectingPoint num="9" id="1483" />
+<TGConnectingPoint num="10" id="1484" />
+<TGConnectingPoint num="11" id="1485" />
+<TGConnectingPoint num="12" id="1486" />
+<TGConnectingPoint num="13" id="1487" />
+<TGConnectingPoint num="14" id="1488" />
+<TGConnectingPoint num="15" id="1489" />
+<TGConnectingPoint num="16" id="1490" />
+<TGConnectingPoint num="17" id="1491" />
+<TGConnectingPoint num="18" id="1492" />
+<TGConnectingPoint num="19" id="1493" />
+<TGConnectingPoint num="20" id="1494" />
+<TGConnectingPoint num="21" id="1495" />
+<TGConnectingPoint num="22" id="1496" />
+<TGConnectingPoint num="23" id="1497" />
+</COMPONENT>
+
+<COMPONENT type="1400" id="1548" >
 <cdparam x="741" y="586" />
 <sizeparam width="333" height="89" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block2" value="CommunicationUnit" />
-<TGConnectingPoint num="0" id="127" />
-<TGConnectingPoint num="1" id="128" />
-<TGConnectingPoint num="2" id="129" />
-<TGConnectingPoint num="3" id="130" />
-<TGConnectingPoint num="4" id="131" />
-<TGConnectingPoint num="5" id="132" />
-<TGConnectingPoint num="6" id="133" />
-<TGConnectingPoint num="7" id="134" />
-<TGConnectingPoint num="8" id="135" />
-<TGConnectingPoint num="9" id="136" />
-<TGConnectingPoint num="10" id="137" />
-<TGConnectingPoint num="11" id="138" />
-<TGConnectingPoint num="12" id="139" />
-<TGConnectingPoint num="13" id="140" />
-<TGConnectingPoint num="14" id="141" />
-<TGConnectingPoint num="15" id="142" />
-<TGConnectingPoint num="16" id="143" />
-<TGConnectingPoint num="17" id="144" />
-<TGConnectingPoint num="18" id="145" />
-<TGConnectingPoint num="19" id="146" />
-<TGConnectingPoint num="20" id="147" />
-<TGConnectingPoint num="21" id="148" />
-<TGConnectingPoint num="22" id="149" />
-<TGConnectingPoint num="23" id="150" />
-</COMPONENT>
-<SUBCOMPONENT type="1401" id="126" >
-<father id="151" num="0" />
-<cdparam x="752" y="623" />
-<sizeparam width="303" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TGConnectingPoint num="0" id="1524" />
+<TGConnectingPoint num="1" id="1525" />
+<TGConnectingPoint num="2" id="1526" />
+<TGConnectingPoint num="3" id="1527" />
+<TGConnectingPoint num="4" id="1528" />
+<TGConnectingPoint num="5" id="1529" />
+<TGConnectingPoint num="6" id="1530" />
+<TGConnectingPoint num="7" id="1531" />
+<TGConnectingPoint num="8" id="1532" />
+<TGConnectingPoint num="9" id="1533" />
+<TGConnectingPoint num="10" id="1534" />
+<TGConnectingPoint num="11" id="1535" />
+<TGConnectingPoint num="12" id="1536" />
+<TGConnectingPoint num="13" id="1537" />
+<TGConnectingPoint num="14" id="1538" />
+<TGConnectingPoint num="15" id="1539" />
+<TGConnectingPoint num="16" id="1540" />
+<TGConnectingPoint num="17" id="1541" />
+<TGConnectingPoint num="18" id="1542" />
+<TGConnectingPoint num="19" id="1543" />
+<TGConnectingPoint num="20" id="1544" />
+<TGConnectingPoint num="21" id="1545" />
+<TGConnectingPoint num="22" id="1546" />
+<TGConnectingPoint num="23" id="1547" />
+</COMPONENT>
+<SUBCOMPONENT type="1401" id="1523" >
+<father id="1548" num="0" />
+<cdparam x="746" y="623" />
+<sizeparam width="328" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="30" minY="0" maxY="49" />
+<cdrectangleparam minX="0" maxX="5" minY="0" maxY="49" />
 <infoparam name="TGComponent" value="CompromisedCommunicationUnitThroughInternet" />
-<TGConnectingPoint num="0" id="114" />
-<TGConnectingPoint num="1" id="115" />
-<TGConnectingPoint num="2" id="116" />
-<TGConnectingPoint num="3" id="117" />
-<TGConnectingPoint num="4" id="118" />
-<TGConnectingPoint num="5" id="119" />
-<TGConnectingPoint num="6" id="120" />
-<TGConnectingPoint num="7" id="121" />
-<TGConnectingPoint num="8" id="122" />
-<TGConnectingPoint num="9" id="123" />
-<TGConnectingPoint num="10" id="124" />
-<TGConnectingPoint num="11" id="125" />
+<TGConnectingPoint num="0" id="1499" />
+<TGConnectingPoint num="1" id="1500" />
+<TGConnectingPoint num="2" id="1501" />
+<TGConnectingPoint num="3" id="1502" />
+<TGConnectingPoint num="4" id="1503" />
+<TGConnectingPoint num="5" id="1504" />
+<TGConnectingPoint num="6" id="1505" />
+<TGConnectingPoint num="7" id="1506" />
+<TGConnectingPoint num="8" id="1507" />
+<TGConnectingPoint num="9" id="1508" />
+<TGConnectingPoint num="10" id="1509" />
+<TGConnectingPoint num="11" id="1510" />
+<TGConnectingPoint num="12" id="1511" />
+<TGConnectingPoint num="13" id="1512" />
+<TGConnectingPoint num="14" id="1513" />
+<TGConnectingPoint num="15" id="1514" />
+<TGConnectingPoint num="16" id="1515" />
+<TGConnectingPoint num="17" id="1516" />
+<TGConnectingPoint num="18" id="1517" />
+<TGConnectingPoint num="19" id="1518" />
+<TGConnectingPoint num="20" id="1519" />
+<TGConnectingPoint num="21" id="1520" />
+<TGConnectingPoint num="22" id="1521" />
+<TGConnectingPoint num="23" id="1522" />
 <extraparam>
 <info description="blah blah blah" root="false" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1402" id="164" >
+<COMPONENT type="1402" id="1561" >
 <cdparam x="697" y="275" />
 <sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="TGComponent" value="&lt;&lt;SEQUENCE&gt;&gt;" />
-<TGConnectingPoint num="0" id="152" />
-<TGConnectingPoint num="1" id="153" />
-<TGConnectingPoint num="2" id="154" />
-<TGConnectingPoint num="3" id="155" />
-<TGConnectingPoint num="4" id="156" />
-<TGConnectingPoint num="5" id="157" />
-<TGConnectingPoint num="6" id="158" />
-<TGConnectingPoint num="7" id="159" />
-<TGConnectingPoint num="8" id="160" />
-<TGConnectingPoint num="9" id="161" />
-<TGConnectingPoint num="10" id="162" />
-<TGConnectingPoint num="11" id="163" />
+<TGConnectingPoint num="0" id="1549" />
+<TGConnectingPoint num="1" id="1550" />
+<TGConnectingPoint num="2" id="1551" />
+<TGConnectingPoint num="3" id="1552" />
+<TGConnectingPoint num="4" id="1553" />
+<TGConnectingPoint num="5" id="1554" />
+<TGConnectingPoint num="6" id="1555" />
+<TGConnectingPoint num="7" id="1556" />
+<TGConnectingPoint num="8" id="1557" />
+<TGConnectingPoint num="9" id="1558" />
+<TGConnectingPoint num="10" id="1559" />
+<TGConnectingPoint num="11" id="1560" />
 <extraparam>
 <info equation="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1400" id="280" >
+<COMPONENT type="1400" id="1737" >
 <cdparam x="491" y="238" />
 <sizeparam width="595" height="446" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block3" value="AutomotiveECUsAndBuses" />
-<TGConnectingPoint num="0" id="256" />
-<TGConnectingPoint num="1" id="257" />
-<TGConnectingPoint num="2" id="258" />
-<TGConnectingPoint num="3" id="259" />
-<TGConnectingPoint num="4" id="260" />
-<TGConnectingPoint num="5" id="261" />
-<TGConnectingPoint num="6" id="262" />
-<TGConnectingPoint num="7" id="263" />
-<TGConnectingPoint num="8" id="264" />
-<TGConnectingPoint num="9" id="265" />
-<TGConnectingPoint num="10" id="266" />
-<TGConnectingPoint num="11" id="267" />
-<TGConnectingPoint num="12" id="268" />
-<TGConnectingPoint num="13" id="269" />
-<TGConnectingPoint num="14" id="270" />
-<TGConnectingPoint num="15" id="271" />
-<TGConnectingPoint num="16" id="272" />
-<TGConnectingPoint num="17" id="273" />
-<TGConnectingPoint num="18" id="274" />
-<TGConnectingPoint num="19" id="275" />
-<TGConnectingPoint num="20" id="276" />
-<TGConnectingPoint num="21" id="277" />
-<TGConnectingPoint num="22" id="278" />
-<TGConnectingPoint num="23" id="279" />
-</COMPONENT>
-<SUBCOMPONENT type="1401" id="177" >
-<father id="280" num="0" />
-<cdparam x="842" y="387" />
-<sizeparam width="235" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TGConnectingPoint num="0" id="1713" />
+<TGConnectingPoint num="1" id="1714" />
+<TGConnectingPoint num="2" id="1715" />
+<TGConnectingPoint num="3" id="1716" />
+<TGConnectingPoint num="4" id="1717" />
+<TGConnectingPoint num="5" id="1718" />
+<TGConnectingPoint num="6" id="1719" />
+<TGConnectingPoint num="7" id="1720" />
+<TGConnectingPoint num="8" id="1721" />
+<TGConnectingPoint num="9" id="1722" />
+<TGConnectingPoint num="10" id="1723" />
+<TGConnectingPoint num="11" id="1724" />
+<TGConnectingPoint num="12" id="1725" />
+<TGConnectingPoint num="13" id="1726" />
+<TGConnectingPoint num="14" id="1727" />
+<TGConnectingPoint num="15" id="1728" />
+<TGConnectingPoint num="16" id="1729" />
+<TGConnectingPoint num="17" id="1730" />
+<TGConnectingPoint num="18" id="1731" />
+<TGConnectingPoint num="19" id="1732" />
+<TGConnectingPoint num="20" id="1733" />
+<TGConnectingPoint num="21" id="1734" />
+<TGConnectingPoint num="22" id="1735" />
+<TGConnectingPoint num="23" id="1736" />
+</COMPONENT>
+<SUBCOMPONENT type="1401" id="1586" >
+<father id="1737" num="0" />
+<cdparam x="938" y="514" />
+<sizeparam width="101" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="360" minY="0" maxY="406" />
-<infoparam name="TGComponent" value="Inject_or_Replay_OpenDoor_Message" />
-<TGConnectingPoint num="0" id="165" />
-<TGConnectingPoint num="1" id="166" />
-<TGConnectingPoint num="2" id="167" />
-<TGConnectingPoint num="3" id="168" />
-<TGConnectingPoint num="4" id="169" />
-<TGConnectingPoint num="5" id="170" />
-<TGConnectingPoint num="6" id="171" />
-<TGConnectingPoint num="7" id="172" />
-<TGConnectingPoint num="8" id="173" />
-<TGConnectingPoint num="9" id="174" />
-<TGConnectingPoint num="10" id="175" />
-<TGConnectingPoint num="11" id="176" />
+<cdrectangleparam minX="0" maxX="494" minY="0" maxY="406" />
+<infoparam name="TGComponent" value="Plug_on_OBD" />
+<TGConnectingPoint num="0" id="1562" />
+<TGConnectingPoint num="1" id="1563" />
+<TGConnectingPoint num="2" id="1564" />
+<TGConnectingPoint num="3" id="1565" />
+<TGConnectingPoint num="4" id="1566" />
+<TGConnectingPoint num="5" id="1567" />
+<TGConnectingPoint num="6" id="1568" />
+<TGConnectingPoint num="7" id="1569" />
+<TGConnectingPoint num="8" id="1570" />
+<TGConnectingPoint num="9" id="1571" />
+<TGConnectingPoint num="10" id="1572" />
+<TGConnectingPoint num="11" id="1573" />
+<TGConnectingPoint num="12" id="1574" />
+<TGConnectingPoint num="13" id="1575" />
+<TGConnectingPoint num="14" id="1576" />
+<TGConnectingPoint num="15" id="1577" />
+<TGConnectingPoint num="16" id="1578" />
+<TGConnectingPoint num="17" id="1579" />
+<TGConnectingPoint num="18" id="1580" />
+<TGConnectingPoint num="19" id="1581" />
+<TGConnectingPoint num="20" id="1582" />
+<TGConnectingPoint num="21" id="1583" />
+<TGConnectingPoint num="22" id="1584" />
+<TGConnectingPoint num="23" id="1585" />
+<accessibility />
 <extraparam>
 <info description="blah blah blah" root="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="190" >
-<father id="280" num="1" />
-<cdparam x="501" y="292" />
-<sizeparam width="155" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1402" id="1599" >
+<father id="1737" num="1" />
+<cdparam x="716" y="522" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="440" minY="0" maxY="406" />
-<infoparam name="TGComponent" value="Connect_to_System_Bus" />
-<TGConnectingPoint num="0" id="178" />
-<TGConnectingPoint num="1" id="179" />
-<TGConnectingPoint num="2" id="180" />
-<TGConnectingPoint num="3" id="181" />
-<TGConnectingPoint num="4" id="182" />
-<TGConnectingPoint num="5" id="183" />
-<TGConnectingPoint num="6" id="184" />
-<TGConnectingPoint num="7" id="185" />
-<TGConnectingPoint num="8" id="186" />
-<TGConnectingPoint num="9" id="187" />
-<TGConnectingPoint num="10" id="188" />
-<TGConnectingPoint num="11" id="189" />
+<cdrectangleparam minX="0" maxX="462" minY="0" maxY="526" />
+<infoparam name="TGComponent" value="&lt;&lt;XOR&gt;&gt;" />
+<TGConnectingPoint num="0" id="1587" />
+<TGConnectingPoint num="1" id="1588" />
+<TGConnectingPoint num="2" id="1589" />
+<TGConnectingPoint num="3" id="1590" />
+<TGConnectingPoint num="4" id="1591" />
+<TGConnectingPoint num="5" id="1592" />
+<TGConnectingPoint num="6" id="1593" />
+<TGConnectingPoint num="7" id="1594" />
+<TGConnectingPoint num="8" id="1595" />
+<TGConnectingPoint num="9" id="1596" />
+<TGConnectingPoint num="10" id="1597" />
+<TGConnectingPoint num="11" id="1598" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="203" >
-<father id="280" num="2" />
-<cdparam x="635" y="344" />
-<sizeparam width="198" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="1624" >
+<father id="1737" num="2" />
+<cdparam x="508" y="446" />
+<sizeparam width="167" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="397" minY="0" maxY="406" />
-<infoparam name="TGComponent" value="Listen_to_OpenDoor_messages" />
-<TGConnectingPoint num="0" id="191" />
-<TGConnectingPoint num="1" id="192" />
-<TGConnectingPoint num="2" id="193" />
-<TGConnectingPoint num="3" id="194" />
-<TGConnectingPoint num="4" id="195" />
-<TGConnectingPoint num="5" id="196" />
-<TGConnectingPoint num="6" id="197" />
-<TGConnectingPoint num="7" id="198" />
-<TGConnectingPoint num="8" id="199" />
-<TGConnectingPoint num="9" id="200" />
-<TGConnectingPoint num="10" id="201" />
-<TGConnectingPoint num="11" id="202" />
+<cdrectangleparam minX="0" maxX="428" minY="0" maxY="406" />
+<infoparam name="TGComponent" value="Bypass_internal_firewall" />
+<TGConnectingPoint num="0" id="1600" />
+<TGConnectingPoint num="1" id="1601" />
+<TGConnectingPoint num="2" id="1602" />
+<TGConnectingPoint num="3" id="1603" />
+<TGConnectingPoint num="4" id="1604" />
+<TGConnectingPoint num="5" id="1605" />
+<TGConnectingPoint num="6" id="1606" />
+<TGConnectingPoint num="7" id="1607" />
+<TGConnectingPoint num="8" id="1608" />
+<TGConnectingPoint num="9" id="1609" />
+<TGConnectingPoint num="10" id="1610" />
+<TGConnectingPoint num="11" id="1611" />
+<TGConnectingPoint num="12" id="1612" />
+<TGConnectingPoint num="13" id="1613" />
+<TGConnectingPoint num="14" id="1614" />
+<TGConnectingPoint num="15" id="1615" />
+<TGConnectingPoint num="16" id="1616" />
+<TGConnectingPoint num="17" id="1617" />
+<TGConnectingPoint num="18" id="1618" />
+<TGConnectingPoint num="19" id="1619" />
+<TGConnectingPoint num="20" id="1620" />
+<TGConnectingPoint num="21" id="1621" />
+<TGConnectingPoint num="22" id="1622" />
+<TGConnectingPoint num="23" id="1623" />
+<accessibility />
 <extraparam>
 <info description="blah blah blah" root="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="216" >
-<father id="280" num="3" />
+<SUBCOMPONENT type="1402" id="1637" >
+<father id="1737" num="3" />
 <cdparam x="716" y="441" />
 <sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="462" minY="0" maxY="526" />
 <infoparam name="TGComponent" value="&lt;&lt;AND&gt;&gt;" />
-<TGConnectingPoint num="0" id="204" />
-<TGConnectingPoint num="1" id="205" />
-<TGConnectingPoint num="2" id="206" />
-<TGConnectingPoint num="3" id="207" />
-<TGConnectingPoint num="4" id="208" />
-<TGConnectingPoint num="5" id="209" />
-<TGConnectingPoint num="6" id="210" />
-<TGConnectingPoint num="7" id="211" />
-<TGConnectingPoint num="8" id="212" />
-<TGConnectingPoint num="9" id="213" />
-<TGConnectingPoint num="10" id="214" />
-<TGConnectingPoint num="11" id="215" />
+<TGConnectingPoint num="0" id="1625" />
+<TGConnectingPoint num="1" id="1626" />
+<TGConnectingPoint num="2" id="1627" />
+<TGConnectingPoint num="3" id="1628" />
+<TGConnectingPoint num="4" id="1629" />
+<TGConnectingPoint num="5" id="1630" />
+<TGConnectingPoint num="6" id="1631" />
+<TGConnectingPoint num="7" id="1632" />
+<TGConnectingPoint num="8" id="1633" />
+<TGConnectingPoint num="9" id="1634" />
+<TGConnectingPoint num="10" id="1635" />
+<TGConnectingPoint num="11" id="1636" />
 <extraparam>
 <info equation="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="229" >
-<father id="280" num="4" />
-<cdparam x="508" y="446" />
-<sizeparam width="156" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="1662" >
+<father id="1737" num="4" />
+<cdparam x="635" y="344" />
+<sizeparam width="215" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="439" minY="0" maxY="406" />
-<infoparam name="TGComponent" value="Bypass_internal_firewall" />
-<TGConnectingPoint num="0" id="217" />
-<TGConnectingPoint num="1" id="218" />
-<TGConnectingPoint num="2" id="219" />
-<TGConnectingPoint num="3" id="220" />
-<TGConnectingPoint num="4" id="221" />
-<TGConnectingPoint num="5" id="222" />
-<TGConnectingPoint num="6" id="223" />
-<TGConnectingPoint num="7" id="224" />
-<TGConnectingPoint num="8" id="225" />
-<TGConnectingPoint num="9" id="226" />
-<TGConnectingPoint num="10" id="227" />
-<TGConnectingPoint num="11" id="228" />
-<accessibility />
+<cdrectangleparam minX="0" maxX="380" minY="0" maxY="406" />
+<infoparam name="TGComponent" value="Listen_to_OpenDoor_messages" />
+<TGConnectingPoint num="0" id="1638" />
+<TGConnectingPoint num="1" id="1639" />
+<TGConnectingPoint num="2" id="1640" />
+<TGConnectingPoint num="3" id="1641" />
+<TGConnectingPoint num="4" id="1642" />
+<TGConnectingPoint num="5" id="1643" />
+<TGConnectingPoint num="6" id="1644" />
+<TGConnectingPoint num="7" id="1645" />
+<TGConnectingPoint num="8" id="1646" />
+<TGConnectingPoint num="9" id="1647" />
+<TGConnectingPoint num="10" id="1648" />
+<TGConnectingPoint num="11" id="1649" />
+<TGConnectingPoint num="12" id="1650" />
+<TGConnectingPoint num="13" id="1651" />
+<TGConnectingPoint num="14" id="1652" />
+<TGConnectingPoint num="15" id="1653" />
+<TGConnectingPoint num="16" id="1654" />
+<TGConnectingPoint num="17" id="1655" />
+<TGConnectingPoint num="18" id="1656" />
+<TGConnectingPoint num="19" id="1657" />
+<TGConnectingPoint num="20" id="1658" />
+<TGConnectingPoint num="21" id="1659" />
+<TGConnectingPoint num="22" id="1660" />
+<TGConnectingPoint num="23" id="1661" />
 <extraparam>
 <info description="blah blah blah" root="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="242" >
-<father id="280" num="5" />
-<cdparam x="716" y="522" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="1687" >
+<father id="1737" num="5" />
+<cdparam x="501" y="292" />
+<sizeparam width="171" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="462" minY="0" maxY="526" />
-<infoparam name="TGComponent" value="&lt;&lt;XOR&gt;&gt;" />
-<TGConnectingPoint num="0" id="230" />
-<TGConnectingPoint num="1" id="231" />
-<TGConnectingPoint num="2" id="232" />
-<TGConnectingPoint num="3" id="233" />
-<TGConnectingPoint num="4" id="234" />
-<TGConnectingPoint num="5" id="235" />
-<TGConnectingPoint num="6" id="236" />
-<TGConnectingPoint num="7" id="237" />
-<TGConnectingPoint num="8" id="238" />
-<TGConnectingPoint num="9" id="239" />
-<TGConnectingPoint num="10" id="240" />
-<TGConnectingPoint num="11" id="241" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="424" minY="0" maxY="406" />
+<infoparam name="TGComponent" value="Connect_to_System_Bus" />
+<TGConnectingPoint num="0" id="1663" />
+<TGConnectingPoint num="1" id="1664" />
+<TGConnectingPoint num="2" id="1665" />
+<TGConnectingPoint num="3" id="1666" />
+<TGConnectingPoint num="4" id="1667" />
+<TGConnectingPoint num="5" id="1668" />
+<TGConnectingPoint num="6" id="1669" />
+<TGConnectingPoint num="7" id="1670" />
+<TGConnectingPoint num="8" id="1671" />
+<TGConnectingPoint num="9" id="1672" />
+<TGConnectingPoint num="10" id="1673" />
+<TGConnectingPoint num="11" id="1674" />
+<TGConnectingPoint num="12" id="1675" />
+<TGConnectingPoint num="13" id="1676" />
+<TGConnectingPoint num="14" id="1677" />
+<TGConnectingPoint num="15" id="1678" />
+<TGConnectingPoint num="16" id="1679" />
+<TGConnectingPoint num="17" id="1680" />
+<TGConnectingPoint num="18" id="1681" />
+<TGConnectingPoint num="19" id="1682" />
+<TGConnectingPoint num="20" id="1683" />
+<TGConnectingPoint num="21" id="1684" />
+<TGConnectingPoint num="22" id="1685" />
+<TGConnectingPoint num="23" id="1686" />
 <extraparam>
-<info equation="" />
+<info description="blah blah blah" root="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="255" >
-<father id="280" num="6" />
-<cdparam x="938" y="514" />
-<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1401" id="1712" >
+<father id="1737" num="6" />
+<cdparam x="835" y="387" />
+<sizeparam width="251" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="495" minY="0" maxY="406" />
-<infoparam name="TGComponent" value="Plug_on_OBD" />
-<TGConnectingPoint num="0" id="243" />
-<TGConnectingPoint num="1" id="244" />
-<TGConnectingPoint num="2" id="245" />
-<TGConnectingPoint num="3" id="246" />
-<TGConnectingPoint num="4" id="247" />
-<TGConnectingPoint num="5" id="248" />
-<TGConnectingPoint num="6" id="249" />
-<TGConnectingPoint num="7" id="250" />
-<TGConnectingPoint num="8" id="251" />
-<TGConnectingPoint num="9" id="252" />
-<TGConnectingPoint num="10" id="253" />
-<TGConnectingPoint num="11" id="254" />
-<accessibility />
+<cdrectangleparam minX="0" maxX="344" minY="0" maxY="406" />
+<infoparam name="TGComponent" value="Inject_or_Replay_OpenDoor_Message" />
+<TGConnectingPoint num="0" id="1688" />
+<TGConnectingPoint num="1" id="1689" />
+<TGConnectingPoint num="2" id="1690" />
+<TGConnectingPoint num="3" id="1691" />
+<TGConnectingPoint num="4" id="1692" />
+<TGConnectingPoint num="5" id="1693" />
+<TGConnectingPoint num="6" id="1694" />
+<TGConnectingPoint num="7" id="1695" />
+<TGConnectingPoint num="8" id="1696" />
+<TGConnectingPoint num="9" id="1697" />
+<TGConnectingPoint num="10" id="1698" />
+<TGConnectingPoint num="11" id="1699" />
+<TGConnectingPoint num="12" id="1700" />
+<TGConnectingPoint num="13" id="1701" />
+<TGConnectingPoint num="14" id="1702" />
+<TGConnectingPoint num="15" id="1703" />
+<TGConnectingPoint num="16" id="1704" />
+<TGConnectingPoint num="17" id="1705" />
+<TGConnectingPoint num="18" id="1706" />
+<TGConnectingPoint num="19" id="1707" />
+<TGConnectingPoint num="20" id="1708" />
+<TGConnectingPoint num="21" id="1709" />
+<TGConnectingPoint num="22" id="1710" />
+<TGConnectingPoint num="23" id="1711" />
 <extraparam>
 <info description="blah blah blah" root="false" />
 </extraparam>
@@ -2991,49 +3099,50 @@
 
 <Modeling type="TML Component Design" nameTab="KDP Perf Design_NoSec" >
 <TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2400" minY="10" maxY="900" channels="true" events="true" requests="true" zoom="1.0" >
-<CONNECTOR type="126" id="281" >
+<CONNECTOR type="126" id="1738" >
 <cdparam x="833" y="144" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="806" y="144" id="296" />
-<P2  x="790" y="193" id="283" />
+<P1  x="806" y="144" id="1755" />
+<P2  x="790" y="193" id="1742" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="282" >
+<CONNECTOR type="126" id="1739" >
 <cdparam x="767" y="144" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="720" y="144" id="298" />
-<P2  x="724" y="193" id="285" />
+<P1  x="720" y="144" id="1753" />
+<P2  x="724" y="193" id="1740" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<COMPONENT type="1202" id="295" >
+<COMPONENT type="1202" id="1752" >
 <cdparam x="704" y="206" />
 <sizeparam width="106" height="94" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
 <infoparam name="Primitive component" value="LoadSink" />
-<TGConnectingPoint num="0" id="287" />
-<TGConnectingPoint num="1" id="288" />
-<TGConnectingPoint num="2" id="289" />
-<TGConnectingPoint num="3" id="290" />
-<TGConnectingPoint num="4" id="291" />
-<TGConnectingPoint num="5" id="292" />
-<TGConnectingPoint num="6" id="293" />
-<TGConnectingPoint num="7" id="294" />
+<TGConnectingPoint num="0" id="1744" />
+<TGConnectingPoint num="1" id="1745" />
+<TGConnectingPoint num="2" id="1746" />
+<TGConnectingPoint num="3" id="1747" />
+<TGConnectingPoint num="4" id="1748" />
+<TGConnectingPoint num="5" id="1749" />
+<TGConnectingPoint num="6" id="1750" />
+<TGConnectingPoint num="7" id="1751" />
 <extraparam>
+<Data isAttacker="No" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="284" >
-<father id="295" num="0" />
-<cdparam x="777" y="193" />
+<SUBCOMPONENT type="1203" id="1741" >
+<father id="1752" num="0" />
+<cdparam x="711" y="193" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="93" minY="-13" maxY="81" />
-<infoparam name="Primitive port" value="Channel lowPrioLoad" />
-<TGConnectingPoint num="0" id="283" />
+<infoparam name="Primitive port" value="Channel highPrioLoad" />
+<TGConnectingPoint num="0" id="1740" />
 <extraparam>
-<Prop commName="lowPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="highPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -3041,16 +3150,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="286" >
-<father id="295" num="1" />
-<cdparam x="711" y="193" />
+<SUBCOMPONENT type="1203" id="1743" >
+<father id="1752" num="1" />
+<cdparam x="777" y="193" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="93" minY="-13" maxY="81" />
-<infoparam name="Primitive port" value="Channel highPrioLoad" />
-<TGConnectingPoint num="0" id="285" />
+<infoparam name="Primitive port" value="Channel lowPrioLoad" />
+<TGConnectingPoint num="0" id="1742" />
 <extraparam>
-<Prop commName="highPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="lowPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -3059,34 +3168,35 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1202" id="308" >
+<COMPONENT type="1202" id="1765" >
 <cdparam x="696" y="41" />
 <sizeparam width="137" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
 <infoparam name="Primitive component" value="LoadSource" />
-<TGConnectingPoint num="0" id="300" />
-<TGConnectingPoint num="1" id="301" />
-<TGConnectingPoint num="2" id="302" />
-<TGConnectingPoint num="3" id="303" />
-<TGConnectingPoint num="4" id="304" />
-<TGConnectingPoint num="5" id="305" />
-<TGConnectingPoint num="6" id="306" />
-<TGConnectingPoint num="7" id="307" />
-<extraparam>
+<TGConnectingPoint num="0" id="1757" />
+<TGConnectingPoint num="1" id="1758" />
+<TGConnectingPoint num="2" id="1759" />
+<TGConnectingPoint num="3" id="1760" />
+<TGConnectingPoint num="4" id="1761" />
+<TGConnectingPoint num="5" id="1762" />
+<TGConnectingPoint num="6" id="1763" />
+<TGConnectingPoint num="7" id="1764" />
+<extraparam>
+<Data isAttacker="No" />
 <Attribute access="2" id="evts" value="0" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="297" >
-<father id="308" num="0" />
-<cdparam x="793" y="118" />
+<SUBCOMPONENT type="1203" id="1754" >
+<father id="1765" num="0" />
+<cdparam x="707" y="118" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="124" minY="-13" maxY="77" />
-<infoparam name="Primitive port" value="Channel lowPrioLoad" />
-<TGConnectingPoint num="0" id="296" />
+<infoparam name="Primitive port" value="Channel highPrioLoad" />
+<TGConnectingPoint num="0" id="1753" />
 <extraparam>
-<Prop commName="lowPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="highPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -3094,16 +3204,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="299" >
-<father id="308" num="1" />
-<cdparam x="707" y="118" />
+<SUBCOMPONENT type="1203" id="1756" >
+<father id="1765" num="1" />
+<cdparam x="793" y="118" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="124" minY="-13" maxY="77" />
-<infoparam name="Primitive port" value="Channel highPrioLoad" />
-<TGConnectingPoint num="0" id="298" />
+<infoparam name="Primitive port" value="Channel lowPrioLoad" />
+<TGConnectingPoint num="0" id="1755" />
 <extraparam>
-<Prop commName="highPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="lowPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -3116,56 +3226,56 @@
 </TMLComponentTaskDiagramPanel>
 
 <TMLActivityDiagramPanel name="LoadSink" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="310" >
+<COMPONENT type="1001" id="1767" >
 <cdparam x="399" y="109" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="309" />
+<TGConnectingPoint num="0" id="1766" />
 </COMPONENT>
 
-<COMPONENT type="1000" id="312" >
+<COMPONENT type="1000" id="1769" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="311" />
+<TGConnectingPoint num="0" id="1768" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="313" >
+<CONNECTOR type="115" id="1770" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to stop state" value="null" />
-<P1  x="407" y="70" id="311" />
-<P2  x="409" y="104" id="309" />
+<P1  x="407" y="70" id="1768" />
+<P2  x="409" y="104" id="1766" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="LoadSource" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1000" id="315" >
+<COMPONENT type="1000" id="1772" >
 <cdparam x="585" y="128" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="314" />
+<TGConnectingPoint num="0" id="1771" />
 </COMPONENT>
 
-<COMPONENT type="1026" id="319" >
+<COMPONENT type="1026" id="1776" >
 <cdparam x="1006" y="302" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="delay" value="null" />
-<TGConnectingPoint num="0" id="317" />
-<TGConnectingPoint num="1" id="318" />
+<TGConnectingPoint num="0" id="1774" />
+<TGConnectingPoint num="1" id="1775" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="316" >
-<father id="319" num="0" />
+<SUBCOMPONENT type="-1" id="1773" >
+<father id="1776" num="0" />
 <cdparam x="1021" y="322" />
 <sizeparam width="34" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3176,35 +3286,35 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="327" >
+<COMPONENT type="1012" id="1784" >
 <cdparam x="916" y="267" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="323" />
-<TGConnectingPoint num="1" id="324" />
-<TGConnectingPoint num="2" id="325" />
-<TGConnectingPoint num="3" id="326" />
+<TGConnectingPoint num="0" id="1780" />
+<TGConnectingPoint num="1" id="1781" />
+<TGConnectingPoint num="2" id="1782" />
+<TGConnectingPoint num="3" id="1783" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="320" >
-<father id="327" num="0" />
+<SUBCOMPONENT type="-1" id="1777" >
+<father id="1784" num="0" />
 <cdparam x="870" y="278" />
 <sizeparam width="32" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ 0% ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="321" >
-<father id="327" num="1" />
+<SUBCOMPONENT type="-1" id="1778" >
+<father id="1784" num="1" />
 <cdparam x="951" y="277" />
 <sizeparam width="40" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ 70% ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="322" >
-<father id="327" num="2" />
+<SUBCOMPONENT type="-1" id="1779" >
+<father id="1784" num="2" />
 <cdparam x="936" y="312" />
 <sizeparam width="40" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3212,288 +3322,328 @@
 <infoparam name="guard 3" value="[ 30% ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="301" id="336" >
+<COMPONENT type="301" id="1801" >
 <cdparam x="208" y="126" />
 <sizeparam width="354" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="accounts for traffic caused by ECUs not taken into account
 " />
-<TGConnectingPoint num="0" id="328" />
-<TGConnectingPoint num="1" id="329" />
-<TGConnectingPoint num="2" id="330" />
-<TGConnectingPoint num="3" id="331" />
-<TGConnectingPoint num="4" id="332" />
-<TGConnectingPoint num="5" id="333" />
-<TGConnectingPoint num="6" id="334" />
-<TGConnectingPoint num="7" id="335" />
+<TGConnectingPoint num="0" id="1785" />
+<TGConnectingPoint num="1" id="1786" />
+<TGConnectingPoint num="2" id="1787" />
+<TGConnectingPoint num="3" id="1788" />
+<TGConnectingPoint num="4" id="1789" />
+<TGConnectingPoint num="5" id="1790" />
+<TGConnectingPoint num="6" id="1791" />
+<TGConnectingPoint num="7" id="1792" />
+<TGConnectingPoint num="8" id="1793" />
+<TGConnectingPoint num="9" id="1794" />
+<TGConnectingPoint num="10" id="1795" />
+<TGConnectingPoint num="11" id="1796" />
+<TGConnectingPoint num="12" id="1797" />
+<TGConnectingPoint num="13" id="1798" />
+<TGConnectingPoint num="14" id="1799" />
+<TGConnectingPoint num="15" id="1800" />
 <extraparam>
 <Line value="accounts for traffic caused by ECUs not taken into account" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1020" id="340" >
+<COMPONENT type="1020" id="1805" >
 <cdparam x="689" y="211" />
 <sizeparam width="93" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="for loop" value="10" />
-<TGConnectingPoint num="0" id="337" />
-<TGConnectingPoint num="1" id="338" />
-<TGConnectingPoint num="2" id="339" />
+<TGConnectingPoint num="0" id="1802" />
+<TGConnectingPoint num="1" id="1803" />
+<TGConnectingPoint num="2" id="1804" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="342" >
+<COMPONENT type="1001" id="1807" >
 <cdparam x="722" y="310" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="341" />
+<TGConnectingPoint num="0" id="1806" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="344" >
+<COMPONENT type="1001" id="1809" >
 <cdparam x="586" y="220" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="343" />
+<TGConnectingPoint num="0" id="1808" />
 </COMPONENT>
 
-<COMPONENT type="1014" id="348" >
+<COMPONENT type="1014" id="1813" >
 <cdparam x="501" y="169" />
 <sizeparam width="190" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="for loop" value="for(evts=0;evts==0;evts=evts)" />
-<TGConnectingPoint num="0" id="345" />
-<TGConnectingPoint num="1" id="346" />
-<TGConnectingPoint num="2" id="347" />
+<TGConnectingPoint num="0" id="1810" />
+<TGConnectingPoint num="1" id="1811" />
+<TGConnectingPoint num="2" id="1812" />
 <extraparam>
 <Data init="evts=0" condition="evts==0" increment="evts=evts" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="350" >
+<COMPONENT type="1001" id="1815" >
 <cdparam x="1001" y="364" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="349" />
+<TGConnectingPoint num="0" id="1814" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="352" >
+<COMPONENT type="1001" id="1817" >
 <cdparam x="922" y="394" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="351" />
+<TGConnectingPoint num="0" id="1816" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="354" >
+<COMPONENT type="1001" id="1819" >
 <cdparam x="835" y="357" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="353" />
+<TGConnectingPoint num="0" id="1818" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="357" >
+<COMPONENT type="1006" id="1822" >
 <cdparam x="800" y="304" />
 <sizeparam width="95" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="lowPrioLoad(1)" />
-<TGConnectingPoint num="0" id="355" />
-<TGConnectingPoint num="1" id="356" />
+<TGConnectingPoint num="0" id="1820" />
+<TGConnectingPoint num="1" id="1821" />
 <extraparam>
-<Data channelName="lowPrioLoad" nbOfSamples="1" />
+<Data channelName="lowPrioLoad" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="366" >
+<COMPONENT type="301" id="1839" >
 <cdparam x="1082" y="303" />
 <sizeparam width="70" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="idle time
 " />
-<TGConnectingPoint num="0" id="358" />
-<TGConnectingPoint num="1" id="359" />
-<TGConnectingPoint num="2" id="360" />
-<TGConnectingPoint num="3" id="361" />
-<TGConnectingPoint num="4" id="362" />
-<TGConnectingPoint num="5" id="363" />
-<TGConnectingPoint num="6" id="364" />
-<TGConnectingPoint num="7" id="365" />
+<TGConnectingPoint num="0" id="1823" />
+<TGConnectingPoint num="1" id="1824" />
+<TGConnectingPoint num="2" id="1825" />
+<TGConnectingPoint num="3" id="1826" />
+<TGConnectingPoint num="4" id="1827" />
+<TGConnectingPoint num="5" id="1828" />
+<TGConnectingPoint num="6" id="1829" />
+<TGConnectingPoint num="7" id="1830" />
+<TGConnectingPoint num="8" id="1831" />
+<TGConnectingPoint num="9" id="1832" />
+<TGConnectingPoint num="10" id="1833" />
+<TGConnectingPoint num="11" id="1834" />
+<TGConnectingPoint num="12" id="1835" />
+<TGConnectingPoint num="13" id="1836" />
+<TGConnectingPoint num="14" id="1837" />
+<TGConnectingPoint num="15" id="1838" />
 <extraparam>
 <Line value="idle time" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="375" >
+<COMPONENT type="301" id="1856" >
 <cdparam x="526" y="287" />
 <sizeparam width="179" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="check if processing finished
 " />
-<TGConnectingPoint num="0" id="367" />
-<TGConnectingPoint num="1" id="368" />
-<TGConnectingPoint num="2" id="369" />
-<TGConnectingPoint num="3" id="370" />
-<TGConnectingPoint num="4" id="371" />
-<TGConnectingPoint num="5" id="372" />
-<TGConnectingPoint num="6" id="373" />
-<TGConnectingPoint num="7" id="374" />
+<TGConnectingPoint num="0" id="1840" />
+<TGConnectingPoint num="1" id="1841" />
+<TGConnectingPoint num="2" id="1842" />
+<TGConnectingPoint num="3" id="1843" />
+<TGConnectingPoint num="4" id="1844" />
+<TGConnectingPoint num="5" id="1845" />
+<TGConnectingPoint num="6" id="1846" />
+<TGConnectingPoint num="7" id="1847" />
+<TGConnectingPoint num="8" id="1848" />
+<TGConnectingPoint num="9" id="1849" />
+<TGConnectingPoint num="10" id="1850" />
+<TGConnectingPoint num="11" id="1851" />
+<TGConnectingPoint num="12" id="1852" />
+<TGConnectingPoint num="13" id="1853" />
+<TGConnectingPoint num="14" id="1854" />
+<TGConnectingPoint num="15" id="1855" />
 <extraparam>
 <Line value="check if processing finished" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="384" >
+<COMPONENT type="301" id="1873" >
 <cdparam x="897" y="423" />
 <sizeparam width="145" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="high priority Bus Load
 " />
-<TGConnectingPoint num="0" id="376" />
-<TGConnectingPoint num="1" id="377" />
-<TGConnectingPoint num="2" id="378" />
-<TGConnectingPoint num="3" id="379" />
-<TGConnectingPoint num="4" id="380" />
-<TGConnectingPoint num="5" id="381" />
-<TGConnectingPoint num="6" id="382" />
-<TGConnectingPoint num="7" id="383" />
+<TGConnectingPoint num="0" id="1857" />
+<TGConnectingPoint num="1" id="1858" />
+<TGConnectingPoint num="2" id="1859" />
+<TGConnectingPoint num="3" id="1860" />
+<TGConnectingPoint num="4" id="1861" />
+<TGConnectingPoint num="5" id="1862" />
+<TGConnectingPoint num="6" id="1863" />
+<TGConnectingPoint num="7" id="1864" />
+<TGConnectingPoint num="8" id="1865" />
+<TGConnectingPoint num="9" id="1866" />
+<TGConnectingPoint num="10" id="1867" />
+<TGConnectingPoint num="11" id="1868" />
+<TGConnectingPoint num="12" id="1869" />
+<TGConnectingPoint num="13" id="1870" />
+<TGConnectingPoint num="14" id="1871" />
+<TGConnectingPoint num="15" id="1872" />
 <extraparam>
 <Line value="high priority Bus Load" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="393" >
+<COMPONENT type="301" id="1890" >
 <cdparam x="732" y="390" />
 <sizeparam width="145" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="high priority Bus Load
 " />
-<TGConnectingPoint num="0" id="385" />
-<TGConnectingPoint num="1" id="386" />
-<TGConnectingPoint num="2" id="387" />
-<TGConnectingPoint num="3" id="388" />
-<TGConnectingPoint num="4" id="389" />
-<TGConnectingPoint num="5" id="390" />
-<TGConnectingPoint num="6" id="391" />
-<TGConnectingPoint num="7" id="392" />
+<TGConnectingPoint num="0" id="1874" />
+<TGConnectingPoint num="1" id="1875" />
+<TGConnectingPoint num="2" id="1876" />
+<TGConnectingPoint num="3" id="1877" />
+<TGConnectingPoint num="4" id="1878" />
+<TGConnectingPoint num="5" id="1879" />
+<TGConnectingPoint num="6" id="1880" />
+<TGConnectingPoint num="7" id="1881" />
+<TGConnectingPoint num="8" id="1882" />
+<TGConnectingPoint num="9" id="1883" />
+<TGConnectingPoint num="10" id="1884" />
+<TGConnectingPoint num="11" id="1885" />
+<TGConnectingPoint num="12" id="1886" />
+<TGConnectingPoint num="13" id="1887" />
+<TGConnectingPoint num="14" id="1888" />
+<TGConnectingPoint num="15" id="1889" />
 <extraparam>
 <Line value="high priority Bus Load" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="396" >
+<COMPONENT type="1006" id="1893" >
 <cdparam x="882" y="344" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="highPrioLoad(1)" />
-<TGConnectingPoint num="0" id="394" />
-<TGConnectingPoint num="1" id="395" />
+<TGConnectingPoint num="0" id="1891" />
+<TGConnectingPoint num="1" id="1892" />
 <extraparam>
-<Data channelName="highPrioLoad" nbOfSamples="1" />
+<Data channelName="highPrioLoad" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="115" id="397" >
+<CONNECTOR type="115" id="1894" >
 <cdparam x="735" y="236" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to stop state" value="null" />
-<P1  x="735" y="236" id="339" />
-<P2  x="732" y="305" id="341" />
+<P1  x="735" y="236" id="1804" />
+<P2  x="732" y="305" id="1806" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="398" >
+<CONNECTOR type="115" id="1895" >
 <cdparam x="782" y="225" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to choice" value="null" />
-<P1  x="782" y="225" id="338" />
-<P2  x="931" y="257" id="323" />
+<P1  x="782" y="225" id="1803" />
+<P2  x="931" y="257" id="1780" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="399" >
+<CONNECTOR type="115" id="1896" >
 <cdparam x="971" y="282" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to delay" value="null" />
-<P1  x="971" y="282" id="325" />
-<P2  x="1011" y="297" id="317" />
+<P1  x="971" y="282" id="1782" />
+<P2  x="1011" y="297" id="1774" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="400" >
+<CONNECTOR type="115" id="1897" >
 <cdparam x="931" y="322" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to write channel" value="null" />
-<P1  x="931" y="322" id="326" />
-<P2  x="932" y="339" id="394" />
+<P1  x="931" y="322" id="1783" />
+<P2  x="932" y="339" id="1891" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="401" >
+<CONNECTOR type="115" id="1898" >
 <cdparam x="891" y="282" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to write channel" value="null" />
-<P1  x="891" y="282" id="324" />
-<P2  x="847" y="299" id="355" />
+<P1  x="891" y="282" id="1781" />
+<P2  x="847" y="299" id="1820" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="402" >
+<CONNECTOR type="115" id="1899" >
 <cdparam x="847" y="329" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="847" y="329" id="356" />
-<P2  x="845" y="352" id="353" />
+<P1  x="847" y="329" id="1821" />
+<P2  x="845" y="352" id="1818" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="403" >
+<CONNECTOR type="115" id="1900" >
 <cdparam x="932" y="369" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="932" y="369" id="395" />
-<P2  x="932" y="389" id="351" />
+<P1  x="932" y="369" id="1892" />
+<P2  x="932" y="389" id="1816" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="404" >
+<CONNECTOR type="115" id="1901" >
 <cdparam x="1011" y="337" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from delay to stop state" value="null" />
-<P1  x="1011" y="337" id="318" />
-<P2  x="1011" y="359" id="349" />
+<P1  x="1011" y="337" id="1775" />
+<P2  x="1011" y="359" id="1814" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="405" >
+<CONNECTOR type="115" id="1902" >
 <cdparam x="598" y="236" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to stop state" value="null" />
-<P1  x="596" y="194" id="347" />
-<P2  x="596" y="215" id="343" />
+<P1  x="596" y="194" id="1812" />
+<P2  x="596" y="215" id="1808" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="406" >
+<CONNECTOR type="115" id="1903" >
 <cdparam x="691" y="183" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to for loop" value="null" />
-<P1  x="691" y="183" id="346" />
-<P2  x="735" y="206" id="337" />
+<P1  x="691" y="183" id="1811" />
+<P2  x="735" y="206" id="1802" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="407" >
+<CONNECTOR type="115" id="1904" >
 <cdparam x="586" y="155" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to for loop" value="null" />
-<P1  x="592" y="148" id="314" />
-<P2  x="596" y="164" id="345" />
+<P1  x="592" y="148" id="1771" />
+<P2  x="596" y="164" id="1810" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
@@ -3506,210 +3656,212 @@
 
 <Modeling type="TML Architecture" nameTab="Architecture_NoSec" >
 <TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1900" minY="10" maxY="1400" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1100" id="441" >
+<COMPONENT type="1100" id="1938" >
 <cdparam x="691" y="578" />
 <sizeparam width="255" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
 <infoparam name="CPU_Sink" value="name" />
-<TGConnectingPoint num="0" id="417" />
-<TGConnectingPoint num="1" id="418" />
-<TGConnectingPoint num="2" id="419" />
-<TGConnectingPoint num="3" id="420" />
-<TGConnectingPoint num="4" id="421" />
-<TGConnectingPoint num="5" id="422" />
-<TGConnectingPoint num="6" id="423" />
-<TGConnectingPoint num="7" id="424" />
-<TGConnectingPoint num="8" id="425" />
-<TGConnectingPoint num="9" id="426" />
-<TGConnectingPoint num="10" id="427" />
-<TGConnectingPoint num="11" id="428" />
-<TGConnectingPoint num="12" id="429" />
-<TGConnectingPoint num="13" id="430" />
-<TGConnectingPoint num="14" id="431" />
-<TGConnectingPoint num="15" id="432" />
-<TGConnectingPoint num="16" id="433" />
-<TGConnectingPoint num="17" id="434" />
-<TGConnectingPoint num="18" id="435" />
-<TGConnectingPoint num="19" id="436" />
-<TGConnectingPoint num="20" id="437" />
-<TGConnectingPoint num="21" id="438" />
-<TGConnectingPoint num="22" id="439" />
-<TGConnectingPoint num="23" id="440" />
+<TGConnectingPoint num="0" id="1914" />
+<TGConnectingPoint num="1" id="1915" />
+<TGConnectingPoint num="2" id="1916" />
+<TGConnectingPoint num="3" id="1917" />
+<TGConnectingPoint num="4" id="1918" />
+<TGConnectingPoint num="5" id="1919" />
+<TGConnectingPoint num="6" id="1920" />
+<TGConnectingPoint num="7" id="1921" />
+<TGConnectingPoint num="8" id="1922" />
+<TGConnectingPoint num="9" id="1923" />
+<TGConnectingPoint num="10" id="1924" />
+<TGConnectingPoint num="11" id="1925" />
+<TGConnectingPoint num="12" id="1926" />
+<TGConnectingPoint num="13" id="1927" />
+<TGConnectingPoint num="14" id="1928" />
+<TGConnectingPoint num="15" id="1929" />
+<TGConnectingPoint num="16" id="1930" />
+<TGConnectingPoint num="17" id="1931" />
+<TGConnectingPoint num="18" id="1932" />
+<TGConnectingPoint num="19" id="1933" />
+<TGConnectingPoint num="20" id="1934" />
+<TGConnectingPoint num="21" id="1935" />
+<TGConnectingPoint num="22" id="1936" />
+<TGConnectingPoint num="23" id="1937" />
 <extraparam>
 <info stereotype="CPURRPB" nodeName="CPU_Sink" />
-<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="416" >
-<father id="441" num="0" />
-<cdparam x="702" y="620" />
-<sizeparam width="229" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="1913" >
+<father id="1938" num="0" />
+<cdparam x="701" y="620" />
+<sizeparam width="245" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="26" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="10" minY="0" maxY="60" />
 <infoparam name="TGComponent" value="KDP Perf Design_NoSec::LoadSink" />
-<TGConnectingPoint num="0" id="408" />
-<TGConnectingPoint num="1" id="409" />
-<TGConnectingPoint num="2" id="410" />
-<TGConnectingPoint num="3" id="411" />
-<TGConnectingPoint num="4" id="412" />
-<TGConnectingPoint num="5" id="413" />
-<TGConnectingPoint num="6" id="414" />
-<TGConnectingPoint num="7" id="415" />
+<TGConnectingPoint num="0" id="1905" />
+<TGConnectingPoint num="1" id="1906" />
+<TGConnectingPoint num="2" id="1907" />
+<TGConnectingPoint num="3" id="1908" />
+<TGConnectingPoint num="4" id="1909" />
+<TGConnectingPoint num="5" id="1910" />
+<TGConnectingPoint num="6" id="1911" />
+<TGConnectingPoint num="7" id="1912" />
 <extraparam>
 <info value="KDP Perf Design_NoSec::LoadSink" taskName="LoadSink" referenceTaskName="KDP Perf Design_NoSec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1100" id="475" >
+<COMPONENT type="1100" id="1972" >
 <cdparam x="674" y="295" />
 <sizeparam width="289" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
 <infoparam name="CPU_Source" value="name" />
-<TGConnectingPoint num="0" id="451" />
-<TGConnectingPoint num="1" id="452" />
-<TGConnectingPoint num="2" id="453" />
-<TGConnectingPoint num="3" id="454" />
-<TGConnectingPoint num="4" id="455" />
-<TGConnectingPoint num="5" id="456" />
-<TGConnectingPoint num="6" id="457" />
-<TGConnectingPoint num="7" id="458" />
-<TGConnectingPoint num="8" id="459" />
-<TGConnectingPoint num="9" id="460" />
-<TGConnectingPoint num="10" id="461" />
-<TGConnectingPoint num="11" id="462" />
-<TGConnectingPoint num="12" id="463" />
-<TGConnectingPoint num="13" id="464" />
-<TGConnectingPoint num="14" id="465" />
-<TGConnectingPoint num="15" id="466" />
-<TGConnectingPoint num="16" id="467" />
-<TGConnectingPoint num="17" id="468" />
-<TGConnectingPoint num="18" id="469" />
-<TGConnectingPoint num="19" id="470" />
-<TGConnectingPoint num="20" id="471" />
-<TGConnectingPoint num="21" id="472" />
-<TGConnectingPoint num="22" id="473" />
-<TGConnectingPoint num="23" id="474" />
+<TGConnectingPoint num="0" id="1948" />
+<TGConnectingPoint num="1" id="1949" />
+<TGConnectingPoint num="2" id="1950" />
+<TGConnectingPoint num="3" id="1951" />
+<TGConnectingPoint num="4" id="1952" />
+<TGConnectingPoint num="5" id="1953" />
+<TGConnectingPoint num="6" id="1954" />
+<TGConnectingPoint num="7" id="1955" />
+<TGConnectingPoint num="8" id="1956" />
+<TGConnectingPoint num="9" id="1957" />
+<TGConnectingPoint num="10" id="1958" />
+<TGConnectingPoint num="11" id="1959" />
+<TGConnectingPoint num="12" id="1960" />
+<TGConnectingPoint num="13" id="1961" />
+<TGConnectingPoint num="14" id="1962" />
+<TGConnectingPoint num="15" id="1963" />
+<TGConnectingPoint num="16" id="1964" />
+<TGConnectingPoint num="17" id="1965" />
+<TGConnectingPoint num="18" id="1966" />
+<TGConnectingPoint num="19" id="1967" />
+<TGConnectingPoint num="20" id="1968" />
+<TGConnectingPoint num="21" id="1969" />
+<TGConnectingPoint num="22" id="1970" />
+<TGConnectingPoint num="23" id="1971" />
 <extraparam>
 <info stereotype="CPURRPB" nodeName="CPU_Source" />
-<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="450" >
-<father id="475" num="0" />
+<SUBCOMPONENT type="1101" id="1947" >
+<father id="1972" num="0" />
 <cdparam x="692" y="340" />
-<sizeparam width="244" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="263" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="45" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="26" minY="0" maxY="60" />
 <infoparam name="TGComponent" value="KDP Perf Design_NoSec::LoadSource" />
-<TGConnectingPoint num="0" id="442" />
-<TGConnectingPoint num="1" id="443" />
-<TGConnectingPoint num="2" id="444" />
-<TGConnectingPoint num="3" id="445" />
-<TGConnectingPoint num="4" id="446" />
-<TGConnectingPoint num="5" id="447" />
-<TGConnectingPoint num="6" id="448" />
-<TGConnectingPoint num="7" id="449" />
+<TGConnectingPoint num="0" id="1939" />
+<TGConnectingPoint num="1" id="1940" />
+<TGConnectingPoint num="2" id="1941" />
+<TGConnectingPoint num="3" id="1942" />
+<TGConnectingPoint num="4" id="1943" />
+<TGConnectingPoint num="5" id="1944" />
+<TGConnectingPoint num="6" id="1945" />
+<TGConnectingPoint num="7" id="1946" />
 <extraparam>
 <info value="KDP Perf Design_NoSec::LoadSource" taskName="LoadSource" referenceTaskName="KDP Perf Design_NoSec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1102" id="518" >
+<COMPONENT type="1102" id="2015" >
 <cdparam x="670" y="425" />
 <sizeparam width="297" height="134" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1400" />
 <infoparam name="MainCAN" value="name" />
-<TGConnectingPoint num="0" id="494" />
-<TGConnectingPoint num="1" id="495" />
-<TGConnectingPoint num="2" id="496" />
-<TGConnectingPoint num="3" id="497" />
-<TGConnectingPoint num="4" id="498" />
-<TGConnectingPoint num="5" id="499" />
-<TGConnectingPoint num="6" id="500" />
-<TGConnectingPoint num="7" id="501" />
-<TGConnectingPoint num="8" id="502" />
-<TGConnectingPoint num="9" id="503" />
-<TGConnectingPoint num="10" id="504" />
-<TGConnectingPoint num="11" id="505" />
-<TGConnectingPoint num="12" id="506" />
-<TGConnectingPoint num="13" id="507" />
-<TGConnectingPoint num="14" id="508" />
-<TGConnectingPoint num="15" id="509" />
-<TGConnectingPoint num="16" id="510" />
-<TGConnectingPoint num="17" id="511" />
-<TGConnectingPoint num="18" id="512" />
-<TGConnectingPoint num="19" id="513" />
-<TGConnectingPoint num="20" id="514" />
-<TGConnectingPoint num="21" id="515" />
-<TGConnectingPoint num="22" id="516" />
-<TGConnectingPoint num="23" id="517" />
-<extraparam>
-<info stereotype="BUS-CAN" nodeName="MainCAN" />
-<attributes byteDataSize="1"  arbitrationPolicy="2"  sliceTime="10000"  pipelineSize="1"  clockRatio="3225" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1103" id="484" >
-<father id="518" num="0" />
-<cdparam x="706" y="508" />
-<sizeparam width="247" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="50" minY="0" maxY="94" />
-<infoparam name="TGComponent" value="KDP Perf Design_NoSec::lowPrioLoad" />
-<TGConnectingPoint num="0" id="476" />
-<TGConnectingPoint num="1" id="477" />
-<TGConnectingPoint num="2" id="478" />
-<TGConnectingPoint num="3" id="479" />
-<TGConnectingPoint num="4" id="480" />
-<TGConnectingPoint num="5" id="481" />
-<TGConnectingPoint num="6" id="482" />
-<TGConnectingPoint num="7" id="483" />
+<TGConnectingPoint num="0" id="1991" />
+<TGConnectingPoint num="1" id="1992" />
+<TGConnectingPoint num="2" id="1993" />
+<TGConnectingPoint num="3" id="1994" />
+<TGConnectingPoint num="4" id="1995" />
+<TGConnectingPoint num="5" id="1996" />
+<TGConnectingPoint num="6" id="1997" />
+<TGConnectingPoint num="7" id="1998" />
+<TGConnectingPoint num="8" id="1999" />
+<TGConnectingPoint num="9" id="2000" />
+<TGConnectingPoint num="10" id="2001" />
+<TGConnectingPoint num="11" id="2002" />
+<TGConnectingPoint num="12" id="2003" />
+<TGConnectingPoint num="13" id="2004" />
+<TGConnectingPoint num="14" id="2005" />
+<TGConnectingPoint num="15" id="2006" />
+<TGConnectingPoint num="16" id="2007" />
+<TGConnectingPoint num="17" id="2008" />
+<TGConnectingPoint num="18" id="2009" />
+<TGConnectingPoint num="19" id="2010" />
+<TGConnectingPoint num="20" id="2011" />
+<TGConnectingPoint num="21" id="2012" />
+<TGConnectingPoint num="22" id="2013" />
+<TGConnectingPoint num="23" id="2014" />
+<extraparam>
+<info stereotype="BUS-RR" nodeName="MainCAN" />
+<attributes byteDataSize="1"  arbitrationPolicy="2"  sliceTime="10000"  pipelineSize="1"  clockRatio="3225"  privacy="0"  referenceAttack="" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1103" id="1981" >
+<father id="2015" num="0" />
+<cdparam x="697" y="462" />
+<sizeparam width="270" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="27" minY="0" maxY="94" />
+<infoparam name="TGComponent" value="KDP Perf Design_NoSec::highPrioLoad" />
+<TGConnectingPoint num="0" id="1973" />
+<TGConnectingPoint num="1" id="1974" />
+<TGConnectingPoint num="2" id="1975" />
+<TGConnectingPoint num="3" id="1976" />
+<TGConnectingPoint num="4" id="1977" />
+<TGConnectingPoint num="5" id="1978" />
+<TGConnectingPoint num="6" id="1979" />
+<TGConnectingPoint num="7" id="1980" />
 <extraparam>
-<info value="KDP Perf Design_NoSec::lowPrioLoad" communicationName="lowPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="1" typeName="channel" />
+<info value="KDP Perf Design_NoSec::highPrioLoad" communicationName="highPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="0" typeName="channel" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1103" id="493" >
-<father id="518" num="1" />
-<cdparam x="702" y="462" />
-<sizeparam width="252" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1103" id="1990" >
+<father id="2015" num="1" />
+<cdparam x="704" y="508" />
+<sizeparam width="263" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="45" minY="0" maxY="94" />
-<infoparam name="TGComponent" value="KDP Perf Design_NoSec::highPrioLoad" />
-<TGConnectingPoint num="0" id="485" />
-<TGConnectingPoint num="1" id="486" />
-<TGConnectingPoint num="2" id="487" />
-<TGConnectingPoint num="3" id="488" />
-<TGConnectingPoint num="4" id="489" />
-<TGConnectingPoint num="5" id="490" />
-<TGConnectingPoint num="6" id="491" />
-<TGConnectingPoint num="7" id="492" />
+<cdrectangleparam minX="0" maxX="34" minY="0" maxY="94" />
+<infoparam name="TGComponent" value="KDP Perf Design_NoSec::lowPrioLoad" />
+<TGConnectingPoint num="0" id="1982" />
+<TGConnectingPoint num="1" id="1983" />
+<TGConnectingPoint num="2" id="1984" />
+<TGConnectingPoint num="3" id="1985" />
+<TGConnectingPoint num="4" id="1986" />
+<TGConnectingPoint num="5" id="1987" />
+<TGConnectingPoint num="6" id="1988" />
+<TGConnectingPoint num="7" id="1989" />
 <extraparam>
-<info value="KDP Perf Design_NoSec::highPrioLoad" communicationName="highPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="0" typeName="channel" />
+<info value="KDP Perf Design_NoSec::lowPrioLoad" communicationName="lowPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="1" typeName="channel" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="125" id="519" >
+<CONNECTOR type="125" id="2016" >
 <cdparam x="1166" y="557" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU_Sink to MainCAN" value="{info}" />
-<P1  x="818" y="578" id="418" />
-<P2  x="818" y="559" id="500" />
+<P1  x="818" y="578" id="1915" />
+<P2  x="818" y="559" id="1997" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="520" >
+<CONNECTOR type="125" id="2017" >
 <cdparam x="545" y="515" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU0 to MainCAN" value="{info}" />
-<P1  x="818" y="395" id="457" />
-<P2  x="818" y="425" id="495" />
+<P1  x="818" y="395" id="1954" />
+<P2  x="818" y="425" id="1992" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
 </CONNECTOR>
 
@@ -3722,25 +3874,25 @@
 
 <Modeling type="TML Component Design" nameTab="KDP Perf Design_Sec" >
 <TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2400" minY="10" maxY="900" channels="true" events="true" requests="true" zoom="1.0" >
-<CONNECTOR type="126" id="523" >
+<CONNECTOR type="126" id="2020" >
 <cdparam x="678" y="51" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="678" y="51" id="600" />
-<P2  x="750" y="28" id="585" />
+<P1  x="678" y="51" id="2101" />
+<P2  x="750" y="28" id="2086" />
 <Point x="725" y="15" />
 <Point x="746" y="16" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="521" >
-<father id="523" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2018" >
+<father id="2020" num="0" />
 <cdparam x="725" y="15" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="522" >
-<father id="523" num="1" />
+<SUBCOMPONENT type="-1" id="2019" >
+<father id="2020" num="1" />
 <cdparam x="746" y="16" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3748,417 +3900,418 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="126" id="524" >
+<CONNECTOR type="126" id="2021" >
 <cdparam x="833" y="144" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="806" y="144" id="589" />
-<P2  x="790" y="193" id="574" />
+<P1  x="806" y="144" id="2082" />
+<P2  x="790" y="193" id="2069" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="525" >
+<CONNECTOR type="126" id="2022" >
 <cdparam x="767" y="144" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="720" y="144" id="587" />
-<P2  x="724" y="193" id="572" />
+<P1  x="720" y="144" id="2084" />
+<P2  x="724" y="193" id="2071" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="526" >
+<CONNECTOR type="126" id="2023" >
 <cdparam x="1845" y="702" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1716" y="670" id="822" />
-<P2  x="1415" y="678" id="747" />
+<P1  x="1716" y="670" id="2325" />
+<P2  x="1415" y="678" id="2226" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="527" >
+<CONNECTOR type="126" id="2024" >
 <cdparam x="1845" y="739" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1716" y="707" id="820" />
-<P2  x="1415" y="720" id="749" />
+<P1  x="1716" y="707" id="2327" />
+<P2  x="1415" y="720" id="2224" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="528" >
+<CONNECTOR type="126" id="2025" >
 <cdparam x="1415" y="639" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1415" y="639" id="745" />
-<P2  x="1716" y="638" id="824" />
+<P1  x="1415" y="639" id="2228" />
+<P2  x="1716" y="638" id="2323" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="529" >
+<CONNECTOR type="126" id="2026" >
 <cdparam x="1415" y="594" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1415" y="594" id="743" />
-<P2  x="1716" y="603" id="826" />
+<P1  x="1415" y="594" id="2230" />
+<P2  x="1716" y="603" id="2321" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="530" >
+<CONNECTOR type="126" id="2027" >
 <cdparam x="678" y="707" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="678" y="707" id="654" />
-<P2  x="1112" y="699" id="741" />
+<P1  x="678" y="707" id="2137" />
+<P2  x="1112" y="699" id="2232" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="531" >
+<CONNECTOR type="126" id="2028" >
 <cdparam x="678" y="671" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="678" y="671" id="652" />
-<P2  x="1112" y="663" id="739" />
+<P1  x="678" y="671" id="2139" />
+<P2  x="1112" y="663" id="2234" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="532" >
+<CONNECTOR type="126" id="2029" >
 <cdparam x="1112" y="629" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1112" y="629" id="737" />
-<P2  x="678" y="624" id="650" />
+<P1  x="1112" y="629" id="2236" />
+<P2  x="678" y="624" id="2141" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="533" >
+<CONNECTOR type="126" id="2030" >
 <cdparam x="1112" y="589" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1112" y="589" id="735" />
-<P2  x="678" y="583" id="648" />
+<P1  x="1112" y="589" id="2238" />
+<P2  x="678" y="583" id="2143" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="534" >
+<CONNECTOR type="126" id="2031" >
 <cdparam x="425" y="111" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="425" y="111" id="691" />
-<P2  x="275" y="90" id="615" />
+<P1  x="425" y="111" id="2162" />
+<P2  x="275" y="90" id="2126" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="535" >
+<CONNECTOR type="126" id="2032" >
 <cdparam x="375" y="226" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="375" y="226" id="689" />
-<P2  x="275" y="231" id="621" />
+<P1  x="375" y="226" id="2164" />
+<P2  x="275" y="231" id="2120" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="536" >
+<CONNECTOR type="126" id="2033" >
 <cdparam x="375" y="176" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="375" y="150" id="687" />
-<P2  x="275" y="139" id="617" />
+<P1  x="375" y="150" id="2166" />
+<P2  x="275" y="139" id="2124" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="537" >
+<CONNECTOR type="126" id="2034" >
 <cdparam x="275" y="183" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="275" y="185" id="619" />
-<P2  x="375" y="187" id="685" />
+<P1  x="275" y="185" id="2122" />
+<P2  x="375" y="187" id="2168" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="538" >
+<CONNECTOR type="126" id="2035" >
 <cdparam x="275" y="271" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="275" y="273" id="623" />
-<P2  x="375" y="267" id="683" />
+<P1  x="275" y="273" id="2118" />
+<P2  x="375" y="267" id="2170" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="539" >
+<CONNECTOR type="126" id="2036" >
 <cdparam x="375" y="337" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="375" y="343" id="681" />
-<P2  x="275" y="358" id="627" />
+<P1  x="375" y="343" id="2172" />
+<P2  x="275" y="358" id="2114" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="540" >
+<CONNECTOR type="126" id="2037" >
 <cdparam x="375" y="334" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="375" y="305" id="679" />
-<P2  x="275" y="319" id="625" />
+<P1  x="375" y="305" id="2174" />
+<P2  x="275" y="319" id="2116" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="541" >
+<CONNECTOR type="126" id="2038" >
 <cdparam x="375" y="335" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="375" y="375" id="677" />
-<P2  x="275" y="393" id="629" />
+<P1  x="375" y="375" id="2176" />
+<P2  x="275" y="393" id="2112" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="542" >
+<CONNECTOR type="126" id="2039" >
 <cdparam x="565" y="202" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="588" y="111" id="675" />
-<P2  x="586" y="91" id="604" />
+<P1  x="588" y="111" id="2178" />
+<P2  x="586" y="91" id="2097" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="543" >
+<CONNECTOR type="126" id="2040" >
 <cdparam x="449" y="151" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="495" y="91" id="602" />
-<P2  x="498" y="111" id="673" />
+<P1  x="495" y="91" id="2099" />
+<P2  x="498" y="111" id="2180" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="544" >
+<CONNECTOR type="126" id="2041" >
 <cdparam x="620" y="437" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="620" y="515" id="646" />
-<P2  x="620" y="410" id="671" />
+<P1  x="620" y="515" id="2145" />
+<P2  x="620" y="410" id="2182" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="545" >
+<CONNECTOR type="126" id="2042" >
 <cdparam x="558" y="437" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="557" y="515" id="644" />
-<P2  x="557" y="410" id="669" />
+<P1  x="557" y="515" id="2147" />
+<P2  x="557" y="410" id="2184" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="546" >
+<CONNECTOR type="126" id="2043" >
 <cdparam x="495" y="381" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="494" y="410" id="667" />
-<P2  x="494" y="515" id="642" />
+<P1  x="494" y="410" id="2186" />
+<P2  x="494" y="515" id="2149" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="547" >
+<CONNECTOR type="126" id="2044" >
 <cdparam x="438" y="381" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="437" y="410" id="665" />
-<P2  x="437" y="515" id="640" />
+<P1  x="437" y="410" id="2188" />
+<P2  x="437" y="515" id="2151" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="548" >
+<CONNECTOR type="126" id="2045" >
 <cdparam x="1170" y="160" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1162" y="114" id="762" />
-<P2  x="1021" y="103" id="702" />
+<P1  x="1162" y="114" id="2277" />
+<P2  x="1021" y="103" id="2213" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="549" >
+<CONNECTOR type="126" id="2046" >
 <cdparam x="1120" y="275" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1112" y="229" id="764" />
-<P2  x="1021" y="244" id="712" />
+<P1  x="1112" y="229" id="2275" />
+<P2  x="1021" y="244" id="2203" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="550" >
+<CONNECTOR type="126" id="2047" >
 <cdparam x="1120" y="225" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1112" y="153" id="766" />
-<P2  x="1021" y="152" id="716" />
+<P1  x="1112" y="153" id="2273" />
+<P2  x="1021" y="152" id="2199" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="551" >
+<CONNECTOR type="126" id="2048" >
 <cdparam x="1020" y="232" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1021" y="198" id="714" />
-<P2  x="1112" y="190" id="768" />
+<P1  x="1021" y="198" id="2201" />
+<P2  x="1112" y="190" id="2271" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="552" >
+<CONNECTOR type="126" id="2049" >
 <cdparam x="1020" y="320" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1021" y="286" id="710" />
-<P2  x="1112" y="270" id="770" />
+<P1  x="1021" y="286" id="2205" />
+<P2  x="1112" y="270" id="2269" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="553" >
+<CONNECTOR type="126" id="2050" >
 <cdparam x="1120" y="386" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1112" y="346" id="772" />
-<P2  x="1021" y="371" id="706" />
+<P1  x="1112" y="346" id="2267" />
+<P2  x="1021" y="371" id="2209" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="554" >
+<CONNECTOR type="126" id="2051" >
 <cdparam x="1120" y="383" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1112" y="308" id="774" />
-<P2  x="1021" y="332" id="708" />
+<P1  x="1112" y="308" id="2265" />
+<P2  x="1021" y="332" id="2207" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="555" >
+<CONNECTOR type="126" id="2052" >
 <cdparam x="1120" y="384" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1112" y="378" id="776" />
-<P2  x="1021" y="406" id="704" />
+<P1  x="1112" y="378" id="2263" />
+<P2  x="1021" y="406" id="2211" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="556" >
+<CONNECTOR type="126" id="2053" >
 <cdparam x="1365" y="486" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1357" y="515" id="729" />
-<P2  x="1357" y="413" id="778" />
+<P1  x="1357" y="515" id="2244" />
+<P2  x="1357" y="413" id="2261" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="557" >
+<CONNECTOR type="126" id="2054" >
 <cdparam x="1303" y="486" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1294" y="515" id="731" />
-<P2  x="1294" y="413" id="780" />
+<P1  x="1294" y="515" id="2242" />
+<P2  x="1294" y="413" id="2259" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="558" >
+<CONNECTOR type="126" id="2055" >
 <cdparam x="1240" y="430" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1231" y="413" id="782" />
-<P2  x="1231" y="515" id="733" />
+<P1  x="1231" y="413" id="2257" />
+<P2  x="1231" y="515" id="2240" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="559" >
+<CONNECTOR type="126" id="2056" >
 <cdparam x="1183" y="430" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1174" y="413" id="760" />
-<P2  x="1174" y="515" id="727" />
+<P1  x="1174" y="413" id="2279" />
+<P2  x="1174" y="515" id="2246" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="560" >
+<CONNECTOR type="126" id="2057" >
 <cdparam x="1766" y="176" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1766" y="176" id="845" />
-<P2  x="1616" y="153" id="793" />
+<P1  x="1766" y="176" id="2360" />
+<P2  x="1616" y="153" id="2304" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="561" >
+<CONNECTOR type="126" id="2058" >
 <cdparam x="1716" y="291" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1716" y="291" id="847" />
-<P2  x="1616" y="294" id="803" />
+<P1  x="1716" y="291" id="2358" />
+<P2  x="1616" y="294" id="2294" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="562" >
+<CONNECTOR type="126" id="2059" >
 <cdparam x="1716" y="241" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1716" y="215" id="849" />
-<P2  x="1616" y="202" id="807" />
+<P1  x="1716" y="215" id="2356" />
+<P2  x="1616" y="202" id="2290" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="563" >
+<CONNECTOR type="126" id="2060" >
 <cdparam x="1616" y="248" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1616" y="248" id="805" />
-<P2  x="1716" y="252" id="851" />
+<P1  x="1616" y="248" id="2292" />
+<P2  x="1716" y="252" id="2354" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="564" >
+<CONNECTOR type="126" id="2061" >
 <cdparam x="1616" y="336" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1616" y="336" id="801" />
-<P2  x="1716" y="332" id="853" />
+<P1  x="1616" y="336" id="2296" />
+<P2  x="1716" y="332" id="2352" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="565" >
+<CONNECTOR type="126" id="2062" >
 <cdparam x="1716" y="402" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1716" y="408" id="855" />
-<P2  x="1616" y="421" id="797" />
+<P1  x="1716" y="408" id="2350" />
+<P2  x="1616" y="421" id="2300" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="566" >
+<CONNECTOR type="126" id="2063" >
 <cdparam x="1716" y="399" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1716" y="370" id="857" />
-<P2  x="1616" y="382" id="799" />
+<P1  x="1716" y="370" id="2348" />
+<P2  x="1616" y="382" id="2298" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="567" >
+<CONNECTOR type="126" id="2064" >
 <cdparam x="1716" y="400" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1716" y="440" id="859" />
-<P2  x="1616" y="456" id="795" />
+<P1  x="1716" y="440" id="2346" />
+<P2  x="1616" y="456" id="2302" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="568" >
+<CONNECTOR type="126" id="2065" >
 <cdparam x="1961" y="502" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1961" y="543" id="828" />
-<P2  x="1961" y="475" id="861" />
+<P1  x="1961" y="543" id="2319" />
+<P2  x="1961" y="475" id="2344" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="569" >
+<CONNECTOR type="126" id="2066" >
 <cdparam x="1899" y="502" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1898" y="543" id="830" />
-<P2  x="1898" y="475" id="863" />
+<P1  x="1898" y="543" id="2317" />
+<P2  x="1898" y="475" id="2342" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="570" >
+<CONNECTOR type="126" id="2067" >
 <cdparam x="1836" y="446" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1835" y="475" id="865" />
-<P2  x="1835" y="543" id="832" />
+<P1  x="1835" y="475" id="2340" />
+<P2  x="1835" y="543" id="2315" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="571" >
+<CONNECTOR type="126" id="2068" >
 <cdparam x="1779" y="446" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Primitive port to Primitive port" value="Connector between ports" />
-<P1  x="1778" y="475" id="843" />
-<P2  x="1778" y="543" id="818" />
+<P1  x="1778" y="475" id="2362" />
+<P2  x="1778" y="543" id="2329" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<COMPONENT type="1202" id="584" >
+<COMPONENT type="1202" id="2081" >
 <cdparam x="704" y="206" />
 <sizeparam width="106" height="94" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
 <infoparam name="Primitive component" value="LoadSink" />
-<TGConnectingPoint num="0" id="576" />
-<TGConnectingPoint num="1" id="577" />
-<TGConnectingPoint num="2" id="578" />
-<TGConnectingPoint num="3" id="579" />
-<TGConnectingPoint num="4" id="580" />
-<TGConnectingPoint num="5" id="581" />
-<TGConnectingPoint num="6" id="582" />
-<TGConnectingPoint num="7" id="583" />
+<TGConnectingPoint num="0" id="2073" />
+<TGConnectingPoint num="1" id="2074" />
+<TGConnectingPoint num="2" id="2075" />
+<TGConnectingPoint num="3" id="2076" />
+<TGConnectingPoint num="4" id="2077" />
+<TGConnectingPoint num="5" id="2078" />
+<TGConnectingPoint num="6" id="2079" />
+<TGConnectingPoint num="7" id="2080" />
 <extraparam>
+<Data isAttacker="No" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="573" >
-<father id="584" num="0" />
-<cdparam x="711" y="193" />
+<SUBCOMPONENT type="1203" id="2070" >
+<father id="2081" num="0" />
+<cdparam x="777" y="193" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="93" minY="-13" maxY="81" />
-<infoparam name="Primitive port" value="Channel highPrioLoad" />
-<TGConnectingPoint num="0" id="572" />
+<infoparam name="Primitive port" value="Channel lowPrioLoad" />
+<TGConnectingPoint num="0" id="2069" />
 <extraparam>
-<Prop commName="highPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="lowPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4166,16 +4319,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="575" >
-<father id="584" num="1" />
-<cdparam x="777" y="193" />
+<SUBCOMPONENT type="1203" id="2072" >
+<father id="2081" num="1" />
+<cdparam x="711" y="193" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="93" minY="-13" maxY="81" />
-<infoparam name="Primitive port" value="Channel lowPrioLoad" />
-<TGConnectingPoint num="0" id="574" />
+<infoparam name="Primitive port" value="Channel highPrioLoad" />
+<TGConnectingPoint num="0" id="2071" />
 <extraparam>
-<Prop commName="lowPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="highPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4184,34 +4337,35 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1202" id="599" >
+<COMPONENT type="1202" id="2096" >
 <cdparam x="696" y="41" />
 <sizeparam width="137" height="90" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
 <infoparam name="Primitive component" value="LoadSource" />
-<TGConnectingPoint num="0" id="591" />
-<TGConnectingPoint num="1" id="592" />
-<TGConnectingPoint num="2" id="593" />
-<TGConnectingPoint num="3" id="594" />
-<TGConnectingPoint num="4" id="595" />
-<TGConnectingPoint num="5" id="596" />
-<TGConnectingPoint num="6" id="597" />
-<TGConnectingPoint num="7" id="598" />
+<TGConnectingPoint num="0" id="2088" />
+<TGConnectingPoint num="1" id="2089" />
+<TGConnectingPoint num="2" id="2090" />
+<TGConnectingPoint num="3" id="2091" />
+<TGConnectingPoint num="4" id="2092" />
+<TGConnectingPoint num="5" id="2093" />
+<TGConnectingPoint num="6" id="2094" />
+<TGConnectingPoint num="7" id="2095" />
 <extraparam>
+<Data isAttacker="No" />
 <Attribute access="2" id="evts" value="0" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="586" >
-<father id="599" num="0" />
-<cdparam x="737" y="28" />
+<SUBCOMPONENT type="1203" id="2083" >
+<father id="2096" num="0" />
+<cdparam x="793" y="118" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="124" minY="-13" maxY="77" />
-<infoparam name="Primitive port" value="Event endProcessing" />
-<TGConnectingPoint num="0" id="585" />
+<infoparam name="Primitive port" value="Channel lowPrioLoad" />
+<TGConnectingPoint num="0" id="2082" />
 <extraparam>
-<Prop commName="endProcessing" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="lowPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4219,16 +4373,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="588" >
-<father id="599" num="1" />
+<SUBCOMPONENT type="1203" id="2085" >
+<father id="2096" num="1" />
 <cdparam x="707" y="118" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="124" minY="-13" maxY="77" />
 <infoparam name="Primitive port" value="Channel highPrioLoad" />
-<TGConnectingPoint num="0" id="587" />
+<TGConnectingPoint num="0" id="2084" />
 <extraparam>
-<Prop commName="highPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="highPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4236,16 +4390,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="590" >
-<father id="599" num="2" />
-<cdparam x="793" y="118" />
+<SUBCOMPONENT type="1203" id="2087" >
+<father id="2096" num="2" />
+<cdparam x="737" y="28" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="124" minY="-13" maxY="77" />
-<infoparam name="Primitive port" value="Channel lowPrioLoad" />
-<TGConnectingPoint num="0" id="589" />
+<infoparam name="Primitive port" value="Event endProcessing" />
+<TGConnectingPoint num="0" id="2086" />
 <extraparam>
-<Prop commName="lowPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="endProcessing" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4254,33 +4408,34 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1202" id="614" >
+<COMPONENT type="1202" id="2111" >
 <cdparam x="381" y="19" />
 <sizeparam width="284" height="59" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
 <infoparam name="Primitive component" value="App_ECU1" />
-<TGConnectingPoint num="0" id="606" />
-<TGConnectingPoint num="1" id="607" />
-<TGConnectingPoint num="2" id="608" />
-<TGConnectingPoint num="3" id="609" />
-<TGConnectingPoint num="4" id="610" />
-<TGConnectingPoint num="5" id="611" />
-<TGConnectingPoint num="6" id="612" />
-<TGConnectingPoint num="7" id="613" />
+<TGConnectingPoint num="0" id="2103" />
+<TGConnectingPoint num="1" id="2104" />
+<TGConnectingPoint num="2" id="2105" />
+<TGConnectingPoint num="3" id="2106" />
+<TGConnectingPoint num="4" id="2107" />
+<TGConnectingPoint num="5" id="2108" />
+<TGConnectingPoint num="6" id="2109" />
+<TGConnectingPoint num="7" id="2110" />
 <extraparam>
+<Data isAttacker="No" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="601" >
-<father id="614" num="0" />
-<cdparam x="652" y="38" />
+<SUBCOMPONENT type="1203" id="2098" >
+<father id="2111" num="0" />
+<cdparam x="573" y="65" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="271" minY="-13" maxY="46" />
-<infoparam name="Primitive port" value="Event endProcessing" />
-<TGConnectingPoint num="0" id="600" />
+<infoparam name="Primitive port" value="Event done" />
+<TGConnectingPoint num="0" id="2097" />
 <extraparam>
-<Prop commName="endProcessing" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="done" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4288,16 +4443,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="603" >
-<father id="614" num="1" />
+<SUBCOMPONENT type="1203" id="2100" >
+<father id="2111" num="1" />
 <cdparam x="482" y="65" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="271" minY="-13" maxY="46" />
 <infoparam name="Primitive port" value="Event distributeKey" />
-<TGConnectingPoint num="0" id="602" />
+<TGConnectingPoint num="0" id="2099" />
 <extraparam>
-<Prop commName="distributeKey" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="distributeKey" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4305,16 +4460,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="605" >
-<father id="614" num="2" />
-<cdparam x="573" y="65" />
+<SUBCOMPONENT type="1203" id="2102" >
+<father id="2111" num="2" />
+<cdparam x="652" y="38" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="271" minY="-13" maxY="46" />
-<infoparam name="Primitive port" value="Event done" />
-<TGConnectingPoint num="0" id="604" />
+<infoparam name="Primitive port" value="Event endProcessing" />
+<TGConnectingPoint num="0" id="2101" />
 <extraparam>
-<Prop commName="done" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="endProcessing" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4323,34 +4478,35 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1202" id="639" >
+<COMPONENT type="1202" id="2136" >
 <cdparam x="144" y="28" />
 <sizeparam width="118" height="398" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
 <infoparam name="Primitive component" value="HSM_ECU1" />
-<TGConnectingPoint num="0" id="631" />
-<TGConnectingPoint num="1" id="632" />
-<TGConnectingPoint num="2" id="633" />
-<TGConnectingPoint num="3" id="634" />
-<TGConnectingPoint num="4" id="635" />
-<TGConnectingPoint num="5" id="636" />
-<TGConnectingPoint num="6" id="637" />
-<TGConnectingPoint num="7" id="638" />
-<extraparam>
+<TGConnectingPoint num="0" id="2128" />
+<TGConnectingPoint num="1" id="2129" />
+<TGConnectingPoint num="2" id="2130" />
+<TGConnectingPoint num="3" id="2131" />
+<TGConnectingPoint num="4" id="2132" />
+<TGConnectingPoint num="5" id="2133" />
+<TGConnectingPoint num="6" id="2134" />
+<TGConnectingPoint num="7" id="2135" />
+<extraparam>
+<Data isAttacker="No" />
 <Attribute access="2" id="sizeOfMsg" value="" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="616" >
-<father id="639" num="0" />
-<cdparam x="249" y="77" />
+<SUBCOMPONENT type="1203" id="2113" >
+<father id="2136" num="0" />
+<cdparam x="249" y="380" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event putMsgECU1" />
-<TGConnectingPoint num="0" id="615" />
+<infoparam name="Primitive port" value="Event generateKeyECU1" />
+<TGConnectingPoint num="0" id="2112" />
 <extraparam>
-<Prop commName="putMsgECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="generateKeyECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4358,16 +4514,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="618" >
-<father id="639" num="1" />
-<cdparam x="249" y="126" />
+<SUBCOMPONENT type="1203" id="2115" >
+<father id="2136" num="1" />
+<cdparam x="249" y="345" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event getMsgECU1" />
-<TGConnectingPoint num="0" id="617" />
+<infoparam name="Primitive port" value="Event macECU1" />
+<TGConnectingPoint num="0" id="2114" />
 <extraparam>
-<Prop commName="getMsgECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="macECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4375,33 +4531,33 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="620" >
-<father id="639" num="2" />
-<cdparam x="249" y="172" />
+<SUBCOMPONENT type="1203" id="2117" >
+<father id="2136" num="2" />
+<cdparam x="249" y="306" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event doneHSMECU1" />
-<TGConnectingPoint num="0" id="619" />
+<infoparam name="Primitive port" value="Event encryptECU1" />
+<TGConnectingPoint num="0" id="2116" />
 <extraparam>
-<Prop commName="doneHSMECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="encryptECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="622" >
-<father id="639" num="3" />
-<cdparam x="249" y="218" />
+<SUBCOMPONENT type="1203" id="2119" >
+<father id="2136" num="3" />
+<cdparam x="249" y="260" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Channel inHSMECU1" />
-<TGConnectingPoint num="0" id="621" />
+<infoparam name="Primitive port" value="Channel outHSMECU1" />
+<TGConnectingPoint num="0" id="2118" />
 <extraparam>
-<Prop commName="inHSMECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="outHSMECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4409,16 +4565,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="624" >
-<father id="639" num="4" />
-<cdparam x="249" y="260" />
+<SUBCOMPONENT type="1203" id="2121" >
+<father id="2136" num="4" />
+<cdparam x="249" y="218" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Channel outHSMECU1" />
-<TGConnectingPoint num="0" id="623" />
+<infoparam name="Primitive port" value="Channel inHSMECU1" />
+<TGConnectingPoint num="0" id="2120" />
 <extraparam>
-<Prop commName="outHSMECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="inHSMECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4426,33 +4582,33 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="626" >
-<father id="639" num="5" />
-<cdparam x="249" y="306" />
+<SUBCOMPONENT type="1203" id="2123" >
+<father id="2136" num="5" />
+<cdparam x="249" y="172" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event encryptECU1" />
-<TGConnectingPoint num="0" id="625" />
+<infoparam name="Primitive port" value="Event doneHSMECU1" />
+<TGConnectingPoint num="0" id="2122" />
 <extraparam>
-<Prop commName="encryptECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSMECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="628" >
-<father id="639" num="6" />
-<cdparam x="249" y="345" />
+<SUBCOMPONENT type="1203" id="2125" >
+<father id="2136" num="6" />
+<cdparam x="249" y="126" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event macECU1" />
-<TGConnectingPoint num="0" id="627" />
+<infoparam name="Primitive port" value="Event getMsgECU1" />
+<TGConnectingPoint num="0" id="2124" />
 <extraparam>
-<Prop commName="macECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="getMsgECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4460,16 +4616,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="630" >
-<father id="639" num="7" />
-<cdparam x="249" y="380" />
+<SUBCOMPONENT type="1203" id="2127" >
+<father id="2136" num="7" />
+<cdparam x="249" y="77" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="105" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event generateKeyECU1" />
-<TGConnectingPoint num="0" id="629" />
+<infoparam name="Primitive port" value="Event putMsgECU1" />
+<TGConnectingPoint num="0" id="2126" />
 <extraparam>
-<Prop commName="generateKeyECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="putMsgECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4478,68 +4634,69 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1202" id="664" >
+<COMPONENT type="1202" id="2161" >
 <cdparam x="388" y="528" />
 <sizeparam width="277" height="200" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
 <infoparam name="Primitive component" value="CTP_ECU1" />
-<TGConnectingPoint num="0" id="656" />
-<TGConnectingPoint num="1" id="657" />
-<TGConnectingPoint num="2" id="658" />
-<TGConnectingPoint num="3" id="659" />
-<TGConnectingPoint num="4" id="660" />
-<TGConnectingPoint num="5" id="661" />
-<TGConnectingPoint num="6" id="662" />
-<TGConnectingPoint num="7" id="663" />
-<extraparam>
+<TGConnectingPoint num="0" id="2153" />
+<TGConnectingPoint num="1" id="2154" />
+<TGConnectingPoint num="2" id="2155" />
+<TGConnectingPoint num="3" id="2156" />
+<TGConnectingPoint num="4" id="2157" />
+<TGConnectingPoint num="5" id="2158" />
+<TGConnectingPoint num="6" id="2159" />
+<TGConnectingPoint num="7" id="2160" />
+<extraparam>
+<Data isAttacker="No" />
 <Attribute access="2" id="nbOfSamples" value="" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="641" >
-<father id="664" num="0" />
-<cdparam x="424" y="515" />
+<SUBCOMPONENT type="1203" id="2138" >
+<father id="2161" num="0" />
+<cdparam x="652" y="694" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event sendEvtECU1" />
-<TGConnectingPoint num="0" id="640" />
+<infoparam name="Primitive port" value="Channel dataFromECU1" />
+<TGConnectingPoint num="0" id="2137" />
 <extraparam>
-<Prop commName="sendEvtECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="dataFromECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="643" >
-<father id="664" num="1" />
-<cdparam x="481" y="515" />
+<SUBCOMPONENT type="1203" id="2140" >
+<father id="2161" num="1" />
+<cdparam x="652" y="658" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel sendDataECU1" />
-<TGConnectingPoint num="0" id="642" />
+<infoparam name="Primitive port" value="Event evtFromECU1" />
+<TGConnectingPoint num="0" id="2139" />
 <extraparam>
-<Prop commName="sendDataECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="evtFromECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="645" >
-<father id="664" num="2" />
-<cdparam x="544" y="515" />
+<SUBCOMPONENT type="1203" id="2142" >
+<father id="2161" num="2" />
+<cdparam x="652" y="611" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel recvDataECU1" />
-<TGConnectingPoint num="0" id="644" />
+<infoparam name="Primitive port" value="Channel dataToECU1" />
+<TGConnectingPoint num="0" id="2141" />
 <extraparam>
-<Prop commName="recvDataECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="dataToECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4547,16 +4704,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="647" >
-<father id="664" num="3" />
-<cdparam x="607" y="515" />
+<SUBCOMPONENT type="1203" id="2144" >
+<father id="2161" num="3" />
+<cdparam x="652" y="570" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event recvEvtECU1" />
-<TGConnectingPoint num="0" id="646" />
+<infoparam name="Primitive port" value="Event evtToECU1" />
+<TGConnectingPoint num="0" id="2143" />
 <extraparam>
-<Prop commName="recvEvtECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="evtToECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4564,16 +4721,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="649" >
-<father id="664" num="4" />
-<cdparam x="652" y="570" />
+<SUBCOMPONENT type="1203" id="2146" >
+<father id="2161" num="4" />
+<cdparam x="607" y="515" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event evtToECU1" />
-<TGConnectingPoint num="0" id="648" />
+<infoparam name="Primitive port" value="Event recvEvtECU1" />
+<TGConnectingPoint num="0" id="2145" />
 <extraparam>
-<Prop commName="evtToECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="recvEvtECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4581,16 +4738,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="651" >
-<father id="664" num="5" />
-<cdparam x="652" y="611" />
+<SUBCOMPONENT type="1203" id="2148" >
+<father id="2161" num="5" />
+<cdparam x="544" y="515" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel dataToECU1" />
-<TGConnectingPoint num="0" id="650" />
+<infoparam name="Primitive port" value="Channel recvDataECU1" />
+<TGConnectingPoint num="0" id="2147" />
 <extraparam>
-<Prop commName="dataToECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="recvDataECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4598,34 +4755,34 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="653" >
-<father id="664" num="6" />
-<cdparam x="652" y="658" />
+<SUBCOMPONENT type="1203" id="2150" >
+<father id="2161" num="6" />
+<cdparam x="481" y="515" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event evtFromECU1" />
-<TGConnectingPoint num="0" id="652" />
+<infoparam name="Primitive port" value="Channel sendDataECU1" />
+<TGConnectingPoint num="0" id="2149" />
 <extraparam>
-<Prop commName="evtFromECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="sendDataECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="655" >
-<father id="664" num="7" />
-<cdparam x="652" y="694" />
+<SUBCOMPONENT type="1203" id="2152" >
+<father id="2161" num="7" />
+<cdparam x="424" y="515" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel dataFromECU1" />
-<TGConnectingPoint num="0" id="654" />
+<infoparam name="Primitive port" value="Event sendEvtECU1" />
+<TGConnectingPoint num="0" id="2151" />
 <extraparam>
-<Prop commName="dataFromECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="sendEvtECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4633,35 +4790,36 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1202" id="701" >
+<COMPONENT type="1202" id="2198" >
 <cdparam x="388" y="124" />
 <sizeparam width="276" height="273" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
 <infoparam name="Primitive component" value="DistributionManager_ECU1" />
-<TGConnectingPoint num="0" id="693" />
-<TGConnectingPoint num="1" id="694" />
-<TGConnectingPoint num="2" id="695" />
-<TGConnectingPoint num="3" id="696" />
-<TGConnectingPoint num="4" id="697" />
-<TGConnectingPoint num="5" id="698" />
-<TGConnectingPoint num="6" id="699" />
-<TGConnectingPoint num="7" id="700" />
+<TGConnectingPoint num="0" id="2190" />
+<TGConnectingPoint num="1" id="2191" />
+<TGConnectingPoint num="2" id="2192" />
+<TGConnectingPoint num="3" id="2193" />
+<TGConnectingPoint num="4" id="2194" />
+<TGConnectingPoint num="5" id="2195" />
+<TGConnectingPoint num="6" id="2196" />
+<TGConnectingPoint num="7" id="2197" />
 <extraparam>
+<Data isAttacker="No" />
 <Attribute access="2" id="nbOfSamples" value="" type="0" typeOther="" />
 <Attribute access="2" id="i" value="0" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="666" >
-<father id="701" num="0" />
-<cdparam x="424" y="384" />
+<SUBCOMPONENT type="1203" id="2163" >
+<father id="2198" num="0" />
+<cdparam x="412" y="111" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event sendEvtECU1" />
-<TGConnectingPoint num="0" id="665" />
+<infoparam name="Primitive port" value="Event putMsgECU1" />
+<TGConnectingPoint num="0" id="2162" />
 <extraparam>
-<Prop commName="sendEvtECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="putMsgECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4669,16 +4827,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="668" >
-<father id="701" num="1" />
-<cdparam x="481" y="384" />
+<SUBCOMPONENT type="1203" id="2165" >
+<father id="2198" num="1" />
+<cdparam x="375" y="213" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel sendDataECU1" />
-<TGConnectingPoint num="0" id="667" />
+<infoparam name="Primitive port" value="Channel inHSMECU1" />
+<TGConnectingPoint num="0" id="2164" />
 <extraparam>
-<Prop commName="sendDataECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="inHSMECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4686,50 +4844,50 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="670" >
-<father id="701" num="2" />
-<cdparam x="544" y="384" />
+<SUBCOMPONENT type="1203" id="2167" >
+<father id="2198" num="2" />
+<cdparam x="375" y="137" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel recvDataECU1" />
-<TGConnectingPoint num="0" id="669" />
+<infoparam name="Primitive port" value="Event getMsgECU1" />
+<TGConnectingPoint num="0" id="2166" />
 <extraparam>
-<Prop commName="recvDataECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="getMsgECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="672" >
-<father id="701" num="3" />
-<cdparam x="607" y="384" />
+<SUBCOMPONENT type="1203" id="2169" >
+<father id="2198" num="3" />
+<cdparam x="375" y="174" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event recvEvtECU1" />
-<TGConnectingPoint num="0" id="671" />
+<infoparam name="Primitive port" value="Event doneHSMECU1" />
+<TGConnectingPoint num="0" id="2168" />
 <extraparam>
-<Prop commName="recvEvtECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSMECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="674" >
-<father id="701" num="4" />
-<cdparam x="485" y="111" />
+<SUBCOMPONENT type="1203" id="2171" >
+<father id="2198" num="4" />
+<cdparam x="375" y="254" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event distributeKey" />
-<TGConnectingPoint num="0" id="673" />
+<infoparam name="Primitive port" value="Channel outHSMECU1" />
+<TGConnectingPoint num="0" id="2170" />
 <extraparam>
-<Prop commName="distributeKey" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="outHSMECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4737,33 +4895,33 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="676" >
-<father id="701" num="5" />
-<cdparam x="575" y="111" />
+<SUBCOMPONENT type="1203" id="2173" >
+<father id="2198" num="5" />
+<cdparam x="375" y="330" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event done" />
-<TGConnectingPoint num="0" id="675" />
+<infoparam name="Primitive port" value="Event macECU1" />
+<TGConnectingPoint num="0" id="2172" />
 <extraparam>
-<Prop commName="done" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="macECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="678" >
-<father id="701" num="6" />
-<cdparam x="375" y="362" />
+<SUBCOMPONENT type="1203" id="2175" >
+<father id="2198" num="6" />
+<cdparam x="375" y="292" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event generateKeyECU1" />
-<TGConnectingPoint num="0" id="677" />
+<infoparam name="Primitive port" value="Event encryptECU1" />
+<TGConnectingPoint num="0" id="2174" />
 <extraparam>
-<Prop commName="generateKeyECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="encryptECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4771,16 +4929,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="680" >
-<father id="701" num="7" />
-<cdparam x="375" y="292" />
+<SUBCOMPONENT type="1203" id="2177" >
+<father id="2198" num="7" />
+<cdparam x="375" y="362" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event encryptECU1" />
-<TGConnectingPoint num="0" id="679" />
+<infoparam name="Primitive port" value="Event generateKeyECU1" />
+<TGConnectingPoint num="0" id="2176" />
 <extraparam>
-<Prop commName="encryptECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="generateKeyECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4788,33 +4946,33 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="682" >
-<father id="701" num="8" />
-<cdparam x="375" y="330" />
+<SUBCOMPONENT type="1203" id="2179" >
+<father id="2198" num="8" />
+<cdparam x="575" y="111" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event macECU1" />
-<TGConnectingPoint num="0" id="681" />
+<infoparam name="Primitive port" value="Event done" />
+<TGConnectingPoint num="0" id="2178" />
 <extraparam>
-<Prop commName="macECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="done" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="684" >
-<father id="701" num="9" />
-<cdparam x="375" y="254" />
+<SUBCOMPONENT type="1203" id="2181" >
+<father id="2198" num="9" />
+<cdparam x="485" y="111" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel outHSMECU1" />
-<TGConnectingPoint num="0" id="683" />
+<infoparam name="Primitive port" value="Event distributeKey" />
+<TGConnectingPoint num="0" id="2180" />
 <extraparam>
-<Prop commName="outHSMECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="distributeKey" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4822,50 +4980,50 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="686" >
-<father id="701" num="10" />
-<cdparam x="375" y="174" />
+<SUBCOMPONENT type="1203" id="2183" >
+<father id="2198" num="10" />
+<cdparam x="607" y="384" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event doneHSMECU1" />
-<TGConnectingPoint num="0" id="685" />
+<infoparam name="Primitive port" value="Event recvEvtECU1" />
+<TGConnectingPoint num="0" id="2182" />
 <extraparam>
-<Prop commName="doneHSMECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="recvEvtECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="688" >
-<father id="701" num="11" />
-<cdparam x="375" y="137" />
+<SUBCOMPONENT type="1203" id="2185" >
+<father id="2198" num="11" />
+<cdparam x="544" y="384" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event getMsgECU1" />
-<TGConnectingPoint num="0" id="687" />
+<infoparam name="Primitive port" value="Channel recvDataECU1" />
+<TGConnectingPoint num="0" id="2184" />
 <extraparam>
-<Prop commName="getMsgECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="recvDataECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="690" >
-<father id="701" num="12" />
-<cdparam x="375" y="213" />
+<SUBCOMPONENT type="1203" id="2187" >
+<father id="2198" num="12" />
+<cdparam x="481" y="384" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel inHSMECU1" />
-<TGConnectingPoint num="0" id="689" />
+<infoparam name="Primitive port" value="Channel sendDataECU1" />
+<TGConnectingPoint num="0" id="2186" />
 <extraparam>
-<Prop commName="inHSMECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="sendDataECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4873,16 +5031,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="692" >
-<father id="701" num="13" />
-<cdparam x="412" y="111" />
+<SUBCOMPONENT type="1203" id="2189" >
+<father id="2198" num="13" />
+<cdparam x="424" y="384" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event putMsgECU1" />
-<TGConnectingPoint num="0" id="691" />
+<infoparam name="Primitive port" value="Event sendEvtECU1" />
+<TGConnectingPoint num="0" id="2188" />
 <extraparam>
-<Prop commName="putMsgECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="sendEvtECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4891,34 +5049,35 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1202" id="726" >
+<COMPONENT type="1202" id="2223" >
 <cdparam x="852" y="41" />
 <sizeparam width="156" height="400" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
 <infoparam name="Primitive component" value="HSM_KM" />
-<TGConnectingPoint num="0" id="718" />
-<TGConnectingPoint num="1" id="719" />
-<TGConnectingPoint num="2" id="720" />
-<TGConnectingPoint num="3" id="721" />
-<TGConnectingPoint num="4" id="722" />
-<TGConnectingPoint num="5" id="723" />
-<TGConnectingPoint num="6" id="724" />
-<TGConnectingPoint num="7" id="725" />
+<TGConnectingPoint num="0" id="2215" />
+<TGConnectingPoint num="1" id="2216" />
+<TGConnectingPoint num="2" id="2217" />
+<TGConnectingPoint num="3" id="2218" />
+<TGConnectingPoint num="4" id="2219" />
+<TGConnectingPoint num="5" id="2220" />
+<TGConnectingPoint num="6" id="2221" />
+<TGConnectingPoint num="7" id="2222" />
 <extraparam>
+<Data isAttacker="No" />
 <Attribute access="2" id="sizeOfMsg" value="" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="703" >
-<father id="726" num="0" />
-<cdparam x="995" y="90" />
+<SUBCOMPONENT type="1203" id="2200" >
+<father id="2223" num="0" />
+<cdparam x="995" y="139" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event putMsg" />
-<TGConnectingPoint num="0" id="702" />
+<infoparam name="Primitive port" value="Event getMsg" />
+<TGConnectingPoint num="0" id="2199" />
 <extraparam>
-<Prop commName="putMsg" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="getMsg" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -4926,118 +5085,118 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="705" >
-<father id="726" num="1" />
-<cdparam x="995" y="393" />
+<SUBCOMPONENT type="1203" id="2202" >
+<father id="2223" num="1" />
+<cdparam x="995" y="185" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event generateKey" />
-<TGConnectingPoint num="0" id="704" />
+<infoparam name="Primitive port" value="Event doneHSM" />
+<TGConnectingPoint num="0" id="2201" />
 <extraparam>
-<Prop commName="generateKey" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSM" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="707" >
-<father id="726" num="2" />
-<cdparam x="995" y="358" />
+<SUBCOMPONENT type="1203" id="2204" >
+<father id="2223" num="2" />
+<cdparam x="995" y="231" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event mac" />
-<TGConnectingPoint num="0" id="706" />
+<infoparam name="Primitive port" value="Channel inHSM" />
+<TGConnectingPoint num="0" id="2203" />
 <extraparam>
-<Prop commName="mac" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="inHSM" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="709" >
-<father id="726" num="3" />
-<cdparam x="995" y="319" />
+<SUBCOMPONENT type="1203" id="2206" >
+<father id="2223" num="3" />
+<cdparam x="995" y="273" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event encrypt" />
-<TGConnectingPoint num="0" id="708" />
+<infoparam name="Primitive port" value="Channel outHSM" />
+<TGConnectingPoint num="0" id="2205" />
 <extraparam>
-<Prop commName="encrypt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="outHSM" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="711" >
-<father id="726" num="4" />
-<cdparam x="995" y="273" />
+<SUBCOMPONENT type="1203" id="2208" >
+<father id="2223" num="4" />
+<cdparam x="995" y="319" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Channel outHSM" />
-<TGConnectingPoint num="0" id="710" />
+<infoparam name="Primitive port" value="Event encrypt" />
+<TGConnectingPoint num="0" id="2207" />
 <extraparam>
-<Prop commName="outHSM" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="encrypt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="713" >
-<father id="726" num="5" />
-<cdparam x="995" y="231" />
+<SUBCOMPONENT type="1203" id="2210" >
+<father id="2223" num="5" />
+<cdparam x="995" y="358" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Channel inHSM" />
-<TGConnectingPoint num="0" id="712" />
+<infoparam name="Primitive port" value="Event mac" />
+<TGConnectingPoint num="0" id="2209" />
 <extraparam>
-<Prop commName="inHSM" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="mac" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="715" >
-<father id="726" num="6" />
-<cdparam x="995" y="185" />
+<SUBCOMPONENT type="1203" id="2212" >
+<father id="2223" num="6" />
+<cdparam x="995" y="393" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event doneHSM" />
-<TGConnectingPoint num="0" id="714" />
+<infoparam name="Primitive port" value="Event generateKey" />
+<TGConnectingPoint num="0" id="2211" />
 <extraparam>
-<Prop commName="doneHSM" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="generateKey" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="717" >
-<father id="726" num="7" />
-<cdparam x="995" y="139" />
+<SUBCOMPONENT type="1203" id="2214" >
+<father id="2223" num="7" />
+<cdparam x="995" y="90" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event getMsg" />
-<TGConnectingPoint num="0" id="716" />
+<infoparam name="Primitive port" value="Event putMsg" />
+<TGConnectingPoint num="0" id="2213" />
 <extraparam>
-<Prop commName="getMsg" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="putMsg" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5046,86 +5205,70 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1202" id="759" >
+<COMPONENT type="1202" id="2256" >
 <cdparam x="1125" y="528" />
 <sizeparam width="277" height="214" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
 <infoparam name="Primitive component" value="CTP_KM" />
-<TGConnectingPoint num="0" id="751" />
-<TGConnectingPoint num="1" id="752" />
-<TGConnectingPoint num="2" id="753" />
-<TGConnectingPoint num="3" id="754" />
-<TGConnectingPoint num="4" id="755" />
-<TGConnectingPoint num="5" id="756" />
-<TGConnectingPoint num="6" id="757" />
-<TGConnectingPoint num="7" id="758" />
-<extraparam>
+<TGConnectingPoint num="0" id="2248" />
+<TGConnectingPoint num="1" id="2249" />
+<TGConnectingPoint num="2" id="2250" />
+<TGConnectingPoint num="3" id="2251" />
+<TGConnectingPoint num="4" id="2252" />
+<TGConnectingPoint num="5" id="2253" />
+<TGConnectingPoint num="6" id="2254" />
+<TGConnectingPoint num="7" id="2255" />
+<extraparam>
+<Data isAttacker="No" />
 <Attribute access="2" id="nbOfSamples" value="" type="0" typeOther="" />
 <Attribute access="2" id="destination" value="" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="728" >
-<father id="759" num="0" />
-<cdparam x="1161" y="515" />
+<SUBCOMPONENT type="1203" id="2225" >
+<father id="2256" num="0" />
+<cdparam x="1389" y="707" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event sendEvt" />
-<TGConnectingPoint num="0" id="727" />
+<infoparam name="Primitive port" value="Channel dataFromECUN" />
+<TGConnectingPoint num="0" id="2224" />
 <extraparam>
-<Prop commName="sendEvt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
-<Type type="1" typeOther="" />
+<Prop commName="dataFromECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="730" >
-<father id="759" num="1" />
-<cdparam x="1344" y="515" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event recvEvt" />
-<TGConnectingPoint num="0" id="729" />
-<extraparam>
-<Prop commName="recvEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="732" >
-<father id="759" num="2" />
-<cdparam x="1281" y="515" />
+<SUBCOMPONENT type="1203" id="2227" >
+<father id="2256" num="1" />
+<cdparam x="1389" y="665" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel recvData" />
-<TGConnectingPoint num="0" id="731" />
+<infoparam name="Primitive port" value="Event evtFromECUN" />
+<TGConnectingPoint num="0" id="2226" />
 <extraparam>
-<Prop commName="recvData" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="evtFromECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="734" >
-<father id="759" num="3" />
-<cdparam x="1218" y="515" />
+<SUBCOMPONENT type="1203" id="2229" >
+<father id="2256" num="2" />
+<cdparam x="1389" y="626" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel sendData" />
-<TGConnectingPoint num="0" id="733" />
+<infoparam name="Primitive port" value="Channel dataToECUN" />
+<TGConnectingPoint num="0" id="2228" />
 <extraparam>
-<Prop commName="sendData" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="dataToECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5133,16 +5276,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="736" >
-<father id="759" num="4" />
-<cdparam x="1112" y="576" />
+<SUBCOMPONENT type="1203" id="2231" >
+<father id="2256" num="3" />
+<cdparam x="1389" y="581" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event evtToECU1" />
-<TGConnectingPoint num="0" id="735" />
+<infoparam name="Primitive port" value="Event evtToECUN" />
+<TGConnectingPoint num="0" id="2230" />
 <extraparam>
-<Prop commName="evtToECU1" commType="1" origin="true" finite="true" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="evtToECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5150,16 +5293,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="738" >
-<father id="759" num="5" />
-<cdparam x="1112" y="616" />
+<SUBCOMPONENT type="1203" id="2233" >
+<father id="2256" num="4" />
+<cdparam x="1112" y="686" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel dataToECU1" />
-<TGConnectingPoint num="0" id="737" />
+<infoparam name="Primitive port" value="Channel dataFromECU1" />
+<TGConnectingPoint num="0" id="2232" />
 <extraparam>
-<Prop commName="dataToECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="dataFromECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5167,16 +5310,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="740" >
-<father id="759" num="6" />
+<SUBCOMPONENT type="1203" id="2235" >
+<father id="2256" num="5" />
 <cdparam x="1112" y="650" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
 <infoparam name="Primitive port" value="Event evtFromECU1" />
-<TGConnectingPoint num="0" id="739" />
+<TGConnectingPoint num="0" id="2234" />
 <extraparam>
-<Prop commName="evtFromECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="evtFromECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5184,16 +5327,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="742" >
-<father id="759" num="7" />
-<cdparam x="1112" y="686" />
+<SUBCOMPONENT type="1203" id="2237" >
+<father id="2256" num="6" />
+<cdparam x="1112" y="616" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel dataFromECU1" />
-<TGConnectingPoint num="0" id="741" />
+<infoparam name="Primitive port" value="Channel dataToECU1" />
+<TGConnectingPoint num="0" id="2236" />
 <extraparam>
-<Prop commName="dataFromECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="dataToECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5201,16 +5344,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="744" >
-<father id="759" num="8" />
-<cdparam x="1389" y="581" />
+<SUBCOMPONENT type="1203" id="2239" >
+<father id="2256" num="7" />
+<cdparam x="1112" y="576" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event evtToECUN" />
-<TGConnectingPoint num="0" id="743" />
+<infoparam name="Primitive port" value="Event evtToECU1" />
+<TGConnectingPoint num="0" id="2238" />
 <extraparam>
-<Prop commName="evtToECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="evtToECU1" commType="1" origin="true" finite="true" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5218,16 +5361,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="746" >
-<father id="759" num="9" />
-<cdparam x="1389" y="626" />
+<SUBCOMPONENT type="1203" id="2241" >
+<father id="2256" num="8" />
+<cdparam x="1218" y="515" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel dataToECUN" />
-<TGConnectingPoint num="0" id="745" />
+<infoparam name="Primitive port" value="Channel sendData" />
+<TGConnectingPoint num="0" id="2240" />
 <extraparam>
-<Prop commName="dataToECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="sendData" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5235,16 +5378,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="748" >
-<father id="759" num="10" />
-<cdparam x="1389" y="665" />
+<SUBCOMPONENT type="1203" id="2243" >
+<father id="2256" num="9" />
+<cdparam x="1281" y="515" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event evtFromECUN" />
-<TGConnectingPoint num="0" id="747" />
+<infoparam name="Primitive port" value="Channel recvData" />
+<TGConnectingPoint num="0" id="2242" />
 <extraparam>
-<Prop commName="evtFromECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="recvData" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5252,104 +5395,122 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="750" >
-<father id="759" num="11" />
-<cdparam x="1389" y="707" />
+<SUBCOMPONENT type="1203" id="2245" >
+<father id="2256" num="10" />
+<cdparam x="1344" y="515" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel dataFromECUN" />
-<TGConnectingPoint num="0" id="749" />
+<infoparam name="Primitive port" value="Event recvEvt" />
+<TGConnectingPoint num="0" id="2244" />
 <extraparam>
-<Prop commName="dataFromECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="recvEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="2247" >
+<father id="2256" num="11" />
+<cdparam x="1161" y="515" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
+<infoparam name="Primitive port" value="Event sendEvt" />
+<TGConnectingPoint num="0" id="2246" />
+<extraparam>
+<Prop commName="sendEvt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
+<Type type="1" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1202" id="792" >
+<COMPONENT type="1202" id="2289" >
 <cdparam x="1125" y="127" />
 <sizeparam width="276" height="273" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
 <infoparam name="Primitive component" value="KM" />
-<TGConnectingPoint num="0" id="784" />
-<TGConnectingPoint num="1" id="785" />
-<TGConnectingPoint num="2" id="786" />
-<TGConnectingPoint num="3" id="787" />
-<TGConnectingPoint num="4" id="788" />
-<TGConnectingPoint num="5" id="789" />
-<TGConnectingPoint num="6" id="790" />
-<TGConnectingPoint num="7" id="791" />
-<extraparam>
+<TGConnectingPoint num="0" id="2281" />
+<TGConnectingPoint num="1" id="2282" />
+<TGConnectingPoint num="2" id="2283" />
+<TGConnectingPoint num="3" id="2284" />
+<TGConnectingPoint num="4" id="2285" />
+<TGConnectingPoint num="5" id="2286" />
+<TGConnectingPoint num="6" id="2287" />
+<TGConnectingPoint num="7" id="2288" />
+<extraparam>
+<Data isAttacker="No" />
 <Attribute access="2" id="nbOfSamples" value="" type="0" typeOther="" />
 <Attribute access="2" id="i" value="0" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="761" >
-<father id="792" num="0" />
-<cdparam x="1161" y="387" />
+<SUBCOMPONENT type="1203" id="2258" >
+<father id="2289" num="0" />
+<cdparam x="1218" y="387" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event sendEvt" />
-<TGConnectingPoint num="0" id="760" />
+<infoparam name="Primitive port" value="Channel sendData" />
+<TGConnectingPoint num="0" id="2257" />
 <extraparam>
-<Prop commName="sendEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
-<Type type="1" typeOther="" />
+<Prop commName="sendData" commType="0" origin="true" finite="false" blocking="true" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="763" >
-<father id="792" num="1" />
-<cdparam x="1149" y="114" />
+<SUBCOMPONENT type="1203" id="2260" >
+<father id="2289" num="1" />
+<cdparam x="1281" y="387" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event putMsg" />
-<TGConnectingPoint num="0" id="762" />
+<infoparam name="Primitive port" value="Channel recvData" />
+<TGConnectingPoint num="0" id="2259" />
 <extraparam>
-<Prop commName="putMsg" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="recvData" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="765" >
-<father id="792" num="2" />
-<cdparam x="1112" y="216" />
+<SUBCOMPONENT type="1203" id="2262" >
+<father id="2289" num="2" />
+<cdparam x="1344" y="387" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel inHSM" />
-<TGConnectingPoint num="0" id="764" />
+<infoparam name="Primitive port" value="Event recvEvt" />
+<TGConnectingPoint num="0" id="2261" />
 <extraparam>
-<Prop commName="inHSM" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="recvEvt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="767" >
-<father id="792" num="3" />
-<cdparam x="1112" y="140" />
+<SUBCOMPONENT type="1203" id="2264" >
+<father id="2289" num="3" />
+<cdparam x="1112" y="365" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event getMsg" />
-<TGConnectingPoint num="0" id="766" />
+<infoparam name="Primitive port" value="Event generateKey" />
+<TGConnectingPoint num="0" id="2263" />
 <extraparam>
-<Prop commName="getMsg" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="generateKey" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5357,84 +5518,84 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="769" >
-<father id="792" num="4" />
-<cdparam x="1112" y="177" />
+<SUBCOMPONENT type="1203" id="2266" >
+<father id="2289" num="4" />
+<cdparam x="1112" y="295" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event doneHSM" />
-<TGConnectingPoint num="0" id="768" />
+<infoparam name="Primitive port" value="Event encrypt" />
+<TGConnectingPoint num="0" id="2265" />
 <extraparam>
-<Prop commName="doneHSM" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="encrypt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="771" >
-<father id="792" num="5" />
-<cdparam x="1112" y="257" />
+<SUBCOMPONENT type="1203" id="2268" >
+<father id="2289" num="5" />
+<cdparam x="1112" y="333" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel outHSM" />
-<TGConnectingPoint num="0" id="770" />
+<infoparam name="Primitive port" value="Event mac" />
+<TGConnectingPoint num="0" id="2267" />
 <extraparam>
-<Prop commName="outHSM" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="mac" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="773" >
-<father id="792" num="6" />
-<cdparam x="1112" y="333" />
+<SUBCOMPONENT type="1203" id="2270" >
+<father id="2289" num="6" />
+<cdparam x="1112" y="257" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event mac" />
-<TGConnectingPoint num="0" id="772" />
+<infoparam name="Primitive port" value="Channel outHSM" />
+<TGConnectingPoint num="0" id="2269" />
 <extraparam>
-<Prop commName="mac" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="outHSM" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="775" >
-<father id="792" num="7" />
-<cdparam x="1112" y="295" />
+<SUBCOMPONENT type="1203" id="2272" >
+<father id="2289" num="7" />
+<cdparam x="1112" y="177" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event encrypt" />
-<TGConnectingPoint num="0" id="774" />
+<infoparam name="Primitive port" value="Event doneHSM" />
+<TGConnectingPoint num="0" id="2271" />
 <extraparam>
-<Prop commName="encrypt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSM" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="777" >
-<father id="792" num="8" />
-<cdparam x="1112" y="365" />
+<SUBCOMPONENT type="1203" id="2274" >
+<father id="2289" num="8" />
+<cdparam x="1112" y="140" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event generateKey" />
-<TGConnectingPoint num="0" id="776" />
+<infoparam name="Primitive port" value="Event getMsg" />
+<TGConnectingPoint num="0" id="2273" />
 <extraparam>
-<Prop commName="generateKey" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="getMsg" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5442,86 +5603,87 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="779" >
-<father id="792" num="9" />
-<cdparam x="1344" y="387" />
+<SUBCOMPONENT type="1203" id="2276" >
+<father id="2289" num="9" />
+<cdparam x="1112" y="216" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event recvEvt" />
-<TGConnectingPoint num="0" id="778" />
+<infoparam name="Primitive port" value="Channel inHSM" />
+<TGConnectingPoint num="0" id="2275" />
 <extraparam>
-<Prop commName="recvEvt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="inHSM" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="781" >
-<father id="792" num="10" />
-<cdparam x="1281" y="387" />
+<SUBCOMPONENT type="1203" id="2278" >
+<father id="2289" num="10" />
+<cdparam x="1149" y="114" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel recvData" />
-<TGConnectingPoint num="0" id="780" />
+<infoparam name="Primitive port" value="Event putMsg" />
+<TGConnectingPoint num="0" id="2277" />
 <extraparam>
-<Prop commName="recvData" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="putMsg" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="783" >
-<father id="792" num="11" />
-<cdparam x="1218" y="387" />
+<SUBCOMPONENT type="1203" id="2280" >
+<father id="2289" num="11" />
+<cdparam x="1161" y="387" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel sendData" />
-<TGConnectingPoint num="0" id="782" />
+<infoparam name="Primitive port" value="Event sendEvt" />
+<TGConnectingPoint num="0" id="2279" />
 <extraparam>
-<Prop commName="sendData" commType="0" origin="true" finite="false" blocking="true" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
+<Prop commName="sendEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1202" id="817" >
+<COMPONENT type="1202" id="2314" >
 <cdparam x="1447" y="91" />
 <sizeparam width="156" height="400" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
 <infoparam name="Primitive component" value="HSM_ECUN" />
-<TGConnectingPoint num="0" id="809" />
-<TGConnectingPoint num="1" id="810" />
-<TGConnectingPoint num="2" id="811" />
-<TGConnectingPoint num="3" id="812" />
-<TGConnectingPoint num="4" id="813" />
-<TGConnectingPoint num="5" id="814" />
-<TGConnectingPoint num="6" id="815" />
-<TGConnectingPoint num="7" id="816" />
-<extraparam>
+<TGConnectingPoint num="0" id="2306" />
+<TGConnectingPoint num="1" id="2307" />
+<TGConnectingPoint num="2" id="2308" />
+<TGConnectingPoint num="3" id="2309" />
+<TGConnectingPoint num="4" id="2310" />
+<TGConnectingPoint num="5" id="2311" />
+<TGConnectingPoint num="6" id="2312" />
+<TGConnectingPoint num="7" id="2313" />
+<extraparam>
+<Data isAttacker="No" />
 <Attribute access="2" id="sizeOfMsg" value="" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="794" >
-<father id="817" num="0" />
-<cdparam x="1590" y="140" />
+<SUBCOMPONENT type="1203" id="2291" >
+<father id="2314" num="0" />
+<cdparam x="1590" y="189" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event putMsgECUN" />
-<TGConnectingPoint num="0" id="793" />
+<infoparam name="Primitive port" value="Event getMsgECUN" />
+<TGConnectingPoint num="0" id="2290" />
 <extraparam>
-<Prop commName="putMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="getMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5529,118 +5691,118 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="796" >
-<father id="817" num="1" />
-<cdparam x="1590" y="443" />
+<SUBCOMPONENT type="1203" id="2293" >
+<father id="2314" num="1" />
+<cdparam x="1590" y="235" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event generateKeyECUN" />
-<TGConnectingPoint num="0" id="795" />
+<infoparam name="Primitive port" value="Event doneHSMECUN" />
+<TGConnectingPoint num="0" id="2292" />
 <extraparam>
-<Prop commName="generateKeyECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSMECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="798" >
-<father id="817" num="2" />
-<cdparam x="1590" y="408" />
+<SUBCOMPONENT type="1203" id="2295" >
+<father id="2314" num="2" />
+<cdparam x="1590" y="281" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event macECUN" />
-<TGConnectingPoint num="0" id="797" />
+<infoparam name="Primitive port" value="Channel inHSMECUN" />
+<TGConnectingPoint num="0" id="2294" />
 <extraparam>
-<Prop commName="macECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="inHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="800" >
-<father id="817" num="3" />
-<cdparam x="1590" y="369" />
+<SUBCOMPONENT type="1203" id="2297" >
+<father id="2314" num="3" />
+<cdparam x="1590" y="323" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event encryptECUN" />
-<TGConnectingPoint num="0" id="799" />
+<infoparam name="Primitive port" value="Channel outHSMECUN" />
+<TGConnectingPoint num="0" id="2296" />
 <extraparam>
-<Prop commName="encryptECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="outHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="802" >
-<father id="817" num="4" />
-<cdparam x="1590" y="323" />
+<SUBCOMPONENT type="1203" id="2299" >
+<father id="2314" num="4" />
+<cdparam x="1590" y="369" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Channel outHSMECUN" />
-<TGConnectingPoint num="0" id="801" />
+<infoparam name="Primitive port" value="Event encryptECUN" />
+<TGConnectingPoint num="0" id="2298" />
 <extraparam>
-<Prop commName="outHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="encryptECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="804" >
-<father id="817" num="5" />
-<cdparam x="1590" y="281" />
+<SUBCOMPONENT type="1203" id="2301" >
+<father id="2314" num="5" />
+<cdparam x="1590" y="408" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Channel inHSMECUN" />
-<TGConnectingPoint num="0" id="803" />
+<infoparam name="Primitive port" value="Event macECUN" />
+<TGConnectingPoint num="0" id="2300" />
 <extraparam>
-<Prop commName="inHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="macECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="806" >
-<father id="817" num="6" />
-<cdparam x="1590" y="235" />
+<SUBCOMPONENT type="1203" id="2303" >
+<father id="2314" num="6" />
+<cdparam x="1590" y="443" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event doneHSMECUN" />
-<TGConnectingPoint num="0" id="805" />
+<infoparam name="Primitive port" value="Event generateKeyECUN" />
+<TGConnectingPoint num="0" id="2302" />
 <extraparam>
-<Prop commName="doneHSMECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="generateKeyECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="808" >
-<father id="817" num="7" />
-<cdparam x="1590" y="189" />
+<SUBCOMPONENT type="1203" id="2305" >
+<father id="2314" num="7" />
+<cdparam x="1590" y="140" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event getMsgECUN" />
-<TGConnectingPoint num="0" id="807" />
+<infoparam name="Primitive port" value="Event putMsgECUN" />
+<TGConnectingPoint num="0" id="2304" />
 <extraparam>
-<Prop commName="getMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="putMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5649,51 +5811,52 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1202" id="842" >
+<COMPONENT type="1202" id="2339" >
 <cdparam x="1729" y="556" />
 <sizeparam width="277" height="200" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
 <infoparam name="Primitive component" value="CTP_ECUN" />
-<TGConnectingPoint num="0" id="834" />
-<TGConnectingPoint num="1" id="835" />
-<TGConnectingPoint num="2" id="836" />
-<TGConnectingPoint num="3" id="837" />
-<TGConnectingPoint num="4" id="838" />
-<TGConnectingPoint num="5" id="839" />
-<TGConnectingPoint num="6" id="840" />
-<TGConnectingPoint num="7" id="841" />
-<extraparam>
+<TGConnectingPoint num="0" id="2331" />
+<TGConnectingPoint num="1" id="2332" />
+<TGConnectingPoint num="2" id="2333" />
+<TGConnectingPoint num="3" id="2334" />
+<TGConnectingPoint num="4" id="2335" />
+<TGConnectingPoint num="5" id="2336" />
+<TGConnectingPoint num="6" id="2337" />
+<TGConnectingPoint num="7" id="2338" />
+<extraparam>
+<Data isAttacker="No" />
 <Attribute access="2" id="nbOfSamples" value="" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="819" >
-<father id="842" num="0" />
-<cdparam x="1765" y="543" />
+<SUBCOMPONENT type="1203" id="2316" >
+<father id="2339" num="0" />
+<cdparam x="1822" y="543" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event sendEvtECUN" />
-<TGConnectingPoint num="0" id="818" />
+<infoparam name="Primitive port" value="Channel sendDataECUN" />
+<TGConnectingPoint num="0" id="2315" />
 <extraparam>
-<Prop commName="sendEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="sendDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="821" >
-<father id="842" num="1" />
-<cdparam x="1716" y="694" />
+<SUBCOMPONENT type="1203" id="2318" >
+<father id="2339" num="1" />
+<cdparam x="1885" y="543" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel dataFromECUN" />
-<TGConnectingPoint num="0" id="820" />
+<infoparam name="Primitive port" value="Channel recvDataECUN" />
+<TGConnectingPoint num="0" id="2317" />
 <extraparam>
-<Prop commName="dataFromECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="recvDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5701,16 +5864,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="823" >
-<father id="842" num="2" />
-<cdparam x="1716" y="657" />
+<SUBCOMPONENT type="1203" id="2320" >
+<father id="2339" num="2" />
+<cdparam x="1948" y="543" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event evtFromECUN" />
-<TGConnectingPoint num="0" id="822" />
+<infoparam name="Primitive port" value="Event recvEvtECUN" />
+<TGConnectingPoint num="0" id="2319" />
 <extraparam>
-<Prop commName="evtFromECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="recvEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5718,50 +5881,50 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="825" >
-<father id="842" num="3" />
-<cdparam x="1716" y="625" />
+<SUBCOMPONENT type="1203" id="2322" >
+<father id="2339" num="3" />
+<cdparam x="1716" y="590" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel dataToECUN" />
-<TGConnectingPoint num="0" id="824" />
+<infoparam name="Primitive port" value="Event evtToECUN" />
+<TGConnectingPoint num="0" id="2321" />
 <extraparam>
-<Prop commName="dataToECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="827" >
-<father id="842" num="4" />
-<cdparam x="1716" y="590" />
+<SUBCOMPONENT type="1203" id="2324" >
+<father id="2339" num="4" />
+<cdparam x="1716" y="625" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event evtToECUN" />
-<TGConnectingPoint num="0" id="826" />
+<infoparam name="Primitive port" value="Channel dataToECUN" />
+<TGConnectingPoint num="0" id="2323" />
 <extraparam>
-<Prop commName="evtToECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="dataToECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="829" >
-<father id="842" num="5" />
-<cdparam x="1948" y="543" />
+<SUBCOMPONENT type="1203" id="2326" >
+<father id="2339" num="5" />
+<cdparam x="1716" y="657" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event recvEvtECUN" />
-<TGConnectingPoint num="0" id="828" />
+<infoparam name="Primitive port" value="Event evtFromECUN" />
+<TGConnectingPoint num="0" id="2325" />
 <extraparam>
-<Prop commName="recvEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="evtFromECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5769,16 +5932,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="831" >
-<father id="842" num="6" />
-<cdparam x="1885" y="543" />
+<SUBCOMPONENT type="1203" id="2328" >
+<father id="2339" num="6" />
+<cdparam x="1716" y="694" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel recvDataECUN" />
-<TGConnectingPoint num="0" id="830" />
+<infoparam name="Primitive port" value="Channel dataFromECUN" />
+<TGConnectingPoint num="0" id="2327" />
 <extraparam>
-<Prop commName="recvDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="dataFromECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5786,17 +5949,17 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="833" >
-<father id="842" num="7" />
-<cdparam x="1822" y="543" />
+<SUBCOMPONENT type="1203" id="2330" >
+<father id="2339" num="7" />
+<cdparam x="1765" y="543" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel sendDataECUN" />
-<TGConnectingPoint num="0" id="832" />
+<infoparam name="Primitive port" value="Event sendEvtECUN" />
+<TGConnectingPoint num="0" id="2329" />
 <extraparam>
-<Prop commName="sendDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="sendEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5804,86 +5967,87 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1202" id="875" >
+<COMPONENT type="1202" id="2372" >
 <cdparam x="1729" y="189" />
 <sizeparam width="276" height="273" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
 <infoparam name="Primitive component" value="KeyManager_ECUN" />
-<TGConnectingPoint num="0" id="867" />
-<TGConnectingPoint num="1" id="868" />
-<TGConnectingPoint num="2" id="869" />
-<TGConnectingPoint num="3" id="870" />
-<TGConnectingPoint num="4" id="871" />
-<TGConnectingPoint num="5" id="872" />
-<TGConnectingPoint num="6" id="873" />
-<TGConnectingPoint num="7" id="874" />
-<extraparam>
+<TGConnectingPoint num="0" id="2364" />
+<TGConnectingPoint num="1" id="2365" />
+<TGConnectingPoint num="2" id="2366" />
+<TGConnectingPoint num="3" id="2367" />
+<TGConnectingPoint num="4" id="2368" />
+<TGConnectingPoint num="5" id="2369" />
+<TGConnectingPoint num="6" id="2370" />
+<TGConnectingPoint num="7" id="2371" />
+<extraparam>
+<Data isAttacker="No" />
 <Attribute access="2" id="nbOfSamples" value="" type="0" typeOther="" />
 <Attribute access="2" id="i" value="0" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="844" >
-<father id="875" num="0" />
-<cdparam x="1765" y="449" />
+<SUBCOMPONENT type="1203" id="2341" >
+<father id="2372" num="0" />
+<cdparam x="1822" y="449" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event sendEvtECUN" />
-<TGConnectingPoint num="0" id="843" />
+<infoparam name="Primitive port" value="Channel sendDataECUN" />
+<TGConnectingPoint num="0" id="2340" />
 <extraparam>
-<Prop commName="sendEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="sendDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="846" >
-<father id="875" num="1" />
-<cdparam x="1753" y="176" />
+<SUBCOMPONENT type="1203" id="2343" >
+<father id="2372" num="1" />
+<cdparam x="1885" y="449" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event putMsgECUN" />
-<TGConnectingPoint num="0" id="845" />
+<infoparam name="Primitive port" value="Channel recvDataECUN" />
+<TGConnectingPoint num="0" id="2342" />
 <extraparam>
-<Prop commName="putMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="recvDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="848" >
-<father id="875" num="2" />
-<cdparam x="1716" y="278" />
+<SUBCOMPONENT type="1203" id="2345" >
+<father id="2372" num="2" />
+<cdparam x="1948" y="449" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel inHSMECUN" />
-<TGConnectingPoint num="0" id="847" />
+<infoparam name="Primitive port" value="Event recvEvtECUN" />
+<TGConnectingPoint num="0" id="2344" />
 <extraparam>
-<Prop commName="inHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="recvEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="850" >
-<father id="875" num="3" />
-<cdparam x="1716" y="202" />
+<SUBCOMPONENT type="1203" id="2347" >
+<father id="2372" num="3" />
+<cdparam x="1716" y="427" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event getMsgECUN" />
-<TGConnectingPoint num="0" id="849" />
+<infoparam name="Primitive port" value="Event generateKeyECUN" />
+<TGConnectingPoint num="0" id="2346" />
 <extraparam>
-<Prop commName="getMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="generateKeyECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5891,84 +6055,84 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="852" >
-<father id="875" num="4" />
-<cdparam x="1716" y="239" />
+<SUBCOMPONENT type="1203" id="2349" >
+<father id="2372" num="4" />
+<cdparam x="1716" y="357" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event doneHSMECUN" />
-<TGConnectingPoint num="0" id="851" />
+<infoparam name="Primitive port" value="Event encryptECUN" />
+<TGConnectingPoint num="0" id="2348" />
 <extraparam>
-<Prop commName="doneHSMECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="encryptECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="854" >
-<father id="875" num="5" />
-<cdparam x="1716" y="319" />
+<SUBCOMPONENT type="1203" id="2351" >
+<father id="2372" num="5" />
+<cdparam x="1716" y="395" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel outHSMECUN" />
-<TGConnectingPoint num="0" id="853" />
+<infoparam name="Primitive port" value="Event macECUN" />
+<TGConnectingPoint num="0" id="2350" />
 <extraparam>
-<Prop commName="outHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="macECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="856" >
-<father id="875" num="6" />
-<cdparam x="1716" y="395" />
+<SUBCOMPONENT type="1203" id="2353" >
+<father id="2372" num="6" />
+<cdparam x="1716" y="319" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event macECUN" />
-<TGConnectingPoint num="0" id="855" />
+<infoparam name="Primitive port" value="Channel outHSMECUN" />
+<TGConnectingPoint num="0" id="2352" />
 <extraparam>
-<Prop commName="macECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="outHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="858" >
-<father id="875" num="7" />
-<cdparam x="1716" y="357" />
+<SUBCOMPONENT type="1203" id="2355" >
+<father id="2372" num="7" />
+<cdparam x="1716" y="239" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event encryptECUN" />
-<TGConnectingPoint num="0" id="857" />
+<infoparam name="Primitive port" value="Event doneHSMECUN" />
+<TGConnectingPoint num="0" id="2354" />
 <extraparam>
-<Prop commName="encryptECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSMECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="860" >
-<father id="875" num="8" />
-<cdparam x="1716" y="427" />
+<SUBCOMPONENT type="1203" id="2357" >
+<father id="2372" num="8" />
+<cdparam x="1716" y="202" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event generateKeyECUN" />
-<TGConnectingPoint num="0" id="859" />
+<infoparam name="Primitive port" value="Event getMsgECUN" />
+<TGConnectingPoint num="0" id="2356" />
 <extraparam>
-<Prop commName="generateKeyECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
+<Prop commName="getMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -5976,51 +6140,51 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="862" >
-<father id="875" num="9" />
-<cdparam x="1948" y="449" />
+<SUBCOMPONENT type="1203" id="2359" >
+<father id="2372" num="9" />
+<cdparam x="1716" y="278" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event recvEvtECUN" />
-<TGConnectingPoint num="0" id="861" />
+<infoparam name="Primitive port" value="Channel inHSMECUN" />
+<TGConnectingPoint num="0" id="2358" />
 <extraparam>
-<Prop commName="recvEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="1" typeOther="" />
+<Prop commName="inHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="864" >
-<father id="875" num="10" />
-<cdparam x="1885" y="449" />
+<SUBCOMPONENT type="1203" id="2361" >
+<father id="2372" num="10" />
+<cdparam x="1753" y="176" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel recvDataECUN" />
-<TGConnectingPoint num="0" id="863" />
+<infoparam name="Primitive port" value="Event putMsgECUN" />
+<TGConnectingPoint num="0" id="2360" />
 <extraparam>
-<Prop commName="recvDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="putMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="866" >
-<father id="875" num="11" />
-<cdparam x="1822" y="449" />
+<SUBCOMPONENT type="1203" id="2363" >
+<father id="2372" num="11" />
+<cdparam x="1765" y="449" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel sendDataECUN" />
-<TGConnectingPoint num="0" id="865" />
+<infoparam name="Primitive port" value="Event sendEvtECUN" />
+<TGConnectingPoint num="0" id="2362" />
 <extraparam>
-<Prop commName="sendDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" />
-<Type type="0" typeOther="" />
+<Prop commName="sendEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -6032,56 +6196,56 @@
 </TMLComponentTaskDiagramPanel>
 
 <TMLActivityDiagramPanel name="LoadSink" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="877" >
+<COMPONENT type="1001" id="2374" >
 <cdparam x="399" y="109" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="876" />
+<TGConnectingPoint num="0" id="2373" />
 </COMPONENT>
 
-<COMPONENT type="1000" id="879" >
+<COMPONENT type="1000" id="2376" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="878" />
+<TGConnectingPoint num="0" id="2375" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="880" >
+<CONNECTOR type="115" id="2377" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to stop state" value="null" />
-<P1  x="407" y="70" id="878" />
-<P2  x="409" y="104" id="876" />
+<P1  x="407" y="70" id="2375" />
+<P2  x="409" y="104" id="2373" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="LoadSource" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1000" id="882" >
+<COMPONENT type="1000" id="2379" >
 <cdparam x="585" y="128" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="881" />
+<TGConnectingPoint num="0" id="2378" />
 </COMPONENT>
 
-<COMPONENT type="1026" id="886" >
+<COMPONENT type="1026" id="2383" >
 <cdparam x="1006" y="302" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="delay" value="null" />
-<TGConnectingPoint num="0" id="884" />
-<TGConnectingPoint num="1" id="885" />
+<TGConnectingPoint num="0" id="2381" />
+<TGConnectingPoint num="1" id="2382" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="883" >
-<father id="886" num="0" />
+<SUBCOMPONENT type="-1" id="2380" >
+<father id="2383" num="0" />
 <cdparam x="1021" y="322" />
 <sizeparam width="32" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6092,35 +6256,35 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="894" >
+<COMPONENT type="1012" id="2391" >
 <cdparam x="916" y="267" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="890" />
-<TGConnectingPoint num="1" id="891" />
-<TGConnectingPoint num="2" id="892" />
-<TGConnectingPoint num="3" id="893" />
+<TGConnectingPoint num="0" id="2387" />
+<TGConnectingPoint num="1" id="2388" />
+<TGConnectingPoint num="2" id="2389" />
+<TGConnectingPoint num="3" id="2390" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="887" >
-<father id="894" num="0" />
+<SUBCOMPONENT type="-1" id="2384" >
+<father id="2391" num="0" />
 <cdparam x="870" y="278" />
 <sizeparam width="30" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ 0% ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="888" >
-<father id="894" num="1" />
+<SUBCOMPONENT type="-1" id="2385" >
+<father id="2391" num="1" />
 <cdparam x="951" y="277" />
 <sizeparam width="37" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ 70% ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="889" >
-<father id="894" num="2" />
+<SUBCOMPONENT type="-1" id="2386" >
+<father id="2391" num="2" />
 <cdparam x="936" y="312" />
 <sizeparam width="37" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6128,504 +6292,544 @@
 <infoparam name="guard 3" value="[ 30% ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="301" id="903" >
+<COMPONENT type="301" id="2408" >
 <cdparam x="208" y="126" />
 <sizeparam width="336" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="accounts for traffic caused by ECUs not taken into account
 " />
-<TGConnectingPoint num="0" id="895" />
-<TGConnectingPoint num="1" id="896" />
-<TGConnectingPoint num="2" id="897" />
-<TGConnectingPoint num="3" id="898" />
-<TGConnectingPoint num="4" id="899" />
-<TGConnectingPoint num="5" id="900" />
-<TGConnectingPoint num="6" id="901" />
-<TGConnectingPoint num="7" id="902" />
+<TGConnectingPoint num="0" id="2392" />
+<TGConnectingPoint num="1" id="2393" />
+<TGConnectingPoint num="2" id="2394" />
+<TGConnectingPoint num="3" id="2395" />
+<TGConnectingPoint num="4" id="2396" />
+<TGConnectingPoint num="5" id="2397" />
+<TGConnectingPoint num="6" id="2398" />
+<TGConnectingPoint num="7" id="2399" />
+<TGConnectingPoint num="8" id="2400" />
+<TGConnectingPoint num="9" id="2401" />
+<TGConnectingPoint num="10" id="2402" />
+<TGConnectingPoint num="11" id="2403" />
+<TGConnectingPoint num="12" id="2404" />
+<TGConnectingPoint num="13" id="2405" />
+<TGConnectingPoint num="14" id="2406" />
+<TGConnectingPoint num="15" id="2407" />
 <extraparam>
 <Line value="accounts for traffic caused by ECUs not taken into account" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1020" id="907" >
+<COMPONENT type="1020" id="2412" >
 <cdparam x="691" y="211" />
 <sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="for loop" value="10" />
-<TGConnectingPoint num="0" id="904" />
-<TGConnectingPoint num="1" id="905" />
-<TGConnectingPoint num="2" id="906" />
+<TGConnectingPoint num="0" id="2409" />
+<TGConnectingPoint num="1" id="2410" />
+<TGConnectingPoint num="2" id="2411" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="909" >
+<COMPONENT type="1001" id="2414" >
 <cdparam x="722" y="310" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="908" />
+<TGConnectingPoint num="0" id="2413" />
 </COMPONENT>
 
-<COMPONENT type="1017" id="912" >
+<COMPONENT type="1017" id="2417" >
 <cdparam x="661" y="257" />
 <sizeparam width="143" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="notified event" value="evts=?endProcessing()" />
-<TGConnectingPoint num="0" id="910" />
-<TGConnectingPoint num="1" id="911" />
+<TGConnectingPoint num="0" id="2415" />
+<TGConnectingPoint num="1" id="2416" />
 <extraparam>
 <Data eventName="endProcessing" variable="evts" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="914" >
+<COMPONENT type="1001" id="2419" >
 <cdparam x="586" y="220" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="913" />
+<TGConnectingPoint num="0" id="2418" />
 </COMPONENT>
 
-<COMPONENT type="1014" id="918" >
+<COMPONENT type="1014" id="2423" >
 <cdparam x="512" y="169" />
 <sizeparam width="168" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="for loop" value="for(evts=0;evts==0;evts=evts)" />
-<TGConnectingPoint num="0" id="915" />
-<TGConnectingPoint num="1" id="916" />
-<TGConnectingPoint num="2" id="917" />
+<TGConnectingPoint num="0" id="2420" />
+<TGConnectingPoint num="1" id="2421" />
+<TGConnectingPoint num="2" id="2422" />
 <extraparam>
 <Data init="evts=0" condition="evts==0" increment="evts=evts" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="920" >
+<COMPONENT type="1001" id="2425" >
 <cdparam x="1001" y="364" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="919" />
+<TGConnectingPoint num="0" id="2424" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="922" >
+<COMPONENT type="1001" id="2427" >
 <cdparam x="922" y="394" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="921" />
+<TGConnectingPoint num="0" id="2426" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="924" >
+<COMPONENT type="1001" id="2429" >
 <cdparam x="835" y="357" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="923" />
+<TGConnectingPoint num="0" id="2428" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="927" >
+<COMPONENT type="1006" id="2432" >
 <cdparam x="800" y="304" />
 <sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="lowPrioLoad(1)" />
-<TGConnectingPoint num="0" id="925" />
-<TGConnectingPoint num="1" id="926" />
+<TGConnectingPoint num="0" id="2430" />
+<TGConnectingPoint num="1" id="2431" />
 <extraparam>
-<Data channelName="lowPrioLoad" nbOfSamples="1" />
+<Data channelName="lowPrioLoad" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="936" >
+<COMPONENT type="301" id="2449" >
 <cdparam x="1082" y="303" />
 <sizeparam width="67" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="idle time
 " />
-<TGConnectingPoint num="0" id="928" />
-<TGConnectingPoint num="1" id="929" />
-<TGConnectingPoint num="2" id="930" />
-<TGConnectingPoint num="3" id="931" />
-<TGConnectingPoint num="4" id="932" />
-<TGConnectingPoint num="5" id="933" />
-<TGConnectingPoint num="6" id="934" />
-<TGConnectingPoint num="7" id="935" />
+<TGConnectingPoint num="0" id="2433" />
+<TGConnectingPoint num="1" id="2434" />
+<TGConnectingPoint num="2" id="2435" />
+<TGConnectingPoint num="3" id="2436" />
+<TGConnectingPoint num="4" id="2437" />
+<TGConnectingPoint num="5" id="2438" />
+<TGConnectingPoint num="6" id="2439" />
+<TGConnectingPoint num="7" id="2440" />
+<TGConnectingPoint num="8" id="2441" />
+<TGConnectingPoint num="9" id="2442" />
+<TGConnectingPoint num="10" id="2443" />
+<TGConnectingPoint num="11" id="2444" />
+<TGConnectingPoint num="12" id="2445" />
+<TGConnectingPoint num="13" id="2446" />
+<TGConnectingPoint num="14" id="2447" />
+<TGConnectingPoint num="15" id="2448" />
 <extraparam>
 <Line value="idle time" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="945" >
+<COMPONENT type="301" id="2466" >
 <cdparam x="526" y="287" />
 <sizeparam width="173" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="check if processing finished
 " />
-<TGConnectingPoint num="0" id="937" />
-<TGConnectingPoint num="1" id="938" />
-<TGConnectingPoint num="2" id="939" />
-<TGConnectingPoint num="3" id="940" />
-<TGConnectingPoint num="4" id="941" />
-<TGConnectingPoint num="5" id="942" />
-<TGConnectingPoint num="6" id="943" />
-<TGConnectingPoint num="7" id="944" />
+<TGConnectingPoint num="0" id="2450" />
+<TGConnectingPoint num="1" id="2451" />
+<TGConnectingPoint num="2" id="2452" />
+<TGConnectingPoint num="3" id="2453" />
+<TGConnectingPoint num="4" id="2454" />
+<TGConnectingPoint num="5" id="2455" />
+<TGConnectingPoint num="6" id="2456" />
+<TGConnectingPoint num="7" id="2457" />
+<TGConnectingPoint num="8" id="2458" />
+<TGConnectingPoint num="9" id="2459" />
+<TGConnectingPoint num="10" id="2460" />
+<TGConnectingPoint num="11" id="2461" />
+<TGConnectingPoint num="12" id="2462" />
+<TGConnectingPoint num="13" id="2463" />
+<TGConnectingPoint num="14" id="2464" />
+<TGConnectingPoint num="15" id="2465" />
 <extraparam>
 <Line value="check if processing finished" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="954" >
+<COMPONENT type="301" id="2483" >
 <cdparam x="897" y="423" />
 <sizeparam width="139" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="high priority Bus Load
 " />
-<TGConnectingPoint num="0" id="946" />
-<TGConnectingPoint num="1" id="947" />
-<TGConnectingPoint num="2" id="948" />
-<TGConnectingPoint num="3" id="949" />
-<TGConnectingPoint num="4" id="950" />
-<TGConnectingPoint num="5" id="951" />
-<TGConnectingPoint num="6" id="952" />
-<TGConnectingPoint num="7" id="953" />
+<TGConnectingPoint num="0" id="2467" />
+<TGConnectingPoint num="1" id="2468" />
+<TGConnectingPoint num="2" id="2469" />
+<TGConnectingPoint num="3" id="2470" />
+<TGConnectingPoint num="4" id="2471" />
+<TGConnectingPoint num="5" id="2472" />
+<TGConnectingPoint num="6" id="2473" />
+<TGConnectingPoint num="7" id="2474" />
+<TGConnectingPoint num="8" id="2475" />
+<TGConnectingPoint num="9" id="2476" />
+<TGConnectingPoint num="10" id="2477" />
+<TGConnectingPoint num="11" id="2478" />
+<TGConnectingPoint num="12" id="2479" />
+<TGConnectingPoint num="13" id="2480" />
+<TGConnectingPoint num="14" id="2481" />
+<TGConnectingPoint num="15" id="2482" />
 <extraparam>
 <Line value="high priority Bus Load" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="963" >
+<COMPONENT type="301" id="2500" >
 <cdparam x="732" y="390" />
 <sizeparam width="139" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="high priority Bus Load
 " />
-<TGConnectingPoint num="0" id="955" />
-<TGConnectingPoint num="1" id="956" />
-<TGConnectingPoint num="2" id="957" />
-<TGConnectingPoint num="3" id="958" />
-<TGConnectingPoint num="4" id="959" />
-<TGConnectingPoint num="5" id="960" />
-<TGConnectingPoint num="6" id="961" />
-<TGConnectingPoint num="7" id="962" />
+<TGConnectingPoint num="0" id="2484" />
+<TGConnectingPoint num="1" id="2485" />
+<TGConnectingPoint num="2" id="2486" />
+<TGConnectingPoint num="3" id="2487" />
+<TGConnectingPoint num="4" id="2488" />
+<TGConnectingPoint num="5" id="2489" />
+<TGConnectingPoint num="6" id="2490" />
+<TGConnectingPoint num="7" id="2491" />
+<TGConnectingPoint num="8" id="2492" />
+<TGConnectingPoint num="9" id="2493" />
+<TGConnectingPoint num="10" id="2494" />
+<TGConnectingPoint num="11" id="2495" />
+<TGConnectingPoint num="12" id="2496" />
+<TGConnectingPoint num="13" id="2497" />
+<TGConnectingPoint num="14" id="2498" />
+<TGConnectingPoint num="15" id="2499" />
 <extraparam>
 <Line value="high priority Bus Load" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="966" >
+<COMPONENT type="1006" id="2503" >
 <cdparam x="883" y="344" />
 <sizeparam width="99" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="highPrioLoad(1)" />
-<TGConnectingPoint num="0" id="964" />
-<TGConnectingPoint num="1" id="965" />
+<TGConnectingPoint num="0" id="2501" />
+<TGConnectingPoint num="1" id="2502" />
 <extraparam>
-<Data channelName="highPrioLoad" nbOfSamples="1" />
+<Data channelName="highPrioLoad" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="115" id="967" >
+<CONNECTOR type="115" id="2504" >
 <cdparam x="732" y="282" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from notified event to stop state" value="null" />
-<P1  x="732" y="282" id="911" />
-<P2  x="732" y="305" id="908" />
+<P1  x="732" y="282" id="2416" />
+<P2  x="732" y="305" id="2413" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="968" >
+<CONNECTOR type="115" id="2505" >
 <cdparam x="735" y="236" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to notified event" value="null" />
-<P1  x="735" y="236" id="906" />
-<P2  x="732" y="252" id="910" />
+<P1  x="735" y="236" id="2411" />
+<P2  x="732" y="252" id="2415" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="969" >
+<CONNECTOR type="115" id="2506" >
 <cdparam x="782" y="225" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to choice" value="null" />
-<P1  x="780" y="225" id="905" />
-<P2  x="931" y="257" id="890" />
+<P1  x="780" y="225" id="2410" />
+<P2  x="931" y="257" id="2387" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="970" >
+<CONNECTOR type="115" id="2507" >
 <cdparam x="971" y="282" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to delay" value="null" />
-<P1  x="971" y="282" id="892" />
-<P2  x="1011" y="297" id="884" />
+<P1  x="971" y="282" id="2389" />
+<P2  x="1011" y="297" id="2381" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="971" >
+<CONNECTOR type="115" id="2508" >
 <cdparam x="931" y="322" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to write channel" value="null" />
-<P1  x="931" y="322" id="893" />
-<P2  x="932" y="339" id="964" />
+<P1  x="931" y="322" id="2390" />
+<P2  x="932" y="339" id="2501" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="972" >
+<CONNECTOR type="115" id="2509" >
 <cdparam x="891" y="282" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to write channel" value="null" />
-<P1  x="891" y="282" id="891" />
-<P2  x="847" y="299" id="925" />
+<P1  x="891" y="282" id="2388" />
+<P2  x="847" y="299" id="2430" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="973" >
+<CONNECTOR type="115" id="2510" >
 <cdparam x="847" y="329" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="847" y="329" id="926" />
-<P2  x="845" y="352" id="923" />
+<P1  x="847" y="329" id="2431" />
+<P2  x="845" y="352" id="2428" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="974" >
+<CONNECTOR type="115" id="2511" >
 <cdparam x="932" y="369" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="932" y="369" id="965" />
-<P2  x="932" y="389" id="921" />
+<P1  x="932" y="369" id="2502" />
+<P2  x="932" y="389" id="2426" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="975" >
+<CONNECTOR type="115" id="2512" >
 <cdparam x="1011" y="337" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from delay to stop state" value="null" />
-<P1  x="1011" y="337" id="885" />
-<P2  x="1011" y="359" id="919" />
+<P1  x="1011" y="337" id="2382" />
+<P2  x="1011" y="359" id="2424" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="976" >
+<CONNECTOR type="115" id="2513" >
 <cdparam x="598" y="236" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to stop state" value="null" />
-<P1  x="596" y="194" id="917" />
-<P2  x="596" y="215" id="913" />
+<P1  x="596" y="194" id="2422" />
+<P2  x="596" y="215" id="2418" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="977" >
+<CONNECTOR type="115" id="2514" >
 <cdparam x="691" y="183" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to for loop" value="null" />
-<P1  x="680" y="183" id="916" />
-<P2  x="735" y="206" id="904" />
+<P1  x="680" y="183" id="2421" />
+<P2  x="735" y="206" id="2409" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="978" >
+<CONNECTOR type="115" id="2515" >
 <cdparam x="586" y="155" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to for loop" value="null" />
-<P1  x="592" y="148" id="881" />
-<P2  x="596" y="164" id="915" />
+<P1  x="592" y="148" id="2378" />
+<P2  x="596" y="164" id="2420" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="App_ECU1" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1000" id="980" >
+<COMPONENT type="1000" id="2517" >
 <cdparam x="258" y="60" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="979" />
+<TGConnectingPoint num="0" id="2516" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="982" >
+<COMPONENT type="1001" id="2519" >
 <cdparam x="297" y="327" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="981" />
+<TGConnectingPoint num="0" id="2518" />
 </COMPONENT>
 
-<COMPONENT type="1010" id="985" >
+<COMPONENT type="1010" id="2522" >
 <cdparam x="252" y="186" />
 <sizeparam width="49" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="done() " />
-<TGConnectingPoint num="0" id="983" />
-<TGConnectingPoint num="1" id="984" />
+<TGConnectingPoint num="0" id="2520" />
+<TGConnectingPoint num="1" id="2521" />
 <extraparam>
 <Data eventName="done" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="988" >
+<COMPONENT type="1008" id="2525" >
 <cdparam x="227" y="146" />
 <sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="distributeKey()" />
-<TGConnectingPoint num="0" id="986" />
-<TGConnectingPoint num="1" id="987" />
+<TGConnectingPoint num="0" id="2523" />
+<TGConnectingPoint num="1" id="2524" />
 <extraparam>
 <Data eventName="distributeKey" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="991" >
+<COMPONENT type="1008" id="2528" >
 <cdparam x="244" y="280" />
 <sizeparam width="102" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="endProcessing()" />
-<TGConnectingPoint num="0" id="989" />
-<TGConnectingPoint num="1" id="990" />
+<TGConnectingPoint num="0" id="2526" />
+<TGConnectingPoint num="1" id="2527" />
 <extraparam>
 <Data eventName="endProcessing" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="115" id="992" >
+<CONNECTOR type="115" id="2529" >
 <cdparam x="283" y="262" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="295" y="305" id="990" />
-<P2  x="307" y="322" id="981" />
+<P1  x="295" y="305" id="2527" />
+<P2  x="307" y="322" id="2518" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="993" >
+<CONNECTOR type="115" id="2530" >
 <cdparam x="271" y="171" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="271" y="171" id="987" />
-<P2  x="276" y="181" id="983" />
+<P1  x="271" y="171" id="2524" />
+<P2  x="276" y="181" id="2520" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="994" >
+<CONNECTOR type="115" id="2531" >
 <cdparam x="276" y="211" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to stop state" value="null" />
-<P1  x="276" y="211" id="984" />
-<P2  x="295" y="275" id="989" />
+<P1  x="276" y="211" id="2521" />
+<P2  x="295" y="275" id="2526" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="995" >
+<CONNECTOR type="115" id="2532" >
 <cdparam x="464" y="109" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to delay" value="null" />
-<P1  x="265" y="80" id="979" />
-<P2  x="271" y="141" id="986" />
+<P1  x="265" y="80" id="2516" />
+<P2  x="271" y="141" id="2523" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="HSM_ECU1" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="997" >
+<COMPONENT type="1001" id="2534" >
 <cdparam x="70" y="410" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="996" />
+<TGConnectingPoint num="0" id="2533" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="1000" >
+<COMPONENT type="1009" id="2537" >
 <cdparam x="5" y="362" />
 <sizeparam width="147" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="inHSMECU1(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="998" />
-<TGConnectingPoint num="1" id="999" />
+<TGConnectingPoint num="0" id="2535" />
+<TGConnectingPoint num="1" id="2536" />
 <extraparam>
-<Data channelName="inHSMECU1" nbOfSamples="sizeOfMsg" />
+<Data channelName="inHSMECU1" nbOfSamples="sizeOfMsg" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1003" >
+<COMPONENT type="1010" id="2540" >
 <cdparam x="4" y="315" />
 <sizeparam width="151" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="putMsgECU1(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1001" />
-<TGConnectingPoint num="1" id="1002" />
+<TGConnectingPoint num="0" id="2538" />
+<TGConnectingPoint num="1" id="2539" />
 <extraparam>
 <Data eventName="putMsgECU1" nbOfParams="5" />
 <Param index="0" value="sizeOfMsg" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1005" >
+<COMPONENT type="1001" id="2542" >
 <cdparam x="213" y="425" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1004" />
+<TGConnectingPoint num="0" id="2541" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1007" >
+<COMPONENT type="1001" id="2544" >
 <cdparam x="353" y="423" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1006" />
+<TGConnectingPoint num="0" id="2543" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1009" >
+<COMPONENT type="1001" id="2546" >
 <cdparam x="495" y="424" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1008" />
+<TGConnectingPoint num="0" id="2545" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1011" >
+<COMPONENT type="1001" id="2548" >
 <cdparam x="681" y="430" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1010" />
+<TGConnectingPoint num="0" id="2547" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1014" >
+<COMPONENT type="1006" id="2551" >
 <cdparam x="615" y="379" />
 <sizeparam width="151" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="outHSMECU1(sizeOfMsg)" />
-<TGConnectingPoint num="0" id="1012" />
-<TGConnectingPoint num="1" id="1013" />
+<TGConnectingPoint num="0" id="2549" />
+<TGConnectingPoint num="1" id="2550" />
 <extraparam>
-<Data channelName="outHSMECU1" nbOfSamples="sizeOfMsg" />
+<Data channelName="outHSMECU1" nbOfSamples="sizeOfMsg" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1013" id="1018" >
+<COMPONENT type="1013" id="2555" >
 <cdparam x="499" y="372" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1016" />
-<TGConnectingPoint num="1" id="1017" />
+<TGConnectingPoint num="0" id="2553" />
+<TGConnectingPoint num="1" id="2554" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="1015" >
-<father id="1018" num="0" />
+<SUBCOMPONENT type="-1" id="2552" >
+<father id="2555" num="0" />
 <cdparam x="514" y="392" />
 <sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6633,17 +6837,17 @@
 <infoparam name="value of the delay" value="sizeOfMsg*60" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="1022" >
+<COMPONENT type="1013" id="2559" >
 <cdparam x="219" y="364" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1020" />
-<TGConnectingPoint num="1" id="1021" />
+<TGConnectingPoint num="0" id="2557" />
+<TGConnectingPoint num="1" id="2558" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="1019" >
-<father id="1022" num="0" />
+<SUBCOMPONENT type="-1" id="2556" >
+<father id="2559" num="0" />
 <cdparam x="234" y="384" />
 <sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6651,17 +6855,17 @@
 <infoparam name="value of the delay" value="15*sizeOfMsg" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="1026" >
+<COMPONENT type="1013" id="2563" >
 <cdparam x="357" y="368" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1024" />
-<TGConnectingPoint num="1" id="1025" />
+<TGConnectingPoint num="0" id="2561" />
+<TGConnectingPoint num="1" id="2562" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="1023" >
-<father id="1026" num="0" />
+<SUBCOMPONENT type="-1" id="2560" >
+<father id="2563" num="0" />
 <cdparam x="372" y="388" />
 <sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6669,43 +6873,43 @@
 <infoparam name="value of the delay" value="15*sizeOfMsg" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1001" id="1028" >
+<COMPONENT type="1001" id="2565" >
 <cdparam x="600" y="243" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1027" />
+<TGConnectingPoint num="0" id="2564" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="1031" >
+<COMPONENT type="1008" id="2568" >
 <cdparam x="557" y="196" />
 <sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="doneHSMECU1()" />
-<TGConnectingPoint num="0" id="1029" />
-<TGConnectingPoint num="1" id="1030" />
+<TGConnectingPoint num="0" id="2566" />
+<TGConnectingPoint num="1" id="2567" />
 <extraparam>
 <Data eventName="doneHSMECU1" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1016" id="1039" >
+<COMPONENT type="1016" id="2576" >
 <cdparam x="466" y="152" />
 <sizeparam width="150" height="5" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="sequence" value="null" />
-<TGConnectingPoint num="0" id="1033" />
-<TGConnectingPoint num="1" id="1034" />
-<TGConnectingPoint num="2" id="1035" />
-<TGConnectingPoint num="3" id="1036" />
-<TGConnectingPoint num="4" id="1037" />
-<TGConnectingPoint num="5" id="1038" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="1032" >
-<father id="1039" num="0" />
+<TGConnectingPoint num="0" id="2570" />
+<TGConnectingPoint num="1" id="2571" />
+<TGConnectingPoint num="2" id="2572" />
+<TGConnectingPoint num="3" id="2573" />
+<TGConnectingPoint num="4" id="2574" />
+<TGConnectingPoint num="5" id="2575" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="2569" >
+<father id="2576" num="0" />
 <cdparam x="620" y="159" />
 <sizeparam width="14" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6713,141 +6917,141 @@
 <infoparam name="Sequence" value="&gt;&gt;" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1010" id="1042" >
+<COMPONENT type="1010" id="2579" >
 <cdparam x="615" y="327" />
 <sizeparam width="151" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="getMsgECU1(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1040" />
-<TGConnectingPoint num="1" id="1041" />
+<TGConnectingPoint num="0" id="2577" />
+<TGConnectingPoint num="1" id="2578" />
 <extraparam>
 <Data eventName="getMsgECU1" nbOfParams="5" />
 <Param index="0" value="sizeOfMsg" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1045" >
+<COMPONENT type="1010" id="2582" >
 <cdparam x="414" y="320" />
 <sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="generateKeyECU1(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1043" />
-<TGConnectingPoint num="1" id="1044" />
+<TGConnectingPoint num="0" id="2580" />
+<TGConnectingPoint num="1" id="2581" />
 <extraparam>
 <Data eventName="generateKeyECU1" nbOfParams="5" />
 <Param index="0" value="sizeOfMsg" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1048" >
+<COMPONENT type="1010" id="2585" >
 <cdparam x="294" y="312" />
 <sizeparam width="135" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="macECU1(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1046" />
-<TGConnectingPoint num="1" id="1047" />
+<TGConnectingPoint num="0" id="2583" />
+<TGConnectingPoint num="1" id="2584" />
 <extraparam>
 <Data eventName="macECU1" nbOfParams="5" />
 <Param index="0" value="sizeOfMsg" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1051" >
+<COMPONENT type="1010" id="2588" >
 <cdparam x="149" y="312" />
 <sizeparam width="150" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="encryptECU1(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1049" />
-<TGConnectingPoint num="1" id="1050" />
+<TGConnectingPoint num="0" id="2586" />
+<TGConnectingPoint num="1" id="2587" />
 <extraparam>
 <Data eventName="encryptECU1" nbOfParams="5" />
 <Param index="0" value="sizeOfMsg" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1018" id="1062" >
+<COMPONENT type="1018" id="2599" >
 <cdparam x="383" y="209" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="1052" />
-<TGConnectingPoint num="1" id="1053" />
-<TGConnectingPoint num="2" id="1054" />
-<TGConnectingPoint num="3" id="1055" />
-<TGConnectingPoint num="4" id="1056" />
-<TGConnectingPoint num="5" id="1057" />
-<TGConnectingPoint num="6" id="1058" />
-<TGConnectingPoint num="7" id="1059" />
-<TGConnectingPoint num="8" id="1060" />
-<TGConnectingPoint num="9" id="1061" />
-</COMPONENT>
-
-<COMPONENT type="1030" id="1065" >
+<TGConnectingPoint num="0" id="2589" />
+<TGConnectingPoint num="1" id="2590" />
+<TGConnectingPoint num="2" id="2591" />
+<TGConnectingPoint num="3" id="2592" />
+<TGConnectingPoint num="4" id="2593" />
+<TGConnectingPoint num="5" id="2594" />
+<TGConnectingPoint num="6" id="2595" />
+<TGConnectingPoint num="7" id="2596" />
+<TGConnectingPoint num="8" id="2597" />
+<TGConnectingPoint num="9" id="2598" />
+</COMPONENT>
+
+<COMPONENT type="1030" id="2602" >
 <cdparam x="209" y="89" />
 <sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="1063" />
-<TGConnectingPoint num="1" id="1064" />
+<TGConnectingPoint num="0" id="2600" />
+<TGConnectingPoint num="1" id="2601" />
 </COMPONENT>
 
-<COMPONENT type="1000" id="1067" >
+<COMPONENT type="1000" id="2604" >
 <cdparam x="242" y="40" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1066" />
+<TGConnectingPoint num="0" id="2603" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="1068" >
+<CONNECTOR type="115" id="2605" >
 <cdparam x="358" y="224" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="358" y="224" id="1056" />
-<P2  x="79" y="310" id="1001" />
+<P1  x="358" y="224" id="2593" />
+<P2  x="79" y="310" id="2538" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1069" >
+<CONNECTOR type="115" id="2606" >
 <cdparam x="534" y="157" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from sequence to select" value="null" />
-<P1  x="515" y="157" id="1035" />
-<P2  x="398" y="199" id="1052" />
+<P1  x="515" y="157" id="2572" />
+<P2  x="398" y="199" id="2589" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1070" >
+<CONNECTOR type="115" id="2607" >
 <cdparam x="585" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="438" y="224" id="1057" />
-<P2  x="690" y="322" id="1040" />
+<P1  x="438" y="224" id="2594" />
+<P2  x="690" y="322" id="2577" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1071" >
+<CONNECTOR type="115" id="2608" >
 <cdparam x="245" y="91" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to for ever loop" value="null" />
-<P1  x="249" y="60" id="1066" />
-<P2  x="249" y="84" id="1063" />
+<P1  x="249" y="60" id="2603" />
+<P2  x="249" y="84" id="2600" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1073" >
+<CONNECTOR type="115" id="2610" >
 <cdparam x="423" y="160" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for ever loop to select" value="null" />
-<P1  x="290" y="103" id="1064" />
-<P2  x="541" y="152" id="1033" />
+<P1  x="290" y="103" id="2601" />
+<P2  x="541" y="152" id="2570" />
 <Point x="476" y="121" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1072" >
-<father id="1073" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2609" >
+<father id="2610" num="0" />
 <cdparam x="476" y="121" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6855,646 +7059,654 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="115" id="1074" >
+<CONNECTOR type="115" id="2611" >
 <cdparam x="505" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="358" y="224" id="1053" />
-<P2  x="224" y="307" id="1049" />
+<P1  x="358" y="224" id="2590" />
+<P2  x="224" y="307" id="2586" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1075" >
+<CONNECTOR type="115" id="2612" >
 <cdparam x="448" y="278" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="398" y="264" id="1055" />
-<P2  x="361" y="307" id="1046" />
+<P1  x="398" y="264" id="2592" />
+<P2  x="361" y="307" id="2583" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1076" >
+<CONNECTOR type="115" id="2613" >
 <cdparam x="585" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="438" y="224" id="1054" />
-<P2  x="504" y="315" id="1043" />
+<P1  x="438" y="224" id="2591" />
+<P2  x="504" y="315" id="2580" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1077" >
+<CONNECTOR type="115" id="2614" >
 <cdparam x="778" y="153" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from sequence to send event" value="null" />
-<P1  x="590" y="157" id="1038" />
-<P2  x="609" y="191" id="1029" />
+<P1  x="590" y="157" id="2575" />
+<P2  x="609" y="191" id="2566" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1078" >
+<CONNECTOR type="115" id="2615" >
 <cdparam x="609" y="221" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="609" y="221" id="1030" />
-<P2  x="610" y="238" id="1027" />
+<P1  x="609" y="221" id="2567" />
+<P2  x="610" y="238" id="2564" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1079" >
+<CONNECTOR type="115" id="2616" >
 <cdparam x="361" y="337" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to execI" value="null" />
-<P1  x="361" y="337" id="1047" />
-<P2  x="362" y="363" id="1024" />
+<P1  x="361" y="337" id="2584" />
+<P2  x="362" y="363" id="2561" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1080" >
+<CONNECTOR type="115" id="2617" >
 <cdparam x="224" y="337" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to execI" value="null" />
-<P1  x="224" y="337" id="1050" />
-<P2  x="224" y="359" id="1020" />
+<P1  x="224" y="337" id="2587" />
+<P2  x="224" y="359" id="2557" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1081" >
+<CONNECTOR type="115" id="2618" >
 <cdparam x="504" y="345" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to execI" value="null" />
-<P1  x="504" y="345" id="1044" />
-<P2  x="504" y="367" id="1016" />
+<P1  x="504" y="345" id="2581" />
+<P2  x="504" y="367" id="2553" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1082" >
+<CONNECTOR type="115" id="2619" >
 <cdparam x="690" y="352" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to write channel" value="null" />
-<P1  x="690" y="352" id="1041" />
-<P2  x="690" y="374" id="1012" />
+<P1  x="690" y="352" id="2578" />
+<P2  x="690" y="374" id="2549" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1083" >
+<CONNECTOR type="115" id="2620" >
 <cdparam x="690" y="404" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="690" y="404" id="1013" />
-<P2  x="691" y="425" id="1010" />
+<P1  x="690" y="404" id="2550" />
+<P2  x="691" y="425" id="2547" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1084" >
+<CONNECTOR type="115" id="2621" >
 <cdparam x="504" y="407" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to stop state" value="null" />
-<P1  x="504" y="407" id="1017" />
-<P2  x="505" y="419" id="1008" />
+<P1  x="504" y="407" id="2554" />
+<P2  x="505" y="419" id="2545" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1085" >
+<CONNECTOR type="115" id="2622" >
 <cdparam x="362" y="403" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to stop state" value="null" />
-<P1  x="362" y="403" id="1025" />
-<P2  x="363" y="418" id="1006" />
+<P1  x="362" y="403" id="2562" />
+<P2  x="363" y="418" id="2543" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1086" >
+<CONNECTOR type="115" id="2623" >
 <cdparam x="224" y="399" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to stop state" value="null" />
-<P1  x="224" y="399" id="1021" />
-<P2  x="223" y="420" id="1004" />
+<P1  x="224" y="399" id="2558" />
+<P2  x="223" y="420" id="2541" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1087" >
+<CONNECTOR type="115" id="2624" >
 <cdparam x="79" y="340" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="79" y="340" id="1002" />
-<P2  x="78" y="357" id="998" />
+<P1  x="79" y="340" id="2539" />
+<P2  x="78" y="357" id="2535" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1088" >
+<CONNECTOR type="115" id="2625" >
 <cdparam x="78" y="387" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to stop state" value="null" />
-<P1  x="78" y="387" id="999" />
-<P2  x="80" y="405" id="996" />
+<P1  x="78" y="387" id="2536" />
+<P2  x="80" y="405" id="2533" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="CTP_ECU1" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="1090" >
+<COMPONENT type="1001" id="2627" >
 <cdparam x="531" y="500" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1089" />
+<TGConnectingPoint num="0" id="2626" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1093" >
+<COMPONENT type="1006" id="2630" >
 <cdparam x="455" y="451" />
 <sizeparam width="175" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="recvDataECU1(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1091" />
-<TGConnectingPoint num="1" id="1092" />
+<TGConnectingPoint num="0" id="2628" />
+<TGConnectingPoint num="1" id="2629" />
 <extraparam>
-<Data channelName="recvDataECU1" nbOfSamples="nbOfSamples" />
+<Data channelName="recvDataECU1" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1096" >
+<COMPONENT type="1008" id="2633" >
 <cdparam x="468" y="396" />
 <sizeparam width="165" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="recvEvtECU1(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1094" />
-<TGConnectingPoint num="1" id="1095" />
+<TGConnectingPoint num="0" id="2631" />
+<TGConnectingPoint num="1" id="2632" />
 <extraparam>
 <Data eventName="recvEvtECU1" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1099" >
+<COMPONENT type="1011" id="2636" >
 <cdparam x="440" y="351" />
 <sizeparam width="211" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="action state" value="nbOfSamples = (nbOfSamples * 7)/8" />
-<TGConnectingPoint num="0" id="1097" />
-<TGConnectingPoint num="1" id="1098" />
+<TGConnectingPoint num="0" id="2634" />
+<TGConnectingPoint num="1" id="2635" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="1102" >
+<COMPONENT type="1009" id="2639" >
 <cdparam x="462" y="283" />
 <sizeparam width="168" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="dataToECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1100" />
-<TGConnectingPoint num="1" id="1101" />
+<TGConnectingPoint num="0" id="2637" />
+<TGConnectingPoint num="1" id="2638" />
 <extraparam>
-<Data channelName="dataToECU1" nbOfSamples="nbOfSamples" />
+<Data channelName="dataToECU1" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1105" >
+<COMPONENT type="1010" id="2642" >
 <cdparam x="466" y="230" />
 <sizeparam width="159" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="evtToECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1103" />
-<TGConnectingPoint num="1" id="1104" />
+<TGConnectingPoint num="0" id="2640" />
+<TGConnectingPoint num="1" id="2641" />
 <extraparam>
 <Data eventName="evtToECU1" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1107" >
+<COMPONENT type="1001" id="2644" >
 <cdparam x="262" y="493" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1106" />
+<TGConnectingPoint num="0" id="2643" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1110" >
+<COMPONENT type="1006" id="2647" >
 <cdparam x="182" y="451" />
 <sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="dataFromECU1(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1108" />
-<TGConnectingPoint num="1" id="1109" />
+<TGConnectingPoint num="0" id="2645" />
+<TGConnectingPoint num="1" id="2646" />
 <extraparam>
-<Data channelName="dataFromECU1" nbOfSamples="nbOfSamples" />
+<Data channelName="dataFromECU1" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1113" >
+<COMPONENT type="1008" id="2650" >
 <cdparam x="187" y="400" />
 <sizeparam width="171" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="evtFromECU1(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1111" />
-<TGConnectingPoint num="1" id="1112" />
+<TGConnectingPoint num="0" id="2648" />
+<TGConnectingPoint num="1" id="2649" />
 <extraparam>
 <Data eventName="evtFromECU1" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1116" >
+<COMPONENT type="1011" id="2653" >
 <cdparam x="164" y="353" />
 <sizeparam width="217" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="action state" value="nbOfSamples = (nbOfSamples * 9) / 8" />
-<TGConnectingPoint num="0" id="1114" />
-<TGConnectingPoint num="1" id="1115" />
+<TGConnectingPoint num="0" id="2651" />
+<TGConnectingPoint num="1" id="2652" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="1119" >
+<COMPONENT type="1009" id="2656" >
 <cdparam x="178" y="284" />
 <sizeparam width="184" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="sendDataECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1117" />
-<TGConnectingPoint num="1" id="1118" />
+<TGConnectingPoint num="0" id="2654" />
+<TGConnectingPoint num="1" id="2655" />
 <extraparam>
-<Data channelName="sendDataECU1" nbOfSamples="nbOfSamples" />
+<Data channelName="sendDataECU1" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1122" >
+<COMPONENT type="1010" id="2659" >
 <cdparam x="182" y="230" />
 <sizeparam width="174" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="sendEvtECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1120" />
-<TGConnectingPoint num="1" id="1121" />
+<TGConnectingPoint num="0" id="2657" />
+<TGConnectingPoint num="1" id="2658" />
 <extraparam>
 <Data eventName="sendEvtECU1" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1030" id="1125" >
+<COMPONENT type="1030" id="2662" >
 <cdparam x="247" y="96" />
 <sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="1123" />
-<TGConnectingPoint num="1" id="1124" />
+<TGConnectingPoint num="0" id="2660" />
+<TGConnectingPoint num="1" id="2661" />
 </COMPONENT>
 
-<COMPONENT type="1018" id="1136" >
+<COMPONENT type="1018" id="2673" >
 <cdparam x="409" y="173" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="1126" />
-<TGConnectingPoint num="1" id="1127" />
-<TGConnectingPoint num="2" id="1128" />
-<TGConnectingPoint num="3" id="1129" />
-<TGConnectingPoint num="4" id="1130" />
-<TGConnectingPoint num="5" id="1131" />
-<TGConnectingPoint num="6" id="1132" />
-<TGConnectingPoint num="7" id="1133" />
-<TGConnectingPoint num="8" id="1134" />
-<TGConnectingPoint num="9" id="1135" />
-</COMPONENT>
-
-<COMPONENT type="1000" id="1138" >
+<TGConnectingPoint num="0" id="2663" />
+<TGConnectingPoint num="1" id="2664" />
+<TGConnectingPoint num="2" id="2665" />
+<TGConnectingPoint num="3" id="2666" />
+<TGConnectingPoint num="4" id="2667" />
+<TGConnectingPoint num="5" id="2668" />
+<TGConnectingPoint num="6" id="2669" />
+<TGConnectingPoint num="7" id="2670" />
+<TGConnectingPoint num="8" id="2671" />
+<TGConnectingPoint num="9" id="2672" />
+</COMPONENT>
+
+<COMPONENT type="1000" id="2675" >
 <cdparam x="270" y="41" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1137" />
+<TGConnectingPoint num="0" id="2674" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="1139" >
+<CONNECTOR type="115" id="2676" >
 <cdparam x="272" y="378" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to send event" value="null" />
-<P1  x="272" y="378" id="1115" />
-<P2  x="272" y="395" id="1111" />
+<P1  x="272" y="378" id="2652" />
+<P2  x="272" y="395" id="2648" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1140" >
+<CONNECTOR type="115" id="2677" >
 <cdparam x="328" y="110" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for ever loop to select" value="null" />
-<P1  x="328" y="110" id="1124" />
-<P2  x="424" y="163" id="1126" />
+<P1  x="328" y="110" id="2661" />
+<P2  x="424" y="163" id="2663" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1141" >
+<CONNECTOR type="115" id="2678" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to stop state" value="null" />
-<P1  x="277" y="61" id="1137" />
-<P2  x="287" y="91" id="1123" />
+<P1  x="277" y="61" id="2674" />
+<P2  x="287" y="91" id="2660" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1142" >
+<CONNECTOR type="115" id="2679" >
 <cdparam x="384" y="188" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="384" y="188" id="1127" />
-<P2  x="269" y="225" id="1120" />
+<P1  x="384" y="188" id="2664" />
+<P2  x="269" y="225" id="2657" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1143" >
+<CONNECTOR type="115" id="2680" >
 <cdparam x="269" y="255" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="269" y="255" id="1121" />
-<P2  x="270" y="279" id="1117" />
+<P1  x="269" y="255" id="2658" />
+<P2  x="270" y="279" id="2654" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1144" >
+<CONNECTOR type="115" id="2681" >
 <cdparam x="270" y="309" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to action state" value="null" />
-<P1  x="270" y="309" id="1118" />
-<P2  x="272" y="348" id="1114" />
+<P1  x="270" y="309" id="2655" />
+<P2  x="272" y="348" id="2651" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1145" >
+<CONNECTOR type="115" id="2682" >
 <cdparam x="272" y="425" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="272" y="425" id="1112" />
-<P2  x="272" y="446" id="1108" />
+<P1  x="272" y="425" id="2649" />
+<P2  x="272" y="446" id="2645" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1146" >
+<CONNECTOR type="115" id="2683" >
 <cdparam x="272" y="476" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="272" y="476" id="1109" />
-<P2  x="272" y="488" id="1106" />
+<P1  x="272" y="476" id="2646" />
+<P2  x="272" y="488" id="2643" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1147" >
+<CONNECTOR type="115" id="2684" >
 <cdparam x="464" y="188" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="464" y="188" id="1128" />
-<P2  x="545" y="225" id="1103" />
+<P1  x="464" y="188" id="2665" />
+<P2  x="545" y="225" id="2640" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1148" >
+<CONNECTOR type="115" id="2685" >
 <cdparam x="545" y="255" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="545" y="255" id="1104" />
-<P2  x="546" y="278" id="1100" />
+<P1  x="545" y="255" id="2641" />
+<P2  x="546" y="278" id="2637" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1149" >
+<CONNECTOR type="115" id="2686" >
 <cdparam x="546" y="308" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to action state" value="null" />
-<P1  x="546" y="308" id="1101" />
-<P2  x="545" y="346" id="1097" />
+<P1  x="546" y="308" id="2638" />
+<P2  x="545" y="346" id="2634" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1150" >
+<CONNECTOR type="115" id="2687" >
 <cdparam x="545" y="376" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to send event" value="null" />
-<P1  x="545" y="376" id="1098" />
-<P2  x="550" y="391" id="1094" />
+<P1  x="545" y="376" id="2635" />
+<P2  x="550" y="391" id="2631" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1151" >
+<CONNECTOR type="115" id="2688" >
 <cdparam x="550" y="421" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="550" y="421" id="1095" />
-<P2  x="542" y="446" id="1091" />
+<P1  x="550" y="421" id="2632" />
+<P2  x="542" y="446" id="2628" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1152" >
+<CONNECTOR type="115" id="2689" >
 <cdparam x="542" y="476" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="542" y="476" id="1092" />
-<P2  x="541" y="495" id="1089" />
+<P1  x="542" y="476" id="2629" />
+<P2  x="541" y="495" id="2626" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="DistributionManager_ECU1" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1010" id="1155" >
+<COMPONENT type="1010" id="2692" >
 <cdparam x="219" y="504" />
 <sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="doneHSMECU1() " />
-<TGConnectingPoint num="0" id="1153" />
-<TGConnectingPoint num="1" id="1154" />
+<TGConnectingPoint num="0" id="2690" />
+<TGConnectingPoint num="1" id="2691" />
 <extraparam>
 <Data eventName="doneHSMECU1" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1164" >
+<COMPONENT type="301" id="2709" >
 <cdparam x="609" y="75" />
 <sizeparam width="127" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="Sending msg to KM
 " />
-<TGConnectingPoint num="0" id="1156" />
-<TGConnectingPoint num="1" id="1157" />
-<TGConnectingPoint num="2" id="1158" />
-<TGConnectingPoint num="3" id="1159" />
-<TGConnectingPoint num="4" id="1160" />
-<TGConnectingPoint num="5" id="1161" />
-<TGConnectingPoint num="6" id="1162" />
-<TGConnectingPoint num="7" id="1163" />
+<TGConnectingPoint num="0" id="2693" />
+<TGConnectingPoint num="1" id="2694" />
+<TGConnectingPoint num="2" id="2695" />
+<TGConnectingPoint num="3" id="2696" />
+<TGConnectingPoint num="4" id="2697" />
+<TGConnectingPoint num="5" id="2698" />
+<TGConnectingPoint num="6" id="2699" />
+<TGConnectingPoint num="7" id="2700" />
+<TGConnectingPoint num="8" id="2701" />
+<TGConnectingPoint num="9" id="2702" />
+<TGConnectingPoint num="10" id="2703" />
+<TGConnectingPoint num="11" id="2704" />
+<TGConnectingPoint num="12" id="2705" />
+<TGConnectingPoint num="13" id="2706" />
+<TGConnectingPoint num="14" id="2707" />
+<TGConnectingPoint num="15" id="2708" />
 <extraparam>
 <Line value="Sending msg to KM" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1167" >
+<COMPONENT type="1010" id="2712" >
 <cdparam x="215" y="371" />
 <sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="doneHSMECU1() " />
-<TGConnectingPoint num="0" id="1165" />
-<TGConnectingPoint num="1" id="1166" />
+<TGConnectingPoint num="0" id="2710" />
+<TGConnectingPoint num="1" id="2711" />
 <extraparam>
 <Data eventName="doneHSMECU1" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1170" >
+<COMPONENT type="1010" id="2715" >
 <cdparam x="214" y="285" />
 <sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="doneHSMECU1() " />
-<TGConnectingPoint num="0" id="1168" />
-<TGConnectingPoint num="1" id="1169" />
+<TGConnectingPoint num="0" id="2713" />
+<TGConnectingPoint num="1" id="2714" />
 <extraparam>
 <Data eventName="doneHSMECU1" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1173" >
+<COMPONENT type="1010" id="2718" >
 <cdparam x="209" y="191" />
 <sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="doneHSMECU1() " />
-<TGConnectingPoint num="0" id="1171" />
-<TGConnectingPoint num="1" id="1172" />
+<TGConnectingPoint num="0" id="2716" />
+<TGConnectingPoint num="1" id="2717" />
 <extraparam>
 <Data eventName="doneHSMECU1" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1176" >
+<COMPONENT type="1008" id="2721" >
 <cdparam x="218" y="420" />
 <sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="getMsgECU1(59)" />
-<TGConnectingPoint num="0" id="1174" />
-<TGConnectingPoint num="1" id="1175" />
+<TGConnectingPoint num="0" id="2719" />
+<TGConnectingPoint num="1" id="2720" />
 <extraparam>
 <Data eventName="getMsgECU1" nbOfParams="5" />
 <Param index="0" value="59" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="1179" >
+<COMPONENT type="1009" id="2724" >
 <cdparam x="218" y="468" />
 <sizeparam width="111" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="outHSMECU1(59) " />
-<TGConnectingPoint num="0" id="1177" />
-<TGConnectingPoint num="1" id="1178" />
+<TGConnectingPoint num="0" id="2722" />
+<TGConnectingPoint num="1" id="2723" />
 <extraparam>
-<Data channelName="outHSMECU1" nbOfSamples="59" />
+<Data channelName="outHSMECU1" nbOfSamples="59" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1182" >
+<COMPONENT type="1008" id="2727" >
 <cdparam x="224" y="336" />
 <sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="macECU1(43)" />
-<TGConnectingPoint num="0" id="1180" />
-<TGConnectingPoint num="1" id="1181" />
+<TGConnectingPoint num="0" id="2725" />
+<TGConnectingPoint num="1" id="2726" />
 <extraparam>
 <Data eventName="macECU1" nbOfParams="5" />
 <Param index="0" value="43" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1185" >
+<COMPONENT type="1008" id="2730" >
 <cdparam x="211" y="238" />
 <sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="encryptECU1(43)" />
-<TGConnectingPoint num="0" id="1183" />
-<TGConnectingPoint num="1" id="1184" />
+<TGConnectingPoint num="0" id="2728" />
+<TGConnectingPoint num="1" id="2729" />
 <extraparam>
 <Data eventName="encryptECU1" nbOfParams="5" />
 <Param index="0" value="43" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1188" >
+<COMPONENT type="1008" id="2733" >
 <cdparam x="196" y="151" />
 <sizeparam width="134" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="generateKeyECU1(32)" />
-<TGConnectingPoint num="0" id="1186" />
-<TGConnectingPoint num="1" id="1187" />
+<TGConnectingPoint num="0" id="2731" />
+<TGConnectingPoint num="1" id="2732" />
 <extraparam>
 <Data eventName="generateKeyECU1" nbOfParams="5" />
 <Param index="0" value="32" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1191" >
+<COMPONENT type="1008" id="2736" >
 <cdparam x="661" y="366" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="done()" />
-<TGConnectingPoint num="0" id="1189" />
-<TGConnectingPoint num="1" id="1190" />
+<TGConnectingPoint num="0" id="2734" />
+<TGConnectingPoint num="1" id="2735" />
 <extraparam>
 <Data eventName="done" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1194" >
+<COMPONENT type="1010" id="2739" >
 <cdparam x="213" y="100" />
 <sizeparam width="92" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="distributeKey() " />
-<TGConnectingPoint num="0" id="1192" />
-<TGConnectingPoint num="1" id="1193" />
+<TGConnectingPoint num="0" id="2737" />
+<TGConnectingPoint num="1" id="2738" />
 <extraparam>
 <Data eventName="distributeKey" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1196" >
+<COMPONENT type="1001" id="2741" >
 <cdparam x="673" y="421" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1195" />
+<TGConnectingPoint num="0" id="2740" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="1199" >
+<COMPONENT type="1009" id="2744" >
 <cdparam x="594" y="319" />
 <sizeparam width="178" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="recvDataECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1197" />
-<TGConnectingPoint num="1" id="1198" />
+<TGConnectingPoint num="0" id="2742" />
+<TGConnectingPoint num="1" id="2743" />
 <extraparam>
-<Data channelName="recvDataECU1" nbOfSamples="nbOfSamples" />
+<Data channelName="recvDataECU1" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1202" >
+<COMPONENT type="1010" id="2747" >
 <cdparam x="598" y="261" />
 <sizeparam width="168" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="recvEvtECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1200" />
-<TGConnectingPoint num="1" id="1201" />
+<TGConnectingPoint num="0" id="2745" />
+<TGConnectingPoint num="1" id="2746" />
 <extraparam>
 <Data eventName="recvEvtECU1" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1205" >
+<COMPONENT type="1006" id="2750" >
 <cdparam x="624" y="213" />
 <sizeparam width="119" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="sendDataECU1(59)" />
-<TGConnectingPoint num="0" id="1203" />
-<TGConnectingPoint num="1" id="1204" />
+<TGConnectingPoint num="0" id="2748" />
+<TGConnectingPoint num="1" id="2749" />
 <extraparam>
-<Data channelName="sendDataECU1" nbOfSamples="59" />
+<Data channelName="sendDataECU1" nbOfSamples="59" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1214" >
+<COMPONENT type="301" id="2767" >
 <cdparam x="14" y="216" />
 <sizeparam width="187" height="68" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -7503,14 +7715,22 @@
 86 bits of structure + key (256) 
 + MAC (16 bytes)
 " />
-<TGConnectingPoint num="0" id="1206" />
-<TGConnectingPoint num="1" id="1207" />
-<TGConnectingPoint num="2" id="1208" />
-<TGConnectingPoint num="3" id="1209" />
-<TGConnectingPoint num="4" id="1210" />
-<TGConnectingPoint num="5" id="1211" />
-<TGConnectingPoint num="6" id="1212" />
-<TGConnectingPoint num="7" id="1213" />
+<TGConnectingPoint num="0" id="2751" />
+<TGConnectingPoint num="1" id="2752" />
+<TGConnectingPoint num="2" id="2753" />
+<TGConnectingPoint num="3" id="2754" />
+<TGConnectingPoint num="4" id="2755" />
+<TGConnectingPoint num="5" id="2756" />
+<TGConnectingPoint num="6" id="2757" />
+<TGConnectingPoint num="7" id="2758" />
+<TGConnectingPoint num="8" id="2759" />
+<TGConnectingPoint num="9" id="2760" />
+<TGConnectingPoint num="10" id="2761" />
+<TGConnectingPoint num="11" id="2762" />
+<TGConnectingPoint num="12" id="2763" />
+<TGConnectingPoint num="13" id="2764" />
+<TGConnectingPoint num="14" id="2765" />
+<TGConnectingPoint num="15" id="2766" />
 <extraparam>
 <Line value="59 bytes" />
 <Line value="86 bits of structure + key (256) " />
@@ -7518,103 +7738,103 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1217" >
+<COMPONENT type="1008" id="2770" >
 <cdparam x="634" y="162" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="sendEvtECU1(59)" />
-<TGConnectingPoint num="0" id="1215" />
-<TGConnectingPoint num="1" id="1216" />
+<TGConnectingPoint num="0" id="2768" />
+<TGConnectingPoint num="1" id="2769" />
 <extraparam>
 <Data eventName="sendEvtECU1" nbOfParams="5" />
 <Param index="0" value="59" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="1219" >
+<COMPONENT type="1000" id="2772" >
 <cdparam x="252" y="37" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1218" />
+<TGConnectingPoint num="0" id="2771" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="1220" >
+<CONNECTOR type="115" id="2773" >
 <cdparam x="273" y="493" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to wait event" value="null" />
-<P1  x="273" y="493" id="1178" />
-<P2  x="273" y="499" id="1153" />
+<P1  x="273" y="493" id="2723" />
+<P2  x="273" y="499" id="2690" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1221" >
+<CONNECTOR type="115" id="2774" >
 <cdparam x="269" y="396" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="269" y="396" id="1166" />
-<P2  x="270" y="415" id="1174" />
+<P1  x="269" y="396" id="2711" />
+<P2  x="270" y="415" id="2719" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1222" >
+<CONNECTOR type="115" id="2775" >
 <cdparam x="263" y="216" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="263" y="216" id="1172" />
-<P2  x="263" y="233" id="1183" />
+<P1  x="263" y="216" id="2717" />
+<P2  x="263" y="233" id="2728" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1223" >
+<CONNECTOR type="115" id="2776" >
 <cdparam x="259" y="125" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="259" y="125" id="1193" />
-<P2  x="263" y="146" id="1186" />
+<P1  x="259" y="125" id="2738" />
+<P2  x="263" y="146" id="2731" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1224" >
+<CONNECTOR type="115" id="2777" >
 <cdparam x="688" y="187" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="688" y="187" id="1216" />
-<P2  x="683" y="208" id="1203" />
+<P1  x="688" y="187" id="2769" />
+<P2  x="683" y="208" id="2748" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1225" >
+<CONNECTOR type="115" id="2778" >
 <cdparam x="281" y="472" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to read channel" value="null" />
-<P1  x="270" y="445" id="1175" />
-<P2  x="273" y="463" id="1177" />
+<P1  x="270" y="445" id="2720" />
+<P2  x="273" y="463" id="2722" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1226" >
+<CONNECTOR type="115" id="2779" >
 <cdparam x="694" y="343" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to send event" value="null" />
-<P1  x="683" y="344" id="1198" />
-<P2  x="684" y="361" id="1189" />
+<P1  x="683" y="344" id="2743" />
+<P2  x="684" y="361" id="2734" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1227" >
+<CONNECTOR type="115" id="2780" >
 <cdparam x="682" y="286" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="682" y="286" id="1201" />
-<P2  x="683" y="314" id="1197" />
+<P1  x="682" y="286" id="2746" />
+<P2  x="683" y="314" id="2742" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1229" >
+<CONNECTOR type="115" id="2782" >
 <cdparam x="684" y="391" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="684" y="391" id="1190" />
-<P2  x="683" y="416" id="1195" />
+<P1  x="684" y="391" id="2735" />
+<P2  x="683" y="416" id="2740" />
 <Point x="683" y="407" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1228" >
-<father id="1229" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2781" >
+<father id="2782" num="0" />
 <cdparam x="683" y="407" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -7622,67 +7842,67 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="115" id="1230" >
+<CONNECTOR type="115" id="2783" >
 <cdparam x="259" y="57" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to send event" value="null" />
-<P1  x="259" y="57" id="1218" />
-<P2  x="259" y="95" id="1192" />
+<P1  x="259" y="57" id="2771" />
+<P2  x="259" y="95" id="2737" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1231" >
+<CONNECTOR type="115" id="2784" >
 <cdparam x="687" y="103" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to wait event" value="null" />
-<P1  x="683" y="238" id="1204" />
-<P2  x="682" y="256" id="1200" />
+<P1  x="683" y="238" id="2749" />
+<P2  x="682" y="256" id="2745" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1232" >
+<CONNECTOR type="115" id="2785" >
 <cdparam x="264" y="200" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to send event" value="null" />
-<P1  x="263" y="176" id="1187" />
-<P2  x="263" y="186" id="1171" />
+<P1  x="263" y="176" id="2732" />
+<P2  x="263" y="186" id="2716" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1237" >
+<CONNECTOR type="115" id="2790" >
 <cdparam x="301" y="381" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to write channel" value="null" />
-<P1  x="273" y="529" id="1154" />
-<P2  x="688" y="157" id="1215" />
+<P1  x="273" y="529" id="2691" />
+<P2  x="688" y="157" id="2768" />
 <Point x="273" y="534" />
 <Point x="480" y="534" />
 <Point x="480" y="137" />
 <Point x="688" y="137" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1233" >
-<father id="1237" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2786" >
+<father id="2790" num="0" />
 <cdparam x="273" y="534" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1234" >
-<father id="1237" num="1" />
+<SUBCOMPONENT type="-1" id="2787" >
+<father id="2790" num="1" />
 <cdparam x="480" y="534" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1235" >
-<father id="1237" num="2" />
+<SUBCOMPONENT type="-1" id="2788" >
+<father id="2790" num="2" />
 <cdparam x="480" y="137" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1236" >
-<father id="1237" num="3" />
+<SUBCOMPONENT type="-1" id="2789" >
+<father id="2790" num="3" />
 <cdparam x="688" y="137" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -7690,130 +7910,130 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="115" id="1238" >
+<CONNECTOR type="115" id="2791" >
 <cdparam x="263" y="263" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="263" y="263" id="1184" />
-<P2  x="268" y="280" id="1168" />
+<P1  x="263" y="263" id="2729" />
+<P2  x="268" y="280" id="2713" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1239" >
+<CONNECTOR type="115" id="2792" >
 <cdparam x="268" y="310" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="268" y="310" id="1169" />
-<P2  x="268" y="331" id="1180" />
+<P1  x="268" y="310" id="2714" />
+<P2  x="268" y="331" id="2725" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1240" >
+<CONNECTOR type="115" id="2793" >
 <cdparam x="268" y="361" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="268" y="361" id="1181" />
-<P2  x="269" y="366" id="1165" />
+<P1  x="268" y="361" id="2726" />
+<P2  x="269" y="366" id="2710" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="HSM_KM" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="1242" >
+<COMPONENT type="1001" id="2795" >
 <cdparam x="70" y="410" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1241" />
+<TGConnectingPoint num="0" id="2794" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="1245" >
+<COMPONENT type="1009" id="2798" >
 <cdparam x="21" y="362" />
 <sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="inHSM(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1243" />
-<TGConnectingPoint num="1" id="1244" />
+<TGConnectingPoint num="0" id="2796" />
+<TGConnectingPoint num="1" id="2797" />
 <extraparam>
-<Data channelName="inHSM" nbOfSamples="sizeOfMsg" />
+<Data channelName="inHSM" nbOfSamples="sizeOfMsg" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1248" >
+<COMPONENT type="1010" id="2801" >
 <cdparam x="20" y="315" />
 <sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="putMsg(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1246" />
-<TGConnectingPoint num="1" id="1247" />
+<TGConnectingPoint num="0" id="2799" />
+<TGConnectingPoint num="1" id="2800" />
 <extraparam>
 <Data eventName="putMsg" nbOfParams="5" />
 <Param index="0" value="sizeOfMsg" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1250" >
+<COMPONENT type="1001" id="2803" >
 <cdparam x="213" y="425" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1249" />
+<TGConnectingPoint num="0" id="2802" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1252" >
+<COMPONENT type="1001" id="2805" >
 <cdparam x="353" y="423" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1251" />
+<TGConnectingPoint num="0" id="2804" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1254" >
+<COMPONENT type="1001" id="2807" >
 <cdparam x="495" y="424" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1253" />
+<TGConnectingPoint num="0" id="2806" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1256" >
+<COMPONENT type="1001" id="2809" >
 <cdparam x="681" y="430" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1255" />
+<TGConnectingPoint num="0" id="2808" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1259" >
+<COMPONENT type="1006" id="2812" >
 <cdparam x="631" y="379" />
 <sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="outHSM(sizeOfMsg)" />
-<TGConnectingPoint num="0" id="1257" />
-<TGConnectingPoint num="1" id="1258" />
+<TGConnectingPoint num="0" id="2810" />
+<TGConnectingPoint num="1" id="2811" />
 <extraparam>
-<Data channelName="outHSM" nbOfSamples="sizeOfMsg" />
+<Data channelName="outHSM" nbOfSamples="sizeOfMsg" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1013" id="1263" >
+<COMPONENT type="1013" id="2816" >
 <cdparam x="499" y="372" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1261" />
-<TGConnectingPoint num="1" id="1262" />
+<TGConnectingPoint num="0" id="2814" />
+<TGConnectingPoint num="1" id="2815" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="1260" >
-<father id="1263" num="0" />
+<SUBCOMPONENT type="-1" id="2813" >
+<father id="2816" num="0" />
 <cdparam x="514" y="392" />
 <sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -7821,17 +8041,17 @@
 <infoparam name="value of the delay" value="sizeOfMsg*60" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="1267" >
+<COMPONENT type="1013" id="2820" >
 <cdparam x="219" y="364" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1265" />
-<TGConnectingPoint num="1" id="1266" />
+<TGConnectingPoint num="0" id="2818" />
+<TGConnectingPoint num="1" id="2819" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="1264" >
-<father id="1267" num="0" />
+<SUBCOMPONENT type="-1" id="2817" >
+<father id="2820" num="0" />
 <cdparam x="234" y="384" />
 <sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -7839,17 +8059,17 @@
 <infoparam name="value of the delay" value="15*sizeOfMsg" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="1271" >
+<COMPONENT type="1013" id="2824" >
 <cdparam x="357" y="368" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1269" />
-<TGConnectingPoint num="1" id="1270" />
+<TGConnectingPoint num="0" id="2822" />
+<TGConnectingPoint num="1" id="2823" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="1268" >
-<father id="1271" num="0" />
+<SUBCOMPONENT type="-1" id="2821" >
+<father id="2824" num="0" />
 <cdparam x="372" y="388" />
 <sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -7857,43 +8077,43 @@
 <infoparam name="value of the delay" value="15*sizeOfMsg" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1001" id="1273" >
+<COMPONENT type="1001" id="2826" >
 <cdparam x="600" y="243" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1272" />
+<TGConnectingPoint num="0" id="2825" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="1276" >
+<COMPONENT type="1008" id="2829" >
 <cdparam x="573" y="196" />
 <sizeparam width="72" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="doneHSM()" />
-<TGConnectingPoint num="0" id="1274" />
-<TGConnectingPoint num="1" id="1275" />
+<TGConnectingPoint num="0" id="2827" />
+<TGConnectingPoint num="1" id="2828" />
 <extraparam>
 <Data eventName="doneHSM" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1016" id="1284" >
+<COMPONENT type="1016" id="2837" >
 <cdparam x="466" y="152" />
 <sizeparam width="150" height="5" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="sequence" value="null" />
-<TGConnectingPoint num="0" id="1278" />
-<TGConnectingPoint num="1" id="1279" />
-<TGConnectingPoint num="2" id="1280" />
-<TGConnectingPoint num="3" id="1281" />
-<TGConnectingPoint num="4" id="1282" />
-<TGConnectingPoint num="5" id="1283" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="1277" >
-<father id="1284" num="0" />
+<TGConnectingPoint num="0" id="2831" />
+<TGConnectingPoint num="1" id="2832" />
+<TGConnectingPoint num="2" id="2833" />
+<TGConnectingPoint num="3" id="2834" />
+<TGConnectingPoint num="4" id="2835" />
+<TGConnectingPoint num="5" id="2836" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="2830" >
+<father id="2837" num="0" />
 <cdparam x="620" y="159" />
 <sizeparam width="14" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -7901,141 +8121,141 @@
 <infoparam name="Sequence" value="&gt;&gt;" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1010" id="1287" >
+<COMPONENT type="1010" id="2840" >
 <cdparam x="631" y="327" />
 <sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="getMsg(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1285" />
-<TGConnectingPoint num="1" id="1286" />
+<TGConnectingPoint num="0" id="2838" />
+<TGConnectingPoint num="1" id="2839" />
 <extraparam>
 <Data eventName="getMsg" nbOfParams="5" />
 <Param index="0" value="sizeOfMsg" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1290" >
+<COMPONENT type="1010" id="2843" >
 <cdparam x="431" y="320" />
 <sizeparam width="147" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="generateKey(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1288" />
-<TGConnectingPoint num="1" id="1289" />
+<TGConnectingPoint num="0" id="2841" />
+<TGConnectingPoint num="1" id="2842" />
 <extraparam>
 <Data eventName="generateKey" nbOfParams="5" />
 <Param index="0" value="sizeOfMsg" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1293" >
+<COMPONENT type="1010" id="2846" >
 <cdparam x="310" y="312" />
 <sizeparam width="102" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="mac(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1291" />
-<TGConnectingPoint num="1" id="1292" />
+<TGConnectingPoint num="0" id="2844" />
+<TGConnectingPoint num="1" id="2845" />
 <extraparam>
 <Data eventName="mac" nbOfParams="5" />
 <Param index="0" value="sizeOfMsg" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1296" >
+<COMPONENT type="1010" id="2849" >
 <cdparam x="166" y="312" />
 <sizeparam width="117" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="encrypt(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1294" />
-<TGConnectingPoint num="1" id="1295" />
+<TGConnectingPoint num="0" id="2847" />
+<TGConnectingPoint num="1" id="2848" />
 <extraparam>
 <Data eventName="encrypt" nbOfParams="5" />
 <Param index="0" value="sizeOfMsg" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1018" id="1307" >
+<COMPONENT type="1018" id="2860" >
 <cdparam x="383" y="209" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="1297" />
-<TGConnectingPoint num="1" id="1298" />
-<TGConnectingPoint num="2" id="1299" />
-<TGConnectingPoint num="3" id="1300" />
-<TGConnectingPoint num="4" id="1301" />
-<TGConnectingPoint num="5" id="1302" />
-<TGConnectingPoint num="6" id="1303" />
-<TGConnectingPoint num="7" id="1304" />
-<TGConnectingPoint num="8" id="1305" />
-<TGConnectingPoint num="9" id="1306" />
-</COMPONENT>
-
-<COMPONENT type="1030" id="1310" >
+<TGConnectingPoint num="0" id="2850" />
+<TGConnectingPoint num="1" id="2851" />
+<TGConnectingPoint num="2" id="2852" />
+<TGConnectingPoint num="3" id="2853" />
+<TGConnectingPoint num="4" id="2854" />
+<TGConnectingPoint num="5" id="2855" />
+<TGConnectingPoint num="6" id="2856" />
+<TGConnectingPoint num="7" id="2857" />
+<TGConnectingPoint num="8" id="2858" />
+<TGConnectingPoint num="9" id="2859" />
+</COMPONENT>
+
+<COMPONENT type="1030" id="2863" >
 <cdparam x="209" y="89" />
 <sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="1308" />
-<TGConnectingPoint num="1" id="1309" />
+<TGConnectingPoint num="0" id="2861" />
+<TGConnectingPoint num="1" id="2862" />
 </COMPONENT>
 
-<COMPONENT type="1000" id="1312" >
+<COMPONENT type="1000" id="2865" >
 <cdparam x="242" y="40" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1311" />
+<TGConnectingPoint num="0" id="2864" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="1313" >
+<CONNECTOR type="115" id="2866" >
 <cdparam x="358" y="224" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="358" y="224" id="1301" />
-<P2  x="79" y="310" id="1246" />
+<P1  x="358" y="224" id="2854" />
+<P2  x="79" y="310" id="2799" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1314" >
+<CONNECTOR type="115" id="2867" >
 <cdparam x="534" y="157" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from sequence to select" value="null" />
-<P1  x="515" y="157" id="1280" />
-<P2  x="398" y="199" id="1297" />
+<P1  x="515" y="157" id="2833" />
+<P2  x="398" y="199" id="2850" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1315" >
+<CONNECTOR type="115" id="2868" >
 <cdparam x="585" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="438" y="224" id="1302" />
-<P2  x="690" y="322" id="1285" />
+<P1  x="438" y="224" id="2855" />
+<P2  x="690" y="322" id="2838" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1316" >
+<CONNECTOR type="115" id="2869" >
 <cdparam x="245" y="91" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to for ever loop" value="null" />
-<P1  x="249" y="60" id="1311" />
-<P2  x="249" y="84" id="1308" />
+<P1  x="249" y="60" id="2864" />
+<P2  x="249" y="84" id="2861" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1318" >
+<CONNECTOR type="115" id="2871" >
 <cdparam x="423" y="160" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for ever loop to select" value="null" />
-<P1  x="290" y="103" id="1309" />
-<P2  x="541" y="152" id="1278" />
+<P1  x="290" y="103" id="2862" />
+<P2  x="541" y="152" id="2831" />
 <Point x="476" y="121" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1317" >
-<father id="1318" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2870" >
+<father id="2871" num="0" />
 <cdparam x="476" y="121" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -8043,286 +8263,286 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="115" id="1319" >
+<CONNECTOR type="115" id="2872" >
 <cdparam x="505" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="358" y="224" id="1298" />
-<P2  x="224" y="307" id="1294" />
+<P1  x="358" y="224" id="2851" />
+<P2  x="224" y="307" id="2847" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1320" >
+<CONNECTOR type="115" id="2873" >
 <cdparam x="448" y="278" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="398" y="264" id="1300" />
-<P2  x="361" y="307" id="1291" />
+<P1  x="398" y="264" id="2853" />
+<P2  x="361" y="307" id="2844" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1321" >
+<CONNECTOR type="115" id="2874" >
 <cdparam x="585" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="438" y="224" id="1299" />
-<P2  x="504" y="315" id="1288" />
+<P1  x="438" y="224" id="2852" />
+<P2  x="504" y="315" id="2841" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1322" >
+<CONNECTOR type="115" id="2875" >
 <cdparam x="778" y="153" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from sequence to send event" value="null" />
-<P1  x="590" y="157" id="1283" />
-<P2  x="609" y="191" id="1274" />
+<P1  x="590" y="157" id="2836" />
+<P2  x="609" y="191" id="2827" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1323" >
+<CONNECTOR type="115" id="2876" >
 <cdparam x="609" y="221" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="609" y="221" id="1275" />
-<P2  x="610" y="238" id="1272" />
+<P1  x="609" y="221" id="2828" />
+<P2  x="610" y="238" id="2825" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1324" >
+<CONNECTOR type="115" id="2877" >
 <cdparam x="361" y="337" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to execI" value="null" />
-<P1  x="361" y="337" id="1292" />
-<P2  x="362" y="363" id="1269" />
+<P1  x="361" y="337" id="2845" />
+<P2  x="362" y="363" id="2822" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1325" >
+<CONNECTOR type="115" id="2878" >
 <cdparam x="224" y="337" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to execI" value="null" />
-<P1  x="224" y="337" id="1295" />
-<P2  x="224" y="359" id="1265" />
+<P1  x="224" y="337" id="2848" />
+<P2  x="224" y="359" id="2818" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1326" >
+<CONNECTOR type="115" id="2879" >
 <cdparam x="504" y="345" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to execI" value="null" />
-<P1  x="504" y="345" id="1289" />
-<P2  x="504" y="367" id="1261" />
+<P1  x="504" y="345" id="2842" />
+<P2  x="504" y="367" id="2814" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1327" >
+<CONNECTOR type="115" id="2880" >
 <cdparam x="690" y="352" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to write channel" value="null" />
-<P1  x="690" y="352" id="1286" />
-<P2  x="690" y="374" id="1257" />
+<P1  x="690" y="352" id="2839" />
+<P2  x="690" y="374" id="2810" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1328" >
+<CONNECTOR type="115" id="2881" >
 <cdparam x="690" y="404" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="690" y="404" id="1258" />
-<P2  x="691" y="425" id="1255" />
+<P1  x="690" y="404" id="2811" />
+<P2  x="691" y="425" id="2808" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1329" >
+<CONNECTOR type="115" id="2882" >
 <cdparam x="504" y="407" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to stop state" value="null" />
-<P1  x="504" y="407" id="1262" />
-<P2  x="505" y="419" id="1253" />
+<P1  x="504" y="407" id="2815" />
+<P2  x="505" y="419" id="2806" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1330" >
+<CONNECTOR type="115" id="2883" >
 <cdparam x="362" y="403" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to stop state" value="null" />
-<P1  x="362" y="403" id="1270" />
-<P2  x="363" y="418" id="1251" />
+<P1  x="362" y="403" id="2823" />
+<P2  x="363" y="418" id="2804" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1331" >
+<CONNECTOR type="115" id="2884" >
 <cdparam x="224" y="399" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to stop state" value="null" />
-<P1  x="224" y="399" id="1266" />
-<P2  x="223" y="420" id="1249" />
+<P1  x="224" y="399" id="2819" />
+<P2  x="223" y="420" id="2802" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1332" >
+<CONNECTOR type="115" id="2885" >
 <cdparam x="79" y="340" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="79" y="340" id="1247" />
-<P2  x="78" y="357" id="1243" />
+<P1  x="79" y="340" id="2800" />
+<P2  x="78" y="357" id="2796" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1333" >
+<CONNECTOR type="115" id="2886" >
 <cdparam x="78" y="387" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to stop state" value="null" />
-<P1  x="78" y="387" id="1244" />
-<P2  x="80" y="405" id="1241" />
+<P1  x="78" y="387" id="2797" />
+<P2  x="80" y="405" id="2794" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="CTP_KM" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="1335" >
+<COMPONENT type="1001" id="2888" >
 <cdparam x="593" y="586" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1334" />
+<TGConnectingPoint num="0" id="2887" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1338" >
-<cdparam x="535" y="516" />
-<sizeparam width="142" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="2891" >
+<cdparam x="527" y="516" />
+<sizeparam width="158" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="recvData(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1336" />
-<TGConnectingPoint num="1" id="1337" />
+<TGConnectingPoint num="0" id="2889" />
+<TGConnectingPoint num="1" id="2890" />
 <extraparam>
-<Data channelName="recvData" nbOfSamples="nbOfSamples" />
+<Data channelName="recvData" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1341" >
-<cdparam x="543" y="460" />
-<sizeparam width="132" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="2894" >
+<cdparam x="536" y="460" />
+<sizeparam width="147" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="recvEvt(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1339" />
-<TGConnectingPoint num="1" id="1340" />
+<TGConnectingPoint num="0" id="2892" />
+<TGConnectingPoint num="1" id="2893" />
 <extraparam>
 <Data eventName="recvEvt" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="1344" >
-<cdparam x="514" y="342" />
-<sizeparam width="183" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="2897" >
+<cdparam x="506" y="342" />
+<sizeparam width="199" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="dataFromECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1342" />
-<TGConnectingPoint num="1" id="1343" />
+<TGConnectingPoint num="0" id="2895" />
+<TGConnectingPoint num="1" id="2896" />
 <extraparam>
-<Data channelName="dataFromECU1" nbOfSamples="nbOfSamples" />
+<Data channelName="dataFromECU1" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1347" >
-<cdparam x="518" y="292" />
-<sizeparam width="174" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="2900" >
+<cdparam x="511" y="292" />
+<sizeparam width="189" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="evtFromECU1(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1345" />
-<TGConnectingPoint num="1" id="1346" />
+<TGConnectingPoint num="0" id="2898" />
+<TGConnectingPoint num="1" id="2899" />
 <extraparam>
 <Data eventName="evtFromECU1" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1350" >
-<cdparam x="36" y="573" />
-<sizeparam width="165" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="2903" >
+<cdparam x="29" y="573" />
+<sizeparam width="179" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="dataToECU1(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1348" />
-<TGConnectingPoint num="1" id="1349" />
+<TGConnectingPoint num="0" id="2901" />
+<TGConnectingPoint num="1" id="2902" />
 <extraparam>
-<Data channelName="dataToECU1" nbOfSamples="nbOfSamples" />
+<Data channelName="dataToECU1" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1353" >
-<cdparam x="45" y="527" />
-<sizeparam width="156" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="2906" >
+<cdparam x="39" y="527" />
+<sizeparam width="169" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="evtToECU1(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1351" />
-<TGConnectingPoint num="1" id="1352" />
+<TGConnectingPoint num="0" id="2904" />
+<TGConnectingPoint num="1" id="2905" />
 <extraparam>
 <Data eventName="evtToECU1" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1012" id="1361" >
+<COMPONENT type="1012" id="2914" >
 <cdparam x="214" y="445" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="1357" />
-<TGConnectingPoint num="1" id="1358" />
-<TGConnectingPoint num="2" id="1359" />
-<TGConnectingPoint num="3" id="1360" />
+<TGConnectingPoint num="0" id="2910" />
+<TGConnectingPoint num="1" id="2911" />
+<TGConnectingPoint num="2" id="2912" />
+<TGConnectingPoint num="3" id="2913" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="1354" >
-<father id="1361" num="0" />
+<SUBCOMPONENT type="-1" id="2907" >
+<father id="2914" num="0" />
 <cdparam x="139" y="456" />
-<sizeparam width="94" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="117" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[destination == 1]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1355" >
-<father id="1361" num="1" />
+<SUBCOMPONENT type="-1" id="2908" >
+<father id="2914" num="1" />
 <cdparam x="249" y="455" />
-<sizeparam width="97" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="121" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[destination == 2 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1356" >
-<father id="1361" num="2" />
+<SUBCOMPONENT type="-1" id="2909" >
+<father id="2914" num="2" />
 <cdparam x="234" y="490" />
-<sizeparam width="9" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1001" id="1363" >
+<COMPONENT type="1001" id="2916" >
 <cdparam x="110" y="637" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1362" />
+<TGConnectingPoint num="0" id="2915" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="1366" >
-<cdparam x="148" y="322" />
-<sizeparam width="151" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="2919" >
+<cdparam x="140" y="322" />
+<sizeparam width="167" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="sendData(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1364" />
-<TGConnectingPoint num="1" id="1365" />
+<TGConnectingPoint num="0" id="2917" />
+<TGConnectingPoint num="1" id="2918" />
 <extraparam>
-<Data channelName="sendData" nbOfSamples="nbOfSamples" />
+<Data channelName="sendData" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1369" >
-<cdparam x="120" y="275" />
-<sizeparam width="208" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="2922" >
+<cdparam x="107" y="275" />
+<sizeparam width="235" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="sendEvt(nbOfSamples, destination) " />
-<TGConnectingPoint num="0" id="1367" />
-<TGConnectingPoint num="1" id="1368" />
+<TGConnectingPoint num="0" id="2920" />
+<TGConnectingPoint num="1" id="2921" />
 <extraparam>
 <Data eventName="sendEvt" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
@@ -8330,697 +8550,705 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1030" id="1372" >
-<cdparam x="361" y="106" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1030" id="2925" >
+<cdparam x="355" y="106" />
+<sizeparam width="92" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="1370" />
-<TGConnectingPoint num="1" id="1371" />
+<TGConnectingPoint num="0" id="2923" />
+<TGConnectingPoint num="1" id="2924" />
 </COMPONENT>
 
-<COMPONENT type="1018" id="1383" >
+<COMPONENT type="1018" id="2936" >
 <cdparam x="591" y="195" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="1373" />
-<TGConnectingPoint num="1" id="1374" />
-<TGConnectingPoint num="2" id="1375" />
-<TGConnectingPoint num="3" id="1376" />
-<TGConnectingPoint num="4" id="1377" />
-<TGConnectingPoint num="5" id="1378" />
-<TGConnectingPoint num="6" id="1379" />
-<TGConnectingPoint num="7" id="1380" />
-<TGConnectingPoint num="8" id="1381" />
-<TGConnectingPoint num="9" id="1382" />
-</COMPONENT>
-
-<COMPONENT type="1000" id="1385" >
+<TGConnectingPoint num="0" id="2926" />
+<TGConnectingPoint num="1" id="2927" />
+<TGConnectingPoint num="2" id="2928" />
+<TGConnectingPoint num="3" id="2929" />
+<TGConnectingPoint num="4" id="2930" />
+<TGConnectingPoint num="5" id="2931" />
+<TGConnectingPoint num="6" id="2932" />
+<TGConnectingPoint num="7" id="2933" />
+<TGConnectingPoint num="8" id="2934" />
+<TGConnectingPoint num="9" id="2935" />
+</COMPONENT>
+
+<COMPONENT type="1000" id="2938" >
 <cdparam x="384" y="51" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1384" />
+<TGConnectingPoint num="0" id="2937" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1388" >
-<cdparam x="239" y="573" />
-<sizeparam width="167" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="2941" >
+<cdparam x="232" y="573" />
+<sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="dataToECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1386" />
-<TGConnectingPoint num="1" id="1387" />
+<TGConnectingPoint num="0" id="2939" />
+<TGConnectingPoint num="1" id="2940" />
 <extraparam>
-<Data channelName="dataToECUN" nbOfSamples="nbOfSamples" />
+<Data channelName="dataToECUN" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1391" >
-<cdparam x="240" y="527" />
-<sizeparam width="158" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="2944" >
+<cdparam x="234" y="527" />
+<sizeparam width="170" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="evtToECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1389" />
-<TGConnectingPoint num="1" id="1390" />
+<TGConnectingPoint num="0" id="2942" />
+<TGConnectingPoint num="1" id="2943" />
 <extraparam>
 <Data eventName="evtToECUN" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1393" >
+<COMPONENT type="1001" id="2946" >
 <cdparam x="313" y="634" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1392" />
+<TGConnectingPoint num="0" id="2945" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1396" >
-<cdparam x="500" y="403" />
-<sizeparam width="217" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="2949" >
+<cdparam x="486" y="403" />
+<sizeparam width="244" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="action state" value="nbOfSamples = (nbOfSamples * 8) / 9" />
-<TGConnectingPoint num="0" id="1394" />
-<TGConnectingPoint num="1" id="1395" />
+<TGConnectingPoint num="0" id="2947" />
+<TGConnectingPoint num="1" id="2948" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1399" >
-<cdparam x="117" y="370" />
-<sizeparam width="217" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="2952" >
+<cdparam x="103" y="370" />
+<sizeparam width="244" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="action state" value="nbOfSamples = (nbOfSamples * 9) / 8" />
-<TGConnectingPoint num="0" id="1397" />
-<TGConnectingPoint num="1" id="1398" />
+<TGConnectingPoint num="0" id="2950" />
+<TGConnectingPoint num="1" id="2951" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1401" >
+<COMPONENT type="1001" id="2954" >
 <cdparam x="921" y="595" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1400" />
+<TGConnectingPoint num="0" id="2953" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1404" >
-<cdparam x="863" y="525" />
-<sizeparam width="142" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="2957" >
+<cdparam x="855" y="525" />
+<sizeparam width="158" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="recvData(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1402" />
-<TGConnectingPoint num="1" id="1403" />
+<TGConnectingPoint num="0" id="2955" />
+<TGConnectingPoint num="1" id="2956" />
 <extraparam>
-<Data channelName="recvData" nbOfSamples="nbOfSamples" />
+<Data channelName="recvData" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1407" >
-<cdparam x="871" y="469" />
-<sizeparam width="132" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="2960" >
+<cdparam x="864" y="469" />
+<sizeparam width="147" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="recvEvt(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1405" />
-<TGConnectingPoint num="1" id="1406" />
+<TGConnectingPoint num="0" id="2958" />
+<TGConnectingPoint num="1" id="2959" />
 <extraparam>
 <Data eventName="recvEvt" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="1410" >
-<cdparam x="841" y="351" />
-<sizeparam width="185" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="2963" >
+<cdparam x="833" y="351" />
+<sizeparam width="200" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="dataFromECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1408" />
-<TGConnectingPoint num="1" id="1409" />
+<TGConnectingPoint num="0" id="2961" />
+<TGConnectingPoint num="1" id="2962" />
 <extraparam>
-<Data channelName="dataFromECUN" nbOfSamples="nbOfSamples" />
+<Data channelName="dataFromECUN" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1413" >
-<cdparam x="845" y="301" />
-<sizeparam width="176" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="2966" >
+<cdparam x="838" y="301" />
+<sizeparam width="190" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="evtFromECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1411" />
-<TGConnectingPoint num="1" id="1412" />
+<TGConnectingPoint num="0" id="2964" />
+<TGConnectingPoint num="1" id="2965" />
 <extraparam>
 <Data eventName="evtFromECUN" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1416" >
-<cdparam x="828" y="412" />
-<sizeparam width="217" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="2969" >
+<cdparam x="814" y="412" />
+<sizeparam width="244" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="action state" value="nbOfSamples = (nbOfSamples * 8) / 9" />
-<TGConnectingPoint num="0" id="1414" />
-<TGConnectingPoint num="1" id="1415" />
+<TGConnectingPoint num="0" id="2967" />
+<TGConnectingPoint num="1" id="2968" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="1417" >
+<CONNECTOR type="115" id="2970" >
 <cdparam x="646" y="210" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="646" y="210" id="1375" />
-<P2  x="933" y="296" id="1411" />
+<P1  x="646" y="210" id="2928" />
+<P2  x="933" y="296" id="2964" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1418" >
+<CONNECTOR type="115" id="2971" >
 <cdparam x="605" y="367" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to action state" value="null" />
-<P1  x="605" y="367" id="1343" />
-<P2  x="608" y="398" id="1394" />
+<P1  x="605" y="367" id="2896" />
+<P2  x="608" y="398" id="2947" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1419" >
+<CONNECTOR type="115" id="2972" >
 <cdparam x="269" y="460" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to send event" value="null" />
-<P1  x="269" y="460" id="1359" />
-<P2  x="319" y="522" id="1389" />
+<P1  x="269" y="460" id="2912" />
+<P2  x="319" y="522" id="2942" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1420" >
+<CONNECTOR type="115" id="2973" >
 <cdparam x="328" y="110" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for ever loop to select" value="null" />
-<P1  x="442" y="120" id="1371" />
-<P2  x="606" y="185" id="1373" />
+<P1  x="447" y="120" id="2924" />
+<P2  x="606" y="185" id="2926" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1421" >
+<CONNECTOR type="115" id="2974" >
 <cdparam x="521" y="80" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to stop state" value="null" />
-<P1  x="391" y="71" id="1384" />
-<P2  x="401" y="101" id="1370" />
+<P1  x="391" y="71" id="2937" />
+<P2  x="401" y="101" id="2923" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1422" >
+<CONNECTOR type="115" id="2975" >
 <cdparam x="384" y="188" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="566" y="210" id="1374" />
-<P2  x="224" y="270" id="1367" />
+<P1  x="566" y="210" id="2927" />
+<P2  x="224" y="270" id="2920" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1423" >
+<CONNECTOR type="115" id="2976" >
 <cdparam x="224" y="300" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="224" y="300" id="1368" />
-<P2  x="223" y="317" id="1364" />
+<P1  x="224" y="300" id="2921" />
+<P2  x="223" y="317" id="2917" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1424" >
+<CONNECTOR type="115" id="2977" >
 <cdparam x="223" y="347" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to action state" value="null" />
-<P1  x="223" y="347" id="1365" />
-<P2  x="225" y="365" id="1397" />
+<P1  x="223" y="347" id="2918" />
+<P2  x="225" y="365" id="2950" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1425" >
+<CONNECTOR type="115" id="2978" >
 <cdparam x="225" y="395" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="225" y="395" id="1398" />
-<P2  x="229" y="435" id="1357" />
+<P1  x="225" y="395" id="2951" />
+<P2  x="229" y="435" id="2910" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1426" >
+<CONNECTOR type="115" id="2979" >
 <cdparam x="189" y="460" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to send event" value="null" />
-<P1  x="189" y="460" id="1358" />
-<P2  x="123" y="522" id="1351" />
+<P1  x="189" y="460" id="2911" />
+<P2  x="123" y="522" id="2904" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1427" >
+<CONNECTOR type="115" id="2980" >
 <cdparam x="123" y="552" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="123" y="552" id="1352" />
-<P2  x="118" y="568" id="1348" />
+<P1  x="123" y="552" id="2905" />
+<P2  x="118" y="568" id="2901" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1428" >
+<CONNECTOR type="115" id="2981" >
 <cdparam x="118" y="598" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="118" y="598" id="1349" />
-<P2  x="120" y="632" id="1362" />
+<P1  x="118" y="598" id="2902" />
+<P2  x="120" y="632" id="2915" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1429" >
+<CONNECTOR type="115" id="2982" >
 <cdparam x="319" y="552" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="319" y="552" id="1390" />
-<P2  x="322" y="568" id="1386" />
+<P1  x="319" y="552" id="2943" />
+<P2  x="322" y="568" id="2939" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1430" >
+<CONNECTOR type="115" id="2983" >
 <cdparam x="314" y="598" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="322" y="598" id="1387" />
-<P2  x="323" y="629" id="1392" />
+<P1  x="322" y="598" id="2940" />
+<P2  x="323" y="629" id="2945" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1431" >
+<CONNECTOR type="115" id="2984" >
 <cdparam x="560" y="239" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="606" y="250" id="1376" />
-<P2  x="605" y="287" id="1345" />
+<P1  x="606" y="250" id="2929" />
+<P2  x="605" y="287" id="2898" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1432" >
+<CONNECTOR type="115" id="2985" >
 <cdparam x="605" y="317" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="605" y="317" id="1346" />
-<P2  x="605" y="337" id="1342" />
+<P1  x="605" y="317" id="2899" />
+<P2  x="605" y="337" id="2895" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1433" >
+<CONNECTOR type="115" id="2986" >
 <cdparam x="608" y="428" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to send event" value="null" />
-<P1  x="608" y="428" id="1395" />
-<P2  x="609" y="455" id="1339" />
+<P1  x="608" y="428" id="2948" />
+<P2  x="609" y="455" id="2892" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1434" >
+<CONNECTOR type="115" id="2987" >
 <cdparam x="609" y="485" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="609" y="485" id="1340" />
-<P2  x="606" y="511" id="1336" />
+<P1  x="609" y="485" id="2893" />
+<P2  x="606" y="511" id="2889" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1435" >
+<CONNECTOR type="115" id="2988" >
 <cdparam x="606" y="541" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="606" y="541" id="1337" />
-<P2  x="603" y="581" id="1334" />
+<P1  x="606" y="541" id="2890" />
+<P2  x="603" y="581" id="2887" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1436" >
+<CONNECTOR type="115" id="2989" >
 <cdparam x="933" y="376" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to action state" value="null" />
-<P1  x="933" y="376" id="1409" />
-<P2  x="936" y="407" id="1414" />
+<P1  x="933" y="376" id="2962" />
+<P2  x="936" y="407" id="2967" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1437" >
+<CONNECTOR type="115" id="2990" >
 <cdparam x="933" y="326" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="933" y="326" id="1412" />
-<P2  x="933" y="346" id="1408" />
+<P1  x="933" y="326" id="2965" />
+<P2  x="933" y="346" id="2961" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1438" >
+<CONNECTOR type="115" id="2991" >
 <cdparam x="936" y="437" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to send event" value="null" />
-<P1  x="936" y="437" id="1415" />
-<P2  x="937" y="464" id="1405" />
+<P1  x="936" y="437" id="2968" />
+<P2  x="937" y="464" id="2958" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1439" >
+<CONNECTOR type="115" id="2992" >
 <cdparam x="937" y="494" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="937" y="494" id="1406" />
-<P2  x="934" y="520" id="1402" />
+<P1  x="937" y="494" id="2959" />
+<P2  x="934" y="520" id="2955" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1440" >
+<CONNECTOR type="115" id="2993" >
 <cdparam x="934" y="550" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="934" y="550" id="1403" />
-<P2  x="931" y="590" id="1400" />
+<P1  x="934" y="550" id="2956" />
+<P2  x="931" y="590" id="2953" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="KM" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1009" id="1443" >
+<COMPONENT type="1009" id="2996" >
 <cdparam x="120" y="184" />
 <sizeparam width="145" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="recvData(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1441" />
-<TGConnectingPoint num="1" id="1442" />
+<TGConnectingPoint num="0" id="2994" />
+<TGConnectingPoint num="1" id="2995" />
 <extraparam>
-<Data channelName="recvData" nbOfSamples="nbOfSamples" />
+<Data channelName="recvData" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1446" >
+<COMPONENT type="1010" id="2999" >
 <cdparam x="120" y="120" />
 <sizeparam width="135" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="recvEvt(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1444" />
-<TGConnectingPoint num="1" id="1445" />
+<TGConnectingPoint num="0" id="2997" />
+<TGConnectingPoint num="1" id="2998" />
 <extraparam>
 <Data eventName="recvEvt" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1449" >
+<COMPONENT type="1010" id="3002" >
 <cdparam x="515" y="536" />
 <sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1447" />
-<TGConnectingPoint num="1" id="1448" />
+<TGConnectingPoint num="0" id="3000" />
+<TGConnectingPoint num="1" id="3001" />
 <extraparam>
 <Data eventName="doneHSM" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1458" >
+<COMPONENT type="301" id="3019" >
 <cdparam x="609" y="75" />
 <sizeparam width="127" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="Sending msg to KM
 " />
-<TGConnectingPoint num="0" id="1450" />
-<TGConnectingPoint num="1" id="1451" />
-<TGConnectingPoint num="2" id="1452" />
-<TGConnectingPoint num="3" id="1453" />
-<TGConnectingPoint num="4" id="1454" />
-<TGConnectingPoint num="5" id="1455" />
-<TGConnectingPoint num="6" id="1456" />
-<TGConnectingPoint num="7" id="1457" />
+<TGConnectingPoint num="0" id="3003" />
+<TGConnectingPoint num="1" id="3004" />
+<TGConnectingPoint num="2" id="3005" />
+<TGConnectingPoint num="3" id="3006" />
+<TGConnectingPoint num="4" id="3007" />
+<TGConnectingPoint num="5" id="3008" />
+<TGConnectingPoint num="6" id="3009" />
+<TGConnectingPoint num="7" id="3010" />
+<TGConnectingPoint num="8" id="3011" />
+<TGConnectingPoint num="9" id="3012" />
+<TGConnectingPoint num="10" id="3013" />
+<TGConnectingPoint num="11" id="3014" />
+<TGConnectingPoint num="12" id="3015" />
+<TGConnectingPoint num="13" id="3016" />
+<TGConnectingPoint num="14" id="3017" />
+<TGConnectingPoint num="15" id="3018" />
 <extraparam>
 <Line value="Sending msg to KM" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1461" >
+<COMPONENT type="1010" id="3022" >
 <cdparam x="511" y="403" />
 <sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1459" />
-<TGConnectingPoint num="1" id="1460" />
+<TGConnectingPoint num="0" id="3020" />
+<TGConnectingPoint num="1" id="3021" />
 <extraparam>
 <Data eventName="doneHSM" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1464" >
+<COMPONENT type="1010" id="3025" >
 <cdparam x="510" y="317" />
 <sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1462" />
-<TGConnectingPoint num="1" id="1463" />
+<TGConnectingPoint num="0" id="3023" />
+<TGConnectingPoint num="1" id="3024" />
 <extraparam>
 <Data eventName="doneHSM" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1467" >
+<COMPONENT type="1008" id="3028" >
 <cdparam x="513" y="452" />
 <sizeparam width="72" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="getMsg(59)" />
-<TGConnectingPoint num="0" id="1465" />
-<TGConnectingPoint num="1" id="1466" />
+<TGConnectingPoint num="0" id="3026" />
+<TGConnectingPoint num="1" id="3027" />
 <extraparam>
 <Data eventName="getMsg" nbOfParams="5" />
 <Param index="0" value="59" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="1470" >
+<COMPONENT type="1009" id="3031" >
 <cdparam x="513" y="500" />
 <sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="outHSM(59) " />
-<TGConnectingPoint num="0" id="1468" />
-<TGConnectingPoint num="1" id="1469" />
+<TGConnectingPoint num="0" id="3029" />
+<TGConnectingPoint num="1" id="3030" />
 <extraparam>
-<Data channelName="outHSM" nbOfSamples="59" />
+<Data channelName="outHSM" nbOfSamples="59" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1473" >
+<COMPONENT type="1008" id="3034" >
 <cdparam x="519" y="368" />
 <sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="mac(43)" />
-<TGConnectingPoint num="0" id="1471" />
-<TGConnectingPoint num="1" id="1472" />
+<TGConnectingPoint num="0" id="3032" />
+<TGConnectingPoint num="1" id="3033" />
 <extraparam>
 <Data eventName="mac" nbOfParams="5" />
 <Param index="0" value="43" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1476" >
+<COMPONENT type="1008" id="3037" >
 <cdparam x="510" y="269" />
 <sizeparam width="71" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="encrypt(43)" />
-<TGConnectingPoint num="0" id="1474" />
-<TGConnectingPoint num="1" id="1475" />
+<TGConnectingPoint num="0" id="3035" />
+<TGConnectingPoint num="1" id="3036" />
 <extraparam>
 <Data eventName="encrypt" nbOfParams="5" />
 <Param index="0" value="43" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1478" >
+<COMPONENT type="1001" id="3039" >
 <cdparam x="870" y="811" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1477" />
+<TGConnectingPoint num="0" id="3038" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="1481" >
+<COMPONENT type="1009" id="3042" >
 <cdparam x="723" y="347" />
 <sizeparam width="145" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="recvData(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1479" />
-<TGConnectingPoint num="1" id="1480" />
+<TGConnectingPoint num="0" id="3040" />
+<TGConnectingPoint num="1" id="3041" />
 <extraparam>
-<Data channelName="recvData" nbOfSamples="nbOfSamples" />
+<Data channelName="recvData" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1484" >
+<COMPONENT type="1010" id="3045" >
 <cdparam x="727" y="289" />
 <sizeparam width="135" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="recvEvt(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1482" />
-<TGConnectingPoint num="1" id="1483" />
+<TGConnectingPoint num="0" id="3043" />
+<TGConnectingPoint num="1" id="3044" />
 <extraparam>
 <Data eventName="recvEvt" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="1486" >
+<COMPONENT type="1000" id="3047" >
 <cdparam x="180" y="44" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1485" />
+<TGConnectingPoint num="0" id="3046" />
 </COMPONENT>
 
-<COMPONENT type="1010" id="1489" >
+<COMPONENT type="1010" id="3050" >
 <cdparam x="177" y="413" />
 <sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1487" />
-<TGConnectingPoint num="1" id="1488" />
+<TGConnectingPoint num="0" id="3048" />
+<TGConnectingPoint num="1" id="3049" />
 <extraparam>
 <Data eventName="doneHSM" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1492" >
+<COMPONENT type="1008" id="3053" >
 <cdparam x="144" y="360" />
 <sizeparam width="133" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="encrypt(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1490" />
-<TGConnectingPoint num="1" id="1491" />
+<TGConnectingPoint num="0" id="3051" />
+<TGConnectingPoint num="1" id="3052" />
 <extraparam>
 <Data eventName="encrypt" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1495" >
+<COMPONENT type="1008" id="3056" >
 <cdparam x="737" y="410" />
 <sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="mac(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1493" />
-<TGConnectingPoint num="1" id="1494" />
+<TGConnectingPoint num="0" id="3054" />
+<TGConnectingPoint num="1" id="3055" />
 <extraparam>
 <Data eventName="mac" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1498" >
+<COMPONENT type="1008" id="3059" >
 <cdparam x="146" y="250" />
 <sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="mac(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1496" />
-<TGConnectingPoint num="1" id="1497" />
+<TGConnectingPoint num="0" id="3057" />
+<TGConnectingPoint num="1" id="3058" />
 <extraparam>
 <Data eventName="mac" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1501" >
+<COMPONENT type="1010" id="3062" >
 <cdparam x="760" y="472" />
 <sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1499" />
-<TGConnectingPoint num="1" id="1500" />
+<TGConnectingPoint num="0" id="3060" />
+<TGConnectingPoint num="1" id="3061" />
 <extraparam>
 <Data eventName="doneHSM" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1504" >
+<COMPONENT type="1010" id="3065" >
 <cdparam x="170" y="307" />
 <sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1502" />
-<TGConnectingPoint num="1" id="1503" />
+<TGConnectingPoint num="0" id="3063" />
+<TGConnectingPoint num="1" id="3064" />
 <extraparam>
 <Data eventName="doneHSM" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1507" >
+<COMPONENT type="1010" id="3068" >
 <cdparam x="765" y="571" />
 <sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1505" />
-<TGConnectingPoint num="1" id="1506" />
+<TGConnectingPoint num="0" id="3066" />
+<TGConnectingPoint num="1" id="3067" />
 <extraparam>
 <Data eventName="doneHSM" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1510" >
+<COMPONENT type="1008" id="3071" >
 <cdparam x="766" y="518" />
 <sizeparam width="64" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="encrypt(1)" />
-<TGConnectingPoint num="0" id="1508" />
-<TGConnectingPoint num="1" id="1509" />
+<TGConnectingPoint num="0" id="3069" />
+<TGConnectingPoint num="1" id="3070" />
 <extraparam>
 <Data eventName="encrypt" nbOfParams="5" />
 <Param index="0" value="1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1513" >
+<COMPONENT type="1010" id="3074" >
 <cdparam x="807" y="663" />
 <sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="doneHSM() " />
-<TGConnectingPoint num="0" id="1511" />
-<TGConnectingPoint num="1" id="1512" />
+<TGConnectingPoint num="0" id="3072" />
+<TGConnectingPoint num="1" id="3073" />
 <extraparam>
 <Data eventName="doneHSM" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1516" >
+<COMPONENT type="1008" id="3077" >
 <cdparam x="798" y="616" />
 <sizeparam width="49" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="mac(1)" />
-<TGConnectingPoint num="0" id="1514" />
-<TGConnectingPoint num="1" id="1515" />
+<TGConnectingPoint num="0" id="3075" />
+<TGConnectingPoint num="1" id="3076" />
 <extraparam>
 <Data eventName="mac" nbOfParams="5" />
 <Param index="0" value="1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1519" >
+<COMPONENT type="1008" id="3080" >
 <cdparam x="843" y="730" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="sendEvt(1, 1)" />
-<TGConnectingPoint num="0" id="1517" />
-<TGConnectingPoint num="1" id="1518" />
+<TGConnectingPoint num="0" id="3078" />
+<TGConnectingPoint num="1" id="3079" />
 <extraparam>
 <Data eventName="sendEvt" nbOfParams="5" />
 <Param index="0" value="1" />
@@ -9028,14 +9256,14 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1522" >
+<COMPONENT type="1008" id="3083" >
 <cdparam x="756" y="190" />
 <sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="sendEvt(59, 2)" />
-<TGConnectingPoint num="0" id="1520" />
-<TGConnectingPoint num="1" id="1521" />
+<TGConnectingPoint num="0" id="3081" />
+<TGConnectingPoint num="1" id="3082" />
 <extraparam>
 <Data eventName="sendEvt" nbOfParams="5" />
 <Param index="0" value="59" />
@@ -9043,117 +9271,117 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1525" >
+<COMPONENT type="1006" id="3086" >
 <cdparam x="856" y="771" />
 <sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="sendData(1)" />
-<TGConnectingPoint num="0" id="1523" />
-<TGConnectingPoint num="1" id="1524" />
+<TGConnectingPoint num="0" id="3084" />
+<TGConnectingPoint num="1" id="3085" />
 <extraparam>
-<Data channelName="sendData" nbOfSamples="1" />
+<Data channelName="sendData" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1528" >
+<COMPONENT type="1006" id="3089" >
 <cdparam x="752" y="241" />
 <sizeparam width="86" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="sendData(59)" />
-<TGConnectingPoint num="0" id="1526" />
-<TGConnectingPoint num="1" id="1527" />
+<TGConnectingPoint num="0" id="3087" />
+<TGConnectingPoint num="1" id="3088" />
 <extraparam>
-<Data channelName="sendData" nbOfSamples="59" />
+<Data channelName="sendData" nbOfSamples="59" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="115" id="1529" >
+<CONNECTOR type="115" id="3090" >
 <cdparam x="895" y="796" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="895" y="796" id="1524" />
-<P2  x="880" y="806" id="1477" />
+<P1  x="895" y="796" id="3085" />
+<P2  x="880" y="806" id="3038" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1530" >
+<CONNECTOR type="115" id="3091" >
 <cdparam x="884" y="755" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="884" y="755" id="1518" />
-<P2  x="895" y="766" id="1523" />
+<P1  x="884" y="755" id="3079" />
+<P2  x="895" y="766" id="3084" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1531" >
+<CONNECTOR type="115" id="3092" >
 <cdparam x="844" y="688" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="844" y="688" id="1512" />
-<P2  x="884" y="725" id="1517" />
+<P1  x="844" y="688" id="3073" />
+<P2  x="884" y="725" id="3078" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1532" >
+<CONNECTOR type="115" id="3093" >
 <cdparam x="802" y="596" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="802" y="596" id="1506" />
-<P2  x="822" y="611" id="1514" />
+<P1  x="802" y="596" id="3067" />
+<P2  x="822" y="611" id="3075" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1533" >
+<CONNECTOR type="115" id="3094" >
 <cdparam x="797" y="497" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="797" y="497" id="1500" />
-<P2  x="798" y="513" id="1508" />
+<P1  x="797" y="497" id="3061" />
+<P2  x="798" y="513" id="3069" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1534" >
+<CONNECTOR type="115" id="3095" >
 <cdparam x="796" y="435" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="796" y="435" id="1494" />
-<P2  x="797" y="467" id="1499" />
+<P1  x="796" y="435" id="3055" />
+<P2  x="797" y="467" id="3060" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1539" >
+<CONNECTOR type="115" id="3100" >
 <cdparam x="214" y="438" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="214" y="438" id="1488" />
-<P2  x="545" y="264" id="1474" />
+<P1  x="214" y="438" id="3049" />
+<P2  x="545" y="264" id="3035" />
 <Point x="221" y="473" />
 <Point x="345" y="482" />
 <Point x="419" y="212" />
 <Point x="538" y="199" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1535" >
-<father id="1539" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3096" >
+<father id="3100" num="0" />
 <cdparam x="221" y="473" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1536" >
-<father id="1539" num="1" />
+<SUBCOMPONENT type="-1" id="3097" >
+<father id="3100" num="1" />
 <cdparam x="345" y="482" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1537" >
-<father id="1539" num="2" />
+<SUBCOMPONENT type="-1" id="3098" >
+<father id="3100" num="2" />
 <cdparam x="419" y="212" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1538" >
-<father id="1539" num="3" />
+<SUBCOMPONENT type="-1" id="3099" >
+<father id="3100" num="3" />
 <cdparam x="538" y="199" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -9161,107 +9389,107 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="115" id="1540" >
+<CONNECTOR type="115" id="3101" >
 <cdparam x="795" y="372" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to stop state" value="null" />
-<P1  x="795" y="372" id="1480" />
-<P2  x="796" y="405" id="1493" />
+<P1  x="795" y="372" id="3041" />
+<P2  x="796" y="405" id="3054" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1541" >
+<CONNECTOR type="115" id="3102" >
 <cdparam x="259" y="57" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to send event" value="null" />
-<P1  x="187" y="64" id="1485" />
-<P2  x="187" y="115" id="1444" />
+<P1  x="187" y="64" id="3046" />
+<P2  x="187" y="115" id="2997" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1542" >
+<CONNECTOR type="115" id="3103" >
 <cdparam x="552" y="525" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to wait event" value="null" />
-<P1  x="552" y="525" id="1469" />
-<P2  x="552" y="531" id="1447" />
+<P1  x="552" y="525" id="3030" />
+<P2  x="552" y="531" id="3000" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1543" >
+<CONNECTOR type="115" id="3104" >
 <cdparam x="548" y="428" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="548" y="428" id="1460" />
-<P2  x="549" y="447" id="1465" />
+<P1  x="548" y="428" id="3021" />
+<P2  x="549" y="447" id="3026" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1544" >
+<CONNECTOR type="115" id="3105" >
 <cdparam x="800" y="215" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="800" y="215" id="1521" />
-<P2  x="795" y="236" id="1526" />
+<P1  x="800" y="215" id="3082" />
+<P2  x="795" y="236" id="3087" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1545" >
+<CONNECTOR type="115" id="3106" >
 <cdparam x="560" y="504" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to read channel" value="null" />
-<P1  x="549" y="477" id="1466" />
-<P2  x="552" y="495" id="1468" />
+<P1  x="549" y="477" id="3027" />
+<P2  x="552" y="495" id="3029" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1546" >
+<CONNECTOR type="115" id="3107" >
 <cdparam x="794" y="314" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="794" y="314" id="1483" />
-<P2  x="795" y="342" id="1479" />
+<P1  x="794" y="314" id="3044" />
+<P2  x="795" y="342" id="3040" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1547" >
+<CONNECTOR type="115" id="3108" >
 <cdparam x="799" y="131" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to wait event" value="null" />
-<P1  x="795" y="266" id="1527" />
-<P2  x="794" y="284" id="1482" />
+<P1  x="795" y="266" id="3088" />
+<P2  x="794" y="284" id="3043" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1552" >
+<CONNECTOR type="115" id="3113" >
 <cdparam x="552" y="391" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to write channel" value="null" />
-<P1  x="552" y="561" id="1448" />
-<P2  x="800" y="185" id="1520" />
+<P1  x="552" y="561" id="3001" />
+<P2  x="800" y="185" id="3081" />
 <Point x="651" y="574" />
 <Point x="670" y="544" />
 <Point x="670" y="147" />
 <Point x="756" y="147" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1548" >
-<father id="1552" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3109" >
+<father id="3113" num="0" />
 <cdparam x="651" y="574" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1549" >
-<father id="1552" num="1" />
+<SUBCOMPONENT type="-1" id="3110" >
+<father id="3113" num="1" />
 <cdparam x="670" y="544" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1550" >
-<father id="1552" num="2" />
+<SUBCOMPONENT type="-1" id="3111" >
+<father id="3113" num="2" />
 <cdparam x="670" y="147" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1551" >
-<father id="1552" num="3" />
+<SUBCOMPONENT type="-1" id="3112" >
+<father id="3113" num="3" />
 <cdparam x="756" y="147" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -9269,186 +9497,186 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="115" id="1553" >
+<CONNECTOR type="115" id="3114" >
 <cdparam x="542" y="295" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="545" y="294" id="1475" />
-<P2  x="547" y="312" id="1462" />
+<P1  x="545" y="294" id="3036" />
+<P2  x="547" y="312" id="3023" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1554" >
+<CONNECTOR type="115" id="3115" >
 <cdparam x="547" y="342" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="547" y="342" id="1463" />
-<P2  x="547" y="363" id="1471" />
+<P1  x="547" y="342" id="3024" />
+<P2  x="547" y="363" id="3032" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1555" >
+<CONNECTOR type="115" id="3116" >
 <cdparam x="547" y="393" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="547" y="393" id="1472" />
-<P2  x="548" y="398" id="1459" />
+<P1  x="547" y="393" id="3033" />
+<P2  x="548" y="398" id="3020" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1556" >
+<CONNECTOR type="115" id="3117" >
 <cdparam x="745" y="370" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="207" y="332" id="1503" />
-<P2  x="210" y="355" id="1490" />
+<P1  x="207" y="332" id="3064" />
+<P2  x="210" y="355" id="3051" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1557" >
+<CONNECTOR type="115" id="3118" >
 <cdparam x="1170" y="317" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to send event" value="null" />
-<P1  x="192" y="209" id="1442" />
-<P2  x="205" y="245" id="1496" />
+<P1  x="192" y="209" id="2995" />
+<P2  x="205" y="245" id="3057" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1558" >
+<CONNECTOR type="115" id="3119" >
 <cdparam x="739" y="237" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="210" y="385" id="1491" />
-<P2  x="214" y="408" id="1487" />
+<P1  x="210" y="385" id="3052" />
+<P2  x="214" y="408" id="3048" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1559" >
+<CONNECTOR type="115" id="3120" >
 <cdparam x="728" y="316" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="205" y="275" id="1497" />
-<P2  x="207" y="302" id="1502" />
+<P1  x="205" y="275" id="3058" />
+<P2  x="207" y="302" id="3063" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1560" >
+<CONNECTOR type="115" id="3121" >
 <cdparam x="205" y="195" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="187" y="145" id="1445" />
-<P2  x="192" y="179" id="1441" />
+<P1  x="187" y="145" id="2998" />
+<P2  x="192" y="179" id="2994" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1561" >
+<CONNECTOR type="115" id="3122" >
 <cdparam x="1327" y="395" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="798" y="543" id="1509" />
-<P2  x="802" y="566" id="1505" />
+<P1  x="798" y="543" id="3070" />
+<P2  x="802" y="566" id="3066" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1562" >
+<CONNECTOR type="115" id="3123" >
 <cdparam x="861" y="650" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="822" y="641" id="1515" />
-<P2  x="844" y="658" id="1511" />
+<P1  x="822" y="641" id="3076" />
+<P2  x="844" y="658" id="3072" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="HSM_ECUN" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="1564" >
+<COMPONENT type="1001" id="3125" >
 <cdparam x="70" y="410" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1563" />
+<TGConnectingPoint num="0" id="3124" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="1567" >
+<COMPONENT type="1009" id="3128" >
 <cdparam x="4" y="362" />
 <sizeparam width="149" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="inHSMECUN(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1565" />
-<TGConnectingPoint num="1" id="1566" />
+<TGConnectingPoint num="0" id="3126" />
+<TGConnectingPoint num="1" id="3127" />
 <extraparam>
-<Data channelName="inHSMECUN" nbOfSamples="sizeOfMsg" />
+<Data channelName="inHSMECUN" nbOfSamples="sizeOfMsg" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1570" >
+<COMPONENT type="1010" id="3131" >
 <cdparam x="3" y="315" />
 <sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="putMsgECUN(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1568" />
-<TGConnectingPoint num="1" id="1569" />
+<TGConnectingPoint num="0" id="3129" />
+<TGConnectingPoint num="1" id="3130" />
 <extraparam>
 <Data eventName="putMsgECUN" nbOfParams="5" />
 <Param index="0" value="sizeOfMsg" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1572" >
+<COMPONENT type="1001" id="3133" >
 <cdparam x="232" y="435" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1571" />
+<TGConnectingPoint num="0" id="3132" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1574" >
+<COMPONENT type="1001" id="3135" >
 <cdparam x="415" y="483" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1573" />
+<TGConnectingPoint num="0" id="3134" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1576" >
+<COMPONENT type="1001" id="3137" >
 <cdparam x="551" y="435" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1575" />
+<TGConnectingPoint num="0" id="3136" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1578" >
+<COMPONENT type="1001" id="3139" >
 <cdparam x="796" y="443" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1577" />
+<TGConnectingPoint num="0" id="3138" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1581" >
+<COMPONENT type="1006" id="3142" >
 <cdparam x="729" y="392" />
 <sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="outHSMECUN(sizeOfMsg)" />
-<TGConnectingPoint num="0" id="1579" />
-<TGConnectingPoint num="1" id="1580" />
+<TGConnectingPoint num="0" id="3140" />
+<TGConnectingPoint num="1" id="3141" />
 <extraparam>
-<Data channelName="outHSMECUN" nbOfSamples="sizeOfMsg" />
+<Data channelName="outHSMECUN" nbOfSamples="sizeOfMsg" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1013" id="1585" >
+<COMPONENT type="1013" id="3146" >
 <cdparam x="555" y="383" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1583" />
-<TGConnectingPoint num="1" id="1584" />
+<TGConnectingPoint num="0" id="3144" />
+<TGConnectingPoint num="1" id="3145" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="1582" >
-<father id="1585" num="0" />
+<SUBCOMPONENT type="-1" id="3143" >
+<father id="3146" num="0" />
 <cdparam x="570" y="403" />
 <sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -9456,17 +9684,17 @@
 <infoparam name="value of the delay" value="sizeOfMsg*60" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="1589" >
+<COMPONENT type="1013" id="3150" >
 <cdparam x="238" y="374" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1587" />
-<TGConnectingPoint num="1" id="1588" />
+<TGConnectingPoint num="0" id="3148" />
+<TGConnectingPoint num="1" id="3149" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="1586" >
-<father id="1589" num="0" />
+<SUBCOMPONENT type="-1" id="3147" >
+<father id="3150" num="0" />
 <cdparam x="253" y="394" />
 <sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -9474,17 +9702,17 @@
 <infoparam name="value of the delay" value="15*sizeOfMsg" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="1593" >
+<COMPONENT type="1013" id="3154" >
 <cdparam x="430" y="435" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="1591" />
-<TGConnectingPoint num="1" id="1592" />
+<TGConnectingPoint num="0" id="3152" />
+<TGConnectingPoint num="1" id="3153" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="1590" >
-<father id="1593" num="0" />
+<SUBCOMPONENT type="-1" id="3151" >
+<father id="3154" num="0" />
 <cdparam x="445" y="455" />
 <sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -9492,43 +9720,43 @@
 <infoparam name="value of the delay" value="15*sizeOfMsg" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1001" id="1595" >
+<COMPONENT type="1001" id="3156" >
 <cdparam x="600" y="243" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1594" />
+<TGConnectingPoint num="0" id="3155" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="1598" >
+<COMPONENT type="1008" id="3159" >
 <cdparam x="556" y="196" />
 <sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="doneHSMECUN()" />
-<TGConnectingPoint num="0" id="1596" />
-<TGConnectingPoint num="1" id="1597" />
+<TGConnectingPoint num="0" id="3157" />
+<TGConnectingPoint num="1" id="3158" />
 <extraparam>
 <Data eventName="doneHSMECUN" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1016" id="1606" >
+<COMPONENT type="1016" id="3167" >
 <cdparam x="466" y="152" />
 <sizeparam width="150" height="5" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="sequence" value="null" />
-<TGConnectingPoint num="0" id="1600" />
-<TGConnectingPoint num="1" id="1601" />
-<TGConnectingPoint num="2" id="1602" />
-<TGConnectingPoint num="3" id="1603" />
-<TGConnectingPoint num="4" id="1604" />
-<TGConnectingPoint num="5" id="1605" />
-</COMPONENT>
-<SUBCOMPONENT type="-1" id="1599" >
-<father id="1606" num="0" />
+<TGConnectingPoint num="0" id="3161" />
+<TGConnectingPoint num="1" id="3162" />
+<TGConnectingPoint num="2" id="3163" />
+<TGConnectingPoint num="3" id="3164" />
+<TGConnectingPoint num="4" id="3165" />
+<TGConnectingPoint num="5" id="3166" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="3160" >
+<father id="3167" num="0" />
 <cdparam x="620" y="159" />
 <sizeparam width="14" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -9536,141 +9764,141 @@
 <infoparam name="Sequence" value="&gt;&gt;" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1010" id="1609" >
+<COMPONENT type="1010" id="3170" >
 <cdparam x="729" y="340" />
 <sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="getMsgECUN(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1607" />
-<TGConnectingPoint num="1" id="1608" />
+<TGConnectingPoint num="0" id="3168" />
+<TGConnectingPoint num="1" id="3169" />
 <extraparam>
 <Data eventName="getMsgECUN" nbOfParams="5" />
 <Param index="0" value="sizeOfMsg" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1612" >
+<COMPONENT type="1010" id="3173" >
 <cdparam x="469" y="331" />
 <sizeparam width="182" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="generateKeyECUN(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1610" />
-<TGConnectingPoint num="1" id="1611" />
+<TGConnectingPoint num="0" id="3171" />
+<TGConnectingPoint num="1" id="3172" />
 <extraparam>
 <Data eventName="generateKeyECUN" nbOfParams="5" />
 <Param index="0" value="sizeOfMsg" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1615" >
+<COMPONENT type="1010" id="3176" >
 <cdparam x="355" y="372" />
 <sizeparam width="137" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="macECUN(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1613" />
-<TGConnectingPoint num="1" id="1614" />
+<TGConnectingPoint num="0" id="3174" />
+<TGConnectingPoint num="1" id="3175" />
 <extraparam>
 <Data eventName="macECUN" nbOfParams="5" />
 <Param index="0" value="sizeOfMsg" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1618" >
+<COMPONENT type="1010" id="3179" >
 <cdparam x="167" y="322" />
 <sizeparam width="152" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="encryptECUN(sizeOfMsg) " />
-<TGConnectingPoint num="0" id="1616" />
-<TGConnectingPoint num="1" id="1617" />
+<TGConnectingPoint num="0" id="3177" />
+<TGConnectingPoint num="1" id="3178" />
 <extraparam>
 <Data eventName="encryptECUN" nbOfParams="5" />
 <Param index="0" value="sizeOfMsg" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1018" id="1629" >
+<COMPONENT type="1018" id="3190" >
 <cdparam x="383" y="209" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="1619" />
-<TGConnectingPoint num="1" id="1620" />
-<TGConnectingPoint num="2" id="1621" />
-<TGConnectingPoint num="3" id="1622" />
-<TGConnectingPoint num="4" id="1623" />
-<TGConnectingPoint num="5" id="1624" />
-<TGConnectingPoint num="6" id="1625" />
-<TGConnectingPoint num="7" id="1626" />
-<TGConnectingPoint num="8" id="1627" />
-<TGConnectingPoint num="9" id="1628" />
-</COMPONENT>
-
-<COMPONENT type="1030" id="1632" >
+<TGConnectingPoint num="0" id="3180" />
+<TGConnectingPoint num="1" id="3181" />
+<TGConnectingPoint num="2" id="3182" />
+<TGConnectingPoint num="3" id="3183" />
+<TGConnectingPoint num="4" id="3184" />
+<TGConnectingPoint num="5" id="3185" />
+<TGConnectingPoint num="6" id="3186" />
+<TGConnectingPoint num="7" id="3187" />
+<TGConnectingPoint num="8" id="3188" />
+<TGConnectingPoint num="9" id="3189" />
+</COMPONENT>
+
+<COMPONENT type="1030" id="3193" >
 <cdparam x="209" y="89" />
 <sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="1630" />
-<TGConnectingPoint num="1" id="1631" />
+<TGConnectingPoint num="0" id="3191" />
+<TGConnectingPoint num="1" id="3192" />
 </COMPONENT>
 
-<COMPONENT type="1000" id="1634" >
+<COMPONENT type="1000" id="3195" >
 <cdparam x="242" y="40" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1633" />
+<TGConnectingPoint num="0" id="3194" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="1635" >
+<CONNECTOR type="115" id="3196" >
 <cdparam x="358" y="224" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="358" y="224" id="1623" />
-<P2  x="79" y="310" id="1568" />
+<P1  x="358" y="224" id="3184" />
+<P2  x="79" y="310" id="3129" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1636" >
+<CONNECTOR type="115" id="3197" >
 <cdparam x="534" y="157" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from sequence to select" value="null" />
-<P1  x="515" y="157" id="1602" />
-<P2  x="398" y="199" id="1619" />
+<P1  x="515" y="157" id="3163" />
+<P2  x="398" y="199" id="3180" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1637" >
+<CONNECTOR type="115" id="3198" >
 <cdparam x="585" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="438" y="224" id="1624" />
-<P2  x="805" y="335" id="1607" />
+<P1  x="438" y="224" id="3185" />
+<P2  x="805" y="335" id="3168" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1638" >
+<CONNECTOR type="115" id="3199" >
 <cdparam x="245" y="91" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to for ever loop" value="null" />
-<P1  x="249" y="60" id="1633" />
-<P2  x="249" y="84" id="1630" />
+<P1  x="249" y="60" id="3194" />
+<P2  x="249" y="84" id="3191" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1640" >
+<CONNECTOR type="115" id="3201" >
 <cdparam x="423" y="160" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for ever loop to select" value="null" />
-<P1  x="290" y="103" id="1631" />
-<P2  x="541" y="152" id="1600" />
+<P1  x="290" y="103" id="3192" />
+<P2  x="541" y="152" id="3161" />
 <Point x="476" y="121" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1639" >
-<father id="1640" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3200" >
+<father id="3201" num="0" />
 <cdparam x="476" y="121" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -9678,645 +9906,653 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="115" id="1641" >
+<CONNECTOR type="115" id="3202" >
 <cdparam x="505" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="358" y="224" id="1620" />
-<P2  x="243" y="317" id="1616" />
+<P1  x="358" y="224" id="3181" />
+<P2  x="243" y="317" id="3177" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1642" >
+<CONNECTOR type="115" id="3203" >
 <cdparam x="448" y="278" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="398" y="264" id="1622" />
-<P2  x="423" y="367" id="1613" />
+<P1  x="398" y="264" id="3183" />
+<P2  x="423" y="367" id="3174" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1643" >
+<CONNECTOR type="115" id="3204" >
 <cdparam x="585" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="438" y="224" id="1621" />
-<P2  x="560" y="326" id="1610" />
+<P1  x="438" y="224" id="3182" />
+<P2  x="560" y="326" id="3171" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1644" >
+<CONNECTOR type="115" id="3205" >
 <cdparam x="778" y="153" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from sequence to send event" value="null" />
-<P1  x="590" y="157" id="1605" />
-<P2  x="609" y="191" id="1596" />
+<P1  x="590" y="157" id="3166" />
+<P2  x="609" y="191" id="3157" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1645" >
+<CONNECTOR type="115" id="3206" >
 <cdparam x="609" y="221" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="609" y="221" id="1597" />
-<P2  x="610" y="238" id="1594" />
+<P1  x="609" y="221" id="3158" />
+<P2  x="610" y="238" id="3155" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1646" >
+<CONNECTOR type="115" id="3207" >
 <cdparam x="434" y="404" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to execI" value="null" />
-<P1  x="423" y="397" id="1614" />
-<P2  x="435" y="430" id="1591" />
+<P1  x="423" y="397" id="3175" />
+<P2  x="435" y="430" id="3152" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1647" >
+<CONNECTOR type="115" id="3208" >
 <cdparam x="243" y="347" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to execI" value="null" />
-<P1  x="243" y="347" id="1617" />
-<P2  x="243" y="369" id="1587" />
+<P1  x="243" y="347" id="3178" />
+<P2  x="243" y="369" id="3148" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1648" >
+<CONNECTOR type="115" id="3209" >
 <cdparam x="560" y="356" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to execI" value="null" />
-<P1  x="560" y="356" id="1611" />
-<P2  x="560" y="378" id="1583" />
+<P1  x="560" y="356" id="3172" />
+<P2  x="560" y="378" id="3144" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1649" >
+<CONNECTOR type="115" id="3210" >
 <cdparam x="805" y="365" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to write channel" value="null" />
-<P1  x="805" y="365" id="1608" />
-<P2  x="805" y="387" id="1579" />
+<P1  x="805" y="365" id="3169" />
+<P2  x="805" y="387" id="3140" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1650" >
+<CONNECTOR type="115" id="3211" >
 <cdparam x="805" y="417" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="805" y="417" id="1580" />
-<P2  x="806" y="438" id="1577" />
+<P1  x="805" y="417" id="3141" />
+<P2  x="806" y="438" id="3138" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1651" >
+<CONNECTOR type="115" id="3212" >
 <cdparam x="560" y="418" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to stop state" value="null" />
-<P1  x="560" y="418" id="1584" />
-<P2  x="561" y="430" id="1575" />
+<P1  x="560" y="418" id="3145" />
+<P2  x="561" y="430" id="3136" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1652" >
+<CONNECTOR type="115" id="3213" >
 <cdparam x="435" y="470" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to stop state" value="null" />
-<P1  x="435" y="470" id="1592" />
-<P2  x="425" y="478" id="1573" />
+<P1  x="435" y="470" id="3153" />
+<P2  x="425" y="478" id="3134" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1653" >
+<CONNECTOR type="115" id="3214" >
 <cdparam x="243" y="409" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to stop state" value="null" />
-<P1  x="243" y="409" id="1588" />
-<P2  x="242" y="430" id="1571" />
+<P1  x="243" y="409" id="3149" />
+<P2  x="242" y="430" id="3132" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1654" >
+<CONNECTOR type="115" id="3215" >
 <cdparam x="79" y="340" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="79" y="340" id="1569" />
-<P2  x="78" y="357" id="1565" />
+<P1  x="79" y="340" id="3130" />
+<P2  x="78" y="357" id="3126" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1655" >
+<CONNECTOR type="115" id="3216" >
 <cdparam x="78" y="387" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to stop state" value="null" />
-<P1  x="78" y="387" id="1566" />
-<P2  x="80" y="405" id="1563" />
+<P1  x="78" y="387" id="3127" />
+<P2  x="80" y="405" id="3124" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="CTP_ECUN" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="1657" >
+<COMPONENT type="1001" id="3218" >
 <cdparam x="531" y="500" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1656" />
+<TGConnectingPoint num="0" id="3217" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1660" >
-<cdparam x="454" y="451" />
-<sizeparam width="177" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="3221" >
+<cdparam x="446" y="451" />
+<sizeparam width="192" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="recvDataECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1658" />
-<TGConnectingPoint num="1" id="1659" />
+<TGConnectingPoint num="0" id="3219" />
+<TGConnectingPoint num="1" id="3220" />
 <extraparam>
-<Data channelName="recvDataECUN" nbOfSamples="nbOfSamples" />
+<Data channelName="recvDataECUN" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1663" >
-<cdparam x="467" y="396" />
-<sizeparam width="167" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="3224" >
+<cdparam x="460" y="396" />
+<sizeparam width="181" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="recvEvtECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1661" />
-<TGConnectingPoint num="1" id="1662" />
+<TGConnectingPoint num="0" id="3222" />
+<TGConnectingPoint num="1" id="3223" />
 <extraparam>
 <Data eventName="recvEvtECUN" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1666" >
-<cdparam x="440" y="351" />
-<sizeparam width="211" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="3227" >
+<cdparam x="427" y="351" />
+<sizeparam width="236" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="action state" value="nbOfSamples = (nbOfSamples * 8)/9" />
-<TGConnectingPoint num="0" id="1664" />
-<TGConnectingPoint num="1" id="1665" />
+<TGConnectingPoint num="0" id="3225" />
+<TGConnectingPoint num="1" id="3226" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="1669" >
-<cdparam x="461" y="283" />
-<sizeparam width="170" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="3230" >
+<cdparam x="454" y="283" />
+<sizeparam width="184" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="dataToECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1667" />
-<TGConnectingPoint num="1" id="1668" />
+<TGConnectingPoint num="0" id="3228" />
+<TGConnectingPoint num="1" id="3229" />
 <extraparam>
-<Data channelName="dataToECUN" nbOfSamples="nbOfSamples" />
+<Data channelName="dataToECUN" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1672" >
-<cdparam x="465" y="230" />
-<sizeparam width="161" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="3233" >
+<cdparam x="458" y="230" />
+<sizeparam width="174" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="evtToECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1670" />
-<TGConnectingPoint num="1" id="1671" />
+<TGConnectingPoint num="0" id="3231" />
+<TGConnectingPoint num="1" id="3232" />
 <extraparam>
 <Data eventName="evtToECUN" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1674" >
+<COMPONENT type="1001" id="3235" >
 <cdparam x="262" y="493" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1673" />
+<TGConnectingPoint num="0" id="3234" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1677" >
-<cdparam x="181" y="451" />
-<sizeparam width="182" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="3238" >
+<cdparam x="174" y="451" />
+<sizeparam width="196" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="dataFromECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1675" />
-<TGConnectingPoint num="1" id="1676" />
+<TGConnectingPoint num="0" id="3236" />
+<TGConnectingPoint num="1" id="3237" />
 <extraparam>
-<Data channelName="dataFromECUN" nbOfSamples="nbOfSamples" />
+<Data channelName="dataFromECUN" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1680" >
-<cdparam x="186" y="400" />
-<sizeparam width="173" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="3241" >
+<cdparam x="179" y="400" />
+<sizeparam width="186" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="evtFromECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1678" />
-<TGConnectingPoint num="1" id="1679" />
+<TGConnectingPoint num="0" id="3239" />
+<TGConnectingPoint num="1" id="3240" />
 <extraparam>
 <Data eventName="evtFromECUN" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1683" >
-<cdparam x="164" y="353" />
-<sizeparam width="217" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1011" id="3244" >
+<cdparam x="150" y="353" />
+<sizeparam width="244" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="action state" value="nbOfSamples = (nbOfSamples * 9) / 8" />
-<TGConnectingPoint num="0" id="1681" />
-<TGConnectingPoint num="1" id="1682" />
+<TGConnectingPoint num="0" id="3242" />
+<TGConnectingPoint num="1" id="3243" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="1686" >
-<cdparam x="177" y="284" />
-<sizeparam width="186" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="3247" >
+<cdparam x="170" y="284" />
+<sizeparam width="201" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="sendDataECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1684" />
-<TGConnectingPoint num="1" id="1685" />
+<TGConnectingPoint num="0" id="3245" />
+<TGConnectingPoint num="1" id="3246" />
 <extraparam>
-<Data channelName="sendDataECUN" nbOfSamples="nbOfSamples" />
+<Data channelName="sendDataECUN" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1689" >
-<cdparam x="181" y="230" />
-<sizeparam width="176" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="3250" >
+<cdparam x="174" y="230" />
+<sizeparam width="190" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="sendEvtECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1687" />
-<TGConnectingPoint num="1" id="1688" />
+<TGConnectingPoint num="0" id="3248" />
+<TGConnectingPoint num="1" id="3249" />
 <extraparam>
 <Data eventName="sendEvtECUN" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1030" id="1692" >
-<cdparam x="247" y="96" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1030" id="3253" >
+<cdparam x="241" y="96" />
+<sizeparam width="92" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="1690" />
-<TGConnectingPoint num="1" id="1691" />
+<TGConnectingPoint num="0" id="3251" />
+<TGConnectingPoint num="1" id="3252" />
 </COMPONENT>
 
-<COMPONENT type="1018" id="1703" >
+<COMPONENT type="1018" id="3264" >
 <cdparam x="409" y="173" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="1693" />
-<TGConnectingPoint num="1" id="1694" />
-<TGConnectingPoint num="2" id="1695" />
-<TGConnectingPoint num="3" id="1696" />
-<TGConnectingPoint num="4" id="1697" />
-<TGConnectingPoint num="5" id="1698" />
-<TGConnectingPoint num="6" id="1699" />
-<TGConnectingPoint num="7" id="1700" />
-<TGConnectingPoint num="8" id="1701" />
-<TGConnectingPoint num="9" id="1702" />
-</COMPONENT>
-
-<COMPONENT type="1000" id="1705" >
+<TGConnectingPoint num="0" id="3254" />
+<TGConnectingPoint num="1" id="3255" />
+<TGConnectingPoint num="2" id="3256" />
+<TGConnectingPoint num="3" id="3257" />
+<TGConnectingPoint num="4" id="3258" />
+<TGConnectingPoint num="5" id="3259" />
+<TGConnectingPoint num="6" id="3260" />
+<TGConnectingPoint num="7" id="3261" />
+<TGConnectingPoint num="8" id="3262" />
+<TGConnectingPoint num="9" id="3263" />
+</COMPONENT>
+
+<COMPONENT type="1000" id="3266" >
 <cdparam x="270" y="41" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1704" />
+<TGConnectingPoint num="0" id="3265" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="1706" >
+<CONNECTOR type="115" id="3267" >
 <cdparam x="272" y="378" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to send event" value="null" />
-<P1  x="272" y="378" id="1682" />
-<P2  x="272" y="395" id="1678" />
+<P1  x="272" y="378" id="3243" />
+<P2  x="272" y="395" id="3239" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1707" >
+<CONNECTOR type="115" id="3268" >
 <cdparam x="328" y="110" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for ever loop to select" value="null" />
-<P1  x="328" y="110" id="1691" />
-<P2  x="424" y="163" id="1693" />
+<P1  x="333" y="110" id="3252" />
+<P2  x="424" y="163" id="3254" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1708" >
+<CONNECTOR type="115" id="3269" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to stop state" value="null" />
-<P1  x="277" y="61" id="1704" />
-<P2  x="287" y="91" id="1690" />
+<P1  x="277" y="61" id="3265" />
+<P2  x="287" y="91" id="3251" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1709" >
+<CONNECTOR type="115" id="3270" >
 <cdparam x="384" y="188" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="384" y="188" id="1694" />
-<P2  x="269" y="225" id="1687" />
+<P1  x="384" y="188" id="3255" />
+<P2  x="269" y="225" id="3248" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1710" >
+<CONNECTOR type="115" id="3271" >
 <cdparam x="269" y="255" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="269" y="255" id="1688" />
-<P2  x="270" y="279" id="1684" />
+<P1  x="269" y="255" id="3249" />
+<P2  x="270" y="279" id="3245" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1711" >
+<CONNECTOR type="115" id="3272" >
 <cdparam x="270" y="309" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to action state" value="null" />
-<P1  x="270" y="309" id="1685" />
-<P2  x="272" y="348" id="1681" />
+<P1  x="270" y="309" id="3246" />
+<P2  x="272" y="348" id="3242" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1712" >
+<CONNECTOR type="115" id="3273" >
 <cdparam x="272" y="425" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="272" y="425" id="1679" />
-<P2  x="272" y="446" id="1675" />
+<P1  x="272" y="425" id="3240" />
+<P2  x="272" y="446" id="3236" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1713" >
+<CONNECTOR type="115" id="3274" >
 <cdparam x="272" y="476" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="272" y="476" id="1676" />
-<P2  x="272" y="488" id="1673" />
+<P1  x="272" y="476" id="3237" />
+<P2  x="272" y="488" id="3234" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1714" >
+<CONNECTOR type="115" id="3275" >
 <cdparam x="464" y="188" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="464" y="188" id="1695" />
-<P2  x="545" y="225" id="1670" />
+<P1  x="464" y="188" id="3256" />
+<P2  x="545" y="225" id="3231" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1715" >
+<CONNECTOR type="115" id="3276" >
 <cdparam x="545" y="255" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="545" y="255" id="1671" />
-<P2  x="546" y="278" id="1667" />
+<P1  x="545" y="255" id="3232" />
+<P2  x="546" y="278" id="3228" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1716" >
+<CONNECTOR type="115" id="3277" >
 <cdparam x="546" y="308" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to action state" value="null" />
-<P1  x="546" y="308" id="1668" />
-<P2  x="545" y="346" id="1664" />
+<P1  x="546" y="308" id="3229" />
+<P2  x="545" y="346" id="3225" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1717" >
+<CONNECTOR type="115" id="3278" >
 <cdparam x="545" y="376" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to send event" value="null" />
-<P1  x="545" y="376" id="1665" />
-<P2  x="550" y="391" id="1661" />
+<P1  x="545" y="376" id="3226" />
+<P2  x="550" y="391" id="3222" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1718" >
+<CONNECTOR type="115" id="3279" >
 <cdparam x="550" y="421" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="550" y="421" id="1662" />
-<P2  x="542" y="446" id="1658" />
+<P1  x="550" y="421" id="3223" />
+<P2  x="542" y="446" id="3219" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1719" >
+<CONNECTOR type="115" id="3280" >
 <cdparam x="542" y="476" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="542" y="476" id="1659" />
-<P2  x="541" y="495" id="1656" />
+<P1  x="542" y="476" id="3220" />
+<P2  x="541" y="495" id="3217" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="KeyManager_ECUN" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1001" id="1721" >
+<COMPONENT type="1001" id="3282" >
 <cdparam x="301" y="676" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1720" />
+<TGConnectingPoint num="0" id="3281" />
 </COMPONENT>
 
-<COMPONENT type="301" id="1730" >
+<COMPONENT type="301" id="3299" >
 <cdparam x="116" y="561" />
 <sizeparam width="127" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="Sending msg to KM
 " />
-<TGConnectingPoint num="0" id="1722" />
-<TGConnectingPoint num="1" id="1723" />
-<TGConnectingPoint num="2" id="1724" />
-<TGConnectingPoint num="3" id="1725" />
-<TGConnectingPoint num="4" id="1726" />
-<TGConnectingPoint num="5" id="1727" />
-<TGConnectingPoint num="6" id="1728" />
-<TGConnectingPoint num="7" id="1729" />
+<TGConnectingPoint num="0" id="3283" />
+<TGConnectingPoint num="1" id="3284" />
+<TGConnectingPoint num="2" id="3285" />
+<TGConnectingPoint num="3" id="3286" />
+<TGConnectingPoint num="4" id="3287" />
+<TGConnectingPoint num="5" id="3288" />
+<TGConnectingPoint num="6" id="3289" />
+<TGConnectingPoint num="7" id="3290" />
+<TGConnectingPoint num="8" id="3291" />
+<TGConnectingPoint num="9" id="3292" />
+<TGConnectingPoint num="10" id="3293" />
+<TGConnectingPoint num="11" id="3294" />
+<TGConnectingPoint num="12" id="3295" />
+<TGConnectingPoint num="13" id="3296" />
+<TGConnectingPoint num="14" id="3297" />
+<TGConnectingPoint num="15" id="3298" />
 <extraparam>
 <Line value="Sending msg to KM" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1733" >
+<COMPONENT type="1010" id="3302" >
 <cdparam x="252" y="381" />
 <sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="doneHSMECUN() " />
-<TGConnectingPoint num="0" id="1731" />
-<TGConnectingPoint num="1" id="1732" />
+<TGConnectingPoint num="0" id="3300" />
+<TGConnectingPoint num="1" id="3301" />
 <extraparam>
 <Data eventName="doneHSMECUN" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1736" >
+<COMPONENT type="1010" id="3305" >
 <cdparam x="262" y="502" />
 <sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="doneHSMECUN() " />
-<TGConnectingPoint num="0" id="1734" />
-<TGConnectingPoint num="1" id="1735" />
+<TGConnectingPoint num="0" id="3303" />
+<TGConnectingPoint num="1" id="3304" />
 <extraparam>
 <Data eventName="doneHSMECUN" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1739" >
+<COMPONENT type="1008" id="3308" >
 <cdparam x="234" y="338" />
 <sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="macECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1737" />
-<TGConnectingPoint num="1" id="1738" />
+<TGConnectingPoint num="0" id="3306" />
+<TGConnectingPoint num="1" id="3307" />
 <extraparam>
 <Data eventName="macECUN" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1742" >
+<COMPONENT type="1008" id="3311" >
 <cdparam x="222" y="444" />
 <sizeparam width="168" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="encryptECUN(nbOfSamples)" />
-<TGConnectingPoint num="0" id="1740" />
-<TGConnectingPoint num="1" id="1741" />
+<TGConnectingPoint num="0" id="3309" />
+<TGConnectingPoint num="1" id="3310" />
 <extraparam>
 <Data eventName="encryptECUN" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="1745" >
+<COMPONENT type="1009" id="3314" >
 <cdparam x="224" y="267" />
 <sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="read channel" value="recvDataECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1743" />
-<TGConnectingPoint num="1" id="1744" />
+<TGConnectingPoint num="0" id="3312" />
+<TGConnectingPoint num="1" id="3313" />
 <extraparam>
-<Data channelName="recvDataECUN" nbOfSamples="nbOfSamples" />
+<Data channelName="recvDataECUN" nbOfSamples="nbOfSamples" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1748" >
+<COMPONENT type="1010" id="3317" >
 <cdparam x="216" y="189" />
 <sizeparam width="170" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="recvEvtECUN(nbOfSamples) " />
-<TGConnectingPoint num="0" id="1746" />
-<TGConnectingPoint num="1" id="1747" />
+<TGConnectingPoint num="0" id="3315" />
+<TGConnectingPoint num="1" id="3316" />
 <extraparam>
 <Data eventName="recvEvtECUN" nbOfParams="5" />
 <Param index="0" value="nbOfSamples" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1751" >
+<COMPONENT type="1006" id="3320" >
 <cdparam x="257" y="627" />
 <sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="write channel" value="sendDataECUN(1)" />
-<TGConnectingPoint num="0" id="1749" />
-<TGConnectingPoint num="1" id="1750" />
+<TGConnectingPoint num="0" id="3318" />
+<TGConnectingPoint num="1" id="3319" />
 <extraparam>
-<Data channelName="sendDataECUN" nbOfSamples="1" />
+<Data channelName="sendDataECUN" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1754" >
+<COMPONENT type="1008" id="3323" >
 <cdparam x="260" y="564" />
 <sizeparam width="104" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="send event" value="sendEvtECUN(1)" />
-<TGConnectingPoint num="0" id="1752" />
-<TGConnectingPoint num="1" id="1753" />
+<TGConnectingPoint num="0" id="3321" />
+<TGConnectingPoint num="1" id="3322" />
 <extraparam>
 <Data eventName="sendEvtECUN" nbOfParams="5" />
 <Param index="0" value="1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="1756" >
+<COMPONENT type="1000" id="3325" >
 <cdparam x="264" y="77" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1755" />
+<TGConnectingPoint num="0" id="3324" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="1757" >
+<CONNECTOR type="115" id="3326" >
 <cdparam x="317" y="527" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="317" y="527" id="1735" />
-<P2  x="312" y="559" id="1752" />
+<P1  x="317" y="527" id="3304" />
+<P2  x="312" y="559" id="3321" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1758" >
+<CONNECTOR type="115" id="3327" >
 <cdparam x="548" y="442" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
-<P1  x="307" y="406" id="1732" />
-<P2  x="306" y="439" id="1740" />
+<P1  x="307" y="406" id="3301" />
+<P2  x="306" y="439" id="3309" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1759" >
+<CONNECTOR type="115" id="3328" >
 <cdparam x="967" y="233" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="312" y="589" id="1753" />
-<P2  x="314" y="622" id="1749" />
+<P1  x="312" y="589" id="3322" />
+<P2  x="314" y="622" id="3318" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1760" >
+<CONNECTOR type="115" id="3329" >
 <cdparam x="973" y="389" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to send event" value="null" />
-<P1  x="314" y="292" id="1744" />
-<P2  x="310" y="333" id="1737" />
+<P1  x="314" y="292" id="3313" />
+<P2  x="310" y="333" id="3306" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1761" >
+<CONNECTOR type="115" id="3330" >
 <cdparam x="961" y="332" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="301" y="214" id="1747" />
-<P2  x="314" y="262" id="1743" />
+<P1  x="301" y="214" id="3316" />
+<P2  x="314" y="262" id="3312" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1762" >
+<CONNECTOR type="115" id="3331" >
 <cdparam x="966" y="149" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to wait event" value="null" />
-<P1  x="271" y="97" id="1755" />
-<P2  x="301" y="184" id="1746" />
+<P1  x="271" y="97" id="3324" />
+<P2  x="301" y="184" id="3315" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1763" >
+<CONNECTOR type="115" id="3332" >
 <cdparam x="542" y="309" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="306" y="469" id="1741" />
-<P2  x="317" y="497" id="1734" />
+<P1  x="306" y="469" id="3310" />
+<P2  x="317" y="497" id="3303" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1764" >
+<CONNECTOR type="115" id="3333" >
 <cdparam x="531" y="388" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="310" y="363" id="1738" />
-<P2  x="307" y="376" id="1731" />
+<P1  x="310" y="363" id="3307" />
+<P2  x="307" y="376" id="3300" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1765" >
+<CONNECTOR type="115" id="3334" >
 <cdparam x="314" y="652" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="314" y="652" id="1750" />
-<P2  x="311" y="671" id="1720" />
+<P1  x="314" y="652" id="3319" />
+<P2  x="311" y="671" id="3281" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
@@ -10329,955 +10565,958 @@
 
 <Modeling type="TML Architecture" nameTab="Architecture_Sec" >
 <TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1900" minY="10" maxY="1900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1100" id="1799" >
+<COMPONENT type="1100" id="3368" >
 <cdparam x="586" y="553" />
 <sizeparam width="228" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="CPU_Sink" value="name" />
-<TGConnectingPoint num="0" id="1775" />
-<TGConnectingPoint num="1" id="1776" />
-<TGConnectingPoint num="2" id="1777" />
-<TGConnectingPoint num="3" id="1778" />
-<TGConnectingPoint num="4" id="1779" />
-<TGConnectingPoint num="5" id="1780" />
-<TGConnectingPoint num="6" id="1781" />
-<TGConnectingPoint num="7" id="1782" />
-<TGConnectingPoint num="8" id="1783" />
-<TGConnectingPoint num="9" id="1784" />
-<TGConnectingPoint num="10" id="1785" />
-<TGConnectingPoint num="11" id="1786" />
-<TGConnectingPoint num="12" id="1787" />
-<TGConnectingPoint num="13" id="1788" />
-<TGConnectingPoint num="14" id="1789" />
-<TGConnectingPoint num="15" id="1790" />
-<TGConnectingPoint num="16" id="1791" />
-<TGConnectingPoint num="17" id="1792" />
-<TGConnectingPoint num="18" id="1793" />
-<TGConnectingPoint num="19" id="1794" />
-<TGConnectingPoint num="20" id="1795" />
-<TGConnectingPoint num="21" id="1796" />
-<TGConnectingPoint num="22" id="1797" />
-<TGConnectingPoint num="23" id="1798" />
+<TGConnectingPoint num="0" id="3344" />
+<TGConnectingPoint num="1" id="3345" />
+<TGConnectingPoint num="2" id="3346" />
+<TGConnectingPoint num="3" id="3347" />
+<TGConnectingPoint num="4" id="3348" />
+<TGConnectingPoint num="5" id="3349" />
+<TGConnectingPoint num="6" id="3350" />
+<TGConnectingPoint num="7" id="3351" />
+<TGConnectingPoint num="8" id="3352" />
+<TGConnectingPoint num="9" id="3353" />
+<TGConnectingPoint num="10" id="3354" />
+<TGConnectingPoint num="11" id="3355" />
+<TGConnectingPoint num="12" id="3356" />
+<TGConnectingPoint num="13" id="3357" />
+<TGConnectingPoint num="14" id="3358" />
+<TGConnectingPoint num="15" id="3359" />
+<TGConnectingPoint num="16" id="3360" />
+<TGConnectingPoint num="17" id="3361" />
+<TGConnectingPoint num="18" id="3362" />
+<TGConnectingPoint num="19" id="3363" />
+<TGConnectingPoint num="20" id="3364" />
+<TGConnectingPoint num="21" id="3365" />
+<TGConnectingPoint num="22" id="3366" />
+<TGConnectingPoint num="23" id="3367" />
 <extraparam>
 <info stereotype="CPURRPB" nodeName="CPU_Sink" />
-<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="1774" >
-<father id="1799" num="0" />
-<cdparam x="594" y="600" />
-<sizeparam width="213" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3343" >
+<father id="3368" num="0" />
+<cdparam x="586" y="600" />
+<sizeparam width="228" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="15" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="0" minY="0" maxY="60" />
 <infoparam name="TGComponent" value="KDP Perf Design_Sec::LoadSink" />
-<TGConnectingPoint num="0" id="1766" />
-<TGConnectingPoint num="1" id="1767" />
-<TGConnectingPoint num="2" id="1768" />
-<TGConnectingPoint num="3" id="1769" />
-<TGConnectingPoint num="4" id="1770" />
-<TGConnectingPoint num="5" id="1771" />
-<TGConnectingPoint num="6" id="1772" />
-<TGConnectingPoint num="7" id="1773" />
+<TGConnectingPoint num="0" id="3335" />
+<TGConnectingPoint num="1" id="3336" />
+<TGConnectingPoint num="2" id="3337" />
+<TGConnectingPoint num="3" id="3338" />
+<TGConnectingPoint num="4" id="3339" />
+<TGConnectingPoint num="5" id="3340" />
+<TGConnectingPoint num="6" id="3341" />
+<TGConnectingPoint num="7" id="3342" />
 <extraparam>
 <info value="KDP Perf Design_Sec::LoadSink" taskName="LoadSink" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1100" id="1833" >
+<COMPONENT type="1100" id="3402" >
 <cdparam x="701" y="293" />
 <sizeparam width="234" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="CPU_Source" value="name" />
-<TGConnectingPoint num="0" id="1809" />
-<TGConnectingPoint num="1" id="1810" />
-<TGConnectingPoint num="2" id="1811" />
-<TGConnectingPoint num="3" id="1812" />
-<TGConnectingPoint num="4" id="1813" />
-<TGConnectingPoint num="5" id="1814" />
-<TGConnectingPoint num="6" id="1815" />
-<TGConnectingPoint num="7" id="1816" />
-<TGConnectingPoint num="8" id="1817" />
-<TGConnectingPoint num="9" id="1818" />
-<TGConnectingPoint num="10" id="1819" />
-<TGConnectingPoint num="11" id="1820" />
-<TGConnectingPoint num="12" id="1821" />
-<TGConnectingPoint num="13" id="1822" />
-<TGConnectingPoint num="14" id="1823" />
-<TGConnectingPoint num="15" id="1824" />
-<TGConnectingPoint num="16" id="1825" />
-<TGConnectingPoint num="17" id="1826" />
-<TGConnectingPoint num="18" id="1827" />
-<TGConnectingPoint num="19" id="1828" />
-<TGConnectingPoint num="20" id="1829" />
-<TGConnectingPoint num="21" id="1830" />
-<TGConnectingPoint num="22" id="1831" />
-<TGConnectingPoint num="23" id="1832" />
+<TGConnectingPoint num="0" id="3378" />
+<TGConnectingPoint num="1" id="3379" />
+<TGConnectingPoint num="2" id="3380" />
+<TGConnectingPoint num="3" id="3381" />
+<TGConnectingPoint num="4" id="3382" />
+<TGConnectingPoint num="5" id="3383" />
+<TGConnectingPoint num="6" id="3384" />
+<TGConnectingPoint num="7" id="3385" />
+<TGConnectingPoint num="8" id="3386" />
+<TGConnectingPoint num="9" id="3387" />
+<TGConnectingPoint num="10" id="3388" />
+<TGConnectingPoint num="11" id="3389" />
+<TGConnectingPoint num="12" id="3390" />
+<TGConnectingPoint num="13" id="3391" />
+<TGConnectingPoint num="14" id="3392" />
+<TGConnectingPoint num="15" id="3393" />
+<TGConnectingPoint num="16" id="3394" />
+<TGConnectingPoint num="17" id="3395" />
+<TGConnectingPoint num="18" id="3396" />
+<TGConnectingPoint num="19" id="3397" />
+<TGConnectingPoint num="20" id="3398" />
+<TGConnectingPoint num="21" id="3399" />
+<TGConnectingPoint num="22" id="3400" />
+<TGConnectingPoint num="23" id="3401" />
 <extraparam>
 <info stereotype="CPURRPB" nodeName="CPU_Source" />
-<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="1808" >
-<father id="1833" num="0" />
-<cdparam x="704" y="343" />
-<sizeparam width="228" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3377" >
+<father id="3402" num="0" />
+<cdparam x="689" y="343" />
+<sizeparam width="246" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="6" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="-12" minY="0" maxY="60" />
 <infoparam name="TGComponent" value="KDP Perf Design_Sec::LoadSource" />
-<TGConnectingPoint num="0" id="1800" />
-<TGConnectingPoint num="1" id="1801" />
-<TGConnectingPoint num="2" id="1802" />
-<TGConnectingPoint num="3" id="1803" />
-<TGConnectingPoint num="4" id="1804" />
-<TGConnectingPoint num="5" id="1805" />
-<TGConnectingPoint num="6" id="1806" />
-<TGConnectingPoint num="7" id="1807" />
+<TGConnectingPoint num="0" id="3369" />
+<TGConnectingPoint num="1" id="3370" />
+<TGConnectingPoint num="2" id="3371" />
+<TGConnectingPoint num="3" id="3372" />
+<TGConnectingPoint num="4" id="3373" />
+<TGConnectingPoint num="5" id="3374" />
+<TGConnectingPoint num="6" id="3375" />
+<TGConnectingPoint num="7" id="3376" />
 <extraparam>
 <info value="KDP Perf Design_Sec::LoadSource" taskName="LoadSource" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1102" id="1876" >
+<COMPONENT type="1102" id="3445" >
 <cdparam x="582" y="410" />
 <sizeparam width="473" height="123" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="MainCAN" value="name" />
-<TGConnectingPoint num="0" id="1852" />
-<TGConnectingPoint num="1" id="1853" />
-<TGConnectingPoint num="2" id="1854" />
-<TGConnectingPoint num="3" id="1855" />
-<TGConnectingPoint num="4" id="1856" />
-<TGConnectingPoint num="5" id="1857" />
-<TGConnectingPoint num="6" id="1858" />
-<TGConnectingPoint num="7" id="1859" />
-<TGConnectingPoint num="8" id="1860" />
-<TGConnectingPoint num="9" id="1861" />
-<TGConnectingPoint num="10" id="1862" />
-<TGConnectingPoint num="11" id="1863" />
-<TGConnectingPoint num="12" id="1864" />
-<TGConnectingPoint num="13" id="1865" />
-<TGConnectingPoint num="14" id="1866" />
-<TGConnectingPoint num="15" id="1867" />
-<TGConnectingPoint num="16" id="1868" />
-<TGConnectingPoint num="17" id="1869" />
-<TGConnectingPoint num="18" id="1870" />
-<TGConnectingPoint num="19" id="1871" />
-<TGConnectingPoint num="20" id="1872" />
-<TGConnectingPoint num="21" id="1873" />
-<TGConnectingPoint num="22" id="1874" />
-<TGConnectingPoint num="23" id="1875" />
-<extraparam>
-<info stereotype="BUS-CAN" nodeName="MainCAN" />
-<attributes byteDataSize="1"  arbitrationPolicy="2"  sliceTime="10000"  pipelineSize="1"  clockRatio="3225" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="1103" id="1842" >
-<father id="1876" num="0" />
-<cdparam x="593" y="443" />
-<sizeparam width="252" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TGConnectingPoint num="0" id="3421" />
+<TGConnectingPoint num="1" id="3422" />
+<TGConnectingPoint num="2" id="3423" />
+<TGConnectingPoint num="3" id="3424" />
+<TGConnectingPoint num="4" id="3425" />
+<TGConnectingPoint num="5" id="3426" />
+<TGConnectingPoint num="6" id="3427" />
+<TGConnectingPoint num="7" id="3428" />
+<TGConnectingPoint num="8" id="3429" />
+<TGConnectingPoint num="9" id="3430" />
+<TGConnectingPoint num="10" id="3431" />
+<TGConnectingPoint num="11" id="3432" />
+<TGConnectingPoint num="12" id="3433" />
+<TGConnectingPoint num="13" id="3434" />
+<TGConnectingPoint num="14" id="3435" />
+<TGConnectingPoint num="15" id="3436" />
+<TGConnectingPoint num="16" id="3437" />
+<TGConnectingPoint num="17" id="3438" />
+<TGConnectingPoint num="18" id="3439" />
+<TGConnectingPoint num="19" id="3440" />
+<TGConnectingPoint num="20" id="3441" />
+<TGConnectingPoint num="21" id="3442" />
+<TGConnectingPoint num="22" id="3443" />
+<TGConnectingPoint num="23" id="3444" />
+<extraparam>
+<info stereotype="BUS-RR" nodeName="MainCAN" />
+<attributes byteDataSize="1"  arbitrationPolicy="2"  sliceTime="10000"  pipelineSize="1"  clockRatio="3225"  privacy="0"  referenceAttack="" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1103" id="3411" >
+<father id="3445" num="0" />
+<cdparam x="787" y="487" />
+<sizeparam width="263" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="221" minY="0" maxY="83" />
-<infoparam name="TGComponent" value="KDP Perf Design_NoSec::highPrioLoad" />
-<TGConnectingPoint num="0" id="1834" />
-<TGConnectingPoint num="1" id="1835" />
-<TGConnectingPoint num="2" id="1836" />
-<TGConnectingPoint num="3" id="1837" />
-<TGConnectingPoint num="4" id="1838" />
-<TGConnectingPoint num="5" id="1839" />
-<TGConnectingPoint num="6" id="1840" />
-<TGConnectingPoint num="7" id="1841" />
+<cdrectangleparam minX="0" maxX="210" minY="0" maxY="83" />
+<infoparam name="TGComponent" value="KDP Perf Design_NoSec::lowPrioLoad" />
+<TGConnectingPoint num="0" id="3403" />
+<TGConnectingPoint num="1" id="3404" />
+<TGConnectingPoint num="2" id="3405" />
+<TGConnectingPoint num="3" id="3406" />
+<TGConnectingPoint num="4" id="3407" />
+<TGConnectingPoint num="5" id="3408" />
+<TGConnectingPoint num="6" id="3409" />
+<TGConnectingPoint num="7" id="3410" />
 <extraparam>
-<info value="KDP Perf Design_NoSec::highPrioLoad" communicationName="highPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="0" typeName="channel" />
+<info value="KDP Perf Design_NoSec::lowPrioLoad" communicationName="lowPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="1" typeName="channel" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1103" id="1851" >
-<father id="1876" num="1" />
-<cdparam x="787" y="487" />
-<sizeparam width="247" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1103" id="3420" >
+<father id="3445" num="1" />
+<cdparam x="593" y="443" />
+<sizeparam width="270" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="226" minY="0" maxY="83" />
-<infoparam name="TGComponent" value="KDP Perf Design_NoSec::lowPrioLoad" />
-<TGConnectingPoint num="0" id="1843" />
-<TGConnectingPoint num="1" id="1844" />
-<TGConnectingPoint num="2" id="1845" />
-<TGConnectingPoint num="3" id="1846" />
-<TGConnectingPoint num="4" id="1847" />
-<TGConnectingPoint num="5" id="1848" />
-<TGConnectingPoint num="6" id="1849" />
-<TGConnectingPoint num="7" id="1850" />
+<cdrectangleparam minX="0" maxX="203" minY="0" maxY="83" />
+<infoparam name="TGComponent" value="KDP Perf Design_NoSec::highPrioLoad" />
+<TGConnectingPoint num="0" id="3412" />
+<TGConnectingPoint num="1" id="3413" />
+<TGConnectingPoint num="2" id="3414" />
+<TGConnectingPoint num="3" id="3415" />
+<TGConnectingPoint num="4" id="3416" />
+<TGConnectingPoint num="5" id="3417" />
+<TGConnectingPoint num="6" id="3418" />
+<TGConnectingPoint num="7" id="3419" />
 <extraparam>
-<info value="KDP Perf Design_NoSec::lowPrioLoad" communicationName="lowPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="1" typeName="channel" />
+<info value="KDP Perf Design_NoSec::highPrioLoad" communicationName="highPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="0" typeName="channel" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1106" id="1901" >
+<COMPONENT type="1106" id="3470" >
 <cdparam x="464" y="326" />
 <sizeparam width="163" height="59" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="BridgeECU1" value="name" />
-<TGConnectingPoint num="0" id="1877" />
-<TGConnectingPoint num="1" id="1878" />
-<TGConnectingPoint num="2" id="1879" />
-<TGConnectingPoint num="3" id="1880" />
-<TGConnectingPoint num="4" id="1881" />
-<TGConnectingPoint num="5" id="1882" />
-<TGConnectingPoint num="6" id="1883" />
-<TGConnectingPoint num="7" id="1884" />
-<TGConnectingPoint num="8" id="1885" />
-<TGConnectingPoint num="9" id="1886" />
-<TGConnectingPoint num="10" id="1887" />
-<TGConnectingPoint num="11" id="1888" />
-<TGConnectingPoint num="12" id="1889" />
-<TGConnectingPoint num="13" id="1890" />
-<TGConnectingPoint num="14" id="1891" />
-<TGConnectingPoint num="15" id="1892" />
-<TGConnectingPoint num="16" id="1893" />
-<TGConnectingPoint num="17" id="1894" />
-<TGConnectingPoint num="18" id="1895" />
-<TGConnectingPoint num="19" id="1896" />
-<TGConnectingPoint num="20" id="1897" />
-<TGConnectingPoint num="21" id="1898" />
-<TGConnectingPoint num="22" id="1899" />
-<TGConnectingPoint num="23" id="1900" />
+<TGConnectingPoint num="0" id="3446" />
+<TGConnectingPoint num="1" id="3447" />
+<TGConnectingPoint num="2" id="3448" />
+<TGConnectingPoint num="3" id="3449" />
+<TGConnectingPoint num="4" id="3450" />
+<TGConnectingPoint num="5" id="3451" />
+<TGConnectingPoint num="6" id="3452" />
+<TGConnectingPoint num="7" id="3453" />
+<TGConnectingPoint num="8" id="3454" />
+<TGConnectingPoint num="9" id="3455" />
+<TGConnectingPoint num="10" id="3456" />
+<TGConnectingPoint num="11" id="3457" />
+<TGConnectingPoint num="12" id="3458" />
+<TGConnectingPoint num="13" id="3459" />
+<TGConnectingPoint num="14" id="3460" />
+<TGConnectingPoint num="15" id="3461" />
+<TGConnectingPoint num="16" id="3462" />
+<TGConnectingPoint num="17" id="3463" />
+<TGConnectingPoint num="18" id="3464" />
+<TGConnectingPoint num="19" id="3465" />
+<TGConnectingPoint num="20" id="3466" />
+<TGConnectingPoint num="21" id="3467" />
+<TGConnectingPoint num="22" id="3468" />
+<TGConnectingPoint num="23" id="3469" />
 <extraparam>
 <info stereotype="BRIDGE" nodeName="BridgeECU1" />
 <attributes bufferByteDataSize="4"  clockRatio="2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1105" id="1926" >
+<COMPONENT type="1105" id="3495" >
 <cdparam x="985" y="270" />
 <sizeparam width="165" height="80" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="MemoryECU1" value="name" />
-<TGConnectingPoint num="0" id="1902" />
-<TGConnectingPoint num="1" id="1903" />
-<TGConnectingPoint num="2" id="1904" />
-<TGConnectingPoint num="3" id="1905" />
-<TGConnectingPoint num="4" id="1906" />
-<TGConnectingPoint num="5" id="1907" />
-<TGConnectingPoint num="6" id="1908" />
-<TGConnectingPoint num="7" id="1909" />
-<TGConnectingPoint num="8" id="1910" />
-<TGConnectingPoint num="9" id="1911" />
-<TGConnectingPoint num="10" id="1912" />
-<TGConnectingPoint num="11" id="1913" />
-<TGConnectingPoint num="12" id="1914" />
-<TGConnectingPoint num="13" id="1915" />
-<TGConnectingPoint num="14" id="1916" />
-<TGConnectingPoint num="15" id="1917" />
-<TGConnectingPoint num="16" id="1918" />
-<TGConnectingPoint num="17" id="1919" />
-<TGConnectingPoint num="18" id="1920" />
-<TGConnectingPoint num="19" id="1921" />
-<TGConnectingPoint num="20" id="1922" />
-<TGConnectingPoint num="21" id="1923" />
-<TGConnectingPoint num="22" id="1924" />
-<TGConnectingPoint num="23" id="1925" />
+<TGConnectingPoint num="0" id="3471" />
+<TGConnectingPoint num="1" id="3472" />
+<TGConnectingPoint num="2" id="3473" />
+<TGConnectingPoint num="3" id="3474" />
+<TGConnectingPoint num="4" id="3475" />
+<TGConnectingPoint num="5" id="3476" />
+<TGConnectingPoint num="6" id="3477" />
+<TGConnectingPoint num="7" id="3478" />
+<TGConnectingPoint num="8" id="3479" />
+<TGConnectingPoint num="9" id="3480" />
+<TGConnectingPoint num="10" id="3481" />
+<TGConnectingPoint num="11" id="3482" />
+<TGConnectingPoint num="12" id="3483" />
+<TGConnectingPoint num="13" id="3484" />
+<TGConnectingPoint num="14" id="3485" />
+<TGConnectingPoint num="15" id="3486" />
+<TGConnectingPoint num="16" id="3487" />
+<TGConnectingPoint num="17" id="3488" />
+<TGConnectingPoint num="18" id="3489" />
+<TGConnectingPoint num="19" id="3490" />
+<TGConnectingPoint num="20" id="3491" />
+<TGConnectingPoint num="21" id="3492" />
+<TGConnectingPoint num="22" id="3493" />
+<TGConnectingPoint num="23" id="3494" />
 <extraparam>
 <info stereotype="MEMORY" nodeName="MemoryECU1" />
-<attributes byteDataSize="4"  clockRatio="2"  bufferType="0" />
+<attributes byteDataSize="4"  memorySize="1024"  clockRatio="2"  bufferType="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1102" id="1951" >
+<COMPONENT type="1102" id="3520" >
 <cdparam x="448" y="206" />
 <sizeparam width="224" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="InternalBusECU1" value="name" />
-<TGConnectingPoint num="0" id="1927" />
-<TGConnectingPoint num="1" id="1928" />
-<TGConnectingPoint num="2" id="1929" />
-<TGConnectingPoint num="3" id="1930" />
-<TGConnectingPoint num="4" id="1931" />
-<TGConnectingPoint num="5" id="1932" />
-<TGConnectingPoint num="6" id="1933" />
-<TGConnectingPoint num="7" id="1934" />
-<TGConnectingPoint num="8" id="1935" />
-<TGConnectingPoint num="9" id="1936" />
-<TGConnectingPoint num="10" id="1937" />
-<TGConnectingPoint num="11" id="1938" />
-<TGConnectingPoint num="12" id="1939" />
-<TGConnectingPoint num="13" id="1940" />
-<TGConnectingPoint num="14" id="1941" />
-<TGConnectingPoint num="15" id="1942" />
-<TGConnectingPoint num="16" id="1943" />
-<TGConnectingPoint num="17" id="1944" />
-<TGConnectingPoint num="18" id="1945" />
-<TGConnectingPoint num="19" id="1946" />
-<TGConnectingPoint num="20" id="1947" />
-<TGConnectingPoint num="21" id="1948" />
-<TGConnectingPoint num="22" id="1949" />
-<TGConnectingPoint num="23" id="1950" />
+<TGConnectingPoint num="0" id="3496" />
+<TGConnectingPoint num="1" id="3497" />
+<TGConnectingPoint num="2" id="3498" />
+<TGConnectingPoint num="3" id="3499" />
+<TGConnectingPoint num="4" id="3500" />
+<TGConnectingPoint num="5" id="3501" />
+<TGConnectingPoint num="6" id="3502" />
+<TGConnectingPoint num="7" id="3503" />
+<TGConnectingPoint num="8" id="3504" />
+<TGConnectingPoint num="9" id="3505" />
+<TGConnectingPoint num="10" id="3506" />
+<TGConnectingPoint num="11" id="3507" />
+<TGConnectingPoint num="12" id="3508" />
+<TGConnectingPoint num="13" id="3509" />
+<TGConnectingPoint num="14" id="3510" />
+<TGConnectingPoint num="15" id="3511" />
+<TGConnectingPoint num="16" id="3512" />
+<TGConnectingPoint num="17" id="3513" />
+<TGConnectingPoint num="18" id="3514" />
+<TGConnectingPoint num="19" id="3515" />
+<TGConnectingPoint num="20" id="3516" />
+<TGConnectingPoint num="21" id="3517" />
+<TGConnectingPoint num="22" id="3518" />
+<TGConnectingPoint num="23" id="3519" />
 <extraparam>
 <info stereotype="BUS-RR" nodeName="InternalBusECU1" />
-<attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="2" />
+<attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="2"  privacy="0"  referenceAttack="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1100" id="2003" >
+<COMPONENT type="1100" id="3572" >
 <cdparam x="757" y="74" />
 <sizeparam width="335" height="173" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="CPU_ECU1" value="name" />
-<TGConnectingPoint num="0" id="1979" />
-<TGConnectingPoint num="1" id="1980" />
-<TGConnectingPoint num="2" id="1981" />
-<TGConnectingPoint num="3" id="1982" />
-<TGConnectingPoint num="4" id="1983" />
-<TGConnectingPoint num="5" id="1984" />
-<TGConnectingPoint num="6" id="1985" />
-<TGConnectingPoint num="7" id="1986" />
-<TGConnectingPoint num="8" id="1987" />
-<TGConnectingPoint num="9" id="1988" />
-<TGConnectingPoint num="10" id="1989" />
-<TGConnectingPoint num="11" id="1990" />
-<TGConnectingPoint num="12" id="1991" />
-<TGConnectingPoint num="13" id="1992" />
-<TGConnectingPoint num="14" id="1993" />
-<TGConnectingPoint num="15" id="1994" />
-<TGConnectingPoint num="16" id="1995" />
-<TGConnectingPoint num="17" id="1996" />
-<TGConnectingPoint num="18" id="1997" />
-<TGConnectingPoint num="19" id="1998" />
-<TGConnectingPoint num="20" id="1999" />
-<TGConnectingPoint num="21" id="2000" />
-<TGConnectingPoint num="22" id="2001" />
-<TGConnectingPoint num="23" id="2002" />
+<TGConnectingPoint num="0" id="3548" />
+<TGConnectingPoint num="1" id="3549" />
+<TGConnectingPoint num="2" id="3550" />
+<TGConnectingPoint num="3" id="3551" />
+<TGConnectingPoint num="4" id="3552" />
+<TGConnectingPoint num="5" id="3553" />
+<TGConnectingPoint num="6" id="3554" />
+<TGConnectingPoint num="7" id="3555" />
+<TGConnectingPoint num="8" id="3556" />
+<TGConnectingPoint num="9" id="3557" />
+<TGConnectingPoint num="10" id="3558" />
+<TGConnectingPoint num="11" id="3559" />
+<TGConnectingPoint num="12" id="3560" />
+<TGConnectingPoint num="13" id="3561" />
+<TGConnectingPoint num="14" id="3562" />
+<TGConnectingPoint num="15" id="3563" />
+<TGConnectingPoint num="16" id="3564" />
+<TGConnectingPoint num="17" id="3565" />
+<TGConnectingPoint num="18" id="3566" />
+<TGConnectingPoint num="19" id="3567" />
+<TGConnectingPoint num="20" id="3568" />
+<TGConnectingPoint num="21" id="3569" />
+<TGConnectingPoint num="22" id="3570" />
+<TGConnectingPoint num="23" id="3571" />
 <extraparam>
 <info stereotype="CPURRPB" nodeName="CPU_ECU1" />
-<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="1960" >
-<father id="2003" num="0" />
-<cdparam x="766" y="157" />
-<sizeparam width="315" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3529" >
+<father id="3572" num="0" />
+<cdparam x="807" y="111" />
+<sizeparam width="235" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="20" minY="0" maxY="133" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::DistributionManager_ECU1" />
-<TGConnectingPoint num="0" id="1952" />
-<TGConnectingPoint num="1" id="1953" />
-<TGConnectingPoint num="2" id="1954" />
-<TGConnectingPoint num="3" id="1955" />
-<TGConnectingPoint num="4" id="1956" />
-<TGConnectingPoint num="5" id="1957" />
-<TGConnectingPoint num="6" id="1958" />
-<TGConnectingPoint num="7" id="1959" />
+<cdrectangleparam minX="0" maxX="100" minY="0" maxY="133" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::App_ECU1" />
+<TGConnectingPoint num="0" id="3521" />
+<TGConnectingPoint num="1" id="3522" />
+<TGConnectingPoint num="2" id="3523" />
+<TGConnectingPoint num="3" id="3524" />
+<TGConnectingPoint num="4" id="3525" />
+<TGConnectingPoint num="5" id="3526" />
+<TGConnectingPoint num="6" id="3527" />
+<TGConnectingPoint num="7" id="3528" />
 <extraparam>
-<info value="KDP Perf Design_Sec::DistributionManager_ECU1" taskName="DistributionManager_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+<info value="KDP Perf Design_Sec::App_ECU1" taskName="App_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1969" >
-<father id="2003" num="1" />
+<SUBCOMPONENT type="1101" id="3538" >
+<father id="3572" num="1" />
 <cdparam x="806" y="202" />
-<sizeparam width="222" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="234" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="113" minY="0" maxY="133" />
+<cdrectangleparam minX="0" maxX="101" minY="0" maxY="133" />
 <infoparam name="TGComponent" value="KDP Perf Design_Sec::CTP_ECU1" />
-<TGConnectingPoint num="0" id="1961" />
-<TGConnectingPoint num="1" id="1962" />
-<TGConnectingPoint num="2" id="1963" />
-<TGConnectingPoint num="3" id="1964" />
-<TGConnectingPoint num="4" id="1965" />
-<TGConnectingPoint num="5" id="1966" />
-<TGConnectingPoint num="6" id="1967" />
-<TGConnectingPoint num="7" id="1968" />
+<TGConnectingPoint num="0" id="3530" />
+<TGConnectingPoint num="1" id="3531" />
+<TGConnectingPoint num="2" id="3532" />
+<TGConnectingPoint num="3" id="3533" />
+<TGConnectingPoint num="4" id="3534" />
+<TGConnectingPoint num="5" id="3535" />
+<TGConnectingPoint num="6" id="3536" />
+<TGConnectingPoint num="7" id="3537" />
 <extraparam>
 <info value="KDP Perf Design_Sec::CTP_ECU1" taskName="CTP_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1978" >
-<father id="2003" num="2" />
-<cdparam x="807" y="111" />
-<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3547" >
+<father id="3572" num="2" />
+<cdparam x="754" y="157" />
+<sizeparam width="338" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="112" minY="0" maxY="133" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::App_ECU1" />
-<TGConnectingPoint num="0" id="1970" />
-<TGConnectingPoint num="1" id="1971" />
-<TGConnectingPoint num="2" id="1972" />
-<TGConnectingPoint num="3" id="1973" />
-<TGConnectingPoint num="4" id="1974" />
-<TGConnectingPoint num="5" id="1975" />
-<TGConnectingPoint num="6" id="1976" />
-<TGConnectingPoint num="7" id="1977" />
+<cdrectangleparam minX="0" maxX="-3" minY="0" maxY="133" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::DistributionManager_ECU1" />
+<TGConnectingPoint num="0" id="3539" />
+<TGConnectingPoint num="1" id="3540" />
+<TGConnectingPoint num="2" id="3541" />
+<TGConnectingPoint num="3" id="3542" />
+<TGConnectingPoint num="4" id="3543" />
+<TGConnectingPoint num="5" id="3544" />
+<TGConnectingPoint num="6" id="3545" />
+<TGConnectingPoint num="7" id="3546" />
 <extraparam>
-<info value="KDP Perf Design_Sec::App_ECU1" taskName="App_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+<info value="KDP Perf Design_Sec::DistributionManager_ECU1" taskName="DistributionManager_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1100" id="2037" >
+<COMPONENT type="1100" id="3606" >
 <cdparam x="440" y="82" />
 <sizeparam width="240" height="105" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="HSM_ECU1" value="name" />
-<TGConnectingPoint num="0" id="2013" />
-<TGConnectingPoint num="1" id="2014" />
-<TGConnectingPoint num="2" id="2015" />
-<TGConnectingPoint num="3" id="2016" />
-<TGConnectingPoint num="4" id="2017" />
-<TGConnectingPoint num="5" id="2018" />
-<TGConnectingPoint num="6" id="2019" />
-<TGConnectingPoint num="7" id="2020" />
-<TGConnectingPoint num="8" id="2021" />
-<TGConnectingPoint num="9" id="2022" />
-<TGConnectingPoint num="10" id="2023" />
-<TGConnectingPoint num="11" id="2024" />
-<TGConnectingPoint num="12" id="2025" />
-<TGConnectingPoint num="13" id="2026" />
-<TGConnectingPoint num="14" id="2027" />
-<TGConnectingPoint num="15" id="2028" />
-<TGConnectingPoint num="16" id="2029" />
-<TGConnectingPoint num="17" id="2030" />
-<TGConnectingPoint num="18" id="2031" />
-<TGConnectingPoint num="19" id="2032" />
-<TGConnectingPoint num="20" id="2033" />
-<TGConnectingPoint num="21" id="2034" />
-<TGConnectingPoint num="22" id="2035" />
-<TGConnectingPoint num="23" id="2036" />
+<TGConnectingPoint num="0" id="3582" />
+<TGConnectingPoint num="1" id="3583" />
+<TGConnectingPoint num="2" id="3584" />
+<TGConnectingPoint num="3" id="3585" />
+<TGConnectingPoint num="4" id="3586" />
+<TGConnectingPoint num="5" id="3587" />
+<TGConnectingPoint num="6" id="3588" />
+<TGConnectingPoint num="7" id="3589" />
+<TGConnectingPoint num="8" id="3590" />
+<TGConnectingPoint num="9" id="3591" />
+<TGConnectingPoint num="10" id="3592" />
+<TGConnectingPoint num="11" id="3593" />
+<TGConnectingPoint num="12" id="3594" />
+<TGConnectingPoint num="13" id="3595" />
+<TGConnectingPoint num="14" id="3596" />
+<TGConnectingPoint num="15" id="3597" />
+<TGConnectingPoint num="16" id="3598" />
+<TGConnectingPoint num="17" id="3599" />
+<TGConnectingPoint num="18" id="3600" />
+<TGConnectingPoint num="19" id="3601" />
+<TGConnectingPoint num="20" id="3602" />
+<TGConnectingPoint num="21" id="3603" />
+<TGConnectingPoint num="22" id="3604" />
+<TGConnectingPoint num="23" id="3605" />
 <extraparam>
 <info stereotype="CPURRPB" nodeName="HSM_ECU1" />
-<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="2012" >
-<father id="2037" num="0" />
-<cdparam x="449" y="130" />
-<sizeparam width="224" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3581" >
+<father id="3606" num="0" />
+<cdparam x="442" y="130" />
+<sizeparam width="238" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="16" minY="0" maxY="65" />
+<cdrectangleparam minX="0" maxX="2" minY="0" maxY="65" />
 <infoparam name="TGComponent" value="KDP Perf Design_Sec::HSM_ECU1" />
-<TGConnectingPoint num="0" id="2004" />
-<TGConnectingPoint num="1" id="2005" />
-<TGConnectingPoint num="2" id="2006" />
-<TGConnectingPoint num="3" id="2007" />
-<TGConnectingPoint num="4" id="2008" />
-<TGConnectingPoint num="5" id="2009" />
-<TGConnectingPoint num="6" id="2010" />
-<TGConnectingPoint num="7" id="2011" />
+<TGConnectingPoint num="0" id="3573" />
+<TGConnectingPoint num="1" id="3574" />
+<TGConnectingPoint num="2" id="3575" />
+<TGConnectingPoint num="3" id="3576" />
+<TGConnectingPoint num="4" id="3577" />
+<TGConnectingPoint num="5" id="3578" />
+<TGConnectingPoint num="6" id="3579" />
+<TGConnectingPoint num="7" id="3580" />
 <extraparam>
 <info value="KDP Perf Design_Sec::HSM_ECU1" taskName="HSM_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1106" id="2062" >
+<COMPONENT type="1106" id="3631" >
 <cdparam x="446" y="726" />
 <sizeparam width="129" height="59" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="BridgeKM" value="name" />
-<TGConnectingPoint num="0" id="2038" />
-<TGConnectingPoint num="1" id="2039" />
-<TGConnectingPoint num="2" id="2040" />
-<TGConnectingPoint num="3" id="2041" />
-<TGConnectingPoint num="4" id="2042" />
-<TGConnectingPoint num="5" id="2043" />
-<TGConnectingPoint num="6" id="2044" />
-<TGConnectingPoint num="7" id="2045" />
-<TGConnectingPoint num="8" id="2046" />
-<TGConnectingPoint num="9" id="2047" />
-<TGConnectingPoint num="10" id="2048" />
-<TGConnectingPoint num="11" id="2049" />
-<TGConnectingPoint num="12" id="2050" />
-<TGConnectingPoint num="13" id="2051" />
-<TGConnectingPoint num="14" id="2052" />
-<TGConnectingPoint num="15" id="2053" />
-<TGConnectingPoint num="16" id="2054" />
-<TGConnectingPoint num="17" id="2055" />
-<TGConnectingPoint num="18" id="2056" />
-<TGConnectingPoint num="19" id="2057" />
-<TGConnectingPoint num="20" id="2058" />
-<TGConnectingPoint num="21" id="2059" />
-<TGConnectingPoint num="22" id="2060" />
-<TGConnectingPoint num="23" id="2061" />
+<TGConnectingPoint num="0" id="3607" />
+<TGConnectingPoint num="1" id="3608" />
+<TGConnectingPoint num="2" id="3609" />
+<TGConnectingPoint num="3" id="3610" />
+<TGConnectingPoint num="4" id="3611" />
+<TGConnectingPoint num="5" id="3612" />
+<TGConnectingPoint num="6" id="3613" />
+<TGConnectingPoint num="7" id="3614" />
+<TGConnectingPoint num="8" id="3615" />
+<TGConnectingPoint num="9" id="3616" />
+<TGConnectingPoint num="10" id="3617" />
+<TGConnectingPoint num="11" id="3618" />
+<TGConnectingPoint num="12" id="3619" />
+<TGConnectingPoint num="13" id="3620" />
+<TGConnectingPoint num="14" id="3621" />
+<TGConnectingPoint num="15" id="3622" />
+<TGConnectingPoint num="16" id="3623" />
+<TGConnectingPoint num="17" id="3624" />
+<TGConnectingPoint num="18" id="3625" />
+<TGConnectingPoint num="19" id="3626" />
+<TGConnectingPoint num="20" id="3627" />
+<TGConnectingPoint num="21" id="3628" />
+<TGConnectingPoint num="22" id="3629" />
+<TGConnectingPoint num="23" id="3630" />
 <extraparam>
 <info stereotype="BRIDGE" nodeName="BridgeKM" />
 <attributes bufferByteDataSize="4"  clockRatio="2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1105" id="2087" >
+<COMPONENT type="1105" id="3656" >
 <cdparam x="443" y="825" />
 <sizeparam width="165" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="MemoryKM" value="name" />
-<TGConnectingPoint num="0" id="2063" />
-<TGConnectingPoint num="1" id="2064" />
-<TGConnectingPoint num="2" id="2065" />
-<TGConnectingPoint num="3" id="2066" />
-<TGConnectingPoint num="4" id="2067" />
-<TGConnectingPoint num="5" id="2068" />
-<TGConnectingPoint num="6" id="2069" />
-<TGConnectingPoint num="7" id="2070" />
-<TGConnectingPoint num="8" id="2071" />
-<TGConnectingPoint num="9" id="2072" />
-<TGConnectingPoint num="10" id="2073" />
-<TGConnectingPoint num="11" id="2074" />
-<TGConnectingPoint num="12" id="2075" />
-<TGConnectingPoint num="13" id="2076" />
-<TGConnectingPoint num="14" id="2077" />
-<TGConnectingPoint num="15" id="2078" />
-<TGConnectingPoint num="16" id="2079" />
-<TGConnectingPoint num="17" id="2080" />
-<TGConnectingPoint num="18" id="2081" />
-<TGConnectingPoint num="19" id="2082" />
-<TGConnectingPoint num="20" id="2083" />
-<TGConnectingPoint num="21" id="2084" />
-<TGConnectingPoint num="22" id="2085" />
-<TGConnectingPoint num="23" id="2086" />
+<TGConnectingPoint num="0" id="3632" />
+<TGConnectingPoint num="1" id="3633" />
+<TGConnectingPoint num="2" id="3634" />
+<TGConnectingPoint num="3" id="3635" />
+<TGConnectingPoint num="4" id="3636" />
+<TGConnectingPoint num="5" id="3637" />
+<TGConnectingPoint num="6" id="3638" />
+<TGConnectingPoint num="7" id="3639" />
+<TGConnectingPoint num="8" id="3640" />
+<TGConnectingPoint num="9" id="3641" />
+<TGConnectingPoint num="10" id="3642" />
+<TGConnectingPoint num="11" id="3643" />
+<TGConnectingPoint num="12" id="3644" />
+<TGConnectingPoint num="13" id="3645" />
+<TGConnectingPoint num="14" id="3646" />
+<TGConnectingPoint num="15" id="3647" />
+<TGConnectingPoint num="16" id="3648" />
+<TGConnectingPoint num="17" id="3649" />
+<TGConnectingPoint num="18" id="3650" />
+<TGConnectingPoint num="19" id="3651" />
+<TGConnectingPoint num="20" id="3652" />
+<TGConnectingPoint num="21" id="3653" />
+<TGConnectingPoint num="22" id="3654" />
+<TGConnectingPoint num="23" id="3655" />
 <extraparam>
 <info stereotype="MEMORY" nodeName="MemoryKM" />
-<attributes byteDataSize="4"  clockRatio="2"  bufferType="0" />
+<attributes byteDataSize="4"  memorySize="1024"  clockRatio="2"  bufferType="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1102" id="2112" >
+<COMPONENT type="1102" id="3681" >
 <cdparam x="648" y="817" />
 <sizeparam width="176" height="67" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="InternalBusKM" value="name" />
-<TGConnectingPoint num="0" id="2088" />
-<TGConnectingPoint num="1" id="2089" />
-<TGConnectingPoint num="2" id="2090" />
-<TGConnectingPoint num="3" id="2091" />
-<TGConnectingPoint num="4" id="2092" />
-<TGConnectingPoint num="5" id="2093" />
-<TGConnectingPoint num="6" id="2094" />
-<TGConnectingPoint num="7" id="2095" />
-<TGConnectingPoint num="8" id="2096" />
-<TGConnectingPoint num="9" id="2097" />
-<TGConnectingPoint num="10" id="2098" />
-<TGConnectingPoint num="11" id="2099" />
-<TGConnectingPoint num="12" id="2100" />
-<TGConnectingPoint num="13" id="2101" />
-<TGConnectingPoint num="14" id="2102" />
-<TGConnectingPoint num="15" id="2103" />
-<TGConnectingPoint num="16" id="2104" />
-<TGConnectingPoint num="17" id="2105" />
-<TGConnectingPoint num="18" id="2106" />
-<TGConnectingPoint num="19" id="2107" />
-<TGConnectingPoint num="20" id="2108" />
-<TGConnectingPoint num="21" id="2109" />
-<TGConnectingPoint num="22" id="2110" />
-<TGConnectingPoint num="23" id="2111" />
+<TGConnectingPoint num="0" id="3657" />
+<TGConnectingPoint num="1" id="3658" />
+<TGConnectingPoint num="2" id="3659" />
+<TGConnectingPoint num="3" id="3660" />
+<TGConnectingPoint num="4" id="3661" />
+<TGConnectingPoint num="5" id="3662" />
+<TGConnectingPoint num="6" id="3663" />
+<TGConnectingPoint num="7" id="3664" />
+<TGConnectingPoint num="8" id="3665" />
+<TGConnectingPoint num="9" id="3666" />
+<TGConnectingPoint num="10" id="3667" />
+<TGConnectingPoint num="11" id="3668" />
+<TGConnectingPoint num="12" id="3669" />
+<TGConnectingPoint num="13" id="3670" />
+<TGConnectingPoint num="14" id="3671" />
+<TGConnectingPoint num="15" id="3672" />
+<TGConnectingPoint num="16" id="3673" />
+<TGConnectingPoint num="17" id="3674" />
+<TGConnectingPoint num="18" id="3675" />
+<TGConnectingPoint num="19" id="3676" />
+<TGConnectingPoint num="20" id="3677" />
+<TGConnectingPoint num="21" id="3678" />
+<TGConnectingPoint num="22" id="3679" />
+<TGConnectingPoint num="23" id="3680" />
 <extraparam>
 <info stereotype="BUS-RR" nodeName="InternalBusKM" />
-<attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="2" />
+<attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="2"  privacy="0"  referenceAttack="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1100" id="2155" >
+<COMPONENT type="1100" id="3724" >
 <cdparam x="510" y="905" />
 <sizeparam width="243" height="147" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="CPU_KM" value="name" />
-<TGConnectingPoint num="0" id="2131" />
-<TGConnectingPoint num="1" id="2132" />
-<TGConnectingPoint num="2" id="2133" />
-<TGConnectingPoint num="3" id="2134" />
-<TGConnectingPoint num="4" id="2135" />
-<TGConnectingPoint num="5" id="2136" />
-<TGConnectingPoint num="6" id="2137" />
-<TGConnectingPoint num="7" id="2138" />
-<TGConnectingPoint num="8" id="2139" />
-<TGConnectingPoint num="9" id="2140" />
-<TGConnectingPoint num="10" id="2141" />
-<TGConnectingPoint num="11" id="2142" />
-<TGConnectingPoint num="12" id="2143" />
-<TGConnectingPoint num="13" id="2144" />
-<TGConnectingPoint num="14" id="2145" />
-<TGConnectingPoint num="15" id="2146" />
-<TGConnectingPoint num="16" id="2147" />
-<TGConnectingPoint num="17" id="2148" />
-<TGConnectingPoint num="18" id="2149" />
-<TGConnectingPoint num="19" id="2150" />
-<TGConnectingPoint num="20" id="2151" />
-<TGConnectingPoint num="21" id="2152" />
-<TGConnectingPoint num="22" id="2153" />
-<TGConnectingPoint num="23" id="2154" />
+<TGConnectingPoint num="0" id="3700" />
+<TGConnectingPoint num="1" id="3701" />
+<TGConnectingPoint num="2" id="3702" />
+<TGConnectingPoint num="3" id="3703" />
+<TGConnectingPoint num="4" id="3704" />
+<TGConnectingPoint num="5" id="3705" />
+<TGConnectingPoint num="6" id="3706" />
+<TGConnectingPoint num="7" id="3707" />
+<TGConnectingPoint num="8" id="3708" />
+<TGConnectingPoint num="9" id="3709" />
+<TGConnectingPoint num="10" id="3710" />
+<TGConnectingPoint num="11" id="3711" />
+<TGConnectingPoint num="12" id="3712" />
+<TGConnectingPoint num="13" id="3713" />
+<TGConnectingPoint num="14" id="3714" />
+<TGConnectingPoint num="15" id="3715" />
+<TGConnectingPoint num="16" id="3716" />
+<TGConnectingPoint num="17" id="3717" />
+<TGConnectingPoint num="18" id="3718" />
+<TGConnectingPoint num="19" id="3719" />
+<TGConnectingPoint num="20" id="3720" />
+<TGConnectingPoint num="21" id="3721" />
+<TGConnectingPoint num="22" id="3722" />
+<TGConnectingPoint num="23" id="3723" />
 <extraparam>
 <info stereotype="CPURRPB" nodeName="CPU_KM" />
-<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="2121" >
-<father id="2155" num="0" />
-<cdparam x="527" y="945" />
-<sizeparam width="180" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3690" >
+<father id="3724" num="0" />
+<cdparam x="522" y="992" />
+<sizeparam width="218" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="63" minY="0" maxY="107" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::KM" />
-<TGConnectingPoint num="0" id="2113" />
-<TGConnectingPoint num="1" id="2114" />
-<TGConnectingPoint num="2" id="2115" />
-<TGConnectingPoint num="3" id="2116" />
-<TGConnectingPoint num="4" id="2117" />
-<TGConnectingPoint num="5" id="2118" />
-<TGConnectingPoint num="6" id="2119" />
-<TGConnectingPoint num="7" id="2120" />
+<cdrectangleparam minX="0" maxX="25" minY="0" maxY="107" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::CTP_KM" />
+<TGConnectingPoint num="0" id="3682" />
+<TGConnectingPoint num="1" id="3683" />
+<TGConnectingPoint num="2" id="3684" />
+<TGConnectingPoint num="3" id="3685" />
+<TGConnectingPoint num="4" id="3686" />
+<TGConnectingPoint num="5" id="3687" />
+<TGConnectingPoint num="6" id="3688" />
+<TGConnectingPoint num="7" id="3689" />
 <extraparam>
-<info value="KDP Perf Design_Sec::KM" taskName="KM" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+<info value="KDP Perf Design_Sec::CTP_KM" taskName="CTP_KM" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="2130" >
-<father id="2155" num="1" />
-<cdparam x="522" y="992" />
-<sizeparam width="209" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3699" >
+<father id="3724" num="1" />
+<cdparam x="527" y="945" />
+<sizeparam width="189" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="34" minY="0" maxY="107" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::CTP_KM" />
-<TGConnectingPoint num="0" id="2122" />
-<TGConnectingPoint num="1" id="2123" />
-<TGConnectingPoint num="2" id="2124" />
-<TGConnectingPoint num="3" id="2125" />
-<TGConnectingPoint num="4" id="2126" />
-<TGConnectingPoint num="5" id="2127" />
-<TGConnectingPoint num="6" id="2128" />
-<TGConnectingPoint num="7" id="2129" />
+<cdrectangleparam minX="0" maxX="54" minY="0" maxY="107" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::KM" />
+<TGConnectingPoint num="0" id="3691" />
+<TGConnectingPoint num="1" id="3692" />
+<TGConnectingPoint num="2" id="3693" />
+<TGConnectingPoint num="3" id="3694" />
+<TGConnectingPoint num="4" id="3695" />
+<TGConnectingPoint num="5" id="3696" />
+<TGConnectingPoint num="6" id="3697" />
+<TGConnectingPoint num="7" id="3698" />
 <extraparam>
-<info value="KDP Perf Design_Sec::CTP_KM" taskName="CTP_KM" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+<info value="KDP Perf Design_Sec::KM" taskName="KM" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1100" id="2189" >
+<COMPONENT type="1100" id="3758" >
 <cdparam x="632" y="690" />
 <sizeparam width="229" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="HSM_KM" value="name" />
-<TGConnectingPoint num="0" id="2165" />
-<TGConnectingPoint num="1" id="2166" />
-<TGConnectingPoint num="2" id="2167" />
-<TGConnectingPoint num="3" id="2168" />
-<TGConnectingPoint num="4" id="2169" />
-<TGConnectingPoint num="5" id="2170" />
-<TGConnectingPoint num="6" id="2171" />
-<TGConnectingPoint num="7" id="2172" />
-<TGConnectingPoint num="8" id="2173" />
-<TGConnectingPoint num="9" id="2174" />
-<TGConnectingPoint num="10" id="2175" />
-<TGConnectingPoint num="11" id="2176" />
-<TGConnectingPoint num="12" id="2177" />
-<TGConnectingPoint num="13" id="2178" />
-<TGConnectingPoint num="14" id="2179" />
-<TGConnectingPoint num="15" id="2180" />
-<TGConnectingPoint num="16" id="2181" />
-<TGConnectingPoint num="17" id="2182" />
-<TGConnectingPoint num="18" id="2183" />
-<TGConnectingPoint num="19" id="2184" />
-<TGConnectingPoint num="20" id="2185" />
-<TGConnectingPoint num="21" id="2186" />
-<TGConnectingPoint num="22" id="2187" />
-<TGConnectingPoint num="23" id="2188" />
+<TGConnectingPoint num="0" id="3734" />
+<TGConnectingPoint num="1" id="3735" />
+<TGConnectingPoint num="2" id="3736" />
+<TGConnectingPoint num="3" id="3737" />
+<TGConnectingPoint num="4" id="3738" />
+<TGConnectingPoint num="5" id="3739" />
+<TGConnectingPoint num="6" id="3740" />
+<TGConnectingPoint num="7" id="3741" />
+<TGConnectingPoint num="8" id="3742" />
+<TGConnectingPoint num="9" id="3743" />
+<TGConnectingPoint num="10" id="3744" />
+<TGConnectingPoint num="11" id="3745" />
+<TGConnectingPoint num="12" id="3746" />
+<TGConnectingPoint num="13" id="3747" />
+<TGConnectingPoint num="14" id="3748" />
+<TGConnectingPoint num="15" id="3749" />
+<TGConnectingPoint num="16" id="3750" />
+<TGConnectingPoint num="17" id="3751" />
+<TGConnectingPoint num="18" id="3752" />
+<TGConnectingPoint num="19" id="3753" />
+<TGConnectingPoint num="20" id="3754" />
+<TGConnectingPoint num="21" id="3755" />
+<TGConnectingPoint num="22" id="3756" />
+<TGConnectingPoint num="23" id="3757" />
 <extraparam>
 <info stereotype="CPURRPB" nodeName="HSM_KM" />
-<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="2164" >
-<father id="2189" num="0" />
-<cdparam x="642" y="733" />
-<sizeparam width="211" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3733" >
+<father id="3758" num="0" />
+<cdparam x="639" y="733" />
+<sizeparam width="222" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="18" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="7" minY="0" maxY="60" />
 <infoparam name="TGComponent" value="KDP Perf Design_Sec::HSM_KM" />
-<TGConnectingPoint num="0" id="2156" />
-<TGConnectingPoint num="1" id="2157" />
-<TGConnectingPoint num="2" id="2158" />
-<TGConnectingPoint num="3" id="2159" />
-<TGConnectingPoint num="4" id="2160" />
-<TGConnectingPoint num="5" id="2161" />
-<TGConnectingPoint num="6" id="2162" />
-<TGConnectingPoint num="7" id="2163" />
+<TGConnectingPoint num="0" id="3725" />
+<TGConnectingPoint num="1" id="3726" />
+<TGConnectingPoint num="2" id="3727" />
+<TGConnectingPoint num="3" id="3728" />
+<TGConnectingPoint num="4" id="3729" />
+<TGConnectingPoint num="5" id="3730" />
+<TGConnectingPoint num="6" id="3731" />
+<TGConnectingPoint num="7" id="3732" />
 <extraparam>
 <info value="KDP Perf Design_Sec::HSM_KM" taskName="HSM_KM" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1106" id="2214" >
+<COMPONENT type="1106" id="3783" >
 <cdparam x="1046" y="617" />
 <sizeparam width="163" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="BridgeECUN" value="name" />
-<TGConnectingPoint num="0" id="2190" />
-<TGConnectingPoint num="1" id="2191" />
-<TGConnectingPoint num="2" id="2192" />
-<TGConnectingPoint num="3" id="2193" />
-<TGConnectingPoint num="4" id="2194" />
-<TGConnectingPoint num="5" id="2195" />
-<TGConnectingPoint num="6" id="2196" />
-<TGConnectingPoint num="7" id="2197" />
-<TGConnectingPoint num="8" id="2198" />
-<TGConnectingPoint num="9" id="2199" />
-<TGConnectingPoint num="10" id="2200" />
-<TGConnectingPoint num="11" id="2201" />
-<TGConnectingPoint num="12" id="2202" />
-<TGConnectingPoint num="13" id="2203" />
-<TGConnectingPoint num="14" id="2204" />
-<TGConnectingPoint num="15" id="2205" />
-<TGConnectingPoint num="16" id="2206" />
-<TGConnectingPoint num="17" id="2207" />
-<TGConnectingPoint num="18" id="2208" />
-<TGConnectingPoint num="19" id="2209" />
-<TGConnectingPoint num="20" id="2210" />
-<TGConnectingPoint num="21" id="2211" />
-<TGConnectingPoint num="22" id="2212" />
-<TGConnectingPoint num="23" id="2213" />
+<TGConnectingPoint num="0" id="3759" />
+<TGConnectingPoint num="1" id="3760" />
+<TGConnectingPoint num="2" id="3761" />
+<TGConnectingPoint num="3" id="3762" />
+<TGConnectingPoint num="4" id="3763" />
+<TGConnectingPoint num="5" id="3764" />
+<TGConnectingPoint num="6" id="3765" />
+<TGConnectingPoint num="7" id="3766" />
+<TGConnectingPoint num="8" id="3767" />
+<TGConnectingPoint num="9" id="3768" />
+<TGConnectingPoint num="10" id="3769" />
+<TGConnectingPoint num="11" id="3770" />
+<TGConnectingPoint num="12" id="3771" />
+<TGConnectingPoint num="13" id="3772" />
+<TGConnectingPoint num="14" id="3773" />
+<TGConnectingPoint num="15" id="3774" />
+<TGConnectingPoint num="16" id="3775" />
+<TGConnectingPoint num="17" id="3776" />
+<TGConnectingPoint num="18" id="3777" />
+<TGConnectingPoint num="19" id="3778" />
+<TGConnectingPoint num="20" id="3779" />
+<TGConnectingPoint num="21" id="3780" />
+<TGConnectingPoint num="22" id="3781" />
+<TGConnectingPoint num="23" id="3782" />
 <extraparam>
 <info stereotype="BRIDGE" nodeName="BridgeECUN" />
 <attributes bufferByteDataSize="4"  clockRatio="2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1105" id="2239" >
+<COMPONENT type="1105" id="3808" >
 <cdparam x="874" y="615" />
 <sizeparam width="152" height="53" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="MemoryECUN" value="name" />
-<TGConnectingPoint num="0" id="2215" />
-<TGConnectingPoint num="1" id="2216" />
-<TGConnectingPoint num="2" id="2217" />
-<TGConnectingPoint num="3" id="2218" />
-<TGConnectingPoint num="4" id="2219" />
-<TGConnectingPoint num="5" id="2220" />
-<TGConnectingPoint num="6" id="2221" />
-<TGConnectingPoint num="7" id="2222" />
-<TGConnectingPoint num="8" id="2223" />
-<TGConnectingPoint num="9" id="2224" />
-<TGConnectingPoint num="10" id="2225" />
-<TGConnectingPoint num="11" id="2226" />
-<TGConnectingPoint num="12" id="2227" />
-<TGConnectingPoint num="13" id="2228" />
-<TGConnectingPoint num="14" id="2229" />
-<TGConnectingPoint num="15" id="2230" />
-<TGConnectingPoint num="16" id="2231" />
-<TGConnectingPoint num="17" id="2232" />
-<TGConnectingPoint num="18" id="2233" />
-<TGConnectingPoint num="19" id="2234" />
-<TGConnectingPoint num="20" id="2235" />
-<TGConnectingPoint num="21" id="2236" />
-<TGConnectingPoint num="22" id="2237" />
-<TGConnectingPoint num="23" id="2238" />
+<TGConnectingPoint num="0" id="3784" />
+<TGConnectingPoint num="1" id="3785" />
+<TGConnectingPoint num="2" id="3786" />
+<TGConnectingPoint num="3" id="3787" />
+<TGConnectingPoint num="4" id="3788" />
+<TGConnectingPoint num="5" id="3789" />
+<TGConnectingPoint num="6" id="3790" />
+<TGConnectingPoint num="7" id="3791" />
+<TGConnectingPoint num="8" id="3792" />
+<TGConnectingPoint num="9" id="3793" />
+<TGConnectingPoint num="10" id="3794" />
+<TGConnectingPoint num="11" id="3795" />
+<TGConnectingPoint num="12" id="3796" />
+<TGConnectingPoint num="13" id="3797" />
+<TGConnectingPoint num="14" id="3798" />
+<TGConnectingPoint num="15" id="3799" />
+<TGConnectingPoint num="16" id="3800" />
+<TGConnectingPoint num="17" id="3801" />
+<TGConnectingPoint num="18" id="3802" />
+<TGConnectingPoint num="19" id="3803" />
+<TGConnectingPoint num="20" id="3804" />
+<TGConnectingPoint num="21" id="3805" />
+<TGConnectingPoint num="22" id="3806" />
+<TGConnectingPoint num="23" id="3807" />
 <extraparam>
 <info stereotype="MEMORY" nodeName="MemoryECUN" />
-<attributes byteDataSize="4"  clockRatio="2"  bufferType="0" />
+<attributes byteDataSize="4"  memorySize="1024"  clockRatio="2"  bufferType="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1102" id="2264" >
+<COMPONENT type="1102" id="3833" >
 <cdparam x="1036" y="678" />
 <sizeparam width="173" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="InternalBusECUN" value="name" />
-<TGConnectingPoint num="0" id="2240" />
-<TGConnectingPoint num="1" id="2241" />
-<TGConnectingPoint num="2" id="2242" />
-<TGConnectingPoint num="3" id="2243" />
-<TGConnectingPoint num="4" id="2244" />
-<TGConnectingPoint num="5" id="2245" />
-<TGConnectingPoint num="6" id="2246" />
-<TGConnectingPoint num="7" id="2247" />
-<TGConnectingPoint num="8" id="2248" />
-<TGConnectingPoint num="9" id="2249" />
-<TGConnectingPoint num="10" id="2250" />
-<TGConnectingPoint num="11" id="2251" />
-<TGConnectingPoint num="12" id="2252" />
-<TGConnectingPoint num="13" id="2253" />
-<TGConnectingPoint num="14" id="2254" />
-<TGConnectingPoint num="15" id="2255" />
-<TGConnectingPoint num="16" id="2256" />
-<TGConnectingPoint num="17" id="2257" />
-<TGConnectingPoint num="18" id="2258" />
-<TGConnectingPoint num="19" id="2259" />
-<TGConnectingPoint num="20" id="2260" />
-<TGConnectingPoint num="21" id="2261" />
-<TGConnectingPoint num="22" id="2262" />
-<TGConnectingPoint num="23" id="2263" />
+<TGConnectingPoint num="0" id="3809" />
+<TGConnectingPoint num="1" id="3810" />
+<TGConnectingPoint num="2" id="3811" />
+<TGConnectingPoint num="3" id="3812" />
+<TGConnectingPoint num="4" id="3813" />
+<TGConnectingPoint num="5" id="3814" />
+<TGConnectingPoint num="6" id="3815" />
+<TGConnectingPoint num="7" id="3816" />
+<TGConnectingPoint num="8" id="3817" />
+<TGConnectingPoint num="9" id="3818" />
+<TGConnectingPoint num="10" id="3819" />
+<TGConnectingPoint num="11" id="3820" />
+<TGConnectingPoint num="12" id="3821" />
+<TGConnectingPoint num="13" id="3822" />
+<TGConnectingPoint num="14" id="3823" />
+<TGConnectingPoint num="15" id="3824" />
+<TGConnectingPoint num="16" id="3825" />
+<TGConnectingPoint num="17" id="3826" />
+<TGConnectingPoint num="18" id="3827" />
+<TGConnectingPoint num="19" id="3828" />
+<TGConnectingPoint num="20" id="3829" />
+<TGConnectingPoint num="21" id="3830" />
+<TGConnectingPoint num="22" id="3831" />
+<TGConnectingPoint num="23" id="3832" />
 <extraparam>
 <info stereotype="BUS-RR" nodeName="InternalBusECUN" />
-<attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="2" />
+<attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="2"  privacy="0"  referenceAttack="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1100" id="2307" >
+<COMPONENT type="1100" id="3876" >
 <cdparam x="907" y="892" />
 <sizeparam width="283" height="126" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="CPU_ECUN" value="name" />
-<TGConnectingPoint num="0" id="2283" />
-<TGConnectingPoint num="1" id="2284" />
-<TGConnectingPoint num="2" id="2285" />
-<TGConnectingPoint num="3" id="2286" />
-<TGConnectingPoint num="4" id="2287" />
-<TGConnectingPoint num="5" id="2288" />
-<TGConnectingPoint num="6" id="2289" />
-<TGConnectingPoint num="7" id="2290" />
-<TGConnectingPoint num="8" id="2291" />
-<TGConnectingPoint num="9" id="2292" />
-<TGConnectingPoint num="10" id="2293" />
-<TGConnectingPoint num="11" id="2294" />
-<TGConnectingPoint num="12" id="2295" />
-<TGConnectingPoint num="13" id="2296" />
-<TGConnectingPoint num="14" id="2297" />
-<TGConnectingPoint num="15" id="2298" />
-<TGConnectingPoint num="16" id="2299" />
-<TGConnectingPoint num="17" id="2300" />
-<TGConnectingPoint num="18" id="2301" />
-<TGConnectingPoint num="19" id="2302" />
-<TGConnectingPoint num="20" id="2303" />
-<TGConnectingPoint num="21" id="2304" />
-<TGConnectingPoint num="22" id="2305" />
-<TGConnectingPoint num="23" id="2306" />
+<TGConnectingPoint num="0" id="3852" />
+<TGConnectingPoint num="1" id="3853" />
+<TGConnectingPoint num="2" id="3854" />
+<TGConnectingPoint num="3" id="3855" />
+<TGConnectingPoint num="4" id="3856" />
+<TGConnectingPoint num="5" id="3857" />
+<TGConnectingPoint num="6" id="3858" />
+<TGConnectingPoint num="7" id="3859" />
+<TGConnectingPoint num="8" id="3860" />
+<TGConnectingPoint num="9" id="3861" />
+<TGConnectingPoint num="10" id="3862" />
+<TGConnectingPoint num="11" id="3863" />
+<TGConnectingPoint num="12" id="3864" />
+<TGConnectingPoint num="13" id="3865" />
+<TGConnectingPoint num="14" id="3866" />
+<TGConnectingPoint num="15" id="3867" />
+<TGConnectingPoint num="16" id="3868" />
+<TGConnectingPoint num="17" id="3869" />
+<TGConnectingPoint num="18" id="3870" />
+<TGConnectingPoint num="19" id="3871" />
+<TGConnectingPoint num="20" id="3872" />
+<TGConnectingPoint num="21" id="3873" />
+<TGConnectingPoint num="22" id="3874" />
+<TGConnectingPoint num="23" id="3875" />
 <extraparam>
 <info stereotype="CPURRPB" nodeName="CPU_ECUN" />
-<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="2273" >
-<father id="2307" num="0" />
-<cdparam x="934" y="973" />
-<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3842" >
+<father id="3876" num="0" />
+<cdparam x="902" y="930" />
+<sizeparam width="288" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="60" minY="0" maxY="86" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::CTP_ECUN" />
-<TGConnectingPoint num="0" id="2265" />
-<TGConnectingPoint num="1" id="2266" />
-<TGConnectingPoint num="2" id="2267" />
-<TGConnectingPoint num="3" id="2268" />
-<TGConnectingPoint num="4" id="2269" />
-<TGConnectingPoint num="5" id="2270" />
-<TGConnectingPoint num="6" id="2271" />
-<TGConnectingPoint num="7" id="2272" />
+<cdrectangleparam minX="0" maxX="-5" minY="0" maxY="86" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::KeyManager_ECUN" />
+<TGConnectingPoint num="0" id="3834" />
+<TGConnectingPoint num="1" id="3835" />
+<TGConnectingPoint num="2" id="3836" />
+<TGConnectingPoint num="3" id="3837" />
+<TGConnectingPoint num="4" id="3838" />
+<TGConnectingPoint num="5" id="3839" />
+<TGConnectingPoint num="6" id="3840" />
+<TGConnectingPoint num="7" id="3841" />
 <extraparam>
-<info value="KDP Perf Design_Sec::CTP_ECUN" taskName="CTP_ECUN" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+<info value="KDP Perf Design_Sec::KeyManager_ECUN" taskName="KeyManager_ECUN" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="2282" >
-<father id="2307" num="1" />
-<cdparam x="913" y="930" />
-<sizeparam width="271" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3851" >
+<father id="3876" num="1" />
+<cdparam x="934" y="973" />
+<sizeparam width="235" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="12" minY="0" maxY="86" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::KeyManager_ECUN" />
-<TGConnectingPoint num="0" id="2274" />
-<TGConnectingPoint num="1" id="2275" />
-<TGConnectingPoint num="2" id="2276" />
-<TGConnectingPoint num="3" id="2277" />
-<TGConnectingPoint num="4" id="2278" />
-<TGConnectingPoint num="5" id="2279" />
-<TGConnectingPoint num="6" id="2280" />
-<TGConnectingPoint num="7" id="2281" />
+<cdrectangleparam minX="0" maxX="48" minY="0" maxY="86" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::CTP_ECUN" />
+<TGConnectingPoint num="0" id="3843" />
+<TGConnectingPoint num="1" id="3844" />
+<TGConnectingPoint num="2" id="3845" />
+<TGConnectingPoint num="3" id="3846" />
+<TGConnectingPoint num="4" id="3847" />
+<TGConnectingPoint num="5" id="3848" />
+<TGConnectingPoint num="6" id="3849" />
+<TGConnectingPoint num="7" id="3850" />
 <extraparam>
-<info value="KDP Perf Design_Sec::KeyManager_ECUN" taskName="KeyManager_ECUN" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+<info value="KDP Perf Design_Sec::CTP_ECUN" taskName="CTP_ECUN" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1100" id="2341" >
+<COMPONENT type="1100" id="3910" >
 <cdparam x="895" y="769" />
 <sizeparam width="234" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="1900" />
 <infoparam name="HSM_ECUN" value="name" />
-<TGConnectingPoint num="0" id="2317" />
-<TGConnectingPoint num="1" id="2318" />
-<TGConnectingPoint num="2" id="2319" />
-<TGConnectingPoint num="3" id="2320" />
-<TGConnectingPoint num="4" id="2321" />
-<TGConnectingPoint num="5" id="2322" />
-<TGConnectingPoint num="6" id="2323" />
-<TGConnectingPoint num="7" id="2324" />
-<TGConnectingPoint num="8" id="2325" />
-<TGConnectingPoint num="9" id="2326" />
-<TGConnectingPoint num="10" id="2327" />
-<TGConnectingPoint num="11" id="2328" />
-<TGConnectingPoint num="12" id="2329" />
-<TGConnectingPoint num="13" id="2330" />
-<TGConnectingPoint num="14" id="2331" />
-<TGConnectingPoint num="15" id="2332" />
-<TGConnectingPoint num="16" id="2333" />
-<TGConnectingPoint num="17" id="2334" />
-<TGConnectingPoint num="18" id="2335" />
-<TGConnectingPoint num="19" id="2336" />
-<TGConnectingPoint num="20" id="2337" />
-<TGConnectingPoint num="21" id="2338" />
-<TGConnectingPoint num="22" id="2339" />
-<TGConnectingPoint num="23" id="2340" />
+<TGConnectingPoint num="0" id="3886" />
+<TGConnectingPoint num="1" id="3887" />
+<TGConnectingPoint num="2" id="3888" />
+<TGConnectingPoint num="3" id="3889" />
+<TGConnectingPoint num="4" id="3890" />
+<TGConnectingPoint num="5" id="3891" />
+<TGConnectingPoint num="6" id="3892" />
+<TGConnectingPoint num="7" id="3893" />
+<TGConnectingPoint num="8" id="3894" />
+<TGConnectingPoint num="9" id="3895" />
+<TGConnectingPoint num="10" id="3896" />
+<TGConnectingPoint num="11" id="3897" />
+<TGConnectingPoint num="12" id="3898" />
+<TGConnectingPoint num="13" id="3899" />
+<TGConnectingPoint num="14" id="3900" />
+<TGConnectingPoint num="15" id="3901" />
+<TGConnectingPoint num="16" id="3902" />
+<TGConnectingPoint num="17" id="3903" />
+<TGConnectingPoint num="18" id="3904" />
+<TGConnectingPoint num="19" id="3905" />
+<TGConnectingPoint num="20" id="3906" />
+<TGConnectingPoint num="21" id="3907" />
+<TGConnectingPoint num="22" id="3908" />
+<TGConnectingPoint num="23" id="3909" />
 <extraparam>
 <info stereotype="CPURRPB" nodeName="HSM_ECUN" />
-<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0"/>
+<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="2316" >
-<father id="2341" num="0" />
-<cdparam x="900" y="817" />
-<sizeparam width="225" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="3885" >
+<father id="3910" num="0" />
+<cdparam x="890" y="817" />
+<sizeparam width="239" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="9" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="-5" minY="0" maxY="60" />
 <infoparam name="TGComponent" value="KDP Perf Design_Sec::HSM_ECUN" />
-<TGConnectingPoint num="0" id="2308" />
-<TGConnectingPoint num="1" id="2309" />
-<TGConnectingPoint num="2" id="2310" />
-<TGConnectingPoint num="3" id="2311" />
-<TGConnectingPoint num="4" id="2312" />
-<TGConnectingPoint num="5" id="2313" />
-<TGConnectingPoint num="6" id="2314" />
-<TGConnectingPoint num="7" id="2315" />
+<TGConnectingPoint num="0" id="3877" />
+<TGConnectingPoint num="1" id="3878" />
+<TGConnectingPoint num="2" id="3879" />
+<TGConnectingPoint num="3" id="3880" />
+<TGConnectingPoint num="4" id="3881" />
+<TGConnectingPoint num="5" id="3882" />
+<TGConnectingPoint num="6" id="3883" />
+<TGConnectingPoint num="7" id="3884" />
 <extraparam>
 <info value="KDP Perf Design_Sec::HSM_ECUN" taskName="HSM_ECUN" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="125" id="2342" >
+<CONNECTOR type="125" id="3911" >
 <cdparam x="1166" y="557" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU_Sink to MainCAN" value="{info}" />
-<P1  x="700" y="553" id="1776" />
-<P2  x="700" y="533" id="1866" />
+<P1  x="700" y="553" id="3345" />
+<P2  x="700" y="533" id="3435" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="2343" >
+<CONNECTOR type="125" id="3912" >
 <cdparam x="545" y="515" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU0 to MainCAN" value="{info}" />
-<P1  x="818" y="393" id="1815" />
-<P2  x="818" y="410" id="1853" />
+<P1  x="818" y="393" id="3384" />
+<P2  x="818" y="410" id="3422" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="2345" >
+<CONNECTOR type="125" id="3914" >
 <cdparam x="1269" y="398" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from BridgeECUN to MainCAN" value="{info}" />
-<P1  x="1127" y="617" id="2191" />
-<P2  x="1055" y="533" id="1859" />
+<P1  x="1127" y="617" id="3760" />
+<P2  x="1055" y="533" id="3428" />
 <Point x="1127" y="533" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="2344" >
-<father id="2345" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3913" >
+<father id="3914" num="0" />
 <cdparam x="1127" y="533" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -11285,19 +11524,20 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="125" id="2347" >
+<CONNECTOR type="125" id="3916" >
 <cdparam x="462" y="724" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Bridge0 to MainCAN" value="{info}" />
-<P1  x="542" y="726" id="2047" />
-<P2  x="582" y="533" id="1857" />
+<P1  x="542" y="726" id="3616" />
+<P2  x="582" y="533" id="3426" />
 <Point x="542" y="533" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="2346" >
-<father id="2347" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3915" >
+<father id="3916" num="0" />
 <cdparam x="542" y="533" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -11305,41 +11545,44 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="125" id="2348" >
+<CONNECTOR type="125" id="3917" >
 <cdparam x="545" y="429" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Bridge0 to MainCAN" value="{info}" />
-<P1  x="545" y="385" id="1883" />
-<P2  x="582" y="410" id="1852" />
+<P1  x="545" y="385" id="3452" />
+<P2  x="582" y="410" id="3421" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="2349" >
+<CONNECTOR type="125" id="3918" >
 <cdparam x="641" y="319" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Bridge0 to Bus0" value="{info}" />
-<P1  x="504" y="326" id="1885" />
-<P2  x="504" y="256" id="1941" />
+<P1  x="504" y="326" id="3454" />
+<P2  x="504" y="256" id="3510" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="2351" >
+<CONNECTOR type="125" id="3920" >
 <cdparam x="599" y="312" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Memory0 to Bus0" value="{info}" />
-<P1  x="985" y="270" id="1902" />
-<P2  x="672" y="256" id="1934" />
+<P1  x="985" y="270" id="3471" />
+<P2  x="672" y="256" id="3503" />
 <Point x="672" y="270" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="2350" >
-<father id="2351" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3919" >
+<father id="3920" num="0" />
 <cdparam x="672" y="270" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -11347,107 +11590,116 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="125" id="2352" >
+<CONNECTOR type="125" id="3921" >
 <cdparam x="791" y="235" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU0_ECU1 to Bus0" value="{info}" />
-<P1  x="757" y="203" id="1991" />
-<P2  x="672" y="231" id="1931" />
+<P1  x="757" y="203" id="3560" />
+<P2  x="672" y="231" id="3500" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="2353" >
+<CONNECTOR type="125" id="3922" >
 <cdparam x="591" y="197" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from HSM_ECU1 to Bus0" value="{info}" />
-<P1  x="560" y="187" id="2019" />
-<P2  x="560" y="206" id="1928" />
+<P1  x="560" y="187" id="3588" />
+<P2  x="560" y="206" id="3497" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="2354" >
+<CONNECTOR type="125" id="3923" >
 <cdparam x="1004" y="1041" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Bridge0 to Bus0" value="{info}" />
-<P1  x="478" y="726" id="2046" />
-<P2  x="648" y="817" id="2088" />
+<P1  x="478" y="726" id="3615" />
+<P2  x="648" y="817" id="3657" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="2355" >
+<CONNECTOR type="125" id="3924" >
 <cdparam x="800" y="997" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Memory0 to Bus0" value="{info}" />
-<P1  x="608" y="850" id="2067" />
-<P2  x="648" y="850" id="2091" />
+<P1  x="608" y="850" id="3636" />
+<P2  x="648" y="850" id="3660" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="2356" >
+<CONNECTOR type="125" id="3925" >
 <cdparam x="992" y="920" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU0_ECU1 to Bus0" value="{info}" />
-<P1  x="692" y="905" id="2140" />
-<P2  x="692" y="884" id="2102" />
+<P1  x="692" y="905" id="3709" />
+<P2  x="692" y="884" id="3671" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="2357" >
+<CONNECTOR type="125" id="3926" >
 <cdparam x="792" y="882" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from HSM_ECU1 to Bus0" value="{info}" />
-<P1  x="746" y="790" id="2171" />
-<P2  x="692" y="817" id="2096" />
+<P1  x="746" y="790" id="3740" />
+<P2  x="692" y="817" id="3665" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="2358" >
+<CONNECTOR type="125" id="3927" >
 <cdparam x="1657" y="831" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Bridge0 to Bus0" value="{info}" />
-<P1  x="1127" y="667" id="2196" />
-<P2  x="1122" y="678" id="2241" />
+<P1  x="1127" y="667" id="3765" />
+<P2  x="1122" y="678" id="3810" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="2359" >
+<CONNECTOR type="125" id="3928" >
 <cdparam x="1453" y="787" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Memory0 to Bus0" value="{info}" />
-<P1  x="950" y="615" id="2216" />
-<P2  x="1036" y="678" id="2240" />
+<P1  x="950" y="615" id="3785" />
+<P2  x="1036" y="678" id="3809" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="2361" >
+<CONNECTOR type="125" id="3930" >
 <cdparam x="1645" y="710" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU0_ECU1 to Bus0" value="{info}" />
-<P1  x="1119" y="892" id="2292" />
-<P2  x="1165" y="728" id="2255" />
+<P1  x="1119" y="892" id="3861" />
+<P2  x="1165" y="728" id="3824" />
 <Point x="1165" y="865" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="2360" >
-<father id="2361" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3929" >
+<father id="3930" num="0" />
 <cdparam x="1165" y="865" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -11455,15 +11707,16 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="125" id="2362" >
+<CONNECTOR type="125" id="3931" >
 <cdparam x="1445" y="672" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from HSM_ECU1 to Bus0" value="{info}" />
-<P1  x="1012" y="769" id="2318" />
-<P2  x="1079" y="728" id="2254" />
+<P1  x="1012" y="769" id="3887" />
+<P2  x="1079" y="728" id="3823" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
+<spy value="false" />
 </extraparam>
 </CONNECTOR>
 
diff --git a/src/main/java/ui/ActionPerformer.java b/src/main/java/ui/ActionPerformer.java
index e9c1902c1b0147b80e53b12aafa1dc9e8565b422..4702368736bc4605a924a50162ac7007f234f96e 100755
--- a/src/main/java/ui/ActionPerformer.java
+++ b/src/main/java/ui/ActionPerformer.java
@@ -407,6 +407,8 @@ public class ActionPerformer {
             mgui.actionOnButton(TGComponentManager.EDIT, -1);
         } else if (command.equals(mgui.actions[TGUIAction.ARD_REQUIREMENT].getActionCommand())) {
             mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARRD_REQUIREMENT);
+        } else if (command.equals(mgui.actions[TGUIAction.ARD_REQUIREMENT_REFERENCE].getActionCommand())) {
+            mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARRD_REQUIREMENT_REFERENCE);
         } else if (command.equals(mgui.actions[TGUIAction.ARD_PROPERTY].getActionCommand())) {
             mgui.actionOnButton(TGComponentManager.COMPONENT, TGComponentManager.AVATARRD_PROPERTY);
         } else if (command.equals(mgui.actions[TGUIAction.ARD_ELEMENT_REFERENCE].getActionCommand())) {
diff --git a/src/main/java/ui/TGComponentManager.java b/src/main/java/ui/TGComponentManager.java
index ec6614eb3cb601504c9d23f1f42bab0e3453231f..7a33ea811752f48b38b49639d6fc96629c7c77cf 100755
--- a/src/main/java/ui/TGComponentManager.java
+++ b/src/main/java/ui/TGComponentManager.java
@@ -410,6 +410,7 @@ public class TGComponentManager {
 
     // AVATAR RD -> starts at 5200
     public static final int AVATARRD_REQUIREMENT = 5200;
+    public static final int AVATARRD_REQUIREMENT_REFERENCE = 5208;
     public static final int AVATARRD_PROPERTY = 5201;
     public static final int AVATARRD_ELEMENT_REFERENCE = 5207;
     public static final int AVATARRD_DERIVE_CONNECTOR = 5202;
@@ -419,6 +420,7 @@ public class TGComponentManager {
     public static final int AVATARRD_COPY_CONNECTOR = 5204;
     public static final int AVATARRD_COMPOSITION_CONNECTOR = 5205;
 
+
     // AVATAR AMD -> starts at 5250
     public static final int AVATARMAD_ASSUMPTION = 5250;
     public static final int AVATARMAD_DIAGRAM_REFERENCE = 5251;
@@ -590,6 +592,9 @@ public class TGComponentManager {
             case AVATARRD_REQUIREMENT:
                 tgc = new AvatarRDRequirement(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
                 break;
+            case AVATARRD_REQUIREMENT_REFERENCE:
+                tgc = new AvatarRDRequirementReference(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
+                break;
             case AVATARRD_PROPERTY:
                 tgc = new AvatarRDProperty(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp);
                 break;
@@ -1551,6 +1556,8 @@ public class TGComponentManager {
             // AVATAR RD
         } else if (tgc instanceof AvatarRDRequirement) {
             return AVATARRD_REQUIREMENT;
+        } else if (tgc instanceof AvatarRDRequirementReference) {
+            return AVATARRD_REQUIREMENT_REFERENCE;
         } else if (tgc instanceof AvatarRDProperty) {
             return AVATARRD_PROPERTY;
         } else if (tgc instanceof AvatarRDElementReference) {
diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java
index c0a62c99ca98ae2eeb76c07a916beee33a5901a3..0bb1fa7f336b2bfb6e81086d92f808150e77ee10 100755
--- a/src/main/java/ui/TGUIAction.java
+++ b/src/main/java/ui/TGUIAction.java
@@ -416,6 +416,7 @@ public class TGUIAction extends AbstractAction {
     public static final int ARD_SATISFY_CONNECTOR = 422;
     public static final int ARD_COPY_CONNECTOR = 305;
     public static final int ARD_COMPOSITION_CONNECTOR = 306;
+    public static final int ARD_REQUIREMENT_REFERENCE = 481;
 
     // AVATAR Assumptions
     public static final int AMAD_EDIT = 370;
@@ -636,7 +637,7 @@ public class TGUIAction extends AbstractAction {
     public static final int MOVE_ENABLED = 463;
     public static final int FIRST_DIAGRAM = 464;
     
-    public static final int NB_ACTION = 481;
+    public static final int NB_ACTION = 482;
 
     private static final TAction [] actions = new TAction[NB_ACTION];
 
@@ -1259,6 +1260,7 @@ public class TGUIAction extends AbstractAction {
         // AVATAR Requirement Diagrams
         actions[ARD_EDIT] = new TAction("edit-ard-diagram", "Edit Requirement Diagram", IconManager.imgic100, IconManager.imgic101, "Edit Requirement Diagram", "Make it possible to edit the currently opened Requirement Diagram", 0);
         actions[ARD_REQUIREMENT] = new TAction("add-ard-requirement", "Add a requirement", IconManager.imgic5006, IconManager.imgic5006, "Requirement", "Add a requirement to the currently opened requirement diagram", 0);
+        actions[ARD_REQUIREMENT_REFERENCE] = new TAction("add-ard-requirement-reference", "Add a reference to a requirement", IconManager.imgic5074, IconManager.imgic5074, "Requirement Reference", "Add a requirement reference to the currently opened requirement diagram", 0);
         actions[ARD_PROPERTY] = new TAction("add-ard-property", "Add a property", IconManager.imgic5008, IconManager.imgic5008, "Property", "Add a reference to a property of the currently opened requirement diagram", 0);
         actions[ARD_ELEMENT_REFERENCE] = new TAction("add-ard-element-reference", "Add a reference to an element", IconManager.imgic5068, IconManager.imgic5068, "Element Reference", "Add a reference to an element of the currently opened requirement diagram", 0);
         actions[ARD_DERIVE_CONNECTOR] = new TAction("add-ard-derive", "Add a <<deriveReqt>> link", IconManager.imgic1008, IconManager.imgic1008, "DeriveReqt", "Add a <<deriveReqt>> link between two requirements of the currently opened requirement diagram", 0);
diff --git a/src/main/java/ui/avatarrd/AvatarRDRequirement.java b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
index 77da73244b12411900a0c08604f7a4d62316a8ad..ba50524829ed64545c0350423be4cfdd07eeff80 100755
--- a/src/main/java/ui/avatarrd/AvatarRDRequirement.java
+++ b/src/main/java/ui/avatarrd/AvatarRDRequirement.java
@@ -860,6 +860,10 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
         return text;
     }
 
+    public String[] getTexts() {
+        return texts;
+    }
+
     public String getID() {
         return id;
     }
@@ -1141,4 +1145,19 @@ public class AvatarRDRequirement extends TGCScalableWithInternalComponent implem
         return s;
     }
 
+
+    // For references
+    public Color getTopColor() {
+        return REQ_TYPE_COLOR.get(reqType);
+    }
+
+    public ArrayList<String> getExtraParamIDs() {
+        return extraParamIDs;
+    }
+
+    public ArrayList<String> getExtraParamValues() {
+        return extraParamValues;
+    }
+
+
 }
diff --git a/src/main/java/ui/avatarrd/AvatarRDRequirementReference.java b/src/main/java/ui/avatarrd/AvatarRDRequirementReference.java
new file mode 100755
index 0000000000000000000000000000000000000000..c4373cbbfc681a813483a2c68a075212cd5c8c60
--- /dev/null
+++ b/src/main/java/ui/avatarrd/AvatarRDRequirementReference.java
@@ -0,0 +1,681 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * 
+ * ludovic.apvrille AT enst.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+
+package ui.avatarrd;
+
+
+import myutil.Conversion;
+import myutil.GraphicLib;
+import myutil.TraceManager;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import ui.*;
+import ui.util.IconManager;
+import ui.window.JDialogChoiceSelection;
+import ui.window.JDialogIDAndStereotype;
+import ui.window.JDialogRequirement;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+
+/**
+ * Class AvatarRDRequirementReference
+ * Avatar requirement reference: to be used in requirement diagram of AVATAR
+ * Creation: 13/07/2018
+ *
+ * @author Ludovic APVRILLE
+ * @version 1.0 13/07/2018
+ */
+public class AvatarRDRequirementReference extends TGCScalableWithInternalComponent implements WithAttributes /*, TGAutoAdjust*/ {
+    public static int SIZE_LIMIT = 35;
+    public static String  DEFAULT_REF = "UnsetReference";
+
+    public String oldValue;
+    protected int textX = 5;
+    protected int textY = 22;
+    protected int lineHeight = 30;
+    private double dlineHeight = 0.0;
+    //protected int reqType = 0;
+    // 0: normal, 1: formal, 2: security
+    //protected int startFontSize = 10;
+    protected Graphics graphics;
+    //protected int iconSize = 30;
+
+    private Font myFont, myFontB;
+    // private int maxFontSize = 30;
+    private int minFontSize = 4;
+    private int currentFontSize = -1;
+    private boolean displayText = true;
+
+    private AvatarRDRequirement reference;
+
+
+    // Icon
+    private int iconSize = 18;
+    //   private boolean iconIsDrawn = false;
+
+    public AvatarRDRequirementReference(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp) {
+        super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
+
+        initScaling(200, 120);
+        oldScaleFactor = tdp.getZoom();
+        dlineHeight = lineHeight * oldScaleFactor;
+        lineHeight = (int) dlineHeight;
+        dlineHeight = dlineHeight - lineHeight;
+
+        minWidth = 1;
+        minHeight = lineHeight;
+
+        nbConnectingPoint = 40;
+        connectingPoint = new TGConnectingPoint[nbConnectingPoint];
+        connectingPoint[0] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.0, 0.25, TGConnectingPoint.WEST);
+        connectingPoint[1] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.0, 0.5, TGConnectingPoint.WEST);
+        connectingPoint[2] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.0, 0.75, TGConnectingPoint.WEST);
+        connectingPoint[3] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 1.0, 0.25, TGConnectingPoint.EAST);
+        connectingPoint[4] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 1.0, 0.5, TGConnectingPoint.EAST);
+        connectingPoint[5] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 1.0, 0.75, TGConnectingPoint.EAST);
+        connectingPoint[6] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.25, 0.0, TGConnectingPoint.NORTH);
+        connectingPoint[7] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.5, 0.0, TGConnectingPoint.NORTH);
+        connectingPoint[8] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.75, 0.0, TGConnectingPoint.NORTH);
+        connectingPoint[9] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.25, 1.0, TGConnectingPoint.SOUTH);
+        connectingPoint[10] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.5, 1.0, TGConnectingPoint.SOUTH);
+        connectingPoint[11] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.75, 1.0, TGConnectingPoint.SOUTH);
+        connectingPoint[12] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.0, 0.25, TGConnectingPoint.WEST);
+        connectingPoint[13] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.0, 0.5, TGConnectingPoint.WEST);
+        connectingPoint[14] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.0, 0.75, TGConnectingPoint.WEST);
+        connectingPoint[15] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 1.0, 0.25, TGConnectingPoint.EAST);
+        connectingPoint[16] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 1.0, 0.5, TGConnectingPoint.EAST);
+        connectingPoint[17] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 1.0, 0.75, TGConnectingPoint.EAST);
+        connectingPoint[18] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.25, 0.0, TGConnectingPoint.NORTH);
+        connectingPoint[19] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.5, 0.0, TGConnectingPoint.NORTH);
+        connectingPoint[20] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.75, 0.0, TGConnectingPoint.NORTH);
+        connectingPoint[21] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.25, 1.0, TGConnectingPoint.SOUTH);
+        connectingPoint[22] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.5, 1.0, TGConnectingPoint.SOUTH);
+        connectingPoint[23] = new AvatarRDConnectingPointVerify(this, 0, 0, true, false, 0.75, 1.0, TGConnectingPoint.SOUTH);
+        connectingPoint[24] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.5, 1.0, TGConnectingPoint.SOUTH);
+        connectingPoint[25] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.5, 1.0, TGConnectingPoint.SOUTH);
+        connectingPoint[26] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.5, 1.0, TGConnectingPoint.SOUTH);
+        connectingPoint[27] = new AvatarRDConnectingPointDerive(this, 0, 0, true, true, 0.5, 1.0, TGConnectingPoint.SOUTH);
+        int i = 28;
+        connectingPoint[0 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.0, 0.25);
+        connectingPoint[1 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.0, 0.5);
+        connectingPoint[2 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.0, 0.75);
+        connectingPoint[3 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 1.0, 0.25);
+        connectingPoint[4 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 1.0, 0.5);
+        connectingPoint[5 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 1.0, 0.75);
+        connectingPoint[6 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.25, 0.0);
+        connectingPoint[7 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.5, 0.0);
+        connectingPoint[8 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.75, 0.0);
+        connectingPoint[9 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.25, 1.0);
+        connectingPoint[10 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.5, 1.0);
+        connectingPoint[11 + i] = new AvatarRDConnectingPointSatisfy(this, 0, 0, true, false, 0.75, 1.0);
+
+        addTGConnectingPointsCommentTop();
+
+        nbInternalTGComponent = 0;
+        //tgcomponent = new TGComponent[nbInternalTGComponent];
+
+//        int h = 1;
+        //TAttributeRequirement tgc0;
+        //tgc0 = new TAttributeRequirement(x, y+height+h, 0, 0, height + h, height+h, true, this, _tdp);
+        //tgcomponent[0] = tgc0;
+
+        moveable = true;
+        editable = true;
+        removable = true;
+        userResizable = true;
+        multieditable = true;
+
+        //reqType = 0;
+
+        value = DEFAULT_REF;
+
+        oldValue = value;
+
+        myImageIcon = IconManager.imgic5074;
+
+    }
+
+    public void internalDrawing(Graphics g) {
+        Font f = g.getFont();
+        //    Font fold = f;
+        //  int w, c;
+        int size;
+
+
+        if ((reference == null) && (value.compareTo(DEFAULT_REF) != 0)) {
+            ArrayList<TGComponent> comps = tdp.getMainGUI().getAllRequirements();
+            String tdpName = getTDPName();
+            String reqName = getRequirementName();
+            for(TGComponent tgc: comps) {
+                if (tgc instanceof AvatarRDRequirement) {
+                    AvatarRDRequirement req = (AvatarRDRequirement)tgc;
+                    if (req.getTDiagramPanel().getName().compareTo(tdpName) == 0) {
+                        if (req.getRequirementName().compareTo(reqName) == 0) {
+                            reference = req;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (!tdp.isScaled()) {
+            graphics = g;
+        }
+
+        if (((rescaled) && (!tdp.isScaled())) || myFont == null) {
+            currentFontSize = tdp.getFontSize();
+            //
+            myFont = f.deriveFont((float) currentFontSize);
+            myFontB = myFont.deriveFont(Font.BOLD);
+
+            if (rescaled) {
+                rescaled = false;
+            }
+        }
+
+        displayText = currentFontSize >= minFontSize;
+
+        //   int h  = g.getFontMetrics().getHeight();
+
+        g.drawRect(x, y, width, height);
+
+        g.drawLine(x, y + lineHeight, x + width, y + lineHeight);
+        Color topColor = null;
+        if (reference != null) {
+            topColor = reference.getTopColor();
+        }
+        if (topColor == null) {
+            //TraceManager.addDev("Swithing back to default Color for:" + REQ_TYPE_STR.get(reqType));
+            topColor = ColorManager.AVATAR_REQUIREMENT_TOP;
+        } else {
+            //TraceManager.addDev("Using color: " + topColor.getRGB() + "for  " +REQ_TYPE_STR.get(reqType));
+        }
+        g.setColor(topColor);
+        g.fillRect(x + 1, y + 1, width - 1, lineHeight - 1);
+        g.setColor(ColorManager.AVATAR_REQUIREMENT_ATTRIBUTES);
+        g.fillRect(x + 1, y + 1 + lineHeight, width - 1, height - 1 - lineHeight);
+        ColorManager.setColor(g, getState(), 0);
+        if ((lineHeight > 23) && (width > 23)) {
+            g.drawImage(IconManager.img5100, x + width - iconSize + 1, y + 3, Color.yellow, null);
+        }
+
+        if (displayText) {
+            size = currentFontSize - 2;
+            g.setFont(myFont.deriveFont((float) (myFont.getSize() - 2)));
+
+            String req = "RefToRequirement";
+            /*if (reference != null) {
+                req = AvatarRDRequirement.REQ_TYPE_STR.get(reference.getRequirementType());
+            }*/
+            drawLimitedString(g, "<<" + req + ">>", x, y + size, width, 1);
+
+            size += currentFontSize;
+            g.setFont(myFontB);
+            //  w = g.getFontMetrics().stringWidth(value);
+            drawLimitedString(g, value, x, y + size, width, 1);
+
+        }
+
+        if (reference != null) {
+            if (reference.isVerified()) {
+                if (reference.isSatisfied()) {
+                    Color tmp = g.getColor();
+                    GraphicLib.setMediumStroke(g);
+                    g.setColor(Color.green);
+                    g.drawLine(x + width - 2, y - 6 + lineHeight, x + width - 6, y - 2 + lineHeight);
+                    g.drawLine(x + width - 6, y - 3 + lineHeight, x + width - 8, y - 6 + lineHeight);
+                    g.setColor(tmp);
+                    GraphicLib.setNormalStroke(g);
+                } else {
+                    //g.drawString("acc", x + width - 10, y+height-10);
+                    Color tmp = g.getColor();
+                    GraphicLib.setMediumStroke(g);
+                    g.setColor(Color.red);
+                    g.drawLine(x + width - 2, y - 2 + lineHeight, x + width - 8, y - 8 + lineHeight);
+                    g.drawLine(x + width - 8, y - 2 + lineHeight, x + width - 2, y - 8 + lineHeight);
+                    g.setColor(tmp);
+                    GraphicLib.setNormalStroke(g);
+                }
+            }
+
+            g.setFont(myFont);
+            String texti = "Text";
+            String s;
+            int i;
+            size = lineHeight + currentFontSize;
+
+            //ID
+            if (size < (height - 2)) {
+                drawLimitedString(g, "ID=" + reference.getID(), x + textX, y + size, width, 0);
+            }
+            size += currentFontSize;
+
+            //text
+            for (i = 0; i < reference.getTexts().length; i++) {
+                if (size < (height - 2)) {
+                    s = reference.getTexts()[i];
+                    if (i == 0) {
+                        s = texti + "=\"" + s;
+                    }
+                    if (i == (reference.getTexts().length - 1)) {
+                        s = s + "\"";
+                    }
+                    drawLimitedString(g, s, x + textX, y + size, width, 0);
+                }
+                size += currentFontSize;
+
+            }
+            // Type and risk
+            if (size < (height - 2)) {
+                drawLimitedString(g, "Kind=\"" + reference.getKind() + "\"", x + textX, y + size, width, 0);
+                size += currentFontSize;
+                if (size < (height - 2)) {
+                    drawLimitedString(g, "Risk=\"" + reference.getCriticality() + "\"", x + textX, y + size, width, 0);
+                    size += currentFontSize;
+                    if (size < (height - 2)) {
+
+                        drawLimitedString(g, "Reference elements=\"" + reference.getReferenceElements() + "\"", x + textX, y + size, width, 0);
+                        size += currentFontSize;
+
+                        if (size < (height - 2)) {
+
+                            if (reference.getRequirementType() == AvatarRDRequirement.SECURITY_REQ) {
+                                drawLimitedString(g, "Targeted attacks=\"" + reference.getAttackTreeNode() + "\"", x + textX, y + size, width, 0);
+                                size += currentFontSize;
+                            }
+
+                            if (reference.getRequirementType() == AvatarRDRequirement.SAFETY_REQ) {
+                                drawLimitedString(g, "State violating req.=\"" + reference.getViolatedAction() + "\"", x + textX, y + size, width, 0);
+                                size += currentFontSize;
+                            }
+                        }
+                    }
+                }
+            }
+
+            // Extra attributes
+            for (i = 0; i < reference.getExtraParamIDs().size(); i++) {
+                if (size < (height - 2)) {
+                    s = reference.getExtraParamIDs().get(i) + ":" + reference.getExtraParamValues().get(i);
+                    drawLimitedString(g, s, x + textX, y + size, width, 0);
+                }
+                size += currentFontSize;
+
+            }
+        }
+
+        g.setFont(f);
+    }
+
+    public boolean editOndoubleClick(JFrame frame, int _x, int _y) {
+        ArrayList<TGComponent> comps = tdp.getMainGUI().getAllRequirements();
+        ArrayList<String> allRequirements = new ArrayList<>(comps.size());
+        ArrayList<AvatarRDRequirement> realComps = new ArrayList<>(comps.size());
+        allRequirements.add(DEFAULT_REF);
+        realComps.add(null);
+        int currentIndex = 0;
+        for(TGComponent tgc: comps) {
+            if (tgc instanceof AvatarRDRequirement) {
+                AvatarRDRequirement req = (AvatarRDRequirement)tgc;
+                realComps.add(req);
+                String name = tgc.getTDiagramPanel().getName() + "::" + req.getRequirementName();
+                if (name.compareTo(value) == 0) {
+                    currentIndex = allRequirements.size();
+                }
+                allRequirements.add(name);
+
+            }
+        }
+        String[] tabAllRequirements = allRequirements.toArray(new String[0]);
+        JDialogChoiceSelection jdcs = new JDialogChoiceSelection(tdp.getGUI().getFrame(), "Setting Reference to a Requirement ",
+                tabAllRequirements, currentIndex);
+        // jdr.setSize(750, 400);
+        GraphicLib.centerOnParent(jdcs, 500, 150);
+        jdcs.setVisible(true);
+
+        if (jdcs.hasBeenCancelled()) {
+            return false;
+        }
+
+        currentIndex = jdcs.getIndexOfSelectedElement();
+        value = tabAllRequirements[currentIndex];
+        reference = realComps.get(currentIndex);
+
+        return true;
+
+
+    }
+
+
+
+    public void rescale(double scaleFactor) {
+        dlineHeight = (lineHeight + dlineHeight) / oldScaleFactor * scaleFactor;
+        lineHeight = (int) (dlineHeight);
+        dlineHeight = dlineHeight - lineHeight;
+
+        minHeight = lineHeight;
+
+        super.rescale(scaleFactor);
+    }
+
+
+    public TGComponent isOnOnlyMe(int x1, int y1) {
+        if (GraphicLib.isInRectangle(x1, y1, x, y, width, height)) {
+            return this;
+        }
+        return null;
+    }
+
+    public String getRequirementReference() {
+        return value;
+    }
+
+
+
+    public String getAttributes() {
+        if (reference == null) {
+            return "";
+        }
+        String attr = "ID=" + reference.getID() + "\n";
+        attr += "Text= " + reference.getText() + "\n";
+        attr += "Kind= " + reference.getKind() + "\n";
+        attr += "Risk= " + reference.getCriticality() + "\n";
+        attr += "References= " + reference.getReferenceElements() + "\n";
+        if (reference.getRequirementType() == AvatarRDRequirement.SAFETY_REQ) {
+            attr += "Violated action= " + reference.getViolatedAction() + "\n";
+        }
+        if (reference.getRequirementType() == AvatarRDRequirement.SECURITY_REQ) {
+            attr += "Attack tree node(s)= " + reference.getAttackTreeNode() + "\n";
+        }
+        for(int i=0; i<reference.getExtraParamIDs().size(); i++) {
+            attr += reference.getExtraParamIDs().get(i) + ": " + reference.getExtraParamValues().get(i) + "\n";
+        }
+
+        return attr;
+    }
+
+
+    public String getTDPName() {
+        int index = value.indexOf("::");
+        if (index == -1) {
+            return null;
+        }
+        return value.substring(0, index);
+    }
+
+    public String getRequirementName() {
+        int index = value.indexOf("::");
+        if (index == -1) {
+            return null;
+        }
+        return value.substring(index+2, value.length());
+    }
+
+
+
+    public int getType() {
+        return TGComponentManager.AVATARRD_REQUIREMENT_REFERENCE;
+    }
+
+
+    /*public void autoAdjust(int mode) {
+        //
+
+        if (graphics == null) {
+            return;
+        }
+
+        Font f = graphics.getFont();
+        Font f0 = f.deriveFont((float) currentFontSize);
+        Font f1 = f0.deriveFont(Font.BOLD);
+        Font f2 = f.deriveFont((float) (currentFontSize - 2));
+
+        // Must find for both modes which width is desirable
+        String s0, s1;
+        s0 = "<<" + REQ_TYPE_STR.get(reqType) + ">>";
+        s1 = "Text=";
+
+        graphics.setFont(f2);
+        int w0 = graphics.getFontMetrics().stringWidth(s0);
+        graphics.setFont(f1);
+        int w1 = graphics.getFontMetrics().stringWidth(value);
+        int w2 = Math.max(w0, w1) + (2 * iconSize);
+
+        graphics.setFont(f0);
+        int w3, w4 = w2;
+        int i;
+
+        if (texts.length == 1) {
+            w3 = graphics.getFontMetrics().stringWidth(s1 + "=\"" + texts[0] + "\"");
+            w4 = Math.max(w4, w3);
+        } else {
+            for (i = 0; i < texts.length; i++) {
+                if (i == 0) {
+                    w3 = graphics.getFontMetrics().stringWidth(s1 + "=\"" + texts[i]);
+                } else if (i == (texts.length - 1)) {
+                    w3 = graphics.getFontMetrics().stringWidth(texts[i] + "\"");
+                } else {
+                    w3 = graphics.getFontMetrics().stringWidth(texts[i]);
+                }
+
+                w4 = Math.max(w4, w3 + 2);
+            }
+        }
+        w3 = graphics.getFontMetrics().stringWidth("Kind=\"" + kind + "\"") + 2;
+        w4 = Math.max(w4, w3);
+        w3 = graphics.getFontMetrics().stringWidth("Risk=\"" + criticality + "\"") + 2;
+        w4 = Math.max(w4, w3);
+        w3 = graphics.getFontMetrics().stringWidth("ID=\"" + id + "\"") + 2;
+        w4 = Math.max(w4, w3);
+
+        if (mode == 1) {
+            resize(w4, lineHeight);
+            return;
+        }
+
+        int h;
+        if (mode == 2) {
+            h = ((texts.length + 4) * currentFontSize) + lineHeight;
+        } else {
+            h = ((texts.length + 5) * currentFontSize) + lineHeight;
+        }
+
+        resize(w4, h);
+
+    }*/
+
+    /*public ArrayList<AvatarRDProperty> getAllPropertiesVerified() {
+        AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+        return myPanel.getAllPropertiesVerify(this);
+    }
+
+    public String getStringOfAllPropertiesVerified() {
+        ArrayList<AvatarRDProperty> list = getAllPropertiesVerified();
+        String s = "";
+        for(int i=0; i<list.size(); i++) {
+            if (i>0) s+= " / ";
+            s += list.get(i).getValue();
+        }
+        return s;
+    }
+
+    public ArrayList<AvatarRDElementReference> getAllElementsSatisfied() {
+        AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+        return myPanel.getAllElementsSatified(this);
+    }
+
+    public String getStringOfAllElementsSatisfied() {
+        ArrayList<AvatarRDElementReference> list = getAllElementsSatisfied();
+        String s = "";
+        for(int i=0; i<list.size(); i++) {
+            if (i>0) s+= " / ";
+            s += list.get(i).getValue();
+        }
+        return s;
+    }
+
+    public ArrayList<AvatarRDRequirement> getAllImmediateSons() {
+        AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+        return myPanel.getAllImmediateSons(this);
+    }
+
+    public String getStringOfAllImmediateSons() {
+        ArrayList<AvatarRDRequirement> list = getAllImmediateSons();
+        String s = "";
+        for(int i=0; i<list.size(); i++) {
+            if (i>0) s+= " / ";
+            s += list.get(i).getValue();
+        }
+        return s;
+    }
+
+    public ArrayList<AvatarRDRequirement> getAllSons() {
+        AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+        return myPanel.getAllSons(this);
+    }
+
+    public String getStringOfAllSons() {
+        ArrayList<AvatarRDRequirement> list = getAllSons();
+        String s = "";
+        for(int i=0; i<list.size(); i++) {
+            if (i>0) s+= " / ";
+            s += list.get(i).getValue();
+        }
+        return s;
+    }
+
+    public ArrayList<AvatarRDRequirement> getAllImmediateFathers() {
+        AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+        return myPanel.getAllImmediateFathers(this);
+    }
+
+    public String getStringOfAllImmediateFathers() {
+        ArrayList<AvatarRDRequirement> list = getAllImmediateFathers();
+        String s = "";
+        for(int i=0; i<list.size(); i++) {
+            if (i>0) s+= " / ";
+            s += list.get(i).getValue();
+        }
+        return s;
+    }
+
+    public ArrayList<AvatarRDRequirement> getAllFathers() {
+        AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+        return myPanel.getAllFathers(this);
+    }
+
+    public String getStringOfAllFathers() {
+        ArrayList<AvatarRDRequirement> list = getAllFathers();
+        String s = "";
+        for(int i=0; i<list.size(); i++) {
+            if (i>0) s+= " / ";
+            s += list.get(i).getValue();
+        }
+        return s;
+    }
+
+    public ArrayList<AvatarRDRequirement> getAllMeRefineOrigin() {
+        AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+        return myPanel.getAllMeRefine(this, 0);
+    }
+
+    public String getStringAllMeRefineOrigin() {
+        ArrayList<AvatarRDRequirement> list = getAllMeRefineOrigin();
+        String s = "";
+        for(int i=0; i<list.size(); i++) {
+            if (i>0) s+= " / ";
+            s += list.get(i).getValue();
+        }
+        return s;
+    }
+
+    public ArrayList<AvatarRDRequirement> getAllMeRefineDestination() {
+        AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+        return myPanel.getAllMeRefine(this, 1);
+    }
+
+    public String getStringAllMeRefineDestination() {
+        ArrayList<AvatarRDRequirement> list = getAllMeRefineDestination();
+        String s = "";
+        for(int i=0; i<list.size(); i++) {
+            if (i>0) s+= " / ";
+            s += list.get(i).getValue();
+        }
+        return s;
+    }
+
+    public ArrayList<AvatarRDRequirement> getAllMeDeriveOrigin() {
+        AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+        return myPanel.getAllMeDerive(this, 0);
+    }
+
+    public String getStringAllMeDeriveOrigin() {
+        ArrayList<AvatarRDRequirement> list = getAllMeDeriveOrigin();
+        String s = "";
+        for(int i=0; i<list.size(); i++) {
+            if (i>0) s+= " / ";
+            s += list.get(i).getValue();
+        }
+        return s;
+    }
+
+    public ArrayList<AvatarRDRequirement> getAllMeDeriveDestination() {
+        AvatarRDPanel myPanel = (AvatarRDPanel)(getTDiagramPanel());
+        return myPanel.getAllMeDerive(this, 1);
+    }
+
+    public String getStringAllMeDeriveDestination() {
+        ArrayList<AvatarRDRequirement> list = getAllMeDeriveDestination();
+        String s = "";
+        for(int i=0; i<list.size(); i++) {
+            if (i>0) s+= " / ";
+            s += list.get(i).getValue();
+        }
+        return s;
+    }*/
+
+}
diff --git a/src/main/java/ui/avatarrd/AvatarRDToolBar.java b/src/main/java/ui/avatarrd/AvatarRDToolBar.java
index 6ad45236fb7f5c654b302274beb00cbfc2da6b04..54b56ab81854e51608eb774f1e8ba3127f98eef7 100755
--- a/src/main/java/ui/avatarrd/AvatarRDToolBar.java
+++ b/src/main/java/ui/avatarrd/AvatarRDToolBar.java
@@ -74,6 +74,7 @@ public class AvatarRDToolBar extends TToolBar {
         mgui.actions[TGUIAction.UML_NOTE].setEnabled(b);
         mgui.actions[TGUIAction.CONNECTOR_COMMENT].setEnabled(b);
         mgui.actions[TGUIAction.ARD_REQUIREMENT].setEnabled(b);
+        mgui.actions[TGUIAction.ARD_REQUIREMENT_REFERENCE].setEnabled(b);
         mgui.actions[TGUIAction.ARD_PROPERTY].setEnabled(b);
         mgui.actions[TGUIAction.ARD_ELEMENT_REFERENCE].setEnabled(b);
         mgui.actions[TGUIAction.ARD_VERIFY_CONNECTOR].setEnabled(b);
@@ -110,6 +111,9 @@ public class AvatarRDToolBar extends TToolBar {
         button = this.add(mgui.actions[TGUIAction.ARD_REQUIREMENT]);
         button.addMouseListener(mgui.mouseHandler);
 
+        button = this.add(mgui.actions[TGUIAction.ARD_REQUIREMENT_REFERENCE]);
+        button.addMouseListener(mgui.mouseHandler);
+
         button = this.add(mgui.actions[TGUIAction.ARD_PROPERTY]);
         button.addMouseListener(mgui.mouseHandler);
 
diff --git a/src/main/java/ui/util/IconManager.java b/src/main/java/ui/util/IconManager.java
index f8bb1dab9b002891f128cf9009ffc35474895ee6..cab39a22b93e4478e8812c2540fe757a4cdea104 100755
--- a/src/main/java/ui/util/IconManager.java
+++ b/src/main/java/ui/util/IconManager.java
@@ -157,7 +157,7 @@ public class IconManager {
     public static ImageIcon imgic5040, imgic5042, imgic5044, imgic5046, imgic5048;
     public static ImageIcon imgic5050, imgic5052, imgic5054, imgic5056, imgic5058;
     public static ImageIcon imgic5060, imgic5062, imgic5064, imgic5066, imgic5068;
-    public static ImageIcon imgic5070, imgic5072;
+    public static ImageIcon imgic5070, imgic5072, imgic5074;
 
     public static ImageIcon imgic5100, imgic5102, imgic5104, imgic5106, imgic5108;
     public static ImageIcon imgic5110, imgic5112, imgic5113, imgic5114;
@@ -621,6 +621,7 @@ public class IconManager {
     private static String icon5068 = "avatarrdref.gif";
     private static String icon5070 = "avatarlibfunction.gif";
     private static String icon5072 = "scissors.png";
+    private static String icon5074 = "avatarrdreqref.gif";
 
     private static String icon5100 = "avatarhead16.gif";
     private static String icon5102 = "avatarhead32.gif";
@@ -1117,6 +1118,7 @@ public class IconManager {
         if (imgic5072 != null) {
             img5072 = imgic5072.getImage();
         }
+        imgic5074 = getIcon(icon5074);
 
         imgic5100 = getIcon(icon5100);
         imgic5102 = getIcon(icon5102);
diff --git a/src/main/java/ui/window/JDialogChoiceSelection.java b/src/main/java/ui/window/JDialogChoiceSelection.java
new file mode 100644
index 0000000000000000000000000000000000000000..6bc3586b5146296cad6ad113dfbc97e87d93a61a
--- /dev/null
+++ b/src/main/java/ui/window/JDialogChoiceSelection.java
@@ -0,0 +1,170 @@
+/* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ * 
+ * ludovic.apvrille AT enst.fr
+ * 
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ * 
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ * 
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ * 
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ * 
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+
+package ui.window;
+
+import ui.AvatarSignal;
+import ui.ColorManager;
+import ui.util.IconManager;
+import ui.TGComponent;
+import myutil.TraceManager;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Vector;
+
+
+/**
+ * Class JDialogChoiceSelection
+ * Dialog for managing several names and stereotype
+ * Creation: 13/07/2018
+ * @version 1.0 13/07/2018
+ * @author Ludovic APVRILLE
+ */
+public class JDialogChoiceSelection extends JDialogBase implements ActionListener  {
+
+    private String[] availableElements;
+    private int indexOfInitialElement;
+
+
+
+    private JPanel panel1;
+
+    // Panel1
+    private JComboBox<String> listOfElements;
+
+    private boolean cancelled;
+
+    /** Creates new form  */
+    public JDialogChoiceSelection(Frame _f, String _title,
+                                  String[] _availableElements, int _indexOfCurrentElements) {
+
+        super(_f, _title, true);
+
+        availableElements = _availableElements;
+        indexOfInitialElement = _indexOfCurrentElements;
+
+        initComponents();
+        myInitComponents();
+
+        pack();
+    }
+
+
+
+    private void myInitComponents() {
+    }
+
+
+    private void initComponents() {
+        Container c = getContentPane();
+        //GridBagLayout gridbag0 = new GridBagLayout();
+        GridBagLayout gridbag1 = new GridBagLayout();
+        //GridBagConstraints c0 = new GridBagConstraints();
+        GridBagConstraints c1 = new GridBagConstraints();
+
+        setFont(new Font("Helvetica", Font.PLAIN, 14));
+        c.setLayout(new BorderLayout());
+
+        setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+        panel1 = new JPanel();
+        panel1.setLayout(gridbag1);
+
+        panel1.setBorder(new javax.swing.border.TitledBorder("Requirement"));
+
+        //panel1.setPreferredSize(new Dimension(500, 250));
+
+        // first line panel1
+        c1.weighty = 1.0;
+        c1.weightx = 1.0;
+        c1.gridwidth = GridBagConstraints.REMAINDER; //end row
+        c1.gridheight = 1;
+        c1.fill = GridBagConstraints.HORIZONTAL;
+        c1.anchor = GridBagConstraints.CENTER;
+        panel1.add(new JLabel(" "), c1);
+
+        // Combo box
+        listOfElements = new JComboBox<String>(availableElements);
+        listOfElements.setSelectedIndex(indexOfInitialElement);
+        panel1.add(listOfElements, c1);
+
+
+
+
+        c.add(panel1, BorderLayout.CENTER);
+
+        JPanel buttons = initBasicButtons(this);
+        c.add(buttons, BorderLayout.SOUTH);
+    }
+
+    public void	actionPerformed(ActionEvent evt)  {
+        //String command = evt.getActionCommand();
+
+        // Compare the action command to the known actions.
+        if (evt.getSource() == closeButton)  {
+            closeDialog();
+        } else if (evt.getSource() == cancelButton)  {
+            cancelDialog();
+        }
+    }
+
+    public void closeDialog() {
+        cancelled = false;
+        dispose();
+    }
+
+    public int getIndexOfSelectedElement() {
+        return listOfElements.getSelectedIndex();
+    }
+
+
+    public boolean hasBeenCancelled() {
+        return cancelled;
+    }
+
+    public void cancelDialog() {
+        cancelled = true;
+        dispose();
+    }
+}
diff --git a/src/main/resources/ui/util/avatarrdreq.gif b/src/main/resources/ui/util/avatarrdreq.gif
index 7903658d8255f406e0b447bb544c37f36305b1de..9cd64a5f08a1eb9eb86cc57068ba8f7b7aad049e 100755
Binary files a/src/main/resources/ui/util/avatarrdreq.gif and b/src/main/resources/ui/util/avatarrdreq.gif differ
diff --git a/src/main/resources/ui/util/avatarrdreqref.gif b/src/main/resources/ui/util/avatarrdreqref.gif
new file mode 100755
index 0000000000000000000000000000000000000000..1dc8e86ec539cd7718de7e2ec68a1143e883ab18
Binary files /dev/null and b/src/main/resources/ui/util/avatarrdreqref.gif differ