diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn
index 3778b2f..c860af5 100644
--- a/pcu/GPRS_Components.ttcn
+++ b/pcu/GPRS_Components.ttcn
@@ -162,17 +162,21 @@
 	/* Connection to the BTS component (one for now) */
 	port RAW_PCU_MSG_PT BTS;
 
-	/* Support only 8 ms for now */
-	var GprsMS g_ms[8];
+	/* Mobile station(s) involved in a testing scenario */
+	var GprsMSArray g_ms := { };
 
 	/* 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(integer num_ms := 1, template (value) GprsMS ms_params := t_GprsMS_def) runs on MS_BTS_IFACE_CT
-{
+/* Generate a list of GprsMS of the given size */
+function f_init_gprs_ms(integer num_ms := 1, template (value) GprsMS t_ms := t_GprsMS_def)
+runs on MS_BTS_IFACE_CT {
 	for (var integer i := 0; i < num_ms; i := i + 1 ) {
-		g_ms[i] := valueof(ms_params);
+		var GprsMS ms := valueof(t_ms);
+
+		/* Append to the global list */
+		g_ms := g_ms & { ms };
 	}
 }