diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn
index edf6516..f7bd570 100644
--- a/library/RLCMAC_Templates.ttcn
+++ b/library/RLCMAC_Templates.ttcn
@@ -374,6 +374,7 @@
 	template RlcmacUlBlock t_RLCMAC_UL_DATA(template uint5_t tfi, template uint4_t cv, template uint7_t bsn,
 						template LlcBlocks blocks := {}, template boolean stall := false) := {
 		data := {
+			cs := CS_1, /* TODO: make this available to template */
 			mac_hdr := {
 				payload_type := MAC_PT_RLC_DATA,
 				countdown := cv,
@@ -394,6 +395,7 @@
 	template RlcmacUlBlock t_RLCMAC_UL_DATA_TLLI(template uint5_t tfi, template uint4_t cv, template uint7_t bsn,
 						     template LlcBlocks blocks := {}, template boolean stall := false, template GprsTlli tlli) := {
 		data := {
+			cs := CS_1, /* TODO: make this available to template */
 			mac_hdr := {
 				payload_type := MAC_PT_RLC_DATA,
 				countdown := cv,
@@ -417,6 +419,7 @@
 						      template uint5_t tfi, template uint4_t cv,
 						      template uint11_t bsn1, template EgprsLlcBlocks blocks := {}) := {
 		data_egprs := {
+			mcs := mcs,
 			mac_hdr := {
 				header_type := f_rlcmac_mcs2headertype(mcs),
 				tfi := tfi,
@@ -657,6 +660,7 @@
 						   template (present) MacRrbp rrbp := ?,
 						   template (present) uint3_t usf := ?) := {
 		data := {
+			cs := ?,
 			mac_hdr := {
 				mac_hdr := {
 					payload_type := MAC_PT_RLC_DATA,
@@ -672,6 +676,7 @@
 
 	template RlcmacDlBlock tr_RLCMAC_DATA_EGPRS := {
 		data_egprs := {
+			mcs := ?,
 			mac_hdr := ?,
 			fbi := ?,
 			e := ?,