diff --git a/ttool/src/test/java/ui/TDiagramPanelCloneArchitectureTest.java b/ttool/src/test/java/ui/TDiagramPanelCloneArchitectureTest.java
index 219329d2c2bc7d9f86cdeee3903e105b77f997dc..51f01c6fb90808b47f3ca48edc68347656e3ff02 100644
--- a/ttool/src/test/java/ui/TDiagramPanelCloneArchitectureTest.java
+++ b/ttool/src/test/java/ui/TDiagramPanelCloneArchitectureTest.java
@@ -51,7 +51,6 @@ import static org.junit.Assert.*;
 
 
 /**
- * #issue 186
  * Testing the clone function on architecture
  * author : Minh Hiep
  * update test : 18/10/2019
@@ -74,11 +73,8 @@ public class TDiagramPanelCloneArchitectureTest extends AbstractUITest {
     static TGComponent Memory_Cl;
 
 
-    static TGComponent mapChannel;
-
     final static String EXPECTED_FILE_MODEL = getBaseResourcesDir() + "/ui/diagram2tml/expected/Expected_CloneArchitecture.xml";
 
-
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
         RESOURCES_DIR = getBaseResourcesDir() + "/ui/diagram2tml/input/CloneCompositeComponentTest.xml";
@@ -129,9 +125,6 @@ public class TDiagramPanelCloneArchitectureTest extends AbstractUITest {
         assertNotNull(architecture_clone);
 
         for (TGComponent tgc : architecture_clone.getAllComponentList()) {
-            if (tgc.getValue().equals("Application::PrimitiveComp1")) {
-                mapChannel = tgc;
-            }
 
             if (tgc.getName().equals("CPU1")) {
                 CPU_Cl = tgc;
diff --git a/ttool/src/test/java/ui/TDiagramPanelCloneTest.java b/ttool/src/test/java/ui/TDiagramPanelCloneTest.java
index b977076687f8183f15772ff15bd697a6b37e6469..ad2249e85137c324d368e4e036c1e7ad5d54ece4 100644
--- a/ttool/src/test/java/ui/TDiagramPanelCloneTest.java
+++ b/ttool/src/test/java/ui/TDiagramPanelCloneTest.java
@@ -79,6 +79,9 @@ public class TDiagramPanelCloneTest extends AbstractUITest {
     public void testCloneCompositeComponentWithNullFather() throws Exception{
         CompareTML compTML = new CompareTML();
         diagramPanel.cloneComponent(tgComponent1);
+       // diagramPanel.cloneComponent(tgComponent2);
+        //diagramPanel.cloneComponent(tgComponent3);
+        //diagramPanel.cloneComponent(tgComponent4);
         mainGUI.checkModelingSyntax(true);
         mainGUI.generateTMLTxt();
         File f1 = new File(EXPECTED_FILE1);
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/Expected_CloneArchitecture.xml b/ttool/src/test/resources/ui/diagram2tml/expected/Expected_CloneArchitecture.xml
index ca40f5d0ab4bdfdded825fb9146c0f97ef2b6458..3caefc32a21a947844fee5be1f2293a7b3013245 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/Expected_CloneArchitecture.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/Expected_CloneArchitecture.xml
@@ -4,93 +4,112 @@
 
 <Modeling type="TML Component Design" nameTab="Application" tabs="TML Component Task Diagram$PrimitiveComp2$PrimitiveComp1$PrimitiveComp3$PrimitiveComp4$PrimitiveComp5$PrimitiveComp6" >
 <TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
-<CONNECTOR type="126" id="5" >
+<CONNECTOR type="126" id="1" >
 <cdparam x="475" y="480" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="467" y="365" id="58" />
-<P2  x="514" y="364" id="69" />
+<P1  x="454" y="352" id="17" />
+<P2  x="527" y="351" id="6" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="4" >
+<CONNECTOR type="126" id="2" >
 <cdparam x="1021" y="460" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="564" y="164" id="19" />
-<P2  x="430" y="163" id="32" />
+<P1  x="577" y="151" id="65" />
+<P2  x="417" y="150" id="52" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="3" >
 <cdparam x="878" y="469" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="430" y="208" id="34" />
-<P2  x="564" y="209" id="21" />
+<P1  x="417" y="195" id="50" />
+<P2  x="577" y="196" id="63" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="2" >
+<CONNECTOR type="126" id="4" >
 <cdparam x="424" y="585" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="424" y="585" id="45" />
-<P2  x="521" y="585" id="47" />
+<P1  x="424" y="559" id="30" />
+<P2  x="521" y="559" id="28" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="126" id="1" >
+<CONNECTOR type="126" id="5" >
 <cdparam x="1144" y="348" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="1144" y="348" id="8" />
-<P2  x="1144" y="405" id="6" />
+<P1  x="1131" y="335" id="85" />
+<P2  x="1131" y="392" id="87" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<COMPONENT type="1200" id="97" >
+<COMPONENT type="1200" id="84" >
 <cdparam x="186" y="10" />
 <sizeparam width="672" height="618" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Composite component" value="CompositeComp1" />
-<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="0" id="76" />
+<TGConnectingPoint num="1" id="77" />
+<TGConnectingPoint num="2" id="78" />
+<TGConnectingPoint num="3" id="79" />
+<TGConnectingPoint num="4" id="80" />
+<TGConnectingPoint num="5" id="81" />
+<TGConnectingPoint num="6" id="82" />
+<TGConnectingPoint num="7" id="83" />
 <extraparam>
 <info hiddeni="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1202" id="31" >
-<father id="97" num="0" />
-<cdparam x="577" y="116" />
+<SUBCOMPONENT type="1200" id="49" >
+<father id="84" num="0" />
+<cdparam x="266" y="278" />
+<sizeparam width="471" height="329" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="201" minY="0" maxY="289" />
+<infoparam name="Composite component" value="CompositeComp2" />
+<TGConnectingPoint num="0" id="41" />
+<TGConnectingPoint num="1" id="42" />
+<TGConnectingPoint num="2" id="43" />
+<TGConnectingPoint num="3" id="44" />
+<TGConnectingPoint num="4" id="45" />
+<TGConnectingPoint num="5" id="46" />
+<TGConnectingPoint num="6" id="47" />
+<TGConnectingPoint num="7" id="48" />
+<extraparam>
+<info hiddeni="false" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="16" >
+<father id="49" num="0" />
+<cdparam x="527" y="316" />
 <sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="472" minY="0" maxY="468" />
-<infoparam name="Primitive component" value="PrimitiveComp2" />
-<TGConnectingPoint num="0" id="23" />
-<TGConnectingPoint num="1" id="24" />
-<TGConnectingPoint num="2" id="25" />
-<TGConnectingPoint num="3" id="26" />
-<TGConnectingPoint num="4" id="27" />
-<TGConnectingPoint num="5" id="28" />
-<TGConnectingPoint num="6" id="29" />
-<TGConnectingPoint num="7" id="30" />
+<cdrectangleparam minX="0" maxX="271" minY="0" maxY="179" />
+<infoparam name="Primitive component" value="PrimitiveComp4" />
+<TGConnectingPoint num="0" id="8" />
+<TGConnectingPoint num="1" id="9" />
+<TGConnectingPoint num="2" id="10" />
+<TGConnectingPoint num="3" id="11" />
+<TGConnectingPoint num="4" id="12" />
+<TGConnectingPoint num="5" id="13" />
+<TGConnectingPoint num="6" id="14" />
+<TGConnectingPoint num="7" id="15" />
 <extraparam>
 <Data isAttacker="No" daemon="false" Operation="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="20" >
-<father id="31" num="0" />
-<cdparam x="564" y="151" />
+<SUBCOMPONENT type="1203" id="7" >
+<father id="16" num="0" />
+<cdparam x="514" y="351" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel channel" />
-<TGConnectingPoint num="0" id="19" />
+<infoparam name="Primitive port" value="Channel channel2" />
+<TGConnectingPoint num="0" id="6" />
 <extraparam>
-<Prop commName="channel" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="channel2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -98,16 +117,35 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="22" >
-<father id="31" num="1" />
-<cdparam x="564" y="196" />
+<SUBCOMPONENT type="1202" id="27" >
+<father id="49" num="1" />
+<cdparam x="285" y="318" />
+<sizeparam width="169" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="302" minY="0" maxY="179" />
+<infoparam name="Primitive component" value="PrimitiveComp3" />
+<TGConnectingPoint num="0" id="19" />
+<TGConnectingPoint num="1" id="20" />
+<TGConnectingPoint num="2" id="21" />
+<TGConnectingPoint num="3" id="22" />
+<TGConnectingPoint num="4" id="23" />
+<TGConnectingPoint num="5" id="24" />
+<TGConnectingPoint num="6" id="25" />
+<TGConnectingPoint num="7" id="26" />
+<extraparam>
+<Data isAttacker="No" daemon="false" Operation="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="18" >
+<father id="27" num="0" />
+<cdparam x="441" y="352" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event event" />
-<TGConnectingPoint num="0" id="21" />
+<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Channel channel2" />
+<TGConnectingPoint num="0" id="17" />
 <extraparam>
-<Prop commName="event" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="channel2" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -115,35 +153,35 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="44" >
-<father id="97" num="1" />
-<cdparam x="217" y="116" />
-<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1202" id="40" >
+<father id="49" num="2" />
+<cdparam x="399" y="491" />
+<sizeparam width="169" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="472" minY="0" maxY="468" />
-<infoparam name="Primitive component" value="PrimitiveComp1" />
-<TGConnectingPoint num="0" id="36" />
-<TGConnectingPoint num="1" id="37" />
-<TGConnectingPoint num="2" id="38" />
-<TGConnectingPoint num="3" id="39" />
-<TGConnectingPoint num="4" id="40" />
-<TGConnectingPoint num="5" id="41" />
-<TGConnectingPoint num="6" id="42" />
-<TGConnectingPoint num="7" id="43" />
+<cdrectangleparam minX="0" maxX="302" minY="0" maxY="248" />
+<infoparam name="Primitive component" value="PrimitiveComp5" />
+<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" />
 <extraparam>
 <Data isAttacker="No" daemon="false" Operation="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="33" >
-<father id="44" num="0" />
-<cdparam x="404" y="150" />
+<SUBCOMPONENT type="1203" id="29" >
+<father id="40" num="0" />
+<cdparam x="508" y="559" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel channel" />
-<TGConnectingPoint num="0" id="32" />
+<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="68" />
+<infoparam name="Primitive port" value="Channel channel3" />
+<TGConnectingPoint num="0" id="28" />
 <extraparam>
-<Prop commName="channel" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="channel3" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -151,16 +189,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="35" >
-<father id="44" num="1" />
-<cdparam x="404" y="195" />
+<SUBCOMPONENT type="1203" id="31" >
+<father id="40" num="1" />
+<cdparam x="411" y="559" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Event event" />
-<TGConnectingPoint num="0" id="34" />
+<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="68" />
+<infoparam name="Primitive port" value="Channel channel3" />
+<TGConnectingPoint num="0" id="30" />
 <extraparam>
-<Prop commName="event" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="channel3" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -168,54 +206,35 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1200" id="88" >
-<father id="97" num="2" />
-<cdparam x="266" y="278" />
-<sizeparam width="471" height="329" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="201" minY="0" maxY="289" />
-<infoparam name="Composite component" value="CompositeComp2" />
-<TGConnectingPoint num="0" id="80" />
-<TGConnectingPoint num="1" id="81" />
-<TGConnectingPoint num="2" id="82" />
-<TGConnectingPoint num="3" id="83" />
-<TGConnectingPoint num="4" id="84" />
-<TGConnectingPoint num="5" id="85" />
-<TGConnectingPoint num="6" id="86" />
-<TGConnectingPoint num="7" id="87" />
-<extraparam>
-<info hiddeni="false" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="57" >
-<father id="88" num="0" />
-<cdparam x="399" y="491" />
-<sizeparam width="169" height="81" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1202" id="62" >
+<father id="84" num="1" />
+<cdparam x="217" y="116" />
+<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="302" minY="0" maxY="248" />
-<infoparam name="Primitive component" value="PrimitiveComp5" />
-<TGConnectingPoint num="0" id="49" />
-<TGConnectingPoint num="1" id="50" />
-<TGConnectingPoint num="2" id="51" />
-<TGConnectingPoint num="3" id="52" />
-<TGConnectingPoint num="4" id="53" />
-<TGConnectingPoint num="5" id="54" />
-<TGConnectingPoint num="6" id="55" />
-<TGConnectingPoint num="7" id="56" />
+<cdrectangleparam minX="0" maxX="472" minY="0" maxY="468" />
+<infoparam name="Primitive component" value="PrimitiveComp1" />
+<TGConnectingPoint num="0" id="54" />
+<TGConnectingPoint num="1" id="55" />
+<TGConnectingPoint num="2" id="56" />
+<TGConnectingPoint num="3" id="57" />
+<TGConnectingPoint num="4" id="58" />
+<TGConnectingPoint num="5" id="59" />
+<TGConnectingPoint num="6" id="60" />
+<TGConnectingPoint num="7" id="61" />
 <extraparam>
 <Data isAttacker="No" daemon="false" Operation="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="46" >
-<father id="57" num="0" />
-<cdparam x="411" y="559" />
+<SUBCOMPONENT type="1203" id="51" >
+<father id="62" num="0" />
+<cdparam x="404" y="195" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="68" />
-<infoparam name="Primitive port" value="Channel channel3" />
-<TGConnectingPoint num="0" id="45" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Event event" />
+<TGConnectingPoint num="0" id="50" />
 <extraparam>
-<Prop commName="channel3" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="event" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -223,16 +242,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="48" >
-<father id="57" num="1" />
-<cdparam x="508" y="559" />
+<SUBCOMPONENT type="1203" id="53" >
+<father id="62" num="1" />
+<cdparam x="404" y="150" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="68" />
-<infoparam name="Primitive port" value="Channel channel3" />
-<TGConnectingPoint num="0" id="47" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Channel channel" />
+<TGConnectingPoint num="0" id="52" />
 <extraparam>
-<Prop commName="channel3" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="channel" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -240,35 +259,35 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="68" >
-<father id="88" num="1" />
-<cdparam x="285" y="318" />
-<sizeparam width="169" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1202" id="75" >
+<father id="84" num="2" />
+<cdparam x="577" y="116" />
+<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="302" minY="0" maxY="179" />
-<infoparam name="Primitive component" value="PrimitiveComp3" />
-<TGConnectingPoint num="0" id="60" />
-<TGConnectingPoint num="1" id="61" />
-<TGConnectingPoint num="2" id="62" />
-<TGConnectingPoint num="3" id="63" />
-<TGConnectingPoint num="4" id="64" />
-<TGConnectingPoint num="5" id="65" />
-<TGConnectingPoint num="6" id="66" />
-<TGConnectingPoint num="7" id="67" />
+<cdrectangleparam minX="0" maxX="472" minY="0" maxY="468" />
+<infoparam name="Primitive component" value="PrimitiveComp2" />
+<TGConnectingPoint num="0" id="67" />
+<TGConnectingPoint num="1" id="68" />
+<TGConnectingPoint num="2" id="69" />
+<TGConnectingPoint num="3" id="70" />
+<TGConnectingPoint num="4" id="71" />
+<TGConnectingPoint num="5" id="72" />
+<TGConnectingPoint num="6" id="73" />
+<TGConnectingPoint num="7" id="74" />
 <extraparam>
 <Data isAttacker="No" daemon="false" Operation="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="59" >
-<father id="68" num="0" />
-<cdparam x="441" y="352" />
+<SUBCOMPONENT type="1203" id="64" >
+<father id="75" num="0" />
+<cdparam x="564" y="196" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="156" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel channel2" />
-<TGConnectingPoint num="0" id="58" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
+<infoparam name="Primitive port" value="Event event" />
+<TGConnectingPoint num="0" id="63" />
 <extraparam>
-<Prop commName="channel2" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="event" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -276,35 +295,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="79" >
-<father id="88" num="2" />
-<cdparam x="527" y="316" />
-<sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="271" minY="0" maxY="179" />
-<infoparam name="Primitive component" value="PrimitiveComp4" />
-<TGConnectingPoint num="0" id="71" />
-<TGConnectingPoint num="1" id="72" />
-<TGConnectingPoint num="2" id="73" />
-<TGConnectingPoint num="3" id="74" />
-<TGConnectingPoint num="4" id="75" />
-<TGConnectingPoint num="5" id="76" />
-<TGConnectingPoint num="6" id="77" />
-<TGConnectingPoint num="7" id="78" />
-<extraparam>
-<Data isAttacker="No" daemon="false" Operation="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="70" >
-<father id="79" num="0" />
-<cdparam x="514" y="351" />
+<SUBCOMPONENT type="1203" id="66" >
+<father id="75" num="1" />
+<cdparam x="564" y="151" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
-<infoparam name="Primitive port" value="Channel channel2" />
-<TGConnectingPoint num="0" id="69" />
+<infoparam name="Primitive port" value="Channel channel" />
+<TGConnectingPoint num="0" id="65" />
 <extraparam>
-<Prop commName="channel2" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="channel" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -313,34 +313,34 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1202" id="18" >
+<COMPONENT type="1202" id="97" >
 <cdparam x="931" y="292" />
 <sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Primitive component" value="PrimitiveComp6" />
-<TGConnectingPoint num="0" id="10" />
-<TGConnectingPoint num="1" id="11" />
-<TGConnectingPoint num="2" id="12" />
-<TGConnectingPoint num="3" id="13" />
-<TGConnectingPoint num="4" id="14" />
-<TGConnectingPoint num="5" id="15" />
-<TGConnectingPoint num="6" id="16" />
-<TGConnectingPoint num="7" id="17" />
+<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" />
 <extraparam>
 <Data isAttacker="No" daemon="false" Operation="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="7" >
-<father id="18" num="0" />
-<cdparam x="1118" y="392" />
+<SUBCOMPONENT type="1203" id="86" >
+<father id="97" num="0" />
+<cdparam x="1118" y="335" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
 <infoparam name="Primitive port" value="Channel channel4" />
-<TGConnectingPoint num="0" id="6" />
+<TGConnectingPoint num="0" id="85" />
 <extraparam>
-<Prop commName="channel4" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="channel4" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -348,16 +348,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9" >
-<father id="18" num="1" />
-<cdparam x="1118" y="335" />
+<SUBCOMPONENT type="1203" id="88" >
+<father id="97" num="1" />
+<cdparam x="1118" y="392" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
 <infoparam name="Primitive port" value="Channel channel4" />
-<TGConnectingPoint num="0" id="8" />
+<TGConnectingPoint num="0" id="87" />
 <extraparam>
-<Prop commName="channel4" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="channel4" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -370,81 +370,81 @@
 </TMLComponentTaskDiagramPanel>
 
 <TMLActivityDiagramPanel name="PrimitiveComp2" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="113" >
+<COMPONENT type="1001" id="99" >
 <cdparam x="520" y="416" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="112" />
+<TGConnectingPoint num="0" id="98" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="115" >
+<COMPONENT type="1001" id="101" >
 <cdparam x="397" y="418" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="114" />
+<TGConnectingPoint num="0" id="100" />
 </COMPONENT>
 
-<COMPONENT type="1010" id="118" >
+<COMPONENT type="1010" id="104" >
 <cdparam x="501" y="302" />
 <sizeparam width="59" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="wait event" value="event() " />
-<TGConnectingPoint num="0" id="116" />
-<TGConnectingPoint num="1" id="117" />
+<TGConnectingPoint num="0" id="102" />
+<TGConnectingPoint num="1" id="103" />
 <extraparam>
 <Data eventName="event" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="121" >
+<COMPONENT type="1009" id="107" >
 <cdparam x="366" y="296" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="read channel" value="channel(1) " />
-<TGConnectingPoint num="0" id="119" />
-<TGConnectingPoint num="1" id="120" />
+<TGConnectingPoint num="0" id="105" />
+<TGConnectingPoint num="1" id="106" />
 <extraparam>
 <Data channelName="channel" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1012" id="129" >
+<COMPONENT type="1012" id="115" >
 <cdparam x="392" y="175" />
 <sizeparam width="30" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="125" />
-<TGConnectingPoint num="1" id="126" />
-<TGConnectingPoint num="2" id="127" />
-<TGConnectingPoint num="3" id="128" />
+<TGConnectingPoint num="0" id="111" />
+<TGConnectingPoint num="1" id="112" />
+<TGConnectingPoint num="2" id="113" />
+<TGConnectingPoint num="3" id="114" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="122" >
-<father id="129" num="0" />
+<SUBCOMPONENT type="-1" id="108" >
+<father id="115" num="0" />
 <cdparam x="367" y="185" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="1" 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="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="123" >
-<father id="129" num="1" />
+<SUBCOMPONENT type="-1" id="109" >
+<father id="115" num="1" />
 <cdparam x="427" y="185" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="1" 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="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="124" >
-<father id="129" num="2" />
+<SUBCOMPONENT type="-1" id="110" >
+<father id="115" num="2" />
 <cdparam x="412" y="220" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -452,25 +452,25 @@
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1000" id="131" >
+<COMPONENT type="1000" id="117" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="130" />
+<TGConnectingPoint num="0" id="116" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="133" >
+<CONNECTOR type="115" id="119" >
 <cdparam x="447" y="190" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="447" y="190" id="127" />
-<P2  x="530" y="297" id="116" />
+<P1  x="447" y="190" id="113" />
+<P2  x="530" y="297" id="102" />
 <Point x="530" y="190" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="132" >
-<father id="133" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="118" >
+<father id="119" num="0" />
 <cdparam x="530" y="190" />
 <sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -478,117 +478,117 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="115" id="134" >
+<CONNECTOR type="115" id="120" >
 <cdparam x="407" y="65" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="65" id="130" />
-<P2  x="407" y="165" id="125" />
+<P1  x="407" y="65" id="116" />
+<P2  x="407" y="165" id="111" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="135" >
+<CONNECTOR type="115" id="121" >
 <cdparam x="407" y="230" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="230" id="128" />
-<P2  x="407" y="291" id="119" />
+<P1  x="407" y="230" id="114" />
+<P2  x="407" y="291" id="105" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="136" >
+<CONNECTOR type="115" id="122" >
 <cdparam x="407" y="321" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="321" id="120" />
-<P2  x="407" y="413" id="114" />
+<P1  x="407" y="321" id="106" />
+<P2  x="407" y="413" id="100" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="137" >
+<CONNECTOR type="115" id="123" >
 <cdparam x="530" y="327" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="530" y="327" id="117" />
-<P2  x="530" y="411" id="112" />
+<P1  x="530" y="327" id="103" />
+<P2  x="530" y="411" id="98" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="PrimitiveComp1" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="139" >
+<COMPONENT type="1001" id="125" >
 <cdparam x="397" y="440" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="138" />
+<TGConnectingPoint num="0" id="124" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="141" >
+<COMPONENT type="1001" id="127" >
 <cdparam x="302" y="444" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="140" />
+<TGConnectingPoint num="0" id="126" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="144" >
+<COMPONENT type="1008" id="130" >
 <cdparam x="285" y="326" />
 <sizeparam width="55" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="send event" value="event()" />
-<TGConnectingPoint num="0" id="142" />
-<TGConnectingPoint num="1" id="143" />
+<TGConnectingPoint num="0" id="128" />
+<TGConnectingPoint num="1" id="129" />
 <extraparam>
 <Data eventName="event" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="147" >
+<COMPONENT type="1006" id="133" >
 <cdparam x="368" y="324" />
 <sizeparam width="78" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="write channel" value="channel(1)" />
-<TGConnectingPoint num="0" id="145" />
-<TGConnectingPoint num="1" id="146" />
+<TGConnectingPoint num="0" id="131" />
+<TGConnectingPoint num="1" id="132" />
 <extraparam>
 <Data channelName="channel" nbOfSamples="1" secPattern="" isAttacker="Yes" isEncForm="Yes" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1012" id="155" >
+<COMPONENT type="1012" id="141" >
 <cdparam x="392" y="183" />
 <sizeparam width="30" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="151" />
-<TGConnectingPoint num="1" id="152" />
-<TGConnectingPoint num="2" id="153" />
-<TGConnectingPoint num="3" id="154" />
+<TGConnectingPoint num="0" id="137" />
+<TGConnectingPoint num="1" id="138" />
+<TGConnectingPoint num="2" id="139" />
+<TGConnectingPoint num="3" id="140" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="148" >
-<father id="155" num="0" />
+<SUBCOMPONENT type="-1" id="134" >
+<father id="141" num="0" />
 <cdparam x="367" y="193" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="1" 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="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="149" >
-<father id="155" num="1" />
+<SUBCOMPONENT type="-1" id="135" >
+<father id="141" num="1" />
 <cdparam x="427" y="193" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="1" 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="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="150" >
-<father id="155" num="2" />
+<SUBCOMPONENT type="-1" id="136" >
+<father id="141" num="2" />
 <cdparam x="412" y="228" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -596,25 +596,25 @@
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1000" id="157" >
+<COMPONENT type="1000" id="143" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="156" />
+<TGConnectingPoint num="0" id="142" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="159" >
+<CONNECTOR type="115" id="145" >
 <cdparam x="367" y="198" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="367" y="198" id="152" />
-<P2  x="312" y="321" id="142" />
+<P1  x="367" y="198" id="138" />
+<P2  x="312" y="321" id="128" />
 <Point x="312" y="198" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="158" >
-<father id="159" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="144" >
+<father id="145" num="0" />
 <cdparam x="312" y="198" />
 <sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -622,288 +622,288 @@
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="115" id="160" >
+<CONNECTOR type="115" id="146" >
 <cdparam x="407" y="65" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="65" id="156" />
-<P2  x="407" y="173" id="151" />
+<P1  x="407" y="65" id="142" />
+<P2  x="407" y="173" id="137" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="161" >
+<CONNECTOR type="115" id="147" >
 <cdparam x="407" y="238" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="238" id="154" />
-<P2  x="407" y="319" id="145" />
+<P1  x="407" y="238" id="140" />
+<P2  x="407" y="319" id="131" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="162" >
+<CONNECTOR type="115" id="148" >
 <cdparam x="312" y="351" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="312" y="351" id="143" />
-<P2  x="312" y="439" id="140" />
+<P1  x="312" y="351" id="129" />
+<P2  x="312" y="439" id="126" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="163" >
+<CONNECTOR type="115" id="149" >
 <cdparam x="407" y="349" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="349" id="146" />
-<P2  x="407" y="435" id="138" />
+<P1  x="407" y="349" id="132" />
+<P2  x="407" y="435" id="124" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="PrimitiveComp3" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="165" >
+<COMPONENT type="1001" id="151" >
 <cdparam x="397" y="269" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="164" />
+<TGConnectingPoint num="0" id="150" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="168" >
+<COMPONENT type="1006" id="154" >
 <cdparam x="364" y="143" />
 <sizeparam width="86" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="write channel" value="channel2(1)" />
-<TGConnectingPoint num="0" id="166" />
-<TGConnectingPoint num="1" id="167" />
+<TGConnectingPoint num="0" id="152" />
+<TGConnectingPoint num="1" id="153" />
 <extraparam>
 <Data channelName="channel2" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="170" >
+<COMPONENT type="1000" id="156" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="169" />
+<TGConnectingPoint num="0" id="155" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="171" >
+<CONNECTOR type="115" id="157" >
 <cdparam x="407" y="168" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="168" id="167" />
-<P2  x="407" y="264" id="164" />
+<P1  x="407" y="168" id="153" />
+<P2  x="407" y="264" id="150" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="172" >
+<CONNECTOR type="115" id="158" >
 <cdparam x="407" y="65" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="65" id="169" />
-<P2  x="407" y="138" id="166" />
+<P1  x="407" y="65" id="155" />
+<P2  x="407" y="138" id="152" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="PrimitiveComp4" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="174" >
+<COMPONENT type="1001" id="160" >
 <cdparam x="397" y="274" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="173" />
+<TGConnectingPoint num="0" id="159" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="177" >
+<COMPONENT type="1009" id="163" >
 <cdparam x="362" y="162" />
 <sizeparam width="90" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="read channel" value="channel2(1) " />
-<TGConnectingPoint num="0" id="175" />
-<TGConnectingPoint num="1" id="176" />
+<TGConnectingPoint num="0" id="161" />
+<TGConnectingPoint num="1" id="162" />
 <extraparam>
 <Data channelName="channel2" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="179" >
+<COMPONENT type="1000" id="165" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="178" />
+<TGConnectingPoint num="0" id="164" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="180" >
+<CONNECTOR type="115" id="166" >
 <cdparam x="407" y="65" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="65" id="178" />
-<P2  x="407" y="157" id="175" />
+<P1  x="407" y="65" id="164" />
+<P2  x="407" y="157" id="161" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="181" >
+<CONNECTOR type="115" id="167" >
 <cdparam x="407" y="187" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="187" id="176" />
-<P2  x="407" y="269" id="173" />
+<P1  x="407" y="187" id="162" />
+<P2  x="407" y="269" id="159" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="PrimitiveComp5" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="183" >
+<COMPONENT type="1001" id="169" >
 <cdparam x="397" y="342" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="182" />
+<TGConnectingPoint num="0" id="168" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="186" >
+<COMPONENT type="1009" id="172" >
 <cdparam x="362" y="238" />
 <sizeparam width="90" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="read channel" value="channel3(1) " />
-<TGConnectingPoint num="0" id="184" />
-<TGConnectingPoint num="1" id="185" />
+<TGConnectingPoint num="0" id="170" />
+<TGConnectingPoint num="1" id="171" />
 <extraparam>
 <Data channelName="channel3" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="189" >
+<COMPONENT type="1006" id="175" >
 <cdparam x="364" y="143" />
 <sizeparam width="86" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="write channel" value="channel3(1)" />
-<TGConnectingPoint num="0" id="187" />
-<TGConnectingPoint num="1" id="188" />
+<TGConnectingPoint num="0" id="173" />
+<TGConnectingPoint num="1" id="174" />
 <extraparam>
 <Data channelName="channel3" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="191" >
+<COMPONENT type="1000" id="177" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="190" />
+<TGConnectingPoint num="0" id="176" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="192" >
+<CONNECTOR type="115" id="178" >
 <cdparam x="407" y="65" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="65" id="190" />
-<P2  x="407" y="138" id="187" />
+<P1  x="407" y="65" id="176" />
+<P2  x="407" y="138" id="173" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="193" >
+<CONNECTOR type="115" id="179" >
 <cdparam x="407" y="168" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="168" id="188" />
-<P2  x="407" y="233" id="184" />
+<P1  x="407" y="168" id="174" />
+<P2  x="407" y="233" id="170" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="194" >
+<CONNECTOR type="115" id="180" >
 <cdparam x="407" y="263" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="263" id="185" />
-<P2  x="407" y="337" id="182" />
+<P1  x="407" y="263" id="171" />
+<P2  x="407" y="337" id="168" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="PrimitiveComp6" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1001" id="196" >
+<COMPONENT type="1001" id="182" >
 <cdparam x="397" y="331" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="195" />
+<TGConnectingPoint num="0" id="181" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="199" >
+<COMPONENT type="1009" id="185" >
 <cdparam x="362" y="233" />
 <sizeparam width="90" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="read channel" value="channel4(1) " />
-<TGConnectingPoint num="0" id="197" />
-<TGConnectingPoint num="1" id="198" />
+<TGConnectingPoint num="0" id="183" />
+<TGConnectingPoint num="1" id="184" />
 <extraparam>
 <Data channelName="channel4" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="202" >
+<COMPONENT type="1006" id="188" >
 <cdparam x="364" y="133" />
 <sizeparam width="86" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="write channel" value="channel4(1)" />
-<TGConnectingPoint num="0" id="200" />
-<TGConnectingPoint num="1" id="201" />
+<TGConnectingPoint num="0" id="186" />
+<TGConnectingPoint num="1" id="187" />
 <extraparam>
 <Data channelName="channel4" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="204" >
+<COMPONENT type="1000" id="190" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="203" />
+<TGConnectingPoint num="0" id="189" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="205" >
+<CONNECTOR type="115" id="191" >
 <cdparam x="407" y="65" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="65" id="203" />
-<P2  x="407" y="128" id="200" />
+<P1  x="407" y="65" id="189" />
+<P2  x="407" y="128" id="186" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="206" >
+<CONNECTOR type="115" id="192" >
 <cdparam x="407" y="158" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="158" id="201" />
-<P2  x="407" y="228" id="197" />
+<P1  x="407" y="158" id="187" />
+<P2  x="407" y="228" id="183" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="207" >
+<CONNECTOR type="115" id="193" >
 <cdparam x="407" y="258" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="258" id="198" />
-<P2  x="407" y="326" id="195" />
+<P1  x="407" y="258" id="184" />
+<P2  x="407" y="326" id="181" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
@@ -916,48 +916,105 @@
 
 <Modeling type="TML Architecture" nameTab="Architecture" >
 <TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1100" id="299" >
+<COMPONENT type="1100" id="272" >
 <cdparam x="83" y="128" />
 <sizeparam width="552" height="225" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="275" />
-<TGConnectingPoint num="1" id="276" />
-<TGConnectingPoint num="2" id="277" />
-<TGConnectingPoint num="3" id="278" />
-<TGConnectingPoint num="4" id="279" />
-<TGConnectingPoint num="5" id="280" />
-<TGConnectingPoint num="6" id="281" />
-<TGConnectingPoint num="7" id="282" />
-<TGConnectingPoint num="8" id="283" />
-<TGConnectingPoint num="9" id="284" />
-<TGConnectingPoint num="10" id="285" />
-<TGConnectingPoint num="11" id="286" />
-<TGConnectingPoint num="12" id="287" />
-<TGConnectingPoint num="13" id="288" />
-<TGConnectingPoint num="14" id="289" />
-<TGConnectingPoint num="15" id="290" />
-<TGConnectingPoint num="16" id="291" />
-<TGConnectingPoint num="17" id="292" />
-<TGConnectingPoint num="18" id="293" />
-<TGConnectingPoint num="19" id="294" />
-<TGConnectingPoint num="20" id="295" />
-<TGConnectingPoint num="21" id="296" />
-<TGConnectingPoint num="22" id="297" />
-<TGConnectingPoint num="23" id="298" />
+<TGConnectingPoint num="0" id="248" />
+<TGConnectingPoint num="1" id="249" />
+<TGConnectingPoint num="2" id="250" />
+<TGConnectingPoint num="3" id="251" />
+<TGConnectingPoint num="4" id="252" />
+<TGConnectingPoint num="5" id="253" />
+<TGConnectingPoint num="6" id="254" />
+<TGConnectingPoint num="7" id="255" />
+<TGConnectingPoint num="8" id="256" />
+<TGConnectingPoint num="9" id="257" />
+<TGConnectingPoint num="10" id="258" />
+<TGConnectingPoint num="11" id="259" />
+<TGConnectingPoint num="12" id="260" />
+<TGConnectingPoint num="13" id="261" />
+<TGConnectingPoint num="14" id="262" />
+<TGConnectingPoint num="15" id="263" />
+<TGConnectingPoint num="16" id="264" />
+<TGConnectingPoint num="17" id="265" />
+<TGConnectingPoint num="18" id="266" />
+<TGConnectingPoint num="19" id="267" />
+<TGConnectingPoint num="20" id="268" />
+<TGConnectingPoint num="21" id="269" />
+<TGConnectingPoint num="22" id="270" />
+<TGConnectingPoint num="23" id="271" />
 <extraparam>
 <info stereotype="CPU" nodeName="CPU0" />
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
+<SUBCOMPONENT type="1101" id="202" >
+<father id="272" num="0" />
+<cdparam x="376" y="255" />
+<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp6" />
+<TGConnectingPoint num="0" id="194" />
+<TGConnectingPoint num="1" id="195" />
+<TGConnectingPoint num="2" id="196" />
+<TGConnectingPoint num="3" id="197" />
+<TGConnectingPoint num="4" id="198" />
+<TGConnectingPoint num="5" id="199" />
+<TGConnectingPoint num="6" id="200" />
+<TGConnectingPoint num="7" id="201" />
+<extraparam>
+<info value="Application::PrimitiveComp6" taskName="PrimitiveComp6" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="211" >
+<father id="272" num="1" />
+<cdparam x="371" y="203" />
+<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp5" />
+<TGConnectingPoint num="0" id="203" />
+<TGConnectingPoint num="1" id="204" />
+<TGConnectingPoint num="2" id="205" />
+<TGConnectingPoint num="3" id="206" />
+<TGConnectingPoint num="4" id="207" />
+<TGConnectingPoint num="5" id="208" />
+<TGConnectingPoint num="6" id="209" />
+<TGConnectingPoint num="7" id="210" />
+<extraparam>
+<info value="Application::PrimitiveComp5" taskName="PrimitiveComp5" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp5" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="220" >
+<father id="272" num="2" />
+<cdparam x="393" y="144" />
+<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp4" />
+<TGConnectingPoint num="0" id="212" />
+<TGConnectingPoint num="1" id="213" />
+<TGConnectingPoint num="2" id="214" />
+<TGConnectingPoint num="3" id="215" />
+<TGConnectingPoint num="4" id="216" />
+<TGConnectingPoint num="5" id="217" />
+<TGConnectingPoint num="6" id="218" />
+<TGConnectingPoint num="7" id="219" />
+<extraparam>
+<info value="Application::PrimitiveComp4" taskName="PrimitiveComp4" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="229" >
-<father id="299" num="0" />
-<cdparam x="110" y="152" />
+<father id="272" num="3" />
+<cdparam x="112" y="261" />
 <sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
-<infoparam name="TGComponent" value="Application::PrimitiveComp1" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp3" />
 <TGConnectingPoint num="0" id="221" />
 <TGConnectingPoint num="1" id="222" />
 <TGConnectingPoint num="2" id="223" />
@@ -967,11 +1024,11 @@
 <TGConnectingPoint num="6" id="227" />
 <TGConnectingPoint num="7" id="228" />
 <extraparam>
-<info value="Application::PrimitiveComp1" taskName="PrimitiveComp1" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
+<info value="Application::PrimitiveComp3" taskName="PrimitiveComp3" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="238" >
-<father id="299" num="1" />
+<father id="272" num="4" />
 <cdparam x="111" y="201" />
 <sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -990,12 +1047,12 @@
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="247" >
-<father id="299" num="2" />
-<cdparam x="112" y="261" />
+<father id="272" num="5" />
+<cdparam x="110" y="152" />
 <sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
-<infoparam name="TGComponent" value="Application::PrimitiveComp3" />
+<infoparam name="TGComponent" value="Application::PrimitiveComp1" />
 <TGConnectingPoint num="0" id="239" />
 <TGConnectingPoint num="1" id="240" />
 <TGConnectingPoint num="2" id="241" />
@@ -1005,637 +1062,580 @@
 <TGConnectingPoint num="6" id="245" />
 <TGConnectingPoint num="7" id="246" />
 <extraparam>
-<info value="Application::PrimitiveComp3" taskName="PrimitiveComp3" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="256" >
-<father id="299" num="3" />
-<cdparam x="393" y="144" />
-<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
-<infoparam name="TGComponent" value="Application::PrimitiveComp4" />
-<TGConnectingPoint num="0" id="248" />
-<TGConnectingPoint num="1" id="249" />
-<TGConnectingPoint num="2" id="250" />
-<TGConnectingPoint num="3" id="251" />
-<TGConnectingPoint num="4" id="252" />
-<TGConnectingPoint num="5" id="253" />
-<TGConnectingPoint num="6" id="254" />
-<TGConnectingPoint num="7" id="255" />
-<extraparam>
-<info value="Application::PrimitiveComp4" taskName="PrimitiveComp4" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="265" >
-<father id="299" num="4" />
-<cdparam x="371" y="203" />
-<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
-<infoparam name="TGComponent" value="Application::PrimitiveComp5" />
-<TGConnectingPoint num="0" id="257" />
-<TGConnectingPoint num="1" id="258" />
-<TGConnectingPoint num="2" id="259" />
-<TGConnectingPoint num="3" id="260" />
-<TGConnectingPoint num="4" id="261" />
-<TGConnectingPoint num="5" id="262" />
-<TGConnectingPoint num="6" id="263" />
-<TGConnectingPoint num="7" id="264" />
-<extraparam>
-<info value="Application::PrimitiveComp5" taskName="PrimitiveComp5" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp5" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="274" >
-<father id="299" num="5" />
-<cdparam x="376" y="255" />
-<sizeparam width="207" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="345" minY="0" maxY="185" />
-<infoparam name="TGComponent" value="Application::PrimitiveComp6" />
-<TGConnectingPoint num="0" id="266" />
-<TGConnectingPoint num="1" id="267" />
-<TGConnectingPoint num="2" id="268" />
-<TGConnectingPoint num="3" id="269" />
-<TGConnectingPoint num="4" id="270" />
-<TGConnectingPoint num="5" id="271" />
-<TGConnectingPoint num="6" id="272" />
-<TGConnectingPoint num="7" id="273" />
-<extraparam>
-<info value="Application::PrimitiveComp6" taskName="PrimitiveComp6" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp6" fatherComponentMECType="0" />
+<info value="Application::PrimitiveComp1" taskName="PrimitiveComp1" referenceTaskName="Application" priority="0" operationMEC="PrimitiveComp4" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1100" id="324" >
+<COMPONENT type="1100" id="297" >
 <cdparam x="1276" y="110" />
 <sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="CPU2" value="name" />
-<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" />
-<TGConnectingPoint num="8" id="308" />
-<TGConnectingPoint num="9" id="309" />
-<TGConnectingPoint num="10" id="310" />
-<TGConnectingPoint num="11" id="311" />
-<TGConnectingPoint num="12" id="312" />
-<TGConnectingPoint num="13" id="313" />
-<TGConnectingPoint num="14" id="314" />
-<TGConnectingPoint num="15" id="315" />
-<TGConnectingPoint num="16" id="316" />
-<TGConnectingPoint num="17" id="317" />
-<TGConnectingPoint num="18" id="318" />
-<TGConnectingPoint num="19" id="319" />
-<TGConnectingPoint num="20" id="320" />
-<TGConnectingPoint num="21" id="321" />
-<TGConnectingPoint num="22" id="322" />
-<TGConnectingPoint num="23" id="323" />
+<TGConnectingPoint num="0" id="273" />
+<TGConnectingPoint num="1" id="274" />
+<TGConnectingPoint num="2" id="275" />
+<TGConnectingPoint num="3" id="276" />
+<TGConnectingPoint num="4" id="277" />
+<TGConnectingPoint num="5" id="278" />
+<TGConnectingPoint num="6" id="279" />
+<TGConnectingPoint num="7" id="280" />
+<TGConnectingPoint num="8" id="281" />
+<TGConnectingPoint num="9" id="282" />
+<TGConnectingPoint num="10" id="283" />
+<TGConnectingPoint num="11" id="284" />
+<TGConnectingPoint num="12" id="285" />
+<TGConnectingPoint num="13" id="286" />
+<TGConnectingPoint num="14" id="287" />
+<TGConnectingPoint num="15" id="288" />
+<TGConnectingPoint num="16" id="289" />
+<TGConnectingPoint num="17" id="290" />
+<TGConnectingPoint num="18" id="291" />
+<TGConnectingPoint num="19" id="292" />
+<TGConnectingPoint num="20" id="293" />
+<TGConnectingPoint num="21" id="294" />
+<TGConnectingPoint num="22" id="295" />
+<TGConnectingPoint num="23" id="296" />
 <extraparam>
 <info stereotype="CPURR" nodeName="CPU2" />
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1100" id="349" >
+<COMPONENT type="1100" id="322" >
 <cdparam x="991" y="100" />
 <sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="CPU1" value="name" />
-<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="0" id="298" />
+<TGConnectingPoint num="1" id="299" />
+<TGConnectingPoint num="2" id="300" />
+<TGConnectingPoint num="3" id="301" />
+<TGConnectingPoint num="4" id="302" />
+<TGConnectingPoint num="5" id="303" />
+<TGConnectingPoint num="6" id="304" />
+<TGConnectingPoint num="7" id="305" />
+<TGConnectingPoint num="8" id="306" />
+<TGConnectingPoint num="9" id="307" />
+<TGConnectingPoint num="10" id="308" />
+<TGConnectingPoint num="11" id="309" />
+<TGConnectingPoint num="12" id="310" />
+<TGConnectingPoint num="13" id="311" />
+<TGConnectingPoint num="14" id="312" />
+<TGConnectingPoint num="15" id="313" />
+<TGConnectingPoint num="16" id="314" />
+<TGConnectingPoint num="17" id="315" />
+<TGConnectingPoint num="18" id="316" />
+<TGConnectingPoint num="19" id="317" />
+<TGConnectingPoint num="20" id="318" />
+<TGConnectingPoint num="21" id="319" />
+<TGConnectingPoint num="22" id="320" />
+<TGConnectingPoint num="23" id="321" />
 <extraparam>
 <info stereotype="CPURR" nodeName="CPU1" />
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1107" id="374" >
+<COMPONENT type="1107" id="347" >
 <cdparam x="699" y="398" />
 <sizeparam width="200" height="200" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="DMA0" value="name" />
-<TGConnectingPoint num="0" id="350" />
-<TGConnectingPoint num="1" id="351" />
-<TGConnectingPoint num="2" id="352" />
-<TGConnectingPoint num="3" id="353" />
-<TGConnectingPoint num="4" id="354" />
-<TGConnectingPoint num="5" id="355" />
-<TGConnectingPoint num="6" id="356" />
-<TGConnectingPoint num="7" id="357" />
-<TGConnectingPoint num="8" id="358" />
-<TGConnectingPoint num="9" id="359" />
-<TGConnectingPoint num="10" id="360" />
-<TGConnectingPoint num="11" id="361" />
-<TGConnectingPoint num="12" id="362" />
-<TGConnectingPoint num="13" id="363" />
-<TGConnectingPoint num="14" id="364" />
-<TGConnectingPoint num="15" id="365" />
-<TGConnectingPoint num="16" id="366" />
-<TGConnectingPoint num="17" id="367" />
-<TGConnectingPoint num="18" id="368" />
-<TGConnectingPoint num="19" id="369" />
-<TGConnectingPoint num="20" id="370" />
-<TGConnectingPoint num="21" id="371" />
-<TGConnectingPoint num="22" id="372" />
-<TGConnectingPoint num="23" id="373" />
+<TGConnectingPoint num="0" id="323" />
+<TGConnectingPoint num="1" id="324" />
+<TGConnectingPoint num="2" id="325" />
+<TGConnectingPoint num="3" id="326" />
+<TGConnectingPoint num="4" id="327" />
+<TGConnectingPoint num="5" id="328" />
+<TGConnectingPoint num="6" id="329" />
+<TGConnectingPoint num="7" id="330" />
+<TGConnectingPoint num="8" id="331" />
+<TGConnectingPoint num="9" id="332" />
+<TGConnectingPoint num="10" id="333" />
+<TGConnectingPoint num="11" id="334" />
+<TGConnectingPoint num="12" id="335" />
+<TGConnectingPoint num="13" id="336" />
+<TGConnectingPoint num="14" id="337" />
+<TGConnectingPoint num="15" id="338" />
+<TGConnectingPoint num="16" id="339" />
+<TGConnectingPoint num="17" id="340" />
+<TGConnectingPoint num="18" id="341" />
+<TGConnectingPoint num="19" id="342" />
+<TGConnectingPoint num="20" id="343" />
+<TGConnectingPoint num="21" id="344" />
+<TGConnectingPoint num="22" id="345" />
+<TGConnectingPoint num="23" id="346" />
 <extraparam>
 <info stereotype="DMA" nodeName="DMA0" />
 <attributes byteDataSize="4" nbOfChannels="1" clockRatio="1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1105" id="399" >
+<COMPONENT type="1105" id="372" >
 <cdparam x="344" y="601" />
 <sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="375" />
-<TGConnectingPoint num="1" id="376" />
-<TGConnectingPoint num="2" id="377" />
-<TGConnectingPoint num="3" id="378" />
-<TGConnectingPoint num="4" id="379" />
-<TGConnectingPoint num="5" id="380" />
-<TGConnectingPoint num="6" id="381" />
-<TGConnectingPoint num="7" id="382" />
-<TGConnectingPoint num="8" id="383" />
-<TGConnectingPoint num="9" id="384" />
-<TGConnectingPoint num="10" id="385" />
-<TGConnectingPoint num="11" id="386" />
-<TGConnectingPoint num="12" id="387" />
-<TGConnectingPoint num="13" id="388" />
-<TGConnectingPoint num="14" id="389" />
-<TGConnectingPoint num="15" id="390" />
-<TGConnectingPoint num="16" id="391" />
-<TGConnectingPoint num="17" id="392" />
-<TGConnectingPoint num="18" id="393" />
-<TGConnectingPoint num="19" id="394" />
-<TGConnectingPoint num="20" id="395" />
-<TGConnectingPoint num="21" id="396" />
-<TGConnectingPoint num="22" id="397" />
-<TGConnectingPoint num="23" id="398" />
+<TGConnectingPoint num="0" id="348" />
+<TGConnectingPoint num="1" id="349" />
+<TGConnectingPoint num="2" id="350" />
+<TGConnectingPoint num="3" id="351" />
+<TGConnectingPoint num="4" id="352" />
+<TGConnectingPoint num="5" id="353" />
+<TGConnectingPoint num="6" id="354" />
+<TGConnectingPoint num="7" id="355" />
+<TGConnectingPoint num="8" id="356" />
+<TGConnectingPoint num="9" id="357" />
+<TGConnectingPoint num="10" id="358" />
+<TGConnectingPoint num="11" id="359" />
+<TGConnectingPoint num="12" id="360" />
+<TGConnectingPoint num="13" id="361" />
+<TGConnectingPoint num="14" id="362" />
+<TGConnectingPoint num="15" id="363" />
+<TGConnectingPoint num="16" id="364" />
+<TGConnectingPoint num="17" id="365" />
+<TGConnectingPoint num="18" id="366" />
+<TGConnectingPoint num="19" id="367" />
+<TGConnectingPoint num="20" id="368" />
+<TGConnectingPoint num="21" id="369" />
+<TGConnectingPoint num="22" id="370" />
+<TGConnectingPoint num="23" id="371" />
 <extraparam>
 <info stereotype="MEMORY" nodeName="Memory0" />
 <attributes byteDataSize="4"  memorySize="1024"  clockRatio="1"  bufferType="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1102" id="424" >
+<COMPONENT type="1102" id="397" >
 <cdparam x="1363" y="461" />
 <sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Bus1" value="name" />
-<TGConnectingPoint num="0" id="400" />
-<TGConnectingPoint num="1" id="401" />
-<TGConnectingPoint num="2" id="402" />
-<TGConnectingPoint num="3" id="403" />
-<TGConnectingPoint num="4" id="404" />
-<TGConnectingPoint num="5" id="405" />
-<TGConnectingPoint num="6" id="406" />
-<TGConnectingPoint num="7" id="407" />
-<TGConnectingPoint num="8" id="408" />
-<TGConnectingPoint num="9" id="409" />
-<TGConnectingPoint num="10" id="410" />
-<TGConnectingPoint num="11" id="411" />
-<TGConnectingPoint num="12" id="412" />
-<TGConnectingPoint num="13" id="413" />
-<TGConnectingPoint num="14" id="414" />
-<TGConnectingPoint num="15" id="415" />
-<TGConnectingPoint num="16" id="416" />
-<TGConnectingPoint num="17" id="417" />
-<TGConnectingPoint num="18" id="418" />
-<TGConnectingPoint num="19" id="419" />
-<TGConnectingPoint num="20" id="420" />
-<TGConnectingPoint num="21" id="421" />
-<TGConnectingPoint num="22" id="422" />
-<TGConnectingPoint num="23" id="423" />
+<TGConnectingPoint num="0" id="373" />
+<TGConnectingPoint num="1" id="374" />
+<TGConnectingPoint num="2" id="375" />
+<TGConnectingPoint num="3" id="376" />
+<TGConnectingPoint num="4" id="377" />
+<TGConnectingPoint num="5" id="378" />
+<TGConnectingPoint num="6" id="379" />
+<TGConnectingPoint num="7" id="380" />
+<TGConnectingPoint num="8" id="381" />
+<TGConnectingPoint num="9" id="382" />
+<TGConnectingPoint num="10" id="383" />
+<TGConnectingPoint num="11" id="384" />
+<TGConnectingPoint num="12" id="385" />
+<TGConnectingPoint num="13" id="386" />
+<TGConnectingPoint num="14" id="387" />
+<TGConnectingPoint num="15" id="388" />
+<TGConnectingPoint num="16" id="389" />
+<TGConnectingPoint num="17" id="390" />
+<TGConnectingPoint num="18" id="391" />
+<TGConnectingPoint num="19" id="392" />
+<TGConnectingPoint num="20" id="393" />
+<TGConnectingPoint num="21" id="394" />
+<TGConnectingPoint num="22" id="395" />
+<TGConnectingPoint num="23" id="396" />
 <extraparam>
 <info stereotype="BUS-RR" nodeName="Bus1" />
 <attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="1"  privacy="0"  referenceAttack="null" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1102" id="449" >
+<COMPONENT type="1102" id="422" >
 <cdparam x="316" y="416" />
 <sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="425" />
-<TGConnectingPoint num="1" id="426" />
-<TGConnectingPoint num="2" id="427" />
-<TGConnectingPoint num="3" id="428" />
-<TGConnectingPoint num="4" id="429" />
-<TGConnectingPoint num="5" id="430" />
-<TGConnectingPoint num="6" id="431" />
-<TGConnectingPoint num="7" id="432" />
-<TGConnectingPoint num="8" id="433" />
-<TGConnectingPoint num="9" id="434" />
-<TGConnectingPoint num="10" id="435" />
-<TGConnectingPoint num="11" id="436" />
-<TGConnectingPoint num="12" id="437" />
-<TGConnectingPoint num="13" id="438" />
-<TGConnectingPoint num="14" id="439" />
-<TGConnectingPoint num="15" id="440" />
-<TGConnectingPoint num="16" id="441" />
-<TGConnectingPoint num="17" id="442" />
-<TGConnectingPoint num="18" id="443" />
-<TGConnectingPoint num="19" id="444" />
-<TGConnectingPoint num="20" id="445" />
-<TGConnectingPoint num="21" id="446" />
-<TGConnectingPoint num="22" id="447" />
-<TGConnectingPoint num="23" id="448" />
+<TGConnectingPoint num="0" id="398" />
+<TGConnectingPoint num="1" id="399" />
+<TGConnectingPoint num="2" id="400" />
+<TGConnectingPoint num="3" id="401" />
+<TGConnectingPoint num="4" id="402" />
+<TGConnectingPoint num="5" id="403" />
+<TGConnectingPoint num="6" id="404" />
+<TGConnectingPoint num="7" id="405" />
+<TGConnectingPoint num="8" id="406" />
+<TGConnectingPoint num="9" id="407" />
+<TGConnectingPoint num="10" id="408" />
+<TGConnectingPoint num="11" id="409" />
+<TGConnectingPoint num="12" id="410" />
+<TGConnectingPoint num="13" id="411" />
+<TGConnectingPoint num="14" id="412" />
+<TGConnectingPoint num="15" id="413" />
+<TGConnectingPoint num="16" id="414" />
+<TGConnectingPoint num="17" id="415" />
+<TGConnectingPoint num="18" id="416" />
+<TGConnectingPoint num="19" id="417" />
+<TGConnectingPoint num="20" id="418" />
+<TGConnectingPoint num="21" id="419" />
+<TGConnectingPoint num="22" id="420" />
+<TGConnectingPoint num="23" id="421" />
 <extraparam>
 <info stereotype="BUS-RR" nodeName="Bus0" />
 <attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="1"  privacy="0"  referenceAttack="null" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1116" id="474" >
+<COMPONENT type="1116" id="447" >
 <cdparam x="1355" y="573" />
 <sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="FPGA1" value="name" />
-<TGConnectingPoint num="0" id="450" />
-<TGConnectingPoint num="1" id="451" />
-<TGConnectingPoint num="2" id="452" />
-<TGConnectingPoint num="3" id="453" />
-<TGConnectingPoint num="4" id="454" />
-<TGConnectingPoint num="5" id="455" />
-<TGConnectingPoint num="6" id="456" />
-<TGConnectingPoint num="7" id="457" />
-<TGConnectingPoint num="8" id="458" />
-<TGConnectingPoint num="9" id="459" />
-<TGConnectingPoint num="10" id="460" />
-<TGConnectingPoint num="11" id="461" />
-<TGConnectingPoint num="12" id="462" />
-<TGConnectingPoint num="13" id="463" />
-<TGConnectingPoint num="14" id="464" />
-<TGConnectingPoint num="15" id="465" />
-<TGConnectingPoint num="16" id="466" />
-<TGConnectingPoint num="17" id="467" />
-<TGConnectingPoint num="18" id="468" />
-<TGConnectingPoint num="19" id="469" />
-<TGConnectingPoint num="20" id="470" />
-<TGConnectingPoint num="21" id="471" />
-<TGConnectingPoint num="22" id="472" />
-<TGConnectingPoint num="23" id="473" />
+<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" />
+<TGConnectingPoint num="10" id="433" />
+<TGConnectingPoint num="11" id="434" />
+<TGConnectingPoint num="12" id="435" />
+<TGConnectingPoint num="13" id="436" />
+<TGConnectingPoint num="14" id="437" />
+<TGConnectingPoint num="15" id="438" />
+<TGConnectingPoint num="16" id="439" />
+<TGConnectingPoint num="17" id="440" />
+<TGConnectingPoint num="18" id="441" />
+<TGConnectingPoint num="19" id="442" />
+<TGConnectingPoint num="20" id="443" />
+<TGConnectingPoint num="21" id="444" />
+<TGConnectingPoint num="22" id="445" />
+<TGConnectingPoint num="23" id="446" />
 <extraparam>
 <info stereotype="FPGA" nodeName="FPGA1" />
 <attributes capacity="100" byteDataSize="4"  mappingPenalty="0"  reconfigurationTime="50"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  execiTime="1" execcTime="1" clockRatio="1" operation =""  scheduling ="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1116" id="499" >
+<COMPONENT type="1116" id="472" >
 <cdparam x="74" y="596" />
 <sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="FPGA0" value="name" />
-<TGConnectingPoint num="0" id="475" />
-<TGConnectingPoint num="1" id="476" />
-<TGConnectingPoint num="2" id="477" />
-<TGConnectingPoint num="3" id="478" />
-<TGConnectingPoint num="4" id="479" />
-<TGConnectingPoint num="5" id="480" />
-<TGConnectingPoint num="6" id="481" />
-<TGConnectingPoint num="7" id="482" />
-<TGConnectingPoint num="8" id="483" />
-<TGConnectingPoint num="9" id="484" />
-<TGConnectingPoint num="10" id="485" />
-<TGConnectingPoint num="11" id="486" />
-<TGConnectingPoint num="12" id="487" />
-<TGConnectingPoint num="13" id="488" />
-<TGConnectingPoint num="14" id="489" />
-<TGConnectingPoint num="15" id="490" />
-<TGConnectingPoint num="16" id="491" />
-<TGConnectingPoint num="17" id="492" />
-<TGConnectingPoint num="18" id="493" />
-<TGConnectingPoint num="19" id="494" />
-<TGConnectingPoint num="20" id="495" />
-<TGConnectingPoint num="21" id="496" />
-<TGConnectingPoint num="22" id="497" />
-<TGConnectingPoint num="23" id="498" />
+<TGConnectingPoint num="0" id="448" />
+<TGConnectingPoint num="1" id="449" />
+<TGConnectingPoint num="2" id="450" />
+<TGConnectingPoint num="3" id="451" />
+<TGConnectingPoint num="4" id="452" />
+<TGConnectingPoint num="5" id="453" />
+<TGConnectingPoint num="6" id="454" />
+<TGConnectingPoint num="7" id="455" />
+<TGConnectingPoint num="8" id="456" />
+<TGConnectingPoint num="9" id="457" />
+<TGConnectingPoint num="10" id="458" />
+<TGConnectingPoint num="11" id="459" />
+<TGConnectingPoint num="12" id="460" />
+<TGConnectingPoint num="13" id="461" />
+<TGConnectingPoint num="14" id="462" />
+<TGConnectingPoint num="15" id="463" />
+<TGConnectingPoint num="16" id="464" />
+<TGConnectingPoint num="17" id="465" />
+<TGConnectingPoint num="18" id="466" />
+<TGConnectingPoint num="19" id="467" />
+<TGConnectingPoint num="20" id="468" />
+<TGConnectingPoint num="21" id="469" />
+<TGConnectingPoint num="22" id="470" />
+<TGConnectingPoint num="23" id="471" />
 <extraparam>
 <info stereotype="FPGA" nodeName="FPGA0" />
 <attributes capacity="100" byteDataSize="4"  mappingPenalty="0"  reconfigurationTime="50"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  execiTime="1" execcTime="1" clockRatio="1" operation =""  scheduling ="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1106" id="524" >
+<COMPONENT type="1106" id="497" >
 <cdparam x="1108" y="814" />
 <sizeparam width="250" height="100" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Bridge1" value="name" />
-<TGConnectingPoint num="0" id="500" />
-<TGConnectingPoint num="1" id="501" />
-<TGConnectingPoint num="2" id="502" />
-<TGConnectingPoint num="3" id="503" />
-<TGConnectingPoint num="4" id="504" />
-<TGConnectingPoint num="5" id="505" />
-<TGConnectingPoint num="6" id="506" />
-<TGConnectingPoint num="7" id="507" />
-<TGConnectingPoint num="8" id="508" />
-<TGConnectingPoint num="9" id="509" />
-<TGConnectingPoint num="10" id="510" />
-<TGConnectingPoint num="11" id="511" />
-<TGConnectingPoint num="12" id="512" />
-<TGConnectingPoint num="13" id="513" />
-<TGConnectingPoint num="14" id="514" />
-<TGConnectingPoint num="15" id="515" />
-<TGConnectingPoint num="16" id="516" />
-<TGConnectingPoint num="17" id="517" />
-<TGConnectingPoint num="18" id="518" />
-<TGConnectingPoint num="19" id="519" />
-<TGConnectingPoint num="20" id="520" />
-<TGConnectingPoint num="21" id="521" />
-<TGConnectingPoint num="22" id="522" />
-<TGConnectingPoint num="23" id="523" />
+<TGConnectingPoint num="0" id="473" />
+<TGConnectingPoint num="1" id="474" />
+<TGConnectingPoint num="2" id="475" />
+<TGConnectingPoint num="3" id="476" />
+<TGConnectingPoint num="4" id="477" />
+<TGConnectingPoint num="5" id="478" />
+<TGConnectingPoint num="6" id="479" />
+<TGConnectingPoint num="7" id="480" />
+<TGConnectingPoint num="8" id="481" />
+<TGConnectingPoint num="9" id="482" />
+<TGConnectingPoint num="10" id="483" />
+<TGConnectingPoint num="11" id="484" />
+<TGConnectingPoint num="12" id="485" />
+<TGConnectingPoint num="13" id="486" />
+<TGConnectingPoint num="14" id="487" />
+<TGConnectingPoint num="15" id="488" />
+<TGConnectingPoint num="16" id="489" />
+<TGConnectingPoint num="17" id="490" />
+<TGConnectingPoint num="18" id="491" />
+<TGConnectingPoint num="19" id="492" />
+<TGConnectingPoint num="20" id="493" />
+<TGConnectingPoint num="21" id="494" />
+<TGConnectingPoint num="22" id="495" />
+<TGConnectingPoint num="23" id="496" />
 <extraparam>
 <info stereotype="BRIDGE" nodeName="Bridge1" />
 <attributes bufferByteDataSize="4"  clockRatio="1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1106" id="549" >
-<cdparam x="13" y="416" />
-<sizeparam width="250" height="100" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Bridge0" value="name" />
-<TGConnectingPoint num="0" id="525" />
-<TGConnectingPoint num="1" id="526" />
-<TGConnectingPoint num="2" id="527" />
-<TGConnectingPoint num="3" id="528" />
-<TGConnectingPoint num="4" id="529" />
-<TGConnectingPoint num="5" id="530" />
-<TGConnectingPoint num="6" id="531" />
-<TGConnectingPoint num="7" id="532" />
-<TGConnectingPoint num="8" id="533" />
-<TGConnectingPoint num="9" id="534" />
-<TGConnectingPoint num="10" id="535" />
-<TGConnectingPoint num="11" id="536" />
-<TGConnectingPoint num="12" id="537" />
-<TGConnectingPoint num="13" id="538" />
-<TGConnectingPoint num="14" id="539" />
-<TGConnectingPoint num="15" id="540" />
-<TGConnectingPoint num="16" id="541" />
-<TGConnectingPoint num="17" id="542" />
-<TGConnectingPoint num="18" id="543" />
-<TGConnectingPoint num="19" id="544" />
-<TGConnectingPoint num="20" id="545" />
-<TGConnectingPoint num="21" id="546" />
-<TGConnectingPoint num="22" id="547" />
-<TGConnectingPoint num="23" id="548" />
-<extraparam>
-<info stereotype="BRIDGE" nodeName="Bridge0" />
-<attributes bufferByteDataSize="4"  clockRatio="1" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1104" id="574" >
+<COMPONENT type="1104" id="522" >
 <cdparam x="1393" y="804" />
 <sizeparam width="200" height="200" minWidth="100" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="HWA1" value="name" />
-<TGConnectingPoint num="0" id="550" />
-<TGConnectingPoint num="1" id="551" />
-<TGConnectingPoint num="2" id="552" />
-<TGConnectingPoint num="3" id="553" />
-<TGConnectingPoint num="4" id="554" />
-<TGConnectingPoint num="5" id="555" />
-<TGConnectingPoint num="6" id="556" />
-<TGConnectingPoint num="7" id="557" />
-<TGConnectingPoint num="8" id="558" />
-<TGConnectingPoint num="9" id="559" />
-<TGConnectingPoint num="10" id="560" />
-<TGConnectingPoint num="11" id="561" />
-<TGConnectingPoint num="12" id="562" />
-<TGConnectingPoint num="13" id="563" />
-<TGConnectingPoint num="14" id="564" />
-<TGConnectingPoint num="15" id="565" />
-<TGConnectingPoint num="16" id="566" />
-<TGConnectingPoint num="17" id="567" />
-<TGConnectingPoint num="18" id="568" />
-<TGConnectingPoint num="19" id="569" />
-<TGConnectingPoint num="20" id="570" />
-<TGConnectingPoint num="21" id="571" />
-<TGConnectingPoint num="22" id="572" />
-<TGConnectingPoint num="23" id="573" />
+<TGConnectingPoint num="0" id="498" />
+<TGConnectingPoint num="1" id="499" />
+<TGConnectingPoint num="2" id="500" />
+<TGConnectingPoint num="3" id="501" />
+<TGConnectingPoint num="4" id="502" />
+<TGConnectingPoint num="5" id="503" />
+<TGConnectingPoint num="6" id="504" />
+<TGConnectingPoint num="7" id="505" />
+<TGConnectingPoint num="8" id="506" />
+<TGConnectingPoint num="9" id="507" />
+<TGConnectingPoint num="10" id="508" />
+<TGConnectingPoint num="11" id="509" />
+<TGConnectingPoint num="12" id="510" />
+<TGConnectingPoint num="13" id="511" />
+<TGConnectingPoint num="14" id="512" />
+<TGConnectingPoint num="15" id="513" />
+<TGConnectingPoint num="16" id="514" />
+<TGConnectingPoint num="17" id="515" />
+<TGConnectingPoint num="18" id="516" />
+<TGConnectingPoint num="19" id="517" />
+<TGConnectingPoint num="20" id="518" />
+<TGConnectingPoint num="21" id="519" />
+<TGConnectingPoint num="22" id="520" />
+<TGConnectingPoint num="23" id="521" />
 <extraparam>
 <info stereotype="HWA" nodeName="HWA1" />
 <attributes byteDataSize="4"  execiTime="1"  clockRatio="1"  operation="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1104" id="599" >
+<COMPONENT type="1104" id="547" >
 <cdparam x="672" y="681" />
 <sizeparam width="200" height="200" minWidth="100" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="HWA0" value="name" />
-<TGConnectingPoint num="0" id="575" />
-<TGConnectingPoint num="1" id="576" />
-<TGConnectingPoint num="2" id="577" />
-<TGConnectingPoint num="3" id="578" />
-<TGConnectingPoint num="4" id="579" />
-<TGConnectingPoint num="5" id="580" />
-<TGConnectingPoint num="6" id="581" />
-<TGConnectingPoint num="7" id="582" />
-<TGConnectingPoint num="8" id="583" />
-<TGConnectingPoint num="9" id="584" />
-<TGConnectingPoint num="10" id="585" />
-<TGConnectingPoint num="11" id="586" />
-<TGConnectingPoint num="12" id="587" />
-<TGConnectingPoint num="13" id="588" />
-<TGConnectingPoint num="14" id="589" />
-<TGConnectingPoint num="15" id="590" />
-<TGConnectingPoint num="16" id="591" />
-<TGConnectingPoint num="17" id="592" />
-<TGConnectingPoint num="18" id="593" />
-<TGConnectingPoint num="19" id="594" />
-<TGConnectingPoint num="20" id="595" />
-<TGConnectingPoint num="21" id="596" />
-<TGConnectingPoint num="22" id="597" />
-<TGConnectingPoint num="23" id="598" />
+<TGConnectingPoint num="0" id="523" />
+<TGConnectingPoint num="1" id="524" />
+<TGConnectingPoint num="2" id="525" />
+<TGConnectingPoint num="3" id="526" />
+<TGConnectingPoint num="4" id="527" />
+<TGConnectingPoint num="5" id="528" />
+<TGConnectingPoint num="6" id="529" />
+<TGConnectingPoint num="7" id="530" />
+<TGConnectingPoint num="8" id="531" />
+<TGConnectingPoint num="9" id="532" />
+<TGConnectingPoint num="10" id="533" />
+<TGConnectingPoint num="11" id="534" />
+<TGConnectingPoint num="12" id="535" />
+<TGConnectingPoint num="13" id="536" />
+<TGConnectingPoint num="14" id="537" />
+<TGConnectingPoint num="15" id="538" />
+<TGConnectingPoint num="16" id="539" />
+<TGConnectingPoint num="17" id="540" />
+<TGConnectingPoint num="18" id="541" />
+<TGConnectingPoint num="19" id="542" />
+<TGConnectingPoint num="20" id="543" />
+<TGConnectingPoint num="21" id="544" />
+<TGConnectingPoint num="22" id="545" />
+<TGConnectingPoint num="23" id="546" />
 <extraparam>
 <info stereotype="HWA" nodeName="HWA0" />
 <attributes byteDataSize="4"  execiTime="1"  clockRatio="1"  operation="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1107" id="624" >
+<COMPONENT type="1107" id="572" >
 <cdparam x="1109" y="354" />
 <sizeparam width="200" height="200" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="DMA1" value="name" />
-<TGConnectingPoint num="0" id="600" />
-<TGConnectingPoint num="1" id="601" />
-<TGConnectingPoint num="2" id="602" />
-<TGConnectingPoint num="3" id="603" />
-<TGConnectingPoint num="4" id="604" />
-<TGConnectingPoint num="5" id="605" />
-<TGConnectingPoint num="6" id="606" />
-<TGConnectingPoint num="7" id="607" />
-<TGConnectingPoint num="8" id="608" />
-<TGConnectingPoint num="9" id="609" />
-<TGConnectingPoint num="10" id="610" />
-<TGConnectingPoint num="11" id="611" />
-<TGConnectingPoint num="12" id="612" />
-<TGConnectingPoint num="13" id="613" />
-<TGConnectingPoint num="14" id="614" />
-<TGConnectingPoint num="15" id="615" />
-<TGConnectingPoint num="16" id="616" />
-<TGConnectingPoint num="17" id="617" />
-<TGConnectingPoint num="18" id="618" />
-<TGConnectingPoint num="19" id="619" />
-<TGConnectingPoint num="20" id="620" />
-<TGConnectingPoint num="21" id="621" />
-<TGConnectingPoint num="22" id="622" />
-<TGConnectingPoint num="23" id="623" />
+<TGConnectingPoint num="0" id="548" />
+<TGConnectingPoint num="1" id="549" />
+<TGConnectingPoint num="2" id="550" />
+<TGConnectingPoint num="3" id="551" />
+<TGConnectingPoint num="4" id="552" />
+<TGConnectingPoint num="5" id="553" />
+<TGConnectingPoint num="6" id="554" />
+<TGConnectingPoint num="7" id="555" />
+<TGConnectingPoint num="8" id="556" />
+<TGConnectingPoint num="9" id="557" />
+<TGConnectingPoint num="10" id="558" />
+<TGConnectingPoint num="11" id="559" />
+<TGConnectingPoint num="12" id="560" />
+<TGConnectingPoint num="13" id="561" />
+<TGConnectingPoint num="14" id="562" />
+<TGConnectingPoint num="15" id="563" />
+<TGConnectingPoint num="16" id="564" />
+<TGConnectingPoint num="17" id="565" />
+<TGConnectingPoint num="18" id="566" />
+<TGConnectingPoint num="19" id="567" />
+<TGConnectingPoint num="20" id="568" />
+<TGConnectingPoint num="21" id="569" />
+<TGConnectingPoint num="22" id="570" />
+<TGConnectingPoint num="23" id="571" />
 <extraparam>
 <info stereotype="DMA" nodeName="DMA1" />
 <attributes byteDataSize="4" nbOfChannels="1" clockRatio="1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1105" id="649" >
+<COMPONENT type="1105" id="597" >
 <cdparam x="1115" y="579" />
 <sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Memory1" value="name" />
-<TGConnectingPoint num="0" id="625" />
-<TGConnectingPoint num="1" id="626" />
-<TGConnectingPoint num="2" id="627" />
-<TGConnectingPoint num="3" id="628" />
-<TGConnectingPoint num="4" id="629" />
-<TGConnectingPoint num="5" id="630" />
-<TGConnectingPoint num="6" id="631" />
-<TGConnectingPoint num="7" id="632" />
-<TGConnectingPoint num="8" id="633" />
-<TGConnectingPoint num="9" id="634" />
-<TGConnectingPoint num="10" id="635" />
-<TGConnectingPoint num="11" id="636" />
-<TGConnectingPoint num="12" id="637" />
-<TGConnectingPoint num="13" id="638" />
-<TGConnectingPoint num="14" id="639" />
-<TGConnectingPoint num="15" id="640" />
-<TGConnectingPoint num="16" id="641" />
-<TGConnectingPoint num="17" id="642" />
-<TGConnectingPoint num="18" id="643" />
-<TGConnectingPoint num="19" id="644" />
-<TGConnectingPoint num="20" id="645" />
-<TGConnectingPoint num="21" id="646" />
-<TGConnectingPoint num="22" id="647" />
-<TGConnectingPoint num="23" id="648" />
+<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" />
 <extraparam>
 <info stereotype="MEMORY" nodeName="Memory1" />
 <attributes byteDataSize="4"  memorySize="1024"  clockRatio="1"  bufferType="0" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="125" id="650" >
-<cdparam x="759" y="623" />
+<COMPONENT type="1106" id="631" >
+<cdparam x="13" y="416" />
+<sizeparam width="250" height="100" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Bridge0" value="name" />
+<TGConnectingPoint num="0" id="607" />
+<TGConnectingPoint num="1" id="608" />
+<TGConnectingPoint num="2" id="609" />
+<TGConnectingPoint num="3" id="610" />
+<TGConnectingPoint num="4" id="611" />
+<TGConnectingPoint num="5" id="612" />
+<TGConnectingPoint num="6" id="613" />
+<TGConnectingPoint num="7" id="614" />
+<TGConnectingPoint num="8" id="615" />
+<TGConnectingPoint num="9" id="616" />
+<TGConnectingPoint num="10" id="617" />
+<TGConnectingPoint num="11" id="618" />
+<TGConnectingPoint num="12" id="619" />
+<TGConnectingPoint num="13" id="620" />
+<TGConnectingPoint num="14" id="621" />
+<TGConnectingPoint num="15" id="622" />
+<TGConnectingPoint num="16" id="623" />
+<TGConnectingPoint num="17" id="624" />
+<TGConnectingPoint num="18" id="625" />
+<TGConnectingPoint num="19" id="626" />
+<TGConnectingPoint num="20" id="627" />
+<TGConnectingPoint num="21" id="628" />
+<TGConnectingPoint num="22" id="629" />
+<TGConnectingPoint num="23" id="630" />
+<extraparam>
+<info stereotype="BRIDGE" nodeName="Bridge0" />
+<attributes bufferByteDataSize="4"  clockRatio="1" />
+</extraparam>
+</COMPONENT>
+
+<CONNECTOR type="125" id="632" >
+<cdparam x="199" y="596" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="722" y="681" id="583" />
-<P2  x="503" y="466" id="440" />
+<P1  x="199" y="596" id="449" />
+<P2  x="378" y="466" id="412" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="651" >
-<cdparam x="444" y="328" />
+<CONNECTOR type="125" id="633" >
+<cdparam x="262" y="461" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="359" y="353" id="281" />
-<P2  x="441" y="416" id="426" />
+<P1  x="263" y="466" id="611" />
+<P2  x="316" y="441" id="401" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="652" >
-<cdparam x="298" y="533" />
+<CONNECTOR type="125" id="634" >
+<cdparam x="770" y="476" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="444" y="601" id="376" />
-<P2  x="441" y="466" id="431" />
+<P1  x="699" y="448" id="333" />
+<P2  x="566" y="441" id="402" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="653" >
-<cdparam x="770" y="476" />
+<CONNECTOR type="125" id="635" >
+<cdparam x="298" y="533" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="699" y="448" id="360" />
-<P2  x="566" y="441" id="429" />
+<P1  x="444" y="601" id="349" />
+<P2  x="441" y="466" id="404" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="654" >
-<cdparam x="262" y="461" />
+<CONNECTOR type="125" id="636" >
+<cdparam x="444" y="328" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="263" y="466" id="529" />
-<P2  x="316" y="441" id="428" />
+<P1  x="359" y="353" id="254" />
+<P2  x="441" y="416" id="399" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="655" >
-<cdparam x="199" y="596" />
+<CONNECTOR type="125" id="637" >
+<cdparam x="759" y="623" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="199" y="596" id="476" />
-<P2  x="378" y="466" id="439" />
+<P1  x="722" y="681" id="531" />
+<P2  x="503" y="466" id="413" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
diff --git a/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml b/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
index 60a0086af9342340da9680a9730f3617970e3a0b..35764656dd286ba7b0772065b4d78cb041adc5d7 100644
--- a/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/input/CloneCompositeComponentTest.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="0" LAST_SELECTED_SUB_TAB="1">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="0">
 
 <Modeling type="TML Component Design" nameTab="Application" tabs="TML Component Task Diagram$PrimitiveComp2$PrimitiveComp1$PrimitiveComp3$PrimitiveComp4$PrimitiveComp5$PrimitiveComp6" >
 <TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
 <CONNECTOR type="126" id="1" >
-<cdparam x="1144" y="348" />
+<cdparam x="475" y="480" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="1100" y="256" id="87" />
-<P2  x="1100" y="313" id="85" />
+<P1  x="467" y="365" id="45" />
+<P2  x="514" y="364" id="56" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="2" >
-<cdparam x="424" y="585" />
+<cdparam x="1021" y="460" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="424" y="585" id="32" />
-<P2  x="521" y="585" id="34" />
+<P1  x="564" y="164" id="6" />
+<P2  x="430" y="163" id="19" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="3" >
@@ -29,19 +29,19 @@
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="4" >
-<cdparam x="1021" y="460" />
+<cdparam x="424" y="585" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="564" y="164" id="6" />
-<P2  x="430" y="163" id="19" />
+<P1  x="424" y="585" id="32" />
+<P2  x="521" y="585" id="34" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="5" >
-<cdparam x="475" y="480" />
+<cdparam x="1144" y="348" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="467" y="365" id="45" />
-<P2  x="514" y="364" id="56" />
+<P1  x="1144" y="348" id="87" />
+<P2  x="1144" y="405" id="85" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <COMPONENT type="1200" id="84" >
@@ -314,7 +314,7 @@
 </SUBCOMPONENT>
 
 <COMPONENT type="1202" id="97" >
-<cdparam x="887" y="200" />
+<cdparam x="931" y="292" />
 <sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
@@ -333,7 +333,7 @@
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="86" >
 <father id="97" num="0" />
-<cdparam x="1074" y="300" />
+<cdparam x="1118" y="392" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
@@ -350,7 +350,7 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="88" >
 <father id="97" num="1" />
-<cdparam x="1074" y="243" />
+<cdparam x="1118" y="335" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
@@ -556,7 +556,7 @@
 <TGConnectingPoint num="0" id="131" />
 <TGConnectingPoint num="1" id="132" />
 <extraparam>
-<Data channelName="channel" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
+<Data channelName="channel" nbOfSamples="1" secPattern="" isAttacker="Yes" isEncForm="Yes" />
 </extraparam>
 </COMPONENT>
 
@@ -1066,48 +1066,12 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1100" id="297" >
+<COMPONENT type="1100" id="322" >
 <cdparam x="991" y="100" />
 <sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="CPU1" value="name" />
-<TGConnectingPoint num="0" id="273" />
-<TGConnectingPoint num="1" id="274" />
-<TGConnectingPoint num="2" id="275" />
-<TGConnectingPoint num="3" id="276" />
-<TGConnectingPoint num="4" id="277" />
-<TGConnectingPoint num="5" id="278" />
-<TGConnectingPoint num="6" id="279" />
-<TGConnectingPoint num="7" id="280" />
-<TGConnectingPoint num="8" id="281" />
-<TGConnectingPoint num="9" id="282" />
-<TGConnectingPoint num="10" id="283" />
-<TGConnectingPoint num="11" id="284" />
-<TGConnectingPoint num="12" id="285" />
-<TGConnectingPoint num="13" id="286" />
-<TGConnectingPoint num="14" id="287" />
-<TGConnectingPoint num="15" id="288" />
-<TGConnectingPoint num="16" id="289" />
-<TGConnectingPoint num="17" id="290" />
-<TGConnectingPoint num="18" id="291" />
-<TGConnectingPoint num="19" id="292" />
-<TGConnectingPoint num="20" id="293" />
-<TGConnectingPoint num="21" id="294" />
-<TGConnectingPoint num="22" id="295" />
-<TGConnectingPoint num="23" id="296" />
-<extraparam>
-<info stereotype="CPURR" nodeName="CPU1" />
-<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1107" id="322" >
-<cdparam x="699" y="398" />
-<sizeparam width="200" height="200" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="DMA0" value="name" />
 <TGConnectingPoint num="0" id="298" />
 <TGConnectingPoint num="1" id="299" />
 <TGConnectingPoint num="2" id="300" />
@@ -1133,17 +1097,17 @@
 <TGConnectingPoint num="22" id="320" />
 <TGConnectingPoint num="23" id="321" />
 <extraparam>
-<info stereotype="DMA" nodeName="DMA0" />
-<attributes byteDataSize="4" nbOfChannels="1" clockRatio="1" />
+<info stereotype="CPURR" nodeName="CPU1" />
+<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1105" id="347" >
-<cdparam x="344" y="601" />
-<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1107" id="347" >
+<cdparam x="699" y="398" />
+<sizeparam width="200" height="200" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Memory0" value="name" />
+<infoparam name="DMA0" value="name" />
 <TGConnectingPoint num="0" id="323" />
 <TGConnectingPoint num="1" id="324" />
 <TGConnectingPoint num="2" id="325" />
@@ -1169,17 +1133,17 @@
 <TGConnectingPoint num="22" id="345" />
 <TGConnectingPoint num="23" id="346" />
 <extraparam>
-<info stereotype="MEMORY" nodeName="Memory0" />
-<attributes byteDataSize="4"  memorySize="1024"  clockRatio="1"  bufferType="0" />
+<info stereotype="DMA" nodeName="DMA0" />
+<attributes byteDataSize="4" nbOfChannels="1" clockRatio="1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1102" id="372" >
-<cdparam x="316" y="416" />
-<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1105" id="372" >
+<cdparam x="344" y="601" />
+<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Bus0" value="name" />
+<infoparam name="Memory0" value="name" />
 <TGConnectingPoint num="0" id="348" />
 <TGConnectingPoint num="1" id="349" />
 <TGConnectingPoint num="2" id="350" />
@@ -1205,53 +1169,17 @@
 <TGConnectingPoint num="22" id="370" />
 <TGConnectingPoint num="23" id="371" />
 <extraparam>
-<info stereotype="BUS-RR" nodeName="Bus0" />
-<attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="1"  privacy="0"  referenceAttack="null" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1116" id="397" >
-<cdparam x="74" y="596" />
-<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="FPGA0" value="name" />
-<TGConnectingPoint num="0" id="373" />
-<TGConnectingPoint num="1" id="374" />
-<TGConnectingPoint num="2" id="375" />
-<TGConnectingPoint num="3" id="376" />
-<TGConnectingPoint num="4" id="377" />
-<TGConnectingPoint num="5" id="378" />
-<TGConnectingPoint num="6" id="379" />
-<TGConnectingPoint num="7" id="380" />
-<TGConnectingPoint num="8" id="381" />
-<TGConnectingPoint num="9" id="382" />
-<TGConnectingPoint num="10" id="383" />
-<TGConnectingPoint num="11" id="384" />
-<TGConnectingPoint num="12" id="385" />
-<TGConnectingPoint num="13" id="386" />
-<TGConnectingPoint num="14" id="387" />
-<TGConnectingPoint num="15" id="388" />
-<TGConnectingPoint num="16" id="389" />
-<TGConnectingPoint num="17" id="390" />
-<TGConnectingPoint num="18" id="391" />
-<TGConnectingPoint num="19" id="392" />
-<TGConnectingPoint num="20" id="393" />
-<TGConnectingPoint num="21" id="394" />
-<TGConnectingPoint num="22" id="395" />
-<TGConnectingPoint num="23" id="396" />
-<extraparam>
-<info stereotype="FPGA" nodeName="FPGA0" />
-<attributes capacity="100" byteDataSize="4"  mappingPenalty="0"  reconfigurationTime="50"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  execiTime="1" execcTime="1" clockRatio="1" operation =""  scheduling ="" />
+<info stereotype="MEMORY" nodeName="Memory0" />
+<attributes byteDataSize="4"  memorySize="1024"  clockRatio="1"  bufferType="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1106" id="422" >
-<cdparam x="13" y="416" />
-<sizeparam width="250" height="100" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1102" id="422" >
+<cdparam x="316" y="416" />
+<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="Bridge0" value="name" />
+<infoparam name="Bus0" value="name" />
 <TGConnectingPoint num="0" id="398" />
 <TGConnectingPoint num="1" id="399" />
 <TGConnectingPoint num="2" id="400" />
@@ -1277,113 +1205,185 @@
 <TGConnectingPoint num="22" id="420" />
 <TGConnectingPoint num="23" id="421" />
 <extraparam>
-<info stereotype="BRIDGE" nodeName="Bridge0" />
-<attributes bufferByteDataSize="4"  clockRatio="1" />
+<info stereotype="BUS-RR" nodeName="Bus0" />
+<attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="1"  privacy="0"  referenceAttack="null" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1116" id="472" >
+<cdparam x="74" y="596" />
+<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="FPGA0" value="name" />
+<TGConnectingPoint num="0" id="448" />
+<TGConnectingPoint num="1" id="449" />
+<TGConnectingPoint num="2" id="450" />
+<TGConnectingPoint num="3" id="451" />
+<TGConnectingPoint num="4" id="452" />
+<TGConnectingPoint num="5" id="453" />
+<TGConnectingPoint num="6" id="454" />
+<TGConnectingPoint num="7" id="455" />
+<TGConnectingPoint num="8" id="456" />
+<TGConnectingPoint num="9" id="457" />
+<TGConnectingPoint num="10" id="458" />
+<TGConnectingPoint num="11" id="459" />
+<TGConnectingPoint num="12" id="460" />
+<TGConnectingPoint num="13" id="461" />
+<TGConnectingPoint num="14" id="462" />
+<TGConnectingPoint num="15" id="463" />
+<TGConnectingPoint num="16" id="464" />
+<TGConnectingPoint num="17" id="465" />
+<TGConnectingPoint num="18" id="466" />
+<TGConnectingPoint num="19" id="467" />
+<TGConnectingPoint num="20" id="468" />
+<TGConnectingPoint num="21" id="469" />
+<TGConnectingPoint num="22" id="470" />
+<TGConnectingPoint num="23" id="471" />
+<extraparam>
+<info stereotype="FPGA" nodeName="FPGA0" />
+<attributes capacity="100" byteDataSize="4"  mappingPenalty="0"  reconfigurationTime="50"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  execiTime="1" execcTime="1" clockRatio="1" operation =""  scheduling ="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1104" id="447" >
-<cdparam x="672" y="681" />
+<COMPONENT type="1104" id="547" >
+<cdparam x="676" y="630" />
 <sizeparam width="200" height="200" minWidth="100" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="HWA0" value="name" />
-<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" />
-<TGConnectingPoint num="10" id="433" />
-<TGConnectingPoint num="11" id="434" />
-<TGConnectingPoint num="12" id="435" />
-<TGConnectingPoint num="13" id="436" />
-<TGConnectingPoint num="14" id="437" />
-<TGConnectingPoint num="15" id="438" />
-<TGConnectingPoint num="16" id="439" />
-<TGConnectingPoint num="17" id="440" />
-<TGConnectingPoint num="18" id="441" />
-<TGConnectingPoint num="19" id="442" />
-<TGConnectingPoint num="20" id="443" />
-<TGConnectingPoint num="21" id="444" />
-<TGConnectingPoint num="22" id="445" />
-<TGConnectingPoint num="23" id="446" />
+<TGConnectingPoint num="0" id="523" />
+<TGConnectingPoint num="1" id="524" />
+<TGConnectingPoint num="2" id="525" />
+<TGConnectingPoint num="3" id="526" />
+<TGConnectingPoint num="4" id="527" />
+<TGConnectingPoint num="5" id="528" />
+<TGConnectingPoint num="6" id="529" />
+<TGConnectingPoint num="7" id="530" />
+<TGConnectingPoint num="8" id="531" />
+<TGConnectingPoint num="9" id="532" />
+<TGConnectingPoint num="10" id="533" />
+<TGConnectingPoint num="11" id="534" />
+<TGConnectingPoint num="12" id="535" />
+<TGConnectingPoint num="13" id="536" />
+<TGConnectingPoint num="14" id="537" />
+<TGConnectingPoint num="15" id="538" />
+<TGConnectingPoint num="16" id="539" />
+<TGConnectingPoint num="17" id="540" />
+<TGConnectingPoint num="18" id="541" />
+<TGConnectingPoint num="19" id="542" />
+<TGConnectingPoint num="20" id="543" />
+<TGConnectingPoint num="21" id="544" />
+<TGConnectingPoint num="22" id="545" />
+<TGConnectingPoint num="23" id="546" />
 <extraparam>
 <info stereotype="HWA" nodeName="HWA0" />
 <attributes byteDataSize="4"  execiTime="1"  clockRatio="1"  operation="" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="125" id="448" >
-<cdparam x="759" y="623" />
+<COMPONENT type="1106" id="631" >
+<cdparam x="13" y="416" />
+<sizeparam width="250" height="100" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Bridge0" value="name" />
+<TGConnectingPoint num="0" id="607" />
+<TGConnectingPoint num="1" id="608" />
+<TGConnectingPoint num="2" id="609" />
+<TGConnectingPoint num="3" id="610" />
+<TGConnectingPoint num="4" id="611" />
+<TGConnectingPoint num="5" id="612" />
+<TGConnectingPoint num="6" id="613" />
+<TGConnectingPoint num="7" id="614" />
+<TGConnectingPoint num="8" id="615" />
+<TGConnectingPoint num="9" id="616" />
+<TGConnectingPoint num="10" id="617" />
+<TGConnectingPoint num="11" id="618" />
+<TGConnectingPoint num="12" id="619" />
+<TGConnectingPoint num="13" id="620" />
+<TGConnectingPoint num="14" id="621" />
+<TGConnectingPoint num="15" id="622" />
+<TGConnectingPoint num="16" id="623" />
+<TGConnectingPoint num="17" id="624" />
+<TGConnectingPoint num="18" id="625" />
+<TGConnectingPoint num="19" id="626" />
+<TGConnectingPoint num="20" id="627" />
+<TGConnectingPoint num="21" id="628" />
+<TGConnectingPoint num="22" id="629" />
+<TGConnectingPoint num="23" id="630" />
+<extraparam>
+<info stereotype="BRIDGE" nodeName="Bridge0" />
+<attributes bufferByteDataSize="4"  clockRatio="1" />
+</extraparam>
+</COMPONENT>
+
+<CONNECTOR type="125" id="632" >
+<cdparam x="199" y="596" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="722" y="681" id="431" />
-<P2  x="503" y="466" id="363" />
+<P1  x="199" y="596" id="449" />
+<P2  x="378" y="466" id="412" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="449" >
-<cdparam x="444" y="328" />
+<CONNECTOR type="125" id="633" >
+<cdparam x="262" y="461" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="359" y="353" id="254" />
-<P2  x="441" y="416" id="349" />
+<P1  x="263" y="466" id="611" />
+<P2  x="316" y="441" id="401" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="450" >
-<cdparam x="298" y="533" />
+<CONNECTOR type="125" id="634" >
+<cdparam x="770" y="476" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="444" y="601" id="324" />
-<P2  x="441" y="466" id="354" />
+<P1  x="699" y="448" id="333" />
+<P2  x="566" y="441" id="402" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="451" >
-<cdparam x="770" y="476" />
+<CONNECTOR type="125" id="635" >
+<cdparam x="298" y="533" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="699" y="448" id="308" />
-<P2  x="566" y="441" id="352" />
+<P1  x="444" y="601" id="349" />
+<P2  x="441" y="466" id="404" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="452" >
-<cdparam x="262" y="461" />
+<CONNECTOR type="125" id="636" >
+<cdparam x="444" y="328" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="263" y="466" id="402" />
-<P2  x="316" y="441" id="351" />
+<P1  x="359" y="353" id="254" />
+<P2  x="441" y="416" id="399" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="453" >
-<cdparam x="199" y="596" />
+<CONNECTOR type="125" id="637" >
+<cdparam x="759" y="623" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="199" y="596" id="374" />
-<P2  x="378" y="466" id="362" />
+<P1  x="726" y="630" id="531" />
+<P2  x="503" y="466" id="413" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
diff --git a/ttool/src/test/resources/ui/diagram2tml/input/Test_equalsFunction.xml b/ttool/src/test/resources/ui/diagram2tml/input/Test_equalsFunction.xml
new file mode 100644
index 0000000000000000000000000000000000000000..032cb3e3f60fcd1034d23a56814b2647d87537d2
--- /dev/null
+++ b/ttool/src/test/resources/ui/diagram2tml/input/Test_equalsFunction.xml
@@ -0,0 +1,1287 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="0">
+
+<Modeling type="TML Component Design" nameTab="Application" tabs="TML Component Task Diagram$Function0$Function1" >
+<TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" zoom="1.0" >
+<CONNECTOR type="126" id="1" >
+<cdparam x="944" y="253" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="Connector between ports" />
+<P1  x="1164" y="257" id="17" />
+<P2  x="1164" y="323" id="7" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="126" id="2" >
+<cdparam x="944" y="462" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="Connector between ports" />
+<P1  x="1164" y="466" id="13" />
+<P2  x="1164" y="394" id="15" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="126" id="3" >
+<cdparam x="699" y="575" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="Connector between ports" />
+<P1  x="962" y="510" id="9" />
+<P2  x="1070" y="510" id="11" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="126" id="4" >
+<cdparam x="894" y="228" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="Connector between ports" />
+<P1  x="661" y="255" id="30" />
+<P2  x="661" y="321" id="28" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="126" id="5" >
+<cdparam x="894" y="437" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="Connector between ports" />
+<P1  x="661" y="464" id="34" />
+<P2  x="661" y="392" id="32" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="126" id="6" >
+<cdparam x="649" y="550" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="Connector between ports" />
+<P1  x="459" y="508" id="38" />
+<P2  x="567" y="508" id="36" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<COMPONENT type="1202" id="27" >
+<cdparam x="728" y="208" />
+<sizeparam width="423" height="289" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Primitive component" value="Function1" />
+<TGConnectingPoint num="0" id="19" />
+<TGConnectingPoint num="1" id="20" />
+<TGConnectingPoint num="2" id="21" />
+<TGConnectingPoint num="3" id="22" />
+<TGConnectingPoint num="4" id="23" />
+<TGConnectingPoint num="5" id="24" />
+<TGConnectingPoint num="6" id="25" />
+<TGConnectingPoint num="7" id="26" />
+<extraparam>
+<Data isAttacker="No" daemon="false" Operation="" />
+<Attribute access="2" id="attr1" value="" type="0" typeOther="" />
+<Attribute access="2" id="attr2" value="" type="4" typeOther="" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1203" id="8" >
+<father id="27" num="0" />
+<cdparam x="1138" y="310" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="410" minY="-13" maxY="276" />
+<infoparam name="Primitive port" value="Channel Ch_in_1" />
+<TGConnectingPoint num="0" id="7" />
+<extraparam>
+<Prop commName="Ch_in_1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="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="10" >
+<father id="27" num="1" />
+<cdparam x="949" y="484" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="410" minY="-13" maxY="276" />
+<infoparam name="Primitive port" value="Request Req_in_1" />
+<TGConnectingPoint num="0" id="9" />
+<extraparam>
+<Prop commName="Req_in_1" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="12" >
+<father id="27" num="2" />
+<cdparam x="1057" y="484" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="410" minY="-13" maxY="276" />
+<infoparam name="Primitive port" value="Request Req_out_1" />
+<TGConnectingPoint num="0" id="11" />
+<extraparam>
+<Prop commName="Req_out_1" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="14" >
+<father id="27" num="3" />
+<cdparam x="1138" y="453" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="410" minY="-13" maxY="276" />
+<infoparam name="Primitive port" value="Event Evt_In_1" />
+<TGConnectingPoint num="0" id="13" />
+<extraparam>
+<Prop commName="Evt_In_1" commType="1" origin="false" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="16" >
+<father id="27" num="4" />
+<cdparam x="1138" y="381" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="410" minY="-13" maxY="276" />
+<infoparam name="Primitive port" value="Event Evt_out_1" />
+<TGConnectingPoint num="0" id="15" />
+<extraparam>
+<Prop commName="Evt_out_1" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="18" >
+<father id="27" num="5" />
+<cdparam x="1138" y="244" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="410" minY="-13" maxY="276" />
+<infoparam name="Primitive port" value="Channel Ch_out_1" />
+<TGConnectingPoint num="0" id="17" />
+<extraparam>
+<Prop commName="Ch_out_1" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1202" id="48" >
+<cdparam x="225" y="206" />
+<sizeparam width="423" height="289" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Primitive component" value="Function0" />
+<TGConnectingPoint num="0" id="40" />
+<TGConnectingPoint num="1" id="41" />
+<TGConnectingPoint num="2" id="42" />
+<TGConnectingPoint num="3" id="43" />
+<TGConnectingPoint num="4" id="44" />
+<TGConnectingPoint num="5" id="45" />
+<TGConnectingPoint num="6" id="46" />
+<TGConnectingPoint num="7" id="47" />
+<extraparam>
+<Data isAttacker="No" daemon="false" Operation="" />
+<Attribute access="2" id="attr1" value="" type="0" typeOther="" />
+<Attribute access="2" id="attr2" value="" type="4" typeOther="" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1203" id="29" >
+<father id="48" num="0" />
+<cdparam x="635" y="308" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="410" minY="-13" maxY="276" />
+<infoparam name="Primitive port" value="Channel Ch_in" />
+<TGConnectingPoint num="0" id="28" />
+<extraparam>
+<Prop commName="Ch_in" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="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="31" >
+<father id="48" num="1" />
+<cdparam x="635" y="242" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="410" minY="-13" maxY="276" />
+<infoparam name="Primitive port" value="Channel Ch_out" />
+<TGConnectingPoint num="0" id="30" />
+<extraparam>
+<Prop commName="Ch_out" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="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="33" >
+<father id="48" num="2" />
+<cdparam x="635" y="379" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="410" minY="-13" maxY="276" />
+<infoparam name="Primitive port" value="Event Evt_out" />
+<TGConnectingPoint num="0" id="32" />
+<extraparam>
+<Prop commName="Evt_out" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="35" >
+<father id="48" num="3" />
+<cdparam x="635" y="451" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="410" minY="-13" maxY="276" />
+<infoparam name="Primitive port" value="Event Evt_In" />
+<TGConnectingPoint num="0" id="34" />
+<extraparam>
+<Prop commName="Evt_In" commType="1" origin="false" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="37" >
+<father id="48" num="4" />
+<cdparam x="554" y="482" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="410" minY="-13" maxY="276" />
+<infoparam name="Primitive port" value="Request Req_out" />
+<TGConnectingPoint num="0" id="36" />
+<extraparam>
+<Prop commName="Req_out" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="39" >
+<father id="48" num="5" />
+<cdparam x="446" y="482" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="410" minY="-13" maxY="276" />
+<infoparam name="Primitive port" value="Request Req_in" />
+<TGConnectingPoint num="0" id="38" />
+<extraparam>
+<Prop commName="Req_in" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+
+
+</TMLComponentTaskDiagramPanel>
+
+<TMLActivityDiagramPanel name="Function0" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="1001" id="50" >
+<cdparam x="461" y="299" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="49" />
+</COMPONENT>
+
+<COMPONENT type="1001" id="52" >
+<cdparam x="721" y="314" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="51" />
+</COMPONENT>
+
+<COMPONENT type="1012" id="60" >
+<cdparam x="431" y="74" />
+<sizeparam width="30" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="56" />
+<TGConnectingPoint num="1" id="57" />
+<TGConnectingPoint num="2" id="58" />
+<TGConnectingPoint num="3" id="59" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="53" >
+<father id="60" num="0" />
+<cdparam x="406" y="84" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" 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="[ ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="54" >
+<father id="60" num="1" />
+<cdparam x="466" y="84" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" 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="[ ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="55" >
+<father id="60" num="2" />
+<cdparam x="451" y="119" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" 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="1009" id="63" >
+<cdparam x="441" y="248" />
+<sizeparam width="65" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="read channel" value="Ch_in(1) " />
+<TGConnectingPoint num="0" id="61" />
+<TGConnectingPoint num="1" id="62" />
+<extraparam>
+<Data channelName="Ch_in" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1008" id="66" >
+<cdparam x="259" y="145" />
+<sizeparam width="136" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="send event" value="Evt_out(attr1, attr2)" />
+<TGConnectingPoint num="0" id="64" />
+<TGConnectingPoint num="1" id="65" />
+<extraparam>
+<Data eventName="Evt_out" nbOfParams="5" />
+<Param index="0" value="attr1" />
+<Param index="1" value="attr2" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1006" id="69" >
+<cdparam x="443" y="171" />
+<sizeparam width="71" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="write channel" value="Ch_out(1)" />
+<TGConnectingPoint num="0" id="67" />
+<TGConnectingPoint num="1" id="68" />
+<extraparam>
+<Data channelName="Ch_out" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1001" id="71" >
+<cdparam x="304" y="309" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="70" />
+</COMPONENT>
+
+<COMPONENT type="1010" id="74" >
+<cdparam x="263" y="211" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="wait event" value="Evt_In(attr1, attr2) " />
+<TGConnectingPoint num="0" id="72" />
+<TGConnectingPoint num="1" id="73" />
+<extraparam>
+<Data eventName="Evt_In" nbOfParams="5" />
+<Param index="0" value="attr1" />
+<Param index="1" value="attr2" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1034" id="77" >
+<cdparam x="648" y="245" />
+<sizeparam width="160" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="read args" value="getReqArg (attr1, attr2)" />
+<TGConnectingPoint num="0" id="75" />
+<TGConnectingPoint num="1" id="76" />
+<extraparam>
+<Data nbOfParams="5" />
+<Param index="0" value="attr1" />
+<Param index="1" value="attr2" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1007" id="80" >
+<cdparam x="656" y="181" />
+<sizeparam width="141" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="send request" value="Req_out(attr1, attr2)" />
+<TGConnectingPoint num="0" id="78" />
+<TGConnectingPoint num="1" id="79" />
+<extraparam>
+<Data requestName="Req_out" nbOfParams="5" />
+<Param index="0" value="attr1" />
+<Param index="1" value="attr2" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1000" id="82" >
+<cdparam x="437" y="22" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="81" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="83" >
+<cdparam x="327" y="170" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="327" y="170" id="65" />
+<P2  x="328" y="206" id="72" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="84" >
+<cdparam x="478" y="196" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="478" y="196" id="68" />
+<P2  x="473" y="243" id="61" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="85" >
+<cdparam x="726" y="206" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="726" y="206" id="79" />
+<P2  x="728" y="240" id="75" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="86" >
+<cdparam x="446" y="129" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="446" y="129" id="59" />
+<P2  x="478" y="166" id="67" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="87" >
+<cdparam x="406" y="421" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="328" y="236" id="73" />
+<P2  x="314" y="304" id="70" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="88" >
+<cdparam x="407" y="65" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="444" y="37" id="81" />
+<P2  x="446" y="64" id="56" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="89" >
+<cdparam x="371" y="117" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="406" y="89" id="57" />
+<P2  x="327" y="140" id="64" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="90" >
+<cdparam x="451" y="117" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="486" y="89" id="58" />
+<P2  x="726" y="176" id="78" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="91" >
+<cdparam x="728" y="270" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="728" y="270" id="76" />
+<P2  x="731" y="309" id="51" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="92" >
+<cdparam x="473" y="273" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="473" y="273" id="62" />
+<P2  x="471" y="294" id="49" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+
+</TMLActivityDiagramPanel>
+
+<TMLActivityDiagramPanel name="Function1" minX="10" maxX="2500" minY="10" maxY="1500" >
+<COMPONENT type="1001" id="94" >
+<cdparam x="461" y="299" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="93" />
+</COMPONENT>
+
+<COMPONENT type="1001" id="96" >
+<cdparam x="721" y="314" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="95" />
+</COMPONENT>
+
+<COMPONENT type="1012" id="104" >
+<cdparam x="431" y="74" />
+<sizeparam width="30" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="100" />
+<TGConnectingPoint num="1" id="101" />
+<TGConnectingPoint num="2" id="102" />
+<TGConnectingPoint num="3" id="103" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="97" >
+<father id="104" num="0" />
+<cdparam x="406" y="84" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" 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="[ ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="98" >
+<father id="104" num="1" />
+<cdparam x="466" y="84" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" 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="[ ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="99" >
+<father id="104" num="2" />
+<cdparam x="451" y="119" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="1" 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="1009" id="107" >
+<cdparam x="434" y="248" />
+<sizeparam width="79" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="read channel" value="Ch_in_1(1) " />
+<TGConnectingPoint num="0" id="105" />
+<TGConnectingPoint num="1" id="106" />
+<extraparam>
+<Data channelName="Ch_in_1" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1008" id="110" >
+<cdparam x="252" y="145" />
+<sizeparam width="150" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="send event" value="Evt_out_1(attr1, attr2)" />
+<TGConnectingPoint num="0" id="108" />
+<TGConnectingPoint num="1" id="109" />
+<extraparam>
+<Data eventName="Evt_out_1" nbOfParams="5" />
+<Param index="0" value="attr1" />
+<Param index="1" value="attr2" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1006" id="113" >
+<cdparam x="436" y="171" />
+<sizeparam width="85" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="write channel" value="Ch_out_1(1)" />
+<TGConnectingPoint num="0" id="111" />
+<TGConnectingPoint num="1" id="112" />
+<extraparam>
+<Data channelName="Ch_out_1" nbOfSamples="1" secPattern="" isAttacker="No" isEncForm="Yes" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1001" id="115" >
+<cdparam x="304" y="309" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="114" />
+</COMPONENT>
+
+<COMPONENT type="1010" id="118" >
+<cdparam x="256" y="211" />
+<sizeparam width="144" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="wait event" value="Evt_In_1(attr1, attr2) " />
+<TGConnectingPoint num="0" id="116" />
+<TGConnectingPoint num="1" id="117" />
+<extraparam>
+<Data eventName="Evt_In_1" nbOfParams="5" />
+<Param index="0" value="attr1" />
+<Param index="1" value="attr2" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1034" id="121" >
+<cdparam x="648" y="245" />
+<sizeparam width="160" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="read args" value="getReqArg (attr1, attr2)" />
+<TGConnectingPoint num="0" id="119" />
+<TGConnectingPoint num="1" id="120" />
+<extraparam>
+<Data nbOfParams="5" />
+<Param index="0" value="attr1" />
+<Param index="1" value="attr2" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1007" id="124" >
+<cdparam x="649" y="181" />
+<sizeparam width="155" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="send request" value="Req_out_1(attr1, attr2)" />
+<TGConnectingPoint num="0" id="122" />
+<TGConnectingPoint num="1" id="123" />
+<extraparam>
+<Data requestName="Req_out_1" nbOfParams="5" />
+<Param index="0" value="attr1" />
+<Param index="1" value="attr2" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1000" id="126" >
+<cdparam x="437" y="22" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="125" />
+</COMPONENT>
+
+<CONNECTOR type="115" id="127" >
+<cdparam x="327" y="170" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="327" y="170" id="109" />
+<P2  x="328" y="206" id="116" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="128" >
+<cdparam x="478" y="196" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="478" y="196" id="112" />
+<P2  x="473" y="243" id="105" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="129" >
+<cdparam x="726" y="206" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="726" y="206" id="123" />
+<P2  x="728" y="240" id="119" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="130" >
+<cdparam x="446" y="129" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="446" y="129" id="103" />
+<P2  x="478" y="166" id="111" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="131" >
+<cdparam x="406" y="421" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="328" y="236" id="117" />
+<P2  x="314" y="304" id="114" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="132" >
+<cdparam x="407" y="65" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="444" y="37" id="125" />
+<P2  x="446" y="64" id="100" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="133" >
+<cdparam x="371" y="117" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="406" y="89" id="101" />
+<P2  x="327" y="140" id="108" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="134" >
+<cdparam x="451" y="117" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="486" y="89" id="102" />
+<P2  x="726" y="176" id="122" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="135" >
+<cdparam x="728" y="270" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="728" y="270" id="120" />
+<P2  x="731" y="309" id="95" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="136" >
+<cdparam x="473" y="273" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="473" y="273" id="106" />
+<P2  x="471" y="294" id="93" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+
+</TMLActivityDiagramPanel>
+
+</Modeling>
+
+
+
+
+<Modeling type="TML Architecture" nameTab="Architecture" >
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
+<COMPONENT type="1102" id="161" >
+<cdparam x="1066" y="517" />
+<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Bus1" value="name" />
+<TGConnectingPoint num="0" id="137" />
+<TGConnectingPoint num="1" id="138" />
+<TGConnectingPoint num="2" id="139" />
+<TGConnectingPoint num="3" id="140" />
+<TGConnectingPoint num="4" id="141" />
+<TGConnectingPoint num="5" id="142" />
+<TGConnectingPoint num="6" id="143" />
+<TGConnectingPoint num="7" id="144" />
+<TGConnectingPoint num="8" id="145" />
+<TGConnectingPoint num="9" id="146" />
+<TGConnectingPoint num="10" id="147" />
+<TGConnectingPoint num="11" id="148" />
+<TGConnectingPoint num="12" id="149" />
+<TGConnectingPoint num="13" id="150" />
+<TGConnectingPoint num="14" id="151" />
+<TGConnectingPoint num="15" id="152" />
+<TGConnectingPoint num="16" id="153" />
+<TGConnectingPoint num="17" id="154" />
+<TGConnectingPoint num="18" id="155" />
+<TGConnectingPoint num="19" id="156" />
+<TGConnectingPoint num="20" id="157" />
+<TGConnectingPoint num="21" id="158" />
+<TGConnectingPoint num="22" id="159" />
+<TGConnectingPoint num="23" id="160" />
+<extraparam>
+<info stereotype="BUS-RR" nodeName="Bus1" />
+<attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="1"  privacy="0"  referenceAttack="null" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1106" id="186" >
+<cdparam x="1068" y="384" />
+<sizeparam width="250" height="100" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Bridge1" value="name" />
+<TGConnectingPoint num="0" id="162" />
+<TGConnectingPoint num="1" id="163" />
+<TGConnectingPoint num="2" id="164" />
+<TGConnectingPoint num="3" id="165" />
+<TGConnectingPoint num="4" id="166" />
+<TGConnectingPoint num="5" id="167" />
+<TGConnectingPoint num="6" id="168" />
+<TGConnectingPoint num="7" id="169" />
+<TGConnectingPoint num="8" id="170" />
+<TGConnectingPoint num="9" id="171" />
+<TGConnectingPoint num="10" id="172" />
+<TGConnectingPoint num="11" id="173" />
+<TGConnectingPoint num="12" id="174" />
+<TGConnectingPoint num="13" id="175" />
+<TGConnectingPoint num="14" id="176" />
+<TGConnectingPoint num="15" id="177" />
+<TGConnectingPoint num="16" id="178" />
+<TGConnectingPoint num="17" id="179" />
+<TGConnectingPoint num="18" id="180" />
+<TGConnectingPoint num="19" id="181" />
+<TGConnectingPoint num="20" id="182" />
+<TGConnectingPoint num="21" id="183" />
+<TGConnectingPoint num="22" id="184" />
+<TGConnectingPoint num="23" id="185" />
+<extraparam>
+<info stereotype="BRIDGE" nodeName="Bridge1" />
+<attributes bufferByteDataSize="4"  clockRatio="1" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1100" id="220" >
+<cdparam x="424" y="30" />
+<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="CPU1" value="name" />
+<TGConnectingPoint num="0" id="196" />
+<TGConnectingPoint num="1" id="197" />
+<TGConnectingPoint num="2" id="198" />
+<TGConnectingPoint num="3" id="199" />
+<TGConnectingPoint num="4" id="200" />
+<TGConnectingPoint num="5" id="201" />
+<TGConnectingPoint num="6" id="202" />
+<TGConnectingPoint num="7" id="203" />
+<TGConnectingPoint num="8" id="204" />
+<TGConnectingPoint num="9" id="205" />
+<TGConnectingPoint num="10" id="206" />
+<TGConnectingPoint num="11" id="207" />
+<TGConnectingPoint num="12" id="208" />
+<TGConnectingPoint num="13" id="209" />
+<TGConnectingPoint num="14" id="210" />
+<TGConnectingPoint num="15" id="211" />
+<TGConnectingPoint num="16" id="212" />
+<TGConnectingPoint num="17" id="213" />
+<TGConnectingPoint num="18" id="214" />
+<TGConnectingPoint num="19" id="215" />
+<TGConnectingPoint num="20" id="216" />
+<TGConnectingPoint num="21" id="217" />
+<TGConnectingPoint num="22" id="218" />
+<TGConnectingPoint num="23" id="219" />
+<extraparam>
+<info stereotype="CPURR" nodeName="CPU1" />
+<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1101" id="195" >
+<father id="220" num="0" />
+<cdparam x="442" y="80" />
+<sizeparam width="174" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="76" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="Application::Function1" />
+<TGConnectingPoint num="0" id="187" />
+<TGConnectingPoint num="1" id="188" />
+<TGConnectingPoint num="2" id="189" />
+<TGConnectingPoint num="3" id="190" />
+<TGConnectingPoint num="4" id="191" />
+<TGConnectingPoint num="5" id="192" />
+<TGConnectingPoint num="6" id="193" />
+<TGConnectingPoint num="7" id="194" />
+<extraparam>
+<info value="Application::Function1" taskName="Function1" referenceTaskName="Application" priority="0" operationMEC="Function1" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1105" id="245" >
+<cdparam x="814" y="382" />
+<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Memory1" value="name" />
+<TGConnectingPoint num="0" id="221" />
+<TGConnectingPoint num="1" id="222" />
+<TGConnectingPoint num="2" id="223" />
+<TGConnectingPoint num="3" id="224" />
+<TGConnectingPoint num="4" id="225" />
+<TGConnectingPoint num="5" id="226" />
+<TGConnectingPoint num="6" id="227" />
+<TGConnectingPoint num="7" id="228" />
+<TGConnectingPoint num="8" id="229" />
+<TGConnectingPoint num="9" id="230" />
+<TGConnectingPoint num="10" id="231" />
+<TGConnectingPoint num="11" id="232" />
+<TGConnectingPoint num="12" id="233" />
+<TGConnectingPoint num="13" id="234" />
+<TGConnectingPoint num="14" id="235" />
+<TGConnectingPoint num="15" id="236" />
+<TGConnectingPoint num="16" id="237" />
+<TGConnectingPoint num="17" id="238" />
+<TGConnectingPoint num="18" id="239" />
+<TGConnectingPoint num="19" id="240" />
+<TGConnectingPoint num="20" id="241" />
+<TGConnectingPoint num="21" id="242" />
+<TGConnectingPoint num="22" id="243" />
+<TGConnectingPoint num="23" id="244" />
+<extraparam>
+<info stereotype="MEMORY" nodeName="Memory1" />
+<attributes byteDataSize="4"  memorySize="1024"  clockRatio="1"  bufferType="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1106" id="279" >
+<cdparam x="162" y="504" />
+<sizeparam width="250" height="100" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Bridge0" value="name" />
+<TGConnectingPoint num="0" id="255" />
+<TGConnectingPoint num="1" id="256" />
+<TGConnectingPoint num="2" id="257" />
+<TGConnectingPoint num="3" id="258" />
+<TGConnectingPoint num="4" id="259" />
+<TGConnectingPoint num="5" id="260" />
+<TGConnectingPoint num="6" id="261" />
+<TGConnectingPoint num="7" id="262" />
+<TGConnectingPoint num="8" id="263" />
+<TGConnectingPoint num="9" id="264" />
+<TGConnectingPoint num="10" id="265" />
+<TGConnectingPoint num="11" id="266" />
+<TGConnectingPoint num="12" id="267" />
+<TGConnectingPoint num="13" id="268" />
+<TGConnectingPoint num="14" id="269" />
+<TGConnectingPoint num="15" id="270" />
+<TGConnectingPoint num="16" id="271" />
+<TGConnectingPoint num="17" id="272" />
+<TGConnectingPoint num="18" id="273" />
+<TGConnectingPoint num="19" id="274" />
+<TGConnectingPoint num="20" id="275" />
+<TGConnectingPoint num="21" id="276" />
+<TGConnectingPoint num="22" id="277" />
+<TGConnectingPoint num="23" id="278" />
+<extraparam>
+<info stereotype="BRIDGE" nodeName="Bridge0" />
+<attributes bufferByteDataSize="4"  clockRatio="1" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1103" id="254" >
+<father id="279" num="0" />
+<cdparam x="178" y="539" />
+<sizeparam width="200" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="50" minY="0" maxY="60" />
+<infoparam name="TGComponent" value="Application::Ch_out__Ch_in" />
+<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" />
+<extraparam>
+<info value="Application::Ch_out__Ch_in" communicationName="Ch_out__Ch_in" referenceCommunicationName="Application" priority="0" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1102" id="313" >
+<cdparam x="162" y="330" />
+<sizeparam width="250" height="84" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Bus0" value="name" />
+<TGConnectingPoint num="0" id="289" />
+<TGConnectingPoint num="1" id="290" />
+<TGConnectingPoint num="2" id="291" />
+<TGConnectingPoint num="3" id="292" />
+<TGConnectingPoint num="4" id="293" />
+<TGConnectingPoint num="5" id="294" />
+<TGConnectingPoint num="6" id="295" />
+<TGConnectingPoint num="7" id="296" />
+<TGConnectingPoint num="8" id="297" />
+<TGConnectingPoint num="9" id="298" />
+<TGConnectingPoint num="10" id="299" />
+<TGConnectingPoint num="11" id="300" />
+<TGConnectingPoint num="12" id="301" />
+<TGConnectingPoint num="13" id="302" />
+<TGConnectingPoint num="14" id="303" />
+<TGConnectingPoint num="15" id="304" />
+<TGConnectingPoint num="16" id="305" />
+<TGConnectingPoint num="17" id="306" />
+<TGConnectingPoint num="18" id="307" />
+<TGConnectingPoint num="19" id="308" />
+<TGConnectingPoint num="20" id="309" />
+<TGConnectingPoint num="21" id="310" />
+<TGConnectingPoint num="22" id="311" />
+<TGConnectingPoint num="23" id="312" />
+<extraparam>
+<info stereotype="BUS-RR" nodeName="Bus0" />
+<attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="1"  privacy="0"  referenceAttack="null" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1103" id="288" >
+<father id="313" num="0" />
+<cdparam x="177" y="368" />
+<sizeparam width="200" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="50" minY="0" maxY="44" />
+<infoparam name="TGComponent" value="Application::Ch_out__Ch_in" />
+<TGConnectingPoint num="0" id="280" />
+<TGConnectingPoint num="1" id="281" />
+<TGConnectingPoint num="2" id="282" />
+<TGConnectingPoint num="3" id="283" />
+<TGConnectingPoint num="4" id="284" />
+<TGConnectingPoint num="5" id="285" />
+<TGConnectingPoint num="6" id="286" />
+<TGConnectingPoint num="7" id="287" />
+<extraparam>
+<info value="Application::Ch_out__Ch_in" communicationName="Ch_out__Ch_in" referenceCommunicationName="Application" priority="0" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1107" id="338" >
+<cdparam x="494" y="381" />
+<sizeparam width="200" height="200" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="DMA1" value="name" />
+<TGConnectingPoint num="0" id="314" />
+<TGConnectingPoint num="1" id="315" />
+<TGConnectingPoint num="2" id="316" />
+<TGConnectingPoint num="3" id="317" />
+<TGConnectingPoint num="4" id="318" />
+<TGConnectingPoint num="5" id="319" />
+<TGConnectingPoint num="6" id="320" />
+<TGConnectingPoint num="7" id="321" />
+<TGConnectingPoint num="8" id="322" />
+<TGConnectingPoint num="9" id="323" />
+<TGConnectingPoint num="10" id="324" />
+<TGConnectingPoint num="11" id="325" />
+<TGConnectingPoint num="12" id="326" />
+<TGConnectingPoint num="13" id="327" />
+<TGConnectingPoint num="14" id="328" />
+<TGConnectingPoint num="15" id="329" />
+<TGConnectingPoint num="16" id="330" />
+<TGConnectingPoint num="17" id="331" />
+<TGConnectingPoint num="18" id="332" />
+<TGConnectingPoint num="19" id="333" />
+<TGConnectingPoint num="20" id="334" />
+<TGConnectingPoint num="21" id="335" />
+<TGConnectingPoint num="22" id="336" />
+<TGConnectingPoint num="23" id="337" />
+<extraparam>
+<info stereotype="DMA" nodeName="DMA1" />
+<attributes byteDataSize="4" nbOfChannels="1" clockRatio="1" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1116" id="363" >
+<cdparam x="979" y="26" />
+<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="FPGA1" value="name" />
+<TGConnectingPoint num="0" id="339" />
+<TGConnectingPoint num="1" id="340" />
+<TGConnectingPoint num="2" id="341" />
+<TGConnectingPoint num="3" id="342" />
+<TGConnectingPoint num="4" id="343" />
+<TGConnectingPoint num="5" id="344" />
+<TGConnectingPoint num="6" id="345" />
+<TGConnectingPoint num="7" id="346" />
+<TGConnectingPoint num="8" id="347" />
+<TGConnectingPoint num="9" id="348" />
+<TGConnectingPoint num="10" id="349" />
+<TGConnectingPoint num="11" id="350" />
+<TGConnectingPoint num="12" id="351" />
+<TGConnectingPoint num="13" id="352" />
+<TGConnectingPoint num="14" id="353" />
+<TGConnectingPoint num="15" id="354" />
+<TGConnectingPoint num="16" id="355" />
+<TGConnectingPoint num="17" id="356" />
+<TGConnectingPoint num="18" id="357" />
+<TGConnectingPoint num="19" id="358" />
+<TGConnectingPoint num="20" id="359" />
+<TGConnectingPoint num="21" id="360" />
+<TGConnectingPoint num="22" id="361" />
+<TGConnectingPoint num="23" id="362" />
+<extraparam>
+<info stereotype="FPGA" nodeName="FPGA1" />
+<attributes capacity="100" byteDataSize="4"  mappingPenalty="0"  reconfigurationTime="50"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  execiTime="1" execcTime="1" clockRatio="1" operation =""  scheduling ="" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1100" id="397" >
+<cdparam x="100" y="28" />
+<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="CPU0" value="name" />
+<TGConnectingPoint num="0" id="373" />
+<TGConnectingPoint num="1" id="374" />
+<TGConnectingPoint num="2" id="375" />
+<TGConnectingPoint num="3" id="376" />
+<TGConnectingPoint num="4" id="377" />
+<TGConnectingPoint num="5" id="378" />
+<TGConnectingPoint num="6" id="379" />
+<TGConnectingPoint num="7" id="380" />
+<TGConnectingPoint num="8" id="381" />
+<TGConnectingPoint num="9" id="382" />
+<TGConnectingPoint num="10" id="383" />
+<TGConnectingPoint num="11" id="384" />
+<TGConnectingPoint num="12" id="385" />
+<TGConnectingPoint num="13" id="386" />
+<TGConnectingPoint num="14" id="387" />
+<TGConnectingPoint num="15" id="388" />
+<TGConnectingPoint num="16" id="389" />
+<TGConnectingPoint num="17" id="390" />
+<TGConnectingPoint num="18" id="391" />
+<TGConnectingPoint num="19" id="392" />
+<TGConnectingPoint num="20" id="393" />
+<TGConnectingPoint num="21" id="394" />
+<TGConnectingPoint num="22" id="395" />
+<TGConnectingPoint num="23" id="396" />
+<extraparam>
+<info stereotype="CPU" nodeName="CPU0" />
+<attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" operation="" MECType="0" encryption="0"/>
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="1101" id="372" >
+<father id="397" num="0" />
+<cdparam x="135" y="81" />
+<sizeparam width="174" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="76" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="Application::Function0" />
+<TGConnectingPoint num="0" id="364" />
+<TGConnectingPoint num="1" id="365" />
+<TGConnectingPoint num="2" id="366" />
+<TGConnectingPoint num="3" id="367" />
+<TGConnectingPoint num="4" id="368" />
+<TGConnectingPoint num="5" id="369" />
+<TGConnectingPoint num="6" id="370" />
+<TGConnectingPoint num="7" id="371" />
+<extraparam>
+<info value="Application::Function0" taskName="Function0" referenceTaskName="Application" priority="0" operationMEC="Function0" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="1104" id="422" >
+<cdparam x="718" y="31" />
+<sizeparam width="200" height="200" minWidth="100" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="HWA1" value="name" />
+<TGConnectingPoint num="0" id="398" />
+<TGConnectingPoint num="1" id="399" />
+<TGConnectingPoint num="2" id="400" />
+<TGConnectingPoint num="3" id="401" />
+<TGConnectingPoint num="4" id="402" />
+<TGConnectingPoint num="5" id="403" />
+<TGConnectingPoint num="6" id="404" />
+<TGConnectingPoint num="7" id="405" />
+<TGConnectingPoint num="8" id="406" />
+<TGConnectingPoint num="9" id="407" />
+<TGConnectingPoint num="10" id="408" />
+<TGConnectingPoint num="11" id="409" />
+<TGConnectingPoint num="12" id="410" />
+<TGConnectingPoint num="13" id="411" />
+<TGConnectingPoint num="14" id="412" />
+<TGConnectingPoint num="15" id="413" />
+<TGConnectingPoint num="16" id="414" />
+<TGConnectingPoint num="17" id="415" />
+<TGConnectingPoint num="18" id="416" />
+<TGConnectingPoint num="19" id="417" />
+<TGConnectingPoint num="20" id="418" />
+<TGConnectingPoint num="21" id="419" />
+<TGConnectingPoint num="22" id="420" />
+<TGConnectingPoint num="23" id="421" />
+<extraparam>
+<info stereotype="HWA" nodeName="HWA1" />
+<attributes byteDataSize="4"  execiTime="1"  clockRatio="1"  operation="" />
+</extraparam>
+</COMPONENT>
+
+<CONNECTOR type="125" id="423" >
+<cdparam x="549" y="230" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1  x="549" y="230" id="202" />
+<P2  x="412" y="330" id="291" />
+<AutomaticDrawing  data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="424" >
+<cdparam x="408" y="345" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1  x="287" y="228" id="388" />
+<P2  x="287" y="330" id="290" />
+<AutomaticDrawing  data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+<CONNECTOR type="125" id="425" >
+<cdparam x="306" y="515" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="{info}" />
+<P1  x="287" y="504" id="256" />
+<P2  x="287" y="414" id="295" />
+<AutomaticDrawing  data="true" />
+<extraparam>
+<info priority="0" />
+<spy value="false" />
+</extraparam>
+</CONNECTOR>
+
+</TMLArchiDiagramPanel>
+
+</Modeling>
+
+
+
+
+</TURTLEGMODELING>
\ No newline at end of file