diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn
index bd9ee210a..b56363f76 100644
--- a/library/DIAMETER_Templates.ttcn
+++ b/library/DIAMETER_Templates.ttcn
@@ -888,6 +888,8 @@ ts_DIA_CEA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id,
 template (value) PDU_DIAMETER
 ts_DIA_AIR(/* template (value) */ hexstring imsi,
 	   template (value) octetstring sess_id := c_def_sess_id,
+	   template (value) charstring orig_host := "ttcn3.localdomain",
+	   template (value) charstring orig_realm := "localdomain",
 	   template (value) charstring dest_realm := "localdomain",
 	   template (value) UINT32 hbh_id := '00000000'O,
 	   template (value) UINT32 ete_id := '00000000'O) :=
@@ -899,9 +901,12 @@ ts_DIA_AIR(/* template (value) */ hexstring imsi,
 		    avps := {
 			ts_AVP_SessionId(sess_id),
 			ts_AVP_DestinationRealm(dest_realm),
+			ts_AVP_OriginHost(orig_host),
+			ts_AVP_OriginRealm(orig_realm),
 			ts_AVP_UserNameImsi(imsi),
 			/* Requested EUTRAN Auth Info */
 			ts_AVP_RequestedEutranAuthInfo,
+			ts_AVP_AuthSessionState(NO_STATE_MAINTAINED),
 			ts_AVP_3GPP_VisitedPlmnId('11111F'O)
 	});
 template (present) PDU_DIAMETER