diff --git a/scenarios_lnp/incoming_peer/0001_test.yml.tt2 b/scenarios_lnp/incoming_peer/0001_test.yml.tt2
index c9ec05d1..05e60ef8 100644
--- a/scenarios_lnp/incoming_peer/0001_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0001_test.yml.tt2
@@ -17,6 +17,7 @@ flow:
   - return|ROUTE_CLEAR_PEER_IN_PREF:
   - start|ROUTE_LOAD_PEER_IN_PREF:
   - return|ROUTE_LOAD_PEER_IN_PREF:
+      $avp(lua_dlg_profile): ["peer:[% peer_00_host0.id %]", "total"]
   - return|ROUTE_FIND_CALLER:
   - start|ROUTE_GET_CALLER_CLI:
   - return|ROUTE_GET_CALLER_CLI:
@@ -34,6 +35,14 @@ flow:
   - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
   - start|ROUTE_SET_CALLEE_DIALOG:
   - return|ROUTE_SET_CALLEE_DIALOG:
+        $avp(lua_dlg_profile): [
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1003.uuid %]",
+        "peer:[% peer_00_host0.id %]",
+        "total"
+      ]
   - start|ROUTE_BLOCK_IN:
   - return|ROUTE_BLOCK_IN:
   - start|ROUTE_ORDER_CF_MAP_ID:
@@ -80,6 +89,14 @@ flow:
   - return|BRANCH_ROUTE_FWD_LOOP:
   - return|BRANCH_ROUTE_FWD_LOOP:
   - exit|ROUTE_EXECUTE_CF_LOOP:
+      $avp(lua_dlg_profile): [
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1003.uuid %]",
+        "peer:[% peer_00_host0.id %]",
+        "total"
+      ]
 sip_in:
   - '^INVITE sip:4311001@'
   - 'Contact: sip:004321001@'
@@ -102,7 +119,7 @@ sip_out:
       'Content-Type: application/sdp',
       'P-HIH-Cause: 302',
       'P-From-Peer: 1',
-      'P-Caller-UUID: \w+',
+      'P-Caller-UUID: [% spce_test.testuser1003.uuid %]',
       'P-First-Caller-UPN: 004321001',
       'P-First-Caller-NPN: 004321001',
       'P-Acc-Caller-User: testuser1001',
diff --git a/scenarios_lnp/incoming_peer/0003_test.yml.tt2 b/scenarios_lnp/incoming_peer/0003_test.yml.tt2
index 7a7883a7..a671b744 100644
--- a/scenarios_lnp/incoming_peer/0003_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0003_test.yml.tt2
@@ -66,9 +66,30 @@ flow:
   - start|ROUTE_LOAD_PEER_OUT_PREF:
   - return|ROUTE_LOAD_PEER_OUT_PREF:
   - return|ROUTE_PSTN_SELECT_PEER:
+      $avp(lua_dlg_profile): ["outgoing"]
   - start|ROUTE_OUTBOUND:
+      $avp(lua_dlg_profile): [
+        "relay",
+        "peerout:[% peer_01_host1.id %]",
+        "peer:[% peer_01_host1.id %]",
+        "outgoing"
+      ]
   - start|ROUTE_SET_CALLER_DIALOG:
   - return|ROUTE_SET_CALLER_DIALOG:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1003.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1003.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1003.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "relay",
+        "peerout:[% peer_01_host1.id %]",
+        "peer:[% peer_01_host1.id %]",
+        "outgoing"
+      ]
   - start|ROUTE_ACC_CALLER:
   - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
@@ -110,11 +131,25 @@ flow:
   # branch ?
   - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1003.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1003.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1003.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "relay",
+        "peerout:[% peer_01_host1.id %]",
+        "peer:[% peer_01_host1.id %]",
+        "outgoing"
+      ]
 sip_in:
   - '^INVITE sip:4311003@'
   - 'P-HIH-Cause: 302'
   - 'P-From-Peer: 1'
-  - 'P-Caller-UUID: \w+'
+  - 'P-Caller-UUID: [% spce_test.testuser1003.uuid %]'
   - 'P-First-Caller-UPN: 004321001'
   - 'P-First-Caller-NPN: 004321001'
   - 'P-Acc-Caller-User: testuser1001'
diff --git a/scenarios_lnp/incoming_peer/0005_test.yml.tt2 b/scenarios_lnp/incoming_peer/0005_test.yml.tt2
index c743f08a..f2b4f287 100644
--- a/scenarios_lnp/incoming_peer/0005_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0005_test.yml.tt2
@@ -1,5 +1,19 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1003.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1003.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1003.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "relay",
+        "peerout:[% peer_01_host1.id %]",
+        "peer:[% peer_01_host1.id %]",
+        "outgoing"
+      ]
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
diff --git a/scenarios_lnp/incoming_peer/0007_test.yml.tt2 b/scenarios_lnp/incoming_peer/0007_test.yml.tt2
index 93e9a18f..d5c7d95d 100644
--- a/scenarios_lnp/incoming_peer/0007_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0007_test.yml.tt2
@@ -1,5 +1,19 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1003.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1003.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1003.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "relay",
+        "peerout:[% peer_01_host1.id %]",
+        "peer:[% peer_01_host1.id %]",
+        "outgoing"
+      ]
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 200 OK'
diff --git a/scenarios_lnp/incoming_peer/0008_test.yml.tt2 b/scenarios_lnp/incoming_peer/0008_test.yml.tt2
new file mode 100644
index 00000000..d7b80ca2
--- /dev/null
+++ b/scenarios_lnp/incoming_peer/0008_test.yml.tt2
@@ -0,0 +1,24 @@
+flow:
+  - start|dialog:start:
+  - return|dialog:start:
+      $avp(lua_dlg_profile): [
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1003.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1003.uuid %]",
+        "peer:[% peer_00_host0.id %]",
+        "total"
+      ]
+  - return|dialog:start:
+sip_in:
+  - '^SIP/2.0 200 OK'
+  - 'CSeq: 1 INVITE'
+  - 'From: <sip:004321001@'
+  - 'To: <sip:4311001@'
+sip_out:
+  - [
+      '^SIP/2.0 200 OK',
+      'CSeq: 1 INVITE',
+      'From: <sip:004321001@',
+      'To: <sip:4311001@',
+    ]
diff --git a/scenarios_lnp/incoming_peer/0011_test.yml.tt2 b/scenarios_lnp/incoming_peer/0011_test.yml.tt2
index d9b3768d..ff813a11 100644
--- a/scenarios_lnp/incoming_peer/0011_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer/0011_test.yml.tt2
@@ -7,6 +7,7 @@ flow:
   - return|ROUTE_INITVARS:
   - 'start|dialog:end':
   - 'return|dialog:end':
+     $avp(lua_dlg_profile): None
   - 'return|dialog:end':
   - start|ROUTE_STOP_RTPPROXY:
   - return|ROUTE_STOP_RTPPROXY:
diff --git a/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2 b/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2
index 463d10fe..57c135a5 100644
--- a/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2
+++ b/scenarios_lnp/incoming_peer_unallocated_authoritative/0001_test.yml.tt2
@@ -17,6 +17,7 @@ flow:
   - return|ROUTE_CLEAR_PEER_IN_PREF:
   - start|ROUTE_LOAD_PEER_IN_PREF:
   - return|ROUTE_LOAD_PEER_IN_PREF:
+      $avp(lua_dlg_profile): ["peer:[% peer_00_host0.id %]", "total"]
   - return|ROUTE_FIND_CALLER:
   - start|ROUTE_GET_CALLER_CLI:
   - return|ROUTE_GET_CALLER_CLI:
@@ -44,6 +45,7 @@ flow:
   - return|ROUTE_ADD_CALLINFO_REPLY:
   - start|dialog:failed:
   - return|dialog:failed:
+      $avp(lua_dlg_profile): None
   - return|dialog:failed:
   - exit|ROUTE_EARLY_REJECT:
 sip_in:
diff --git a/scenarios_lnp/invite/0003_test.yml.tt2 b/scenarios_lnp/invite/0003_test.yml.tt2
index 2031dcfb..2fcbb9a8 100644
--- a/scenarios_lnp/invite/0003_test.yml.tt2
+++ b/scenarios_lnp/invite/0003_test.yml.tt2
@@ -42,6 +42,13 @@ flow:
   - return|ROUTE_LOAD_CALLEE_CONTRACT_PREF:
   - start|ROUTE_SET_CALLEE_DIALOG:
   - return|ROUTE_SET_CALLEE_DIALOG:
+      $avp(lua_dlg_profile): [
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1001.uuid %]",
+        "total",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1001.uuid %]"
+      ]
   - start|ROUTE_BLOCK_IN:
   - return|ROUTE_BLOCK_IN:
   - start|ROUTE_ORDER_CF_MAP_ID:
@@ -73,14 +80,52 @@ flow:
   - start|ROUTE_INVITE_TO_EXT:
   - start|ROUTE_PSTN:
   - start|ROUTE_PSTN_SELECT_PEER:
+      $avp(lua_dlg_profile): [
+        "outgoing",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1001.uuid %]",
+        "total",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1001.uuid %]"
+      ]
   - start|ROUTE_CLEAR_PEER_OUT_PREF:
   - return|ROUTE_CLEAR_PEER_OUT_PREF:
   - start|ROUTE_LOAD_PEER_OUT_PREF:
   - return|ROUTE_LOAD_PEER_OUT_PREF:
   - return|ROUTE_PSTN_SELECT_PEER:
   - start|ROUTE_OUTBOUND:
+      $avp(lua_dlg_profile): [
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1001.uuid %]",
+        "total",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1001.uuid %]"
+      ]
   - start|ROUTE_SET_CALLER_DIALOG:
   - return|ROUTE_SET_CALLER_DIALOG:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1001.uuid %]",
+        "total",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1001.uuid %]"
+      ]
   - start|ROUTE_ACC_CALLER:
   - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
@@ -121,6 +166,25 @@ flow:
   - return|BRANCH_ROUTE_SBC:
   - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1001.uuid %]",
+        "total",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1001.uuid %]"
+      ]
 sip_in:
   - '^INVITE sip:4311001@'
   - 'Contact: sip:testuser1002@'
@@ -147,8 +211,8 @@ sip_out:
       'From: <sip:4311002@',
       'To: <sip:4311001@',
       'Content-Type: application/sdp',
-      'P-Caller-UUID: \w+',
-      'P-Callee-UUID: \w+',
+      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
+      'P-Callee-UUID: [% spce_test.testuser1001.uuid %]',
       'P-Asserted-Identity: <sip:4311002@',
       'P-Called-Party-ID: <sip:4318881001@',
       'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
diff --git a/scenarios_lnp/invite/0005_test.yml.tt2 b/scenarios_lnp/invite/0005_test.yml.tt2
index f3b91c81..ad548bd7 100644
--- a/scenarios_lnp/invite/0005_test.yml.tt2
+++ b/scenarios_lnp/invite/0005_test.yml.tt2
@@ -1,5 +1,24 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1001.uuid %]",
+        "total",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1001.uuid %]"
+      ]
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
diff --git a/scenarios_lnp/invite/0006_test.yml.tt2 b/scenarios_lnp/invite/0006_test.yml.tt2
index 69059c06..be204354 100644
--- a/scenarios_lnp/invite/0006_test.yml.tt2
+++ b/scenarios_lnp/invite/0006_test.yml.tt2
@@ -2,7 +2,25 @@ flow:
   - start|REPLY_ROUTE_NAT:
   - 'start|dialog:start':
   - 'return|dialog:start':
-  # branch ??
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1001.uuid %]",
+        "total",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1001.uuid %]"
+      ]
   - 'return|dialog:start':
 sip_in:
   - '^SIP/2.0 200 OK'
diff --git a/scenarios_lnp/invite/0008_test.yml.tt2 b/scenarios_lnp/invite/0008_test.yml.tt2
index e75f0fcd..372a0986 100644
--- a/scenarios_lnp/invite/0008_test.yml.tt2
+++ b/scenarios_lnp/invite/0008_test.yml.tt2
@@ -7,6 +7,7 @@ flow:
   - return|ROUTE_INITVARS:
   - 'start|dialog:end':
   - 'return|dialog:end':
+      $avp(lua_dlg_profile): None
   - 'return|dialog:end':
   - start|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_RESTORE_CLUSTERSET:
diff --git a/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2
index 3270d536..a685da25 100644
--- a/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0011_test.yml.tt2
@@ -57,14 +57,36 @@ flow:
   - start|ROUTE_INVITE_TO_EXT:
   - start|ROUTE_PSTN:
   - start|ROUTE_PSTN_SELECT_PEER:
+      $avp(lua_dlg_profile): ["outgoing"]
   - start|ROUTE_CLEAR_PEER_OUT_PREF:
   - return|ROUTE_CLEAR_PEER_OUT_PREF:
   - start|ROUTE_LOAD_PEER_OUT_PREF:
   - return|ROUTE_LOAD_PEER_OUT_PREF:
   - return|ROUTE_PSTN_SELECT_PEER:
   - start|ROUTE_OUTBOUND:
+      $avp(lua_dlg_profile): [
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
   - start|ROUTE_SET_CALLER_DIALOG:
   - return|ROUTE_SET_CALLER_DIALOG:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
   - start|ROUTE_ACC_CALLER:
   - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
@@ -107,6 +129,21 @@ flow:
   - return|BRANCH_ROUTE_SBC:
   - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
 sip_in:
   - '^INVITE sip:43999300'
   - 'From: <sip:testuser1002@'
diff --git a/scenarios_lnp/invite_ncos_black/0013_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0013_test.yml.tt2
index f1afc5de..ff058b32 100644
--- a/scenarios_lnp/invite_ncos_black/0013_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0013_test.yml.tt2
@@ -1,5 +1,20 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
diff --git a/scenarios_lnp/invite_ncos_black/0014_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0014_test.yml.tt2
index 49d390a7..4134b28e 100644
--- a/scenarios_lnp/invite_ncos_black/0014_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0014_test.yml.tt2
@@ -2,7 +2,21 @@ flow:
   - start|REPLY_ROUTE_NAT:
   - 'start|dialog:start':
   - 'return|dialog:start':
-  # branch ??
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
   - 'return|dialog:start':
 sip_in:
   - '^SIP/2.0 200 OK'
diff --git a/scenarios_lnp/invite_ncos_black/0016_test.yml.tt2 b/scenarios_lnp/invite_ncos_black/0016_test.yml.tt2
index 08c80654..e2060646 100644
--- a/scenarios_lnp/invite_ncos_black/0016_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_black/0016_test.yml.tt2
@@ -7,6 +7,7 @@ flow:
   - return|ROUTE_INITVARS:
   - 'start|dialog:end':
   - 'return|dialog:end':
+      $avp(lua_dlg_profile): None
   - 'return|dialog:end':
   - start|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_RESTORE_CLUSTERSET:
diff --git a/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2
index 77ef4c75..25ae4a0c 100644
--- a/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0003_test.yml.tt2
@@ -57,14 +57,38 @@ flow:
   - start|ROUTE_INVITE_TO_EXT:
   - start|ROUTE_PSTN:
   - start|ROUTE_PSTN_SELECT_PEER:
+      $avp(lua_dlg_profile): [
+        "outgoing"
+      ]
   - start|ROUTE_CLEAR_PEER_OUT_PREF:
   - return|ROUTE_CLEAR_PEER_OUT_PREF:
   - start|ROUTE_LOAD_PEER_OUT_PREF:
   - return|ROUTE_LOAD_PEER_OUT_PREF:
   - return|ROUTE_PSTN_SELECT_PEER:
   - start|ROUTE_OUTBOUND:
+      $avp(lua_dlg_profile): [
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
   - start|ROUTE_SET_CALLER_DIALOG:
   - return|ROUTE_SET_CALLER_DIALOG:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
   - start|ROUTE_ACC_CALLER:
   - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
@@ -107,7 +131,21 @@ flow:
   - return|BRANCH_ROUTE_SBC:
   - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
-
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
 sip_in:
   - '^INVITE sip:43999100@'
   - 'Contact: sip:testuser1002@'
@@ -134,8 +172,8 @@ sip_out:
       'From: <sip:4311002@',
       'To: <sip:43999100@',
       'Content-Type: application/sdp',
-      'P-Caller-UUID: \w+',
-      'P-Callee-UUID: \w+',
+      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
+      'P-Callee-UUID: 0',
       'P-Asserted-Identity: <sip:4311002@',
       'P-Called-Party-ID: <sip:43999100@',
       'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
diff --git a/scenarios_lnp/invite_ncos_white/0005_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0005_test.yml.tt2
index c8a8b9d1..0f50eb3b 100644
--- a/scenarios_lnp/invite_ncos_white/0005_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0005_test.yml.tt2
@@ -1,5 +1,20 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
diff --git a/scenarios_lnp/invite_ncos_white/0006_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0006_test.yml.tt2
index c096ec34..66770e7b 100644
--- a/scenarios_lnp/invite_ncos_white/0006_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0006_test.yml.tt2
@@ -2,7 +2,21 @@ flow:
   - start|REPLY_ROUTE_NAT:
   - 'start|dialog:start':
   - 'return|dialog:start':
-  # branch ??
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
   - 'return|dialog:start':
 sip_in:
   - '^SIP/2.0 200 OK'
diff --git a/scenarios_lnp/invite_ncos_white/0008_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0008_test.yml.tt2
index 412ce272..013a8275 100644
--- a/scenarios_lnp/invite_ncos_white/0008_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0008_test.yml.tt2
@@ -7,6 +7,7 @@ flow:
   - return|ROUTE_INITVARS:
   - 'start|dialog:end':
   - 'return|dialog:end':
+      $avp(lua_dlg_profile): None
   - 'return|dialog:end':
   - start|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_RESTORE_CLUSTERSET:
diff --git a/scenarios_lnp/invite_ncos_white/0012_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0012_test.yml.tt2
index ed0dd522..20c83323 100644
--- a/scenarios_lnp/invite_ncos_white/0012_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0012_test.yml.tt2
@@ -61,14 +61,38 @@ flow:
   - start|ROUTE_INVITE_TO_EXT:
   - start|ROUTE_PSTN:
   - start|ROUTE_PSTN_SELECT_PEER:
+      $avp(lua_dlg_profile): [
+        "outgoing"
+      ]
   - start|ROUTE_CLEAR_PEER_OUT_PREF:
   - return|ROUTE_CLEAR_PEER_OUT_PREF:
   - start|ROUTE_LOAD_PEER_OUT_PREF:
   - return|ROUTE_LOAD_PEER_OUT_PREF:
   - return|ROUTE_PSTN_SELECT_PEER:
   - start|ROUTE_OUTBOUND:
+      $avp(lua_dlg_profile): [
+        "relay",
+        "peerout:[% peer_00_host1.id %]",
+        "peer:[% peer_00_host1.id %]",
+        "outgoing"
+      ]
   - start|ROUTE_SET_CALLER_DIALOG:
   - return|ROUTE_SET_CALLER_DIALOG:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host1.id %]",
+        "peer:[% peer_00_host1.id %]",
+        "outgoing"
+      ]
   - start|ROUTE_ACC_CALLER:
   - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
@@ -113,8 +137,21 @@ flow:
   - return|BRANCH_ROUTE_SBC:
   - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
-
-
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host1.id %]",
+        "peer:[% peer_00_host1.id %]",
+        "outgoing"
+      ]
 sip_in:
   - '^INVITE sip:43999200@'
   - 'Contact: sip:testuser1002@'
@@ -141,8 +178,8 @@ sip_out:
       'From: <sip:4311002@',
       'To: <sip:43999200@',
       'Content-Type: application/sdp',
-      'P-Caller-UUID: \w+',
-      'P-Callee-UUID: \w+',
+      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
+      'P-Callee-UUID: 0',
       'P-Asserted-Identity: <sip:4311002@',
       'P-Called-Party-ID: <sip:4318881001@',
       'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
diff --git a/scenarios_lnp/invite_ncos_white/0014_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0014_test.yml.tt2
index b7d12608..9b760c0f 100644
--- a/scenarios_lnp/invite_ncos_white/0014_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0014_test.yml.tt2
@@ -1,5 +1,20 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host1.id %]",
+        "peer:[% peer_00_host1.id %]",
+        "outgoing"
+      ]
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
diff --git a/scenarios_lnp/invite_ncos_white/0015_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0015_test.yml.tt2
index 1b4c381e..78bca92a 100644
--- a/scenarios_lnp/invite_ncos_white/0015_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0015_test.yml.tt2
@@ -2,7 +2,21 @@ flow:
   - start|REPLY_ROUTE_NAT:
   - 'start|dialog:start':
   - 'return|dialog:start':
-  # branch ??
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host1.id %]",
+        "peer:[% peer_00_host1.id %]",
+        "outgoing"
+      ]
   - 'return|dialog:start':
 sip_in:
   - '^SIP/2.0 200 OK'
diff --git a/scenarios_lnp/invite_ncos_white/0017_test.yml.tt2 b/scenarios_lnp/invite_ncos_white/0017_test.yml.tt2
index 5da52d47..e40ed75f 100644
--- a/scenarios_lnp/invite_ncos_white/0017_test.yml.tt2
+++ b/scenarios_lnp/invite_ncos_white/0017_test.yml.tt2
@@ -7,6 +7,7 @@ flow:
   - return|ROUTE_INITVARS:
   - 'start|dialog:end':
   - 'return|dialog:end':
+      $avp(lua_dlg_profile): None
   - 'return|dialog:end':
   - start|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_RESTORE_CLUSTERSET:
diff --git a/scenarios_lnp/invite_peerout/0003_test.yml.tt2 b/scenarios_lnp/invite_peerout/0003_test.yml.tt2
index 6c981b3d..82a0f420 100644
--- a/scenarios_lnp/invite_peerout/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0003_test.yml.tt2
@@ -71,14 +71,38 @@ flow:
   - start|ROUTE_INVITE_TO_EXT:
   - start|ROUTE_PSTN:
   - start|ROUTE_PSTN_SELECT_PEER:
+      $avp(lua_dlg_profile): [
+        "outgoing"
+      ]
   - start|ROUTE_CLEAR_PEER_OUT_PREF:
   - return|ROUTE_CLEAR_PEER_OUT_PREF:
   - start|ROUTE_LOAD_PEER_OUT_PREF:
   - return|ROUTE_LOAD_PEER_OUT_PREF:
   - return|ROUTE_PSTN_SELECT_PEER:
   - start|ROUTE_OUTBOUND:
+      $avp(lua_dlg_profile): [
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
   - start|ROUTE_SET_CALLER_DIALOG:
   - return|ROUTE_SET_CALLER_DIALOG:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
   - start|ROUTE_ACC_CALLER:
   - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
@@ -123,9 +147,23 @@ flow:
   - start|ROUTE_ADD_CALLINFO:
   - return|ROUTE_ADD_CALLINFO:
   - return|BRANCH_ROUTE_SBC:
-  # branch ??
   - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
 sip_in:
   - '^INVITE sip:004321001@'
   - 'Contact: sip:testuser1002@'
@@ -152,8 +190,8 @@ sip_out:
       'From: <sip:4311002@',
       'To: <sip:004321001@',
       'Content-Type: application/sdp',
-      'P-Caller-UUID: \w+',
-      'P-Callee-UUID: \w+',
+      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
+      'P-Callee-UUID: 0',
       'P-Asserted-Identity: <sip:4311002@',
       'P-Called-Party-ID: <sip:0043test28881001;npdi@',
       'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',
diff --git a/scenarios_lnp/invite_peerout/0005_test.yml.tt2 b/scenarios_lnp/invite_peerout/0005_test.yml.tt2
index 365aa769..a1d52088 100644
--- a/scenarios_lnp/invite_peerout/0005_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0005_test.yml.tt2
@@ -1,5 +1,20 @@
 flow:
   - start|REPLY_ROUTE_NAT:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
   - exit|REPLY_ROUTE_NAT:
 sip_in:
   - '^SIP/2.0 180 Ringing'
diff --git a/scenarios_lnp/invite_peerout/0006_test.yml.tt2 b/scenarios_lnp/invite_peerout/0006_test.yml.tt2
index e550517c..46d5da2f 100644
--- a/scenarios_lnp/invite_peerout/0006_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0006_test.yml.tt2
@@ -2,7 +2,21 @@ flow:
   - start|REPLY_ROUTE_NAT:
   - 'start|dialog:start':
   - 'return|dialog:start':
-  # branch ??
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
   - 'return|dialog:start':
 sip_in:
   - '^SIP/2.0 200 OK'
diff --git a/scenarios_lnp/invite_peerout/0008_test.yml.tt2 b/scenarios_lnp/invite_peerout/0008_test.yml.tt2
index 39224e7a..7329d7ef 100644
--- a/scenarios_lnp/invite_peerout/0008_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout/0008_test.yml.tt2
@@ -8,6 +8,7 @@ flow:
   - return|ROUTE_INITVARS:
   - 'start|dialog:end':
   - 'return|dialog:end':
+      $avp(lua_dlg_profile): None
   - 'return|dialog:end':
   - start|ROUTE_STOP_RTPPROXY:
   - start|ROUTE_RESTORE_CLUSTERSET:
diff --git a/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2 b/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2
index 27c6423e..afdde633 100644
--- a/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2
+++ b/scenarios_lnp/invite_peerout_rn/0003_test.yml.tt2
@@ -62,14 +62,38 @@ flow:
   - start|ROUTE_INVITE_TO_EXT:
   - start|ROUTE_PSTN:
   - start|ROUTE_PSTN_SELECT_PEER:
+      $avp(lua_dlg_profile): [
+        "outgoing"
+      ]
   - start|ROUTE_CLEAR_PEER_OUT_PREF:
   - return|ROUTE_CLEAR_PEER_OUT_PREF:
   - start|ROUTE_LOAD_PEER_OUT_PREF:
   - return|ROUTE_LOAD_PEER_OUT_PREF:
   - return|ROUTE_PSTN_SELECT_PEER:
   - start|ROUTE_OUTBOUND:
+      $avp(lua_dlg_profile): [
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
   - start|ROUTE_SET_CALLER_DIALOG:
   - return|ROUTE_SET_CALLER_DIALOG:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
   - start|ROUTE_ACC_CALLER:
   - return|ROUTE_ACC_CALLER:
   - start|ROUTE_ACC_CALLEE:
@@ -108,9 +132,23 @@ flow:
   - start|ROUTE_ADD_CALLINFO:
   - return|ROUTE_ADD_CALLINFO:
   - return|BRANCH_ROUTE_SBC:
-  # branch ??
   - return|BRANCH_ROUTE_SBC:
   - exit|ROUTE_OUTBOUND:
+      $avp(lua_dlg_profile): [
+        "accountout:[% customer_test.id %]",
+        "userout:[% spce_test.testuser1002.uuid %]",
+        "account:[% customer_test.id %]",
+        "user:[% spce_test.testuser1002.uuid %]",
+        "totalaccountout:[% customer_test.id %]",
+        "totaluserout:[% spce_test.testuser1002.uuid %]",
+        "totalaccount:[% customer_test.id %]",
+        "totaluser:[% spce_test.testuser1002.uuid %]",
+        "total",
+        "relay",
+        "peerout:[% peer_00_host0.id %]",
+        "peer:[% peer_00_host0.id %]",
+        "outgoing"
+      ]
 sip_in:
   - '^INVITE sip:004321001@'
   - 'Contact: sip:testuser1002@'
@@ -137,8 +175,8 @@ sip_out:
       'From: <sip:4311002@',
       'To: <sip:004321001@',
       'Content-Type: application/sdp',
-      'P-Caller-UUID: \w+',
-      'P-Callee-UUID: \w+',
+      'P-Caller-UUID: [% spce_test.testuser1002.uuid %]',
+      'P-Callee-UUID: 0',
       'P-Asserted-Identity: <sip:4311002@',
       'P-Called-Party-ID: <sip:004321001;npdi;rn=004328881001@',
       'P-App-Param: ;aleg_sst_enable=no;sst_enable=no',