diff --git a/src/main/java/tmltranslator/TMLActivityElementChannel.java b/src/main/java/tmltranslator/TMLActivityElementChannel.java
index 34dd5221b5a0bbcb73a76e3dd3f14e7dd703503b..02810c614d6c2da473d0aff5fd92ab68ad8164f2 100755
--- a/src/main/java/tmltranslator/TMLActivityElementChannel.java
+++ b/src/main/java/tmltranslator/TMLActivityElementChannel.java
@@ -37,8 +37,6 @@
  */
 
 
-
-
 package tmltranslator;
 
 import java.util.ArrayList;
@@ -47,19 +45,20 @@ import java.util.ArrayList;
 /**
  * Class TMLReadChannel
  * Creation: 23/11/2005
- * @version 1.1 18/02/2015
+ *
  * @author Ludovic APVRILLE
+ * @version 1.1 18/02/2015
  */
 public class TMLActivityElementChannel extends TMLActivityElement {
     protected ArrayList<TMLChannel> channels;
     protected String nbOfSamples;
-	private boolean isAttacker;
-	protected boolean isEncForm; //If the Cryptographic 
+    private boolean isAttacker;
+    protected boolean isEncForm; //If the Cryptographic
 
     public TMLActivityElementChannel(String _name, Object _referenceObject) {
         super(_name, _referenceObject);
         channels = new ArrayList<TMLChannel>();
-		isAttacker=false;
+        isAttacker = false;
     }
 
     public void addChannel(TMLChannel _channel) {
@@ -74,13 +73,13 @@ public class TMLActivityElementChannel extends TMLActivityElement {
         return channels.get(_index);
     }
 
-	public boolean isAttacker(){
-		return isAttacker;
-	}
+    public boolean isAttacker() {
+        return isAttacker;
+    }
 
-	public void setAttacker(boolean attacker){
-		isAttacker=attacker;
-	}
+    public void setAttacker(boolean attacker) {
+        isAttacker = attacker;
+    }
 
     public void setNbOfSamples(String _nbOfSamples) {
         nbOfSamples = _nbOfSamples;
@@ -89,14 +88,15 @@ public class TMLActivityElementChannel extends TMLActivityElement {
     public String getNbOfSamples() {
         return nbOfSamples;
     }
-    
-    public boolean getEncForm(){
-    	return isEncForm;
+
+    public boolean getEncForm() {
+        return isEncForm;
+    }
+
+    public void setEncForm(boolean form) {
+        isEncForm = form;
     }
-	public void setEncForm(boolean form){
-		isEncForm = form;
-	}
-	
+
     public void replaceChannelWith(TMLChannel oldChan, TMLChannel newChan) {
         if (channels.contains(oldChan)) {
             channels.remove(oldChan);
@@ -105,12 +105,15 @@ public class TMLActivityElementChannel extends TMLActivityElement {
     }
 
     public String customExtraToXML() {
-	String s= " nbOfSamples=\"" + nbOfSamples +"\" " ;
-	String chan= "";
-	for(TMLChannel ch: channels) {
-	    chan += ch.getName() + " ";
-	}
-	s += " channels=\"" + chan + "\" ";
-	return s;
+        String s = " nbOfSamples=\"" + nbOfSamples + "\" ";
+        String chan = "";
+        String chanType = "0";
+        for (TMLChannel ch : channels) {
+            chan += ch.getName() + " ";
+            chanType = "" + ch.getType();
+        }
+        s += " channels=\"" + chan + "\" ";
+        s += " type=\"" + chanType + "\" ";
+        return s;
     }
 }
diff --git a/src/main/java/tmltranslator/TMLSendEvent.java b/src/main/java/tmltranslator/TMLSendEvent.java
index 3e0753d58b80e13ff4ed57e1bf9deabed2f6a496..6774bc6d7a4074c20a2adeaf8578de1ae73a3a6e 100755
--- a/src/main/java/tmltranslator/TMLSendEvent.java
+++ b/src/main/java/tmltranslator/TMLSendEvent.java
@@ -61,7 +61,9 @@ public class TMLSendEvent extends TMLActivityElementEvent {
     }
 
     public String customExtraToXML() {
-	return " event=\"" + event.getName() +  "\" params=\"" + getAllParams() + "\" ";
+        String ret = " event=\"" + event.getName() +  "\" params=\"" + getAllParams() + "\" ";
+        ret += " blocking=\"" + event.isBlocking() + "\" ";
+        return ret;
     }
 
     
diff --git a/src/main/java/tmltranslator/TMLWaitEvent.java b/src/main/java/tmltranslator/TMLWaitEvent.java
index f746752683dbcf7d22388f0ed662ac1c44c37960..0ab035552f1b2e1c87baf39e47d7c24bdeecf9f1 100755
--- a/src/main/java/tmltranslator/TMLWaitEvent.java
+++ b/src/main/java/tmltranslator/TMLWaitEvent.java
@@ -46,7 +46,7 @@ package tmltranslator;
 /**
  * Class TMLWaitEvent
  * Creation: 23/11/2005
- * @version 1.0 23/11/2005
+ * @version 1.1 13/06/2019
  * @author Ludovic APVRILLE
  */
 public class TMLWaitEvent extends TMLActivityElementEvent {
@@ -60,7 +60,9 @@ public class TMLWaitEvent extends TMLActivityElementEvent {
     }
 
     public String customExtraToXML() {
-	return " event=\"" + event.getName() +  "\" params=\"" + getAllParams() + "\" ";
+	    String ret = " event=\"" + event.getName() +  "\" params=\"" + getAllParams() + "\" ";
+        ret += " blocking=\"" + event.isBlocking() + "\" ";
+        return ret;
     }
 
 }
diff --git a/ttool/src/test/java/test/AbstractTest.java b/ttool/src/test/java/test/AbstractTest.java
index 2d5591feb39402e62702222813aff54457c4a8b3..ffbdabb2d560f763e0a01004f7062d7070ec40b3 100644
--- a/ttool/src/test/java/test/AbstractTest.java
+++ b/ttool/src/test/java/test/AbstractTest.java
@@ -51,6 +51,8 @@ public abstract class AbstractTest {
 									final String fileName ) {
 		try {
 			final String expectedCode = FileUtils.loadFile( EXPECTED_CODE_DIR + fileName + XML_EXT );
+
+			//FileUtils.saveFile(EXPECTED_CODE_DIR + fileName + XML_EXT, actualCode);
 			
 			if ( !compareXml( actualCode, expectedCode ) ) {
 				saveActualResults( fileName + XML_EXT, actualCode );
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/Mapping_0.xml b/ttool/src/test/resources/ui/diagram2tml/expected/Mapping_0.xml
index 2238a71b1a48af906cf076becf7d71d439bbc96b..a41bf88d287bdf0e9ecb6694206305b22bd675c7 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/Mapping_0.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/Mapping_0.xml
@@ -13,7 +13,7 @@
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="2" name="read channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwpI_ch_out__cwpQ_ch_out__sink_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwpI_ch_out__cwpQ_ch_out__sink_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="3" name="stop state">
@@ -36,7 +36,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="2" name="send event">
-<CUSTOM  event="Zigbee_TX__Source_evt_out__Zigbee_TX__bit2symbol_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__Source_evt_out__Zigbee_TX__bit2symbol_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="3" name="send request">
@@ -65,7 +65,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="3" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__Source_ch_out__Zigbee_TX__symbol2ChipSeq_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__Source_ch_out__Zigbee_TX__symbol2ChipSeq_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="4" name="action reading args">
@@ -82,14 +82,14 @@
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="1" name="wait event">
-<CUSTOM  event="Zigbee_TX__Source_evt_out__Zigbee_TX__bit2symbol_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__Source_evt_out__Zigbee_TX__bit2symbol_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="2" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="3" name="send event">
-<CUSTOM  event="Zigbee_TX__bit2symbol_evt_out__Zigbee_TX__chip2octet_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__bit2symbol_evt_out__Zigbee_TX__chip2octet_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="4" name="send request">
@@ -111,14 +111,14 @@
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="2" name="read channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__symbol2ChipSeq_ch_out__Zigbee_TX__chip2octet_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__symbol2ChipSeq_ch_out__Zigbee_TX__chip2octet_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="3" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="4" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__chip2octet_ch_out__Zigbee_TX__cwl_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__chip2octet_ch_out__Zigbee_TX__cwl_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="5" name="action reading args">
@@ -143,11 +143,11 @@
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="3" name="wait event">
-<CUSTOM  event="Zigbee_TX__cwpQ_evt_out__Zigbee_TX__sink_evt_in_1" params="size_1"  />
+<CUSTOM  event="Zigbee_TX__cwpQ_evt_out__Zigbee_TX__sink_evt_in_1" params="size_1"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="4" name="wait event">
-<CUSTOM  event="Zigbee_TX__cwpI_evt_out__Zigbee_TX__sink_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__cwpI_evt_out__Zigbee_TX__sink_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 </ACTIVITY>
@@ -160,7 +160,7 @@
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="1" name="wait event">
-<CUSTOM  event="Zigbee_TX__chip2octet_evt_out__Zigbee_TX__cwl_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__chip2octet_evt_out__Zigbee_TX__cwl_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="2" name="stop state">
@@ -171,11 +171,11 @@
 <NEXTACTIVITYELEMENT id="5" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="4" name="send event">
-<CUSTOM  event="Zigbee_TX__cwl_evt_out_1__Zigbee_TX__cwpQ_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__cwl_evt_out_1__Zigbee_TX__cwpQ_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="5" name="send event">
-<CUSTOM  event="Zigbee_TX__cwl_evt_out__Zigbee_TX__cwpI_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__cwl_evt_out__Zigbee_TX__cwpI_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 </ACTIVITY>
@@ -188,14 +188,14 @@
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="1" name="wait event">
-<CUSTOM  event="Zigbee_TX__cwl_evt_out_1__Zigbee_TX__cwpQ_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__cwl_evt_out_1__Zigbee_TX__cwpQ_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="2" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="3" name="send event">
-<CUSTOM  event="Zigbee_TX__cwpQ_evt_out__Zigbee_TX__sink_evt_in_1" params="size"  />
+<CUSTOM  event="Zigbee_TX__cwpQ_evt_out__Zigbee_TX__sink_evt_in_1" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="4" name="send request">
@@ -212,14 +212,14 @@
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="1" name="wait event">
-<CUSTOM  event="Zigbee_TX__cwl_evt_out__Zigbee_TX__cwpI_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__cwl_evt_out__Zigbee_TX__cwpI_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="2" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="3" name="send event">
-<CUSTOM  event="Zigbee_TX__cwpI_evt_out__Zigbee_TX__sink_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__cwpI_evt_out__Zigbee_TX__sink_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="4" name="send request">
@@ -236,14 +236,14 @@
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="1" name="wait event">
-<CUSTOM  event="Zigbee_TX__bit2symbol_evt_out__Zigbee_TX__chip2octet_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__bit2symbol_evt_out__Zigbee_TX__chip2octet_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="2" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="3" name="send event">
-<CUSTOM  event="Zigbee_TX__chip2octet_evt_out__Zigbee_TX__cwl_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__chip2octet_evt_out__Zigbee_TX__cwl_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="4" name="send request">
@@ -265,14 +265,14 @@
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="2" name="read channel">
-<CUSTOM  nbOfSamples="size"  channels="FORKCHANNEL_S_1_S_Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="FORKCHANNEL_S_1_S_Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="3" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="4" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="JOINCHANNEL_S_0__Zigbee_TX__cwpI_ch_out__cwpQ_ch_out__sink_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="JOINCHANNEL_S_0__Zigbee_TX__cwpI_ch_out__cwpQ_ch_out__sink_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="5" name="action reading args">
@@ -294,14 +294,14 @@
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="2" name="read channel">
-<CUSTOM  nbOfSamples="size"  channels="FORKCHANNEL_S_0_S_Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="FORKCHANNEL_S_0_S_Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="3" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="4" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="JOINCHANNEL_S_1__Zigbee_TX__cwpI_ch_out__cwpQ_ch_out__sink_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="JOINCHANNEL_S_1__Zigbee_TX__cwpI_ch_out__cwpQ_ch_out__sink_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="5" name="action reading args">
@@ -323,14 +323,14 @@
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="2" name="read channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__chip2octet_ch_out__Zigbee_TX__cwl_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__chip2octet_ch_out__Zigbee_TX__cwl_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="3" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="4" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="5" name="action reading args">
@@ -352,14 +352,14 @@
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="2" name="read channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__Source_ch_out__Zigbee_TX__symbol2ChipSeq_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__Source_ch_out__Zigbee_TX__symbol2ChipSeq_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="3" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="4" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__symbol2ChipSeq_ch_out__Zigbee_TX__chip2octet_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__symbol2ChipSeq_ch_out__Zigbee_TX__chip2octet_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="5" name="action reading args">
@@ -387,15 +387,15 @@
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="4" name="ReadOfFork">
-<CUSTOM  nbOfSamples="1"  channels="Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  />
+<CUSTOM  nbOfSamples="1"  channels="Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="5" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="5" name="WriteOfFork_S_0">
-<CUSTOM  nbOfSamples="1"  channels="FORKCHANNEL_S_0_S_Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  />
+<CUSTOM  nbOfSamples="1"  channels="FORKCHANNEL_S_0_S_Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="6" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="6" name="WriteOfFork_S_1">
-<CUSTOM  nbOfSamples="1"  channels="FORKCHANNEL_S_1_S_Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  />
+<CUSTOM  nbOfSamples="1"  channels="FORKCHANNEL_S_1_S_Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 </ACTIVITY>
@@ -419,15 +419,15 @@
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="4" name="WriteOfJoin">
-<CUSTOM  nbOfSamples="1"  channels="Zigbee_TX__cwpI_ch_out__cwpQ_ch_out__sink_ch_in "  />
+<CUSTOM  nbOfSamples="1"  channels="Zigbee_TX__cwpI_ch_out__cwpQ_ch_out__sink_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="5" name="ReadOfJoin_S_0">
-<CUSTOM  nbOfSamples="1"  channels="JOINCHANNEL_S_0__Zigbee_TX__cwpI_ch_out__cwpQ_ch_out__sink_ch_in "  />
+<CUSTOM  nbOfSamples="1"  channels="JOINCHANNEL_S_0__Zigbee_TX__cwpI_ch_out__cwpQ_ch_out__sink_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="6" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="6" name="ReadOfJoin_S_1">
-<CUSTOM  nbOfSamples="1"  channels="JOINCHANNEL_S_1__Zigbee_TX__cwpI_ch_out__cwpQ_ch_out__sink_ch_in "  />
+<CUSTOM  nbOfSamples="1"  channels="JOINCHANNEL_S_1__Zigbee_TX__cwpI_ch_out__cwpQ_ch_out__sink_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 </ACTIVITY>
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/Zigbee_TX.xml b/ttool/src/test/resources/ui/diagram2tml/expected/Zigbee_TX.xml
index cb58209c789f8d272336e795981888f9a34cda7d..47cd9854309c547b91311538ced578d698830a99 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/Zigbee_TX.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/Zigbee_TX.xml
@@ -15,7 +15,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="3" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__Source_ch_out__Zigbee_TX__symbol2ChipSeq_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__Source_ch_out__Zigbee_TX__symbol2ChipSeq_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="4" name="action reading args">
@@ -35,7 +35,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="2" name="send event">
-<CUSTOM  event="Zigbee_TX__Source_evt_out__Zigbee_TX__bit2symbol_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__Source_evt_out__Zigbee_TX__bit2symbol_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="3" name="send request">
@@ -61,14 +61,14 @@
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="2" name="read channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__Source_ch_out__Zigbee_TX__symbol2ChipSeq_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__Source_ch_out__Zigbee_TX__symbol2ChipSeq_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="3" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="4" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__symbol2ChipSeq_ch_out__Zigbee_TX__chip2octet_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__symbol2ChipSeq_ch_out__Zigbee_TX__chip2octet_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="5" name="action reading args">
@@ -85,14 +85,14 @@
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="1" name="wait event">
-<CUSTOM  event="Zigbee_TX__Source_evt_out__Zigbee_TX__bit2symbol_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__Source_evt_out__Zigbee_TX__bit2symbol_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="2" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="3" name="send event">
-<CUSTOM  event="Zigbee_TX__bit2symbol_evt_out__Zigbee_TX__chip2octet_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__bit2symbol_evt_out__Zigbee_TX__chip2octet_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="4" name="send request">
@@ -114,14 +114,14 @@
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="2" name="read channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__symbol2ChipSeq_ch_out__Zigbee_TX__chip2octet_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__symbol2ChipSeq_ch_out__Zigbee_TX__chip2octet_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="3" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="4" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__chip2octet_ch_out__Zigbee_TX__cwl_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__chip2octet_ch_out__Zigbee_TX__cwl_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="5" name="action reading args">
@@ -138,14 +138,14 @@
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="1" name="wait event">
-<CUSTOM  event="Zigbee_TX__bit2symbol_evt_out__Zigbee_TX__chip2octet_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__bit2symbol_evt_out__Zigbee_TX__chip2octet_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="2" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="3" name="send event">
-<CUSTOM  event="Zigbee_TX__chip2octet_evt_out__Zigbee_TX__cwl_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__chip2octet_evt_out__Zigbee_TX__cwl_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="4" name="send request">
@@ -167,14 +167,14 @@
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="2" name="read channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__chip2octet_ch_out__Zigbee_TX__cwl_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__chip2octet_ch_out__Zigbee_TX__cwl_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="3" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="4" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="5" name="action reading args">
@@ -191,7 +191,7 @@
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="1" name="wait event">
-<CUSTOM  event="Zigbee_TX__chip2octet_evt_out__Zigbee_TX__cwl_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__chip2octet_evt_out__Zigbee_TX__cwl_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="2" name="stop state">
@@ -202,11 +202,11 @@
 <NEXTACTIVITYELEMENT id="5" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="4" name="send event">
-<CUSTOM  event="Zigbee_TX__cwl_evt_out_1__Zigbee_TX__cwpQ_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__cwl_evt_out_1__Zigbee_TX__cwpQ_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="5" name="send event">
-<CUSTOM  event="Zigbee_TX__cwl_evt_out__Zigbee_TX__cwpI_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__cwl_evt_out__Zigbee_TX__cwpI_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 </ACTIVITY>
@@ -224,7 +224,7 @@
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="2" name="read channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwpQ_ch_out__sink_ch_in__cwpI_ch_out "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwpQ_ch_out__sink_ch_in__cwpI_ch_out "  type="0"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="3" name="stop state">
@@ -252,11 +252,11 @@
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="3" name="wait event">
-<CUSTOM  event="Zigbee_TX__cwpQ_evt_out__Zigbee_TX__sink_evt_in_1" params="size_1"  />
+<CUSTOM  event="Zigbee_TX__cwpQ_evt_out__Zigbee_TX__sink_evt_in_1" params="size_1"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="4" name="wait event">
-<CUSTOM  event="Zigbee_TX__cwpI_evt_out__Zigbee_TX__sink_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__cwpI_evt_out__Zigbee_TX__sink_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 </ACTIVITY>
@@ -274,14 +274,14 @@
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="2" name="read channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="3" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="4" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwpQ_ch_out__sink_ch_in__cwpI_ch_out "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwpQ_ch_out__sink_ch_in__cwpI_ch_out "  type="0"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="5" name="action reading args">
@@ -298,14 +298,14 @@
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="1" name="wait event">
-<CUSTOM  event="Zigbee_TX__cwl_evt_out_1__Zigbee_TX__cwpQ_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__cwl_evt_out_1__Zigbee_TX__cwpQ_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="2" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="3" name="send event">
-<CUSTOM  event="Zigbee_TX__cwpQ_evt_out__Zigbee_TX__sink_evt_in_1" params="size"  />
+<CUSTOM  event="Zigbee_TX__cwpQ_evt_out__Zigbee_TX__sink_evt_in_1" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="4" name="send request">
@@ -327,14 +327,14 @@
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="2" name="read channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwl_ch_out__cwpQ_ch_in__cwpI_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="3" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="4" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwpQ_ch_out__sink_ch_in__cwpI_ch_out "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__cwpQ_ch_out__sink_ch_in__cwpI_ch_out "  type="0"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="5" name="action reading args">
@@ -351,14 +351,14 @@
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="1" name="wait event">
-<CUSTOM  event="Zigbee_TX__cwl_evt_out__Zigbee_TX__cwpI_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__cwl_evt_out__Zigbee_TX__cwpI_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="2" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="3" name="send event">
-<CUSTOM  event="Zigbee_TX__cwpI_evt_out__Zigbee_TX__sink_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__cwpI_evt_out__Zigbee_TX__sink_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="4" name="send request">
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Source_Disable_ActionState.xml b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Source_Disable_ActionState.xml
index 95d407d311c5f77b0090c8cb0aac2c432efd1099..c5b73881b919f7e648ea1eb7fbf83448054b589e 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Source_Disable_ActionState.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Source_Disable_ActionState.xml
@@ -7,7 +7,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="2" name="send event">
-<CUSTOM  event="Zigbee_TX__Source_evt_out__Zigbee_TX__bit2symbol_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__Source_evt_out__Zigbee_TX__bit2symbol_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="3" name="send request">
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Source_Disable_ActionStateSendRequest.xml b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Source_Disable_ActionStateSendRequest.xml
index 47fef1cbf4fb1854794a2c3229ed41c4470ebef9..78afe3a0dbcbff9d4f5863f41493e6e1cd439a09 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Source_Disable_ActionStateSendRequest.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Source_Disable_ActionStateSendRequest.xml
@@ -7,7 +7,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="2" name="send event">
-<CUSTOM  event="Zigbee_TX__Source_evt_out__Zigbee_TX__bit2symbol_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__Source_evt_out__Zigbee_TX__bit2symbol_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 </ACTIVITY>
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Source_Disable_SendRequest.xml b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Source_Disable_SendRequest.xml
index 5a6db0d5b06bc3258592b634ffaf52ed6f51f742..64a81d3d25b3d81ff415a929f35f1bbc071411f4 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Source_Disable_SendRequest.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Source_Disable_SendRequest.xml
@@ -7,7 +7,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="2" name="send event">
-<CUSTOM  event="Zigbee_TX__Source_evt_out__Zigbee_TX__bit2symbol_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__Source_evt_out__Zigbee_TX__bit2symbol_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="3" name="action">
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Symbol2ChipSeq_Disable_WaitEvent.xml b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Symbol2ChipSeq_Disable_WaitEvent.xml
index c6da6d2ea972aa16c9c43f86cc47d6262878426f..fc04d6acdf051fb0622c4d11fbc2dc1617dc399a 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Symbol2ChipSeq_Disable_WaitEvent.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/F_Symbol2ChipSeq_Disable_WaitEvent.xml
@@ -7,7 +7,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="2" name="send event">
-<CUSTOM  event="Zigbee_TX__bit2symbol_evt_out__Zigbee_TX__chip2octet_evt_in" params="size"  />
+<CUSTOM  event="Zigbee_TX__bit2symbol_evt_out__Zigbee_TX__chip2octet_evt_in" params="size"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="3" name="send request">
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/InterfaceDevice_Disable_ChoiceLeft.xml b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/InterfaceDevice_Disable_ChoiceLeft.xml
index eb03280482b70bf3b11253153813a7fa7adcafa5..5bed31141088970e81cea2850a3677e4e732d064 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/InterfaceDevice_Disable_ChoiceLeft.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/InterfaceDevice_Disable_ChoiceLeft.xml
@@ -9,7 +9,7 @@
 <NEXTACTIVITYELEMENT id="11" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLChoice" value="" id="2" name="choice">
-<CUSTOM  guards="[ true ];[ x>0 ];"  />
+<CUSTOM  guards="[ true ];[ x&gt;0 ];"  />
 <NEXTACTIVITYELEMENT id="12" />
 <NEXTACTIVITYELEMENT id="14" />
 </ACTIVITYELEMENT>
@@ -18,27 +18,27 @@
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="4" name="send event">
-<CUSTOM  event="AppC__reset__AppC__reset" params=""  />
+<CUSTOM  event="AppC__reset__AppC__reset" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="5" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="5" name="wait event">
-<CUSTOM  event="AppC__answerToReset__AppC__answerToReset" params=""  />
+<CUSTOM  event="AppC__answerToReset__AppC__answerToReset" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="6" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="6" name="send event">
-<CUSTOM  event="AppC__pTS__AppC__pTS" params=""  />
+<CUSTOM  event="AppC__pTS__AppC__pTS" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="7" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="7" name="wait event">
-<CUSTOM  event="AppC__pTSConfirm__AppC__pTSConfirm" params=""  />
+<CUSTOM  event="AppC__pTSConfirm__AppC__pTSConfirm" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="16" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="8" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromDtoSC "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromDtoSC "  type="1"  />
 <NEXTACTIVITYELEMENT id="9" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="9" name="send event">
-<CUSTOM  event="AppC__data_Ready__AppC__data_Ready" params="x,b"  />
+<CUSTOM  event="AppC__data_Ready__AppC__data_Ready" params="x,b"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="10" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="10" name="stop state">
@@ -52,11 +52,11 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="13" name="read channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromSCtoD "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromSCtoD "  type="1"  />
 <NEXTACTIVITYELEMENT id="15" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="14" name="wait event">
-<CUSTOM  event="AppC__data_Ready_SC__AppC__data_Ready_SC" params=""  />
+<CUSTOM  event="AppC__data_Ready_SC__AppC__data_Ready_SC" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="13" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="15" name="stop state">
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/InterfaceDevice_Disable_ConnectorChoice.xml b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/InterfaceDevice_Disable_ConnectorChoice.xml
index ee58a0c10c43eb1f3247daecd47c6429aed5ae00..c34a8ac28b994674c7c3a01ce868b6a1d31e140f 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/InterfaceDevice_Disable_ConnectorChoice.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/InterfaceDevice_Disable_ConnectorChoice.xml
@@ -18,27 +18,27 @@
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="4" name="send event">
-<CUSTOM  event="AppC__reset__AppC__reset" params=""  />
+<CUSTOM  event="AppC__reset__AppC__reset" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="5" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="5" name="wait event">
-<CUSTOM  event="AppC__answerToReset__AppC__answerToReset" params=""  />
+<CUSTOM  event="AppC__answerToReset__AppC__answerToReset" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="6" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="6" name="send event">
-<CUSTOM  event="AppC__pTS__AppC__pTS" params=""  />
+<CUSTOM  event="AppC__pTS__AppC__pTS" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="7" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="7" name="wait event">
-<CUSTOM  event="AppC__pTSConfirm__AppC__pTSConfirm" params=""  />
+<CUSTOM  event="AppC__pTSConfirm__AppC__pTSConfirm" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="13" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="8" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromDtoSC "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromDtoSC "  type="1"  />
 <NEXTACTIVITYELEMENT id="9" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="9" name="send event">
-<CUSTOM  event="AppC__data_Ready__AppC__data_Ready" params="x,b"  />
+<CUSTOM  event="AppC__data_Ready__AppC__data_Ready" params="x,b"  blocking="false"  />
 <NEXTACTIVITYELEMENT id="10" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="10" name="stop state">
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/InterfaceDevice_Disable_ForLoop.xml b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/InterfaceDevice_Disable_ForLoop.xml
index 22d98880ac49d77677d5823aa0c88555daffd3a0..dbea79b568ccfbc4543f0fca7e7936bb196a5910 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/InterfaceDevice_Disable_ForLoop.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/InterfaceDevice_Disable_ForLoop.xml
@@ -8,19 +8,19 @@
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="2" name="send event">
-<CUSTOM  event="AppC__reset__AppC__reset" params=""  />
+<CUSTOM  event="AppC__reset__AppC__reset" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="3" name="wait event">
-<CUSTOM  event="AppC__answerToReset__AppC__answerToReset" params=""  />
+<CUSTOM  event="AppC__answerToReset__AppC__answerToReset" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="4" name="send event">
-<CUSTOM  event="AppC__pTS__AppC__pTS" params=""  />
+<CUSTOM  event="AppC__pTS__AppC__pTS" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="5" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="5" name="wait event">
-<CUSTOM  event="AppC__pTSConfirm__AppC__pTSConfirm" params=""  />
+<CUSTOM  event="AppC__pTSConfirm__AppC__pTSConfirm" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="6" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="6" name="stop state">
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/TCPIP_Disable_ChoiceLeftBottom.xml b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/TCPIP_Disable_ChoiceLeftBottom.xml
index ec7277413c327edb8e816284446eaf15ae1b1eb4..502c0ee062261638fea24b224db500b7cd96606a 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/TCPIP_Disable_ChoiceLeftBottom.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/TCPIP_Disable_ChoiceLeftBottom.xml
@@ -136,7 +136,7 @@
 <NEXTACTIVITYELEMENT id="46" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLChoice" value="" id="29" name="choice">
-<CUSTOM  guards="[ tcpctrl__a>0 ];[ tcpctrl__a==0 ];"  />
+<CUSTOM  guards="[ tcpctrl__a&gt;0 ];[ tcpctrl__a==0 ];"  />
 <NEXTACTIVITYELEMENT id="48" />
 <NEXTACTIVITYELEMENT id="45" />
 </ACTIVITYELEMENT>
@@ -160,7 +160,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="34" name="read channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromPtoT "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromPtoT "  type="1"  />
 <NEXTACTIVITYELEMENT id="24" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLForLoop" value="" id="35" name="loop">
@@ -180,27 +180,27 @@
 <NEXTACTIVITYELEMENT id="29" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="39" name="read channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="16" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="40" name="wait event">
-<CUSTOM  event="AppC__timeOut__AppC__timeOut" params=""  />
+<CUSTOM  event="AppC__timeOut__AppC__timeOut" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="39" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="41" name="wait event">
-<CUSTOM  event="AppC__receive__AppC__receive" params=""  />
+<CUSTOM  event="AppC__receive__AppC__receive" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="34" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="42" name="wait event">
-<CUSTOM  event="AppC__close__AppC__close" params=""  />
+<CUSTOM  event="AppC__close__AppC__close" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="30" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="43" name="wait event">
-<CUSTOM  event="AppC__send_TCP__AppC__send_TCP" params=""  />
+<CUSTOM  event="AppC__send_TCP__AppC__send_TCP" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="31" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="44" name="wait event">
-<CUSTOM  event="AppC__open__AppC__open" params=""  />
+<CUSTOM  event="AppC__open__AppC__open" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="28" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSelectEvt" value="" id="45" name="select">
@@ -218,18 +218,18 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="48" name="wait event">
-<CUSTOM  event="AppC__abort__AppC__abort" params=""  />
+<CUSTOM  event="AppC__abort__AppC__abort" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="49" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="49" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="50" name="read channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromAtoT "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromAtoT "  type="1"  />
 <NEXTACTIVITYELEMENT id="26" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="51" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="89" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="52" name="stop state">
@@ -247,7 +247,7 @@
 <NEXTACTIVITYELEMENT id="76" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="56" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="92" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="57" name="action">
@@ -258,11 +258,11 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="59" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="91" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="60" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="90" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="61" name="stop state">
@@ -276,7 +276,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="64" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="94" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="65" name="action">
@@ -291,7 +291,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="68" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="95" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="69" name="action">
@@ -302,7 +302,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="71" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="96" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="72" name="action">
@@ -313,7 +313,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="74" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="93" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="75" name="stop state">
@@ -324,7 +324,7 @@
 <NEXTACTIVITYELEMENT id="77" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="77" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="78" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="78" name="stop state">
@@ -335,7 +335,7 @@
 <NEXTACTIVITYELEMENT id="80" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="80" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="52" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="81" name="send request">
@@ -343,7 +343,7 @@
 <NEXTACTIVITYELEMENT id="82" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="82" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="58" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="83" name="send request">
@@ -351,7 +351,7 @@
 <NEXTACTIVITYELEMENT id="84" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="84" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="54" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="85" name="action">
@@ -371,35 +371,35 @@
 <NEXTACTIVITYELEMENT id="60" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="89" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="79" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="90" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="57" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="91" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="53" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="92" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="55" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="93" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="75" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="94" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="65" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="95" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="69" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="96" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="72" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="97" name="stop state">
@@ -409,7 +409,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="99" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="100" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="100" name="action">
@@ -424,7 +424,7 @@
 <NEXTACTIVITYELEMENT id="101" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="103" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="102" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="104" name="stop state">
@@ -434,34 +434,34 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="106" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoA "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoA "  type="1"  />
 <NEXTACTIVITYELEMENT id="138" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="107" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="111" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="108" name="send event">
-<CUSTOM  event="AppC__stop__AppC__stop" params=""  />
+<CUSTOM  event="AppC__stop__AppC__stop" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="139" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="109" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="112" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="110" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="111" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="105" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="112" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="113" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="113" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="110" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="114" name="stop state">
@@ -500,7 +500,7 @@
 <NEXTACTIVITYELEMENT id="122" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="124" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="129" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="125" name="stop state">
@@ -511,7 +511,7 @@
 <NEXTACTIVITYELEMENT id="127" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="127" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="130" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="128" name="action">
@@ -519,7 +519,7 @@
 <NEXTACTIVITYELEMENT id="124" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="129" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="126" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="130" name="action">
@@ -527,7 +527,7 @@
 <NEXTACTIVITYELEMENT id="125" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="131" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="134" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="132" name="action">
@@ -538,7 +538,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="134" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="132" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="135" name="stop state">
@@ -551,11 +551,11 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="138" name="send event">
-<CUSTOM  event="AppC__receive_Application__AppC__receive_Application" params=""  />
+<CUSTOM  event="AppC__receive_Application__AppC__receive_Application" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="6" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="139" name="read channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="5" />
 </ACTIVITYELEMENT>
 </ACTIVITY>
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/TCPIP_Disable_ChoiceLeftBottomRight.xml b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/TCPIP_Disable_ChoiceLeftBottomRight.xml
index d0e74ad7a1a44bf5103ccc974523e4a5b750a2dd..875bbd51963a57dc148e8560b1039508a6fcf635 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/TCPIP_Disable_ChoiceLeftBottomRight.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/TCPIP_Disable_ChoiceLeftBottomRight.xml
@@ -136,7 +136,7 @@
 <NEXTACTIVITYELEMENT id="46" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLChoice" value="" id="29" name="choice">
-<CUSTOM  guards="[ tcpctrl__a>0 ];[ tcpctrl__a==0 ];"  />
+<CUSTOM  guards="[ tcpctrl__a&gt;0 ];[ tcpctrl__a==0 ];"  />
 <NEXTACTIVITYELEMENT id="48" />
 <NEXTACTIVITYELEMENT id="45" />
 </ACTIVITYELEMENT>
@@ -160,7 +160,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="34" name="read channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromPtoT "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromPtoT "  type="1"  />
 <NEXTACTIVITYELEMENT id="24" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLForLoop" value="" id="35" name="loop">
@@ -180,27 +180,27 @@
 <NEXTACTIVITYELEMENT id="29" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="39" name="read channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="16" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="40" name="wait event">
-<CUSTOM  event="AppC__timeOut__AppC__timeOut" params=""  />
+<CUSTOM  event="AppC__timeOut__AppC__timeOut" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="39" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="41" name="wait event">
-<CUSTOM  event="AppC__receive__AppC__receive" params=""  />
+<CUSTOM  event="AppC__receive__AppC__receive" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="34" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="42" name="wait event">
-<CUSTOM  event="AppC__close__AppC__close" params=""  />
+<CUSTOM  event="AppC__close__AppC__close" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="30" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="43" name="wait event">
-<CUSTOM  event="AppC__send_TCP__AppC__send_TCP" params=""  />
+<CUSTOM  event="AppC__send_TCP__AppC__send_TCP" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="31" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="44" name="wait event">
-<CUSTOM  event="AppC__open__AppC__open" params=""  />
+<CUSTOM  event="AppC__open__AppC__open" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="28" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSelectEvt" value="" id="45" name="select">
@@ -218,18 +218,18 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWaitEvent" value="" id="48" name="wait event">
-<CUSTOM  event="AppC__abort__AppC__abort" params=""  />
+<CUSTOM  event="AppC__abort__AppC__abort" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="49" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="49" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="50" name="read channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromAtoT "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromAtoT "  type="1"  />
 <NEXTACTIVITYELEMENT id="26" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="51" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="89" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="52" name="stop state">
@@ -247,7 +247,7 @@
 <NEXTACTIVITYELEMENT id="76" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="56" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="92" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="57" name="action">
@@ -258,11 +258,11 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="59" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="91" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="60" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="90" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="61" name="stop state">
@@ -276,7 +276,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="64" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="94" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="65" name="action">
@@ -291,7 +291,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="68" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="95" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="69" name="action">
@@ -302,7 +302,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="71" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="96" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="72" name="action">
@@ -313,7 +313,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="74" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="93" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="75" name="stop state">
@@ -324,7 +324,7 @@
 <NEXTACTIVITYELEMENT id="77" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="77" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="78" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="78" name="stop state">
@@ -335,7 +335,7 @@
 <NEXTACTIVITYELEMENT id="80" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="80" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="52" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="81" name="send request">
@@ -343,7 +343,7 @@
 <NEXTACTIVITYELEMENT id="82" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="82" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="58" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendRequest" value="" id="83" name="send request">
@@ -351,7 +351,7 @@
 <NEXTACTIVITYELEMENT id="84" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="84" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="54" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="85" name="action">
@@ -371,35 +371,35 @@
 <NEXTACTIVITYELEMENT id="60" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="89" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="79" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="90" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="57" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="91" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="53" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="92" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="55" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="93" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="75" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="94" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="65" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="95" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="69" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="96" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="72" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="97" name="stop state">
@@ -409,7 +409,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="99" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="100" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="100" name="action">
@@ -424,7 +424,7 @@
 <NEXTACTIVITYELEMENT id="101" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="103" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="102" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="104" name="stop state">
@@ -434,34 +434,34 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="106" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoA "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoA "  type="1"  />
 <NEXTACTIVITYELEMENT id="138" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="107" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="111" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="108" name="send event">
-<CUSTOM  event="AppC__stop__AppC__stop" params=""  />
+<CUSTOM  event="AppC__stop__AppC__stop" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="139" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="109" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="112" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="110" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="111" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="105" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="112" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="113" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="113" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="110" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="114" name="stop state">
@@ -500,7 +500,7 @@
 <NEXTACTIVITYELEMENT id="122" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="124" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="129" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="125" name="stop state">
@@ -511,7 +511,7 @@
 <NEXTACTIVITYELEMENT id="127" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="127" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="130" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="128" name="action">
@@ -519,7 +519,7 @@
 <NEXTACTIVITYELEMENT id="124" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="129" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="126" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="130" name="action">
@@ -527,7 +527,7 @@
 <NEXTACTIVITYELEMENT id="125" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="131" name="write channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__fromTtoP "  type="1"  />
 <NEXTACTIVITYELEMENT id="134" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="132" name="action">
@@ -538,7 +538,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="134" name="send event">
-<CUSTOM  event="AppC__send__AppC__send" params=""  />
+<CUSTOM  event="AppC__send__AppC__send" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="132" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="135" name="stop state">
@@ -551,11 +551,11 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLSendEvent" value="" id="138" name="send event">
-<CUSTOM  event="AppC__receive_Application__AppC__receive_Application" params=""  />
+<CUSTOM  event="AppC__receive_Application__AppC__receive_Application" params=""  blocking="false"  />
 <NEXTACTIVITYELEMENT id="6" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="139" name="read channel">
-<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  />
+<CUSTOM  nbOfSamples="1"  channels="AppC__temp "  type="2"  />
 <NEXTACTIVITYELEMENT id="5" />
 </ACTIVITYELEMENT>
 </ACTIVITY>
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Chip2Octet_Disable_ExecC.xml b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Chip2Octet_Disable_ExecC.xml
index 706ae6f37486134961ceb73781f29e69ea8b0460..db1488a9fb8b566004821b9436679be1feea3e46 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Chip2Octet_Disable_ExecC.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Chip2Octet_Disable_ExecC.xml
@@ -4,14 +4,14 @@
 <NEXTACTIVITYELEMENT id="4" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLReadChannel" value="" id="1" name="read channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__symbol2ChipSeq_ch_out__Zigbee_TX__chip2octet_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__symbol2ChipSeq_ch_out__Zigbee_TX__chip2octet_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="3" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLStopState" value="" id="2" name="stop state">
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="3" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__chip2octet_ch_out__Zigbee_TX__cwl_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__chip2octet_ch_out__Zigbee_TX__cwl_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="4" name="action reading args">
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Source_Disable_ExecI.xml b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Source_Disable_ExecI.xml
index 84b8bcd6405104de27303c3ae18a0e704b089be9..ca5380fe5d1dd30a95efc74423cb96881576b9c9 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Source_Disable_ExecI.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Source_Disable_ExecI.xml
@@ -7,7 +7,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="2" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__Source_ch_out__Zigbee_TX__symbol2ChipSeq_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__Source_ch_out__Zigbee_TX__symbol2ChipSeq_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="1" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="3" name="action reading args">
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Source_Disable_ReadRequestArg.xml b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Source_Disable_ReadRequestArg.xml
index a9555fc44af24ca8919929de5093707ad2f48cc1..41f5f572d4d6bcb1a5e73fb965533d20bf75b9d7 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Source_Disable_ReadRequestArg.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Source_Disable_ReadRequestArg.xml
@@ -11,7 +11,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="3" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__Source_ch_out__Zigbee_TX__symbol2ChipSeq_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__Source_ch_out__Zigbee_TX__symbol2ChipSeq_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 </ACTIVITY>
diff --git a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Symbol2ChipSeq_Disable_ReadChannel.xml b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Symbol2ChipSeq_Disable_ReadChannel.xml
index 756b85ad30cd16cad7e5c82f6f7b75d1db25fbe0..525e9dcff3c294692795438db99698e446bd3f69 100644
--- a/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Symbol2ChipSeq_Disable_ReadChannel.xml
+++ b/ttool/src/test/resources/ui/diagram2tml/expected/components_disabling/X_Symbol2ChipSeq_Disable_ReadChannel.xml
@@ -11,7 +11,7 @@
 <CUSTOM  />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLWriteChannel" value="" id="3" name="write channel">
-<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__symbol2ChipSeq_ch_out__Zigbee_TX__chip2octet_ch_in "  />
+<CUSTOM  nbOfSamples="size"  channels="Zigbee_TX__symbol2ChipSeq_ch_out__Zigbee_TX__chip2octet_ch_in "  type="0"  />
 <NEXTACTIVITYELEMENT id="2" />
 </ACTIVITYELEMENT>
 <ACTIVITYELEMENT type="tmltranslator.TMLActionState" value="" id="4" name="action reading args">