diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn
index 3d69017..644728e 100644
--- a/library/GTPv2_Templates.ttcn
+++ b/library/GTPv2_Templates.ttcn
@@ -1035,6 +1035,25 @@
 		privateExtension := *
 	}});
 
+/* 8.18 */
+template (value) ServingNetwork
+ts_GTP2C_ServingNetwork(template (value) hexstring mcc,
+			template (value) hexstring mnc,
+			template (value) BIT4 instance := '0000'B) :=
+{
+	elementIdentifier := '53'O,
+	lengthIndicator := 0, /* overwritten */
+	instance := instance,
+	spare := '0000'B,
+	mccDigit1 := mcc[0],
+	mccDigit2 := mcc[1],
+	mccDigit3 := mcc[2],
+	mncDigit3 := mnc[2], /* 'F'H for 2 digit MNC */
+	mncDigit1 := mnc[0],
+	mncDigit2 := mnc[1],
+	additionalOctets := omit
+}
+
 
 
 }
diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn
index 81e3552..f026e58 100644
--- a/pgw/PGW_Tests.ttcn
+++ b/pgw/PGW_Tests.ttcn
@@ -305,6 +305,7 @@
 	var template (value) TAI tai := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0001'O };
 	var template (value) ECGI ecgi := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0'H, 23 };
 	g2c.gtpcv2_pdu.createSessionRequest.userLocationInfo := ts_GTP2C_UserLocInfo(tai := tai, ecgi := ecgi);
+	g2c.gtpcv2_pdu.createSessionRequest.servingNetwork := ts_GTP2C_ServingNetwork('001'H, '01F'H);
 
 	GTP2.send(g2c);
 	if (DIAMETER_PROC.checkstate("Connected")) {