diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn
index 981061c..6b5fb9f 100644
--- a/library/RLCMAC_Templates.ttcn
+++ b/library/RLCMAC_Templates.ttcn
@@ -422,9 +422,12 @@
 	}
 
 	/* Template for uplink Data block */
-	template RlcmacUlBlock t_RLCMAC_UL_DATA(template CodingScheme cs, template uint5_t tfi,
-						template uint4_t cv, template uint7_t bsn,
-						template LlcBlocks blocks := {}, template boolean stall := false) := {
+	template (value) RlcmacUlBlock t_RLCMAC_UL_DATA(template (value) CodingScheme cs,
+							template (value) uint5_t tfi,
+							template (value) uint4_t cv,
+							template (value) uint7_t bsn,
+							template (value) LlcBlocks blocks := {},
+							template (value) boolean stall := false) := {
 		data := {
 			cs := cs,
 			mac_hdr := {
@@ -444,10 +447,13 @@
 			blocks := blocks
 		}
 	}
-	template RlcmacUlBlock t_RLCMAC_UL_DATA_TLLI(template CodingScheme cs, template uint5_t tfi,
-						     template uint4_t cv, template uint7_t bsn,
-						     template LlcBlocks blocks := {}, template boolean stall := false,
-						     template GprsTlli tlli) := {
+	template (value) RlcmacUlBlock t_RLCMAC_UL_DATA_TLLI(template (value) CodingScheme cs,
+							     template (value) uint5_t tfi,
+							     template (value) uint4_t cv,
+							     template (value) uint7_t bsn,
+							     template (value) LlcBlocks blocks := {},
+							     template (value) boolean stall := false,
+							     template (value) GprsTlli tlli) := {
 		data := {
 			cs := cs,
 			mac_hdr := {
@@ -469,9 +475,12 @@
 	}
 
 	/* Template for uplink Data block */
-	template RlcmacUlBlock t_RLCMAC_UL_EGPRS_DATA(CodingScheme mcs,
-						      template uint5_t tfi, template uint4_t cv,
-						      template uint11_t bsn1, template uint8_t bsn2_offset := 0, template EgprsLlcBlocks blocks := {}) := {
+	template (value) RlcmacUlBlock t_RLCMAC_UL_EGPRS_DATA(CodingScheme mcs,
+							      template (value) uint5_t tfi,
+							      template (value) uint4_t cv,
+							      template (value) uint11_t bsn1,
+							      template (value) uint8_t bsn2_offset := 0,
+							      template (value) EgprsLlcBlocks blocks := {}) := {
 		data_egprs := {
 			mcs := mcs,
 			mac_hdr := {