diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn
index 2807b92..6f3e3e2 100644
--- a/pcu/GPRS_Components.ttcn
+++ b/pcu/GPRS_Components.ttcn
@@ -121,7 +121,7 @@
 
 template (value) GprsMS t_GprsMS_def := {
         imsi := f_gen_imsi(42),
-        tlli := '00000001'O,
+        tlli := f_gen_tlli(),
         ra := bit2int(chan_req_def),
         ra_is_11bit := 0,
         burst_type := BURST_TYPE_0,
@@ -147,16 +147,18 @@
 	/* Connection to the BTS component (one for now) */
 	port RAW_PCU_MSG_PT BTS;
 
-	/* Support only 1 ms for now */
-	var GprsMS g_ms[1];
+	/* Support only 8 ms for now */
+	var GprsMS g_ms[8];
 
 	/* Value at which Countdown Procedure starts. Announced by network (GPRS Cell Options as per TS 04.60 Chapter 12.24) */
 	var uint4_t g_bs_cv_max := 4;
 }
 
-function f_init_gprs_ms(template (value) GprsMS ms_params := t_GprsMS_def) runs on MS_BTS_IFACE_CT
+function f_init_gprs_ms(integer num_ms := 1, template (value) GprsMS ms_params := t_GprsMS_def) runs on MS_BTS_IFACE_CT
 {
-	g_ms[0] := valueof(ms_params);
+	for (var integer i := 0; i < num_ms; i := i + 1 ) {
+		g_ms[i] := valueof(ms_params);
+	}
 }