diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn
index 9782a3a..0d833a5 100644
--- a/library/GTP_Templates.ttcn
+++ b/library/GTP_Templates.ttcn
@@ -1226,11 +1226,13 @@
 			private_extension_gtpc := *
 		}
 	}
-	template (value) GTPC_PDUs ts_RANInfoRelay(template (value) RANTransparentContainer transparentContainer) := {
+	template (value) GTPC_PDUs ts_RANInfoRelay(template (value) RANTransparentContainer transparentContainer,
+						    template (omit) RIM_RoutingAddress ra := omit,
+						    template (omit) RIM_RoutingAddress_Discriminator ra_discr := omit) := {
 		ranInformationRelay := {
 			transparentContainer := transparentContainer,
-			rIM_RoutingAddress := omit,
-			rIM_RoutingAddress_Discriminator := omit,
+			rIM_RoutingAddress := ra,
+			rIM_RoutingAddress_Discriminator := ra_discr,
 			private_extension_gtpc := omit
 		}
 	}
@@ -1242,9 +1244,11 @@
 	}
 	template (value) Gtp1cUnitdata
 	ts_GTPC_RANInfoRelay(template (value) GtpPeer peer,
-			     template (value) RANTransparentContainer transparentContainer) := {
+			     template (value) RANTransparentContainer transparentContainer,
+			     template (omit) RIM_RoutingAddress ra := omit,
+			     template (omit) RIM_RoutingAddress_Discriminator ra_discr := omit) := {
 		peer := peer,
-		gtpc := ts_GTP1C_PDU(rANInformationRelay, '00000000'O, valueof(ts_RANInfoRelay(transparentContainer)), 0)
+		gtpc := ts_GTP1C_PDU(rANInformationRelay, '00000000'O, valueof(ts_RANInfoRelay(transparentContainer, ra, ra_discr)), 0)
 	}