diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn
index b64289b..f071d04 100644
--- a/library/GTP_Templates.ttcn
+++ b/library/GTP_Templates.ttcn
@@ -295,7 +295,7 @@
 
 	template GTPC_PDUs ts_CreatePdpRespPDU(OCT1 cause, OCT4 teid_data, OCT4 teid_ctrl, BIT4 nsapi,
 						octetstring ggsn_ip_sign, octetstring ggsn_ip_data,
-						template EndUserAddress eua := omit,
+						OCT4 chg_id, template EndUserAddress eua := omit,
 						template ProtConfigOptions pco := omit) := {
 		createPDPContextResponse := {
 			cause := { '00'O, cause },
@@ -310,7 +310,10 @@
 				teidControlPlane := teid_ctrl
 			},
 			nsapi := ts_NSAPI(nsapi),
-			chargingID := omit,
+			chargingID := {
+				type_gtpc := '7F'O,
+				chargingID := chg_id
+			},
 			endUserAddress := eua,
 			protConfigOptions := pco,
 			ggsn_addr_controlPlane := ts_GsnAddr(ggsn_ip_sign),
@@ -335,13 +338,13 @@
 						 OCT1 cause,
 						 OCT4 teid_ctrl, OCT4 teid_data,
 						 BIT4 nsapi, octetstring ggsn_ip_sign,
-						 octetstring ggsn_ip_data,
+						 octetstring ggsn_ip_data, OCT4 chg_id,
 						 template EndUserAddress eua := omit,
 						 template ProtConfigOptions pco := omit) := {
 		peer := peer,
 		gtpc := ts_GTP1C_PDU(createPDPContextResponse, teid,
 					valueof(ts_CreatePdpRespPDU(cause, teid_data, teid_ctrl, nsapi,
-								ggsn_ip_sign, ggsn_ip_data,
+								ggsn_ip_sign, ggsn_ip_data, chg_id,
 								eua, pco)), seq)
 	}