diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn
index 11746eb..450e013 100644
--- a/library/DIAMETER_Templates.ttcn
+++ b/library/DIAMETER_Templates.ttcn
@@ -783,13 +783,15 @@
 
 /* 5.3.2 Capabilities Exchange Answer */
 template (value) PDU_DIAMETER
-ts_DIA_CEA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id)
+ts_DIA_CEA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id,
+	   template (value) charstring origin_host, template (value) charstring origin_realm,
+	   template (value) octetstring host_ip, uint32_t vendor_app_id)
 := ts_DIAMETER(flags:='00000000'B, cmd_code:=Capabilities_Exchange, hbh_id:=hbh_id, ete_id:=ete_id,
 	avps := {
 		ts_AVP_ResultCode(DIAMETER_SUCCESS),
-		ts_AVP_OriginHost("hss.localdomain"),
-		ts_AVP_OriginRealm("localdomain"),
-		ts_AVP_HostIpAddr('7E000004'O),
+		ts_AVP_OriginHost(origin_host),
+		ts_AVP_OriginRealm(origin_realm),
+		ts_AVP_HostIpAddr(host_ip),
 		ts_AVP_VendorId(vendor_id_3GPP),
 		ts_AVP_ProductName("TTCN-3 Testsuite"),
 		ts_AVP_OriginStateId('00000001'O),
@@ -798,7 +800,7 @@
 		ts_AVP_SuppVendorIdRaw(13019), /* ETSI */
 		ts_AVP_AuthAppId('FFFFFFFF'O),
 		ts_AVP_InbSecId('00000000'O),
-		ts_AVP_VendorSpecAppId(vendor_id_3GPP, c_DIAMETER_3GPP_S6_AID)
+		ts_AVP_VendorSpecAppId(vendor_id_3GPP, vendor_app_id)
 	});