diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn
index 1774197..0ffa840 100644
--- a/library/RLCMAC_Templates.ttcn
+++ b/library/RLCMAC_Templates.ttcn
@@ -508,7 +508,7 @@
 	}
 
 	/* Receive Template for Uplink ACK/NACK */
-	template RlcmacDlBlock tr_RLCMAC_UL_ACK_NACK(template uint5_t ul_tfi, template GprsTlli tlli := ?) := {
+	template RlcmacDlBlock tr_RLCMAC_UL_ACK_NACK(template uint5_t ul_tfi) := {
 		ctrl := {
 			mac_hdr := {
 				payload_type := (MAC_PT_RLCMAC_NO_OPT, MAC_PT_RLCMAC_OPT),
@@ -524,22 +524,44 @@
 						page_mode := ?,
 						msg_excape := ?,
 						uplink_tfi := ul_tfi,
-						is_egprs := '0'B,
-						gprs := {
-							ch_coding_cmd := ?,
-							ack_nack_desc := ?,
-							cont_res_tlli_present := ?,
-							cont_res_tlli := tlli,
-							pkt_ta_present := ?,
-							pkt_ta := *,
-							pwr_ctrl_present := ?,
-							pwr_ctrl := *
-						}
+						is_egprs := ?,
+						gprs := *,
+						egprs := *
 					}
 				}
 			}
 		}
-	}
+	};
+
+	template RlcmacDlBlock tr_RLCMAC_UL_ACK_NACK_GPRS(template uint5_t ul_tfi, template UlAckNackGprs gprs := tr_UlAckNackGprs(*))
+	modifies tr_RLCMAC_UL_ACK_NACK := {
+		ctrl := {
+			payload := {
+				u := {
+					ul_ack_nack := {
+						is_egprs := '0'B,
+						gprs := gprs,
+						egprs := omit
+					}
+				}
+			}
+		}
+	};
+
+	template RlcmacDlBlock tr_RLCMAC_UL_ACK_NACK_EGPRS(template uint5_t ul_tfi, template UlAckNackEgprs egprs := tr_UlAckNackEgprs(*))
+	modifies tr_RLCMAC_UL_ACK_NACK := {
+		ctrl := {
+			payload := {
+				u := {
+					ul_ack_nack := {
+						is_egprs := '1'B,
+						gprs := omit,
+						egprs := egprs
+					}
+				}
+			}
+		}
+	};
 
 	template RlcmacDlBlock tr_RLCMAC_PACKET_PAG_REQ(template uint3_t usf := ?) := {
 		ctrl := {