diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn
index 4d2c3c5..b9c6f39 100644
--- a/library/GSUP_Types.ttcn
+++ b/library/GSUP_Types.ttcn
@@ -227,7 +227,7 @@
 	ies := ies
 }
 
-template GSUP_PDU ts_GSUP_SAI_REQ(hexstring imsi) :=
+template (value) GSUP_PDU ts_GSUP_SAI_REQ(hexstring imsi) :=
 	ts_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, { valueof(ts_GSUP_IE_IMSI(imsi)) });
 
 template GSUP_PDU tr_GSUP_SAI_REQ(template hexstring imsi) :=
@@ -241,9 +241,9 @@
 	tr_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR, {
 			tr_GSUP_IE_IMSI(imsi), tr_GSUP_IE_Cause(cause) });
 
-template GSUP_PDU ts_GSUP_SAI_ERR(hexstring imsi, integer cause) :=
-	tr_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR, {
-			ts_GSUP_IE_IMSI(imsi), ts_GSUP_IE_Cause(cause) });
+template (value) GSUP_PDU ts_GSUP_SAI_ERR(hexstring imsi, integer cause) :=
+	ts_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR, {
+			valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_Cause(cause)) });
 
 
 template GSUP_PDU tr_GSUP_SAI_RES(template hexstring imsi) :=
@@ -254,14 +254,14 @@
 	tr_GSUP(OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST, {
 			tr_GSUP_IE_IMSI(imsi), * });
 
-template GSUP_PDU ts_GSUP_UL_RES(hexstring imsi) :=
+template (value) GSUP_PDU ts_GSUP_UL_RES(hexstring imsi) :=
 	ts_GSUP(OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT, { valueof(ts_GSUP_IE_IMSI(imsi)) });
 
-template GSUP_PDU ts_GSUP_UL_ERR(hexstring imsi, integer cause) :=
+template (value) GSUP_PDU ts_GSUP_UL_ERR(hexstring imsi, integer cause) :=
 	ts_GSUP(OSMO_GSUP_MSGT_UPDATE_LOCATION_ERROR, {
 			valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_Cause(cause)) });
 
-template GSUP_PDU ts_GSUP_ISD_REQ(hexstring imsi, hexstring msisdn) :=
+template (value) GSUP_PDU ts_GSUP_ISD_REQ(hexstring imsi, hexstring msisdn) :=
 	ts_GSUP(OSMO_GSUP_MSGT_INSERT_DATA_REQUEST, {
 			valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_MSISDN(msisdn)) });