diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn
index 6b5fb9f..e398491 100644
--- a/library/RLCMAC_Templates.ttcn
+++ b/library/RLCMAC_Templates.ttcn
@@ -369,7 +369,7 @@
 	}
 
 	/* Send Template for Downlink ACK/NACK */
-	template RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK(template uint5_t tfi, AckNackDescription andesc, boolean retry := false,
+	template (value) RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK(template (value) uint5_t tfi, AckNackDescription andesc, boolean retry := false,
 						     template (omit) ChannelReqDescription chreq_desc := omit) := {
 		ctrl := {
 			mac_hdr := {
@@ -393,8 +393,10 @@
 	}
 
 	/* Send Template for Egprs Downlink ACK/NACK */
-	template RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK_EGPRS(template uint5_t tfi, EgprsAckNackDescription andesc, boolean retry := false,
-							   template (omit) ChannelReqDescription chreq_desc := omit) := {
+	template (value) RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK_EGPRS(template (value) uint5_t tfi,
+								   EgprsAckNackDescription andesc,
+								   boolean retry := false,
+								   template (omit) ChannelReqDescription chreq_desc := omit) := {
 		ctrl := {
 			mac_hdr := {
 				payload_type := MAC_PT_RLCMAC_NO_OPT,
@@ -762,7 +764,8 @@
 	}
 
 	/* Template for Uplink MAC Control Header */
-	template UlMacCtrlHeader t_RLCMAC_UlMacCtrlH(template MacPayloadType pt, template boolean retry := false) := {
+	template (value) UlMacCtrlHeader t_RLCMAC_UlMacCtrlH(template (value) MacPayloadType pt,
+							     template (value) boolean retry := false) := {
 		payload_type := pt,
 		spare := '00000'B,
 		retry := retry