diff --git a/scenarios/callee.csv b/scenarios/callee.csv
index bf290225..33e556d2 100644
--- a/scenarios/callee.csv
+++ b/scenarios/callee.csv
@@ -1,2 +1,3 @@
 SEQUENTIAL
 testuser1003;4311003;[authentication username=testuser1003 password=testuser];DOMAIN
+testuser1001;4311001;[authentication username=testuser1001 password=testuser];DOMAIN
diff --git a/scenarios/invite/sipp_scenario.xml b/scenarios/invite/sipp_scenario.xml
index 9fc2b537..3bbb6663 100644
--- a/scenarios/invite/sipp_scenario.xml
+++ b/scenarios/invite/sipp_scenario.xml
@@ -4,10 +4,10 @@
   <send retrans="500" start_rtd="1" start_rtd="2">
     <![CDATA[
 
-      INVITE sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -35,10 +35,10 @@
   <send>
     <![CDATA[
 
-      ACK sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]:[remote_port] SIP/2.0
+      ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -51,10 +51,10 @@
   <send retrans="500" start_rtd="3">
     <![CDATA[
 
-      INVITE sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -93,7 +93,7 @@
       ACK [next_url] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       [routes]
       CSeq: 2 ACK
@@ -119,7 +119,7 @@
       BYE [next_url] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 3 BYE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
diff --git a/scenarios/invite/sipp_scenario_responder01_reg.xml b/scenarios/invite/sipp_scenario_responder01_reg.xml
index 101bfbf3..d9cc4973 100644
--- a/scenarios/invite/sipp_scenario_responder01_reg.xml
+++ b/scenarios/invite/sipp_scenario_responder01_reg.xml
@@ -5,13 +5,13 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 REGISTER
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -28,14 +28,14 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 REGISTER
-      [field2 file="callee.csv"]
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      [field2 file="callee.csv" line=0]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
diff --git a/scenarios/invite/sipp_scenario_responder01_unreg.xml b/scenarios/invite/sipp_scenario_responder01_unreg.xml
index 15f0a61e..ec70b8d6 100644
--- a/scenarios/invite/sipp_scenario_responder01_unreg.xml
+++ b/scenarios/invite/sipp_scenario_responder01_unreg.xml
@@ -5,13 +5,13 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 REGISTER
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -28,14 +28,14 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 REGISTER
-      [field2 file="callee.csv"]
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      [field2 file="callee.csv" line=0]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 0
       Max-Forwards: 70
       Content-Length: 0
diff --git a/scenarios/invite_allowip/sipp_scenario.xml b/scenarios/invite_allowip/sipp_scenario.xml
index b7a1e010..28f30bda 100644
--- a/scenarios/invite_allowip/sipp_scenario.xml
+++ b/scenarios/invite_allowip/sipp_scenario.xml
@@ -4,10 +4,10 @@
   <send retrans="500" start_rtd="1" start_rtd="2">
     <![CDATA[
 
-      INVITE sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -35,10 +35,10 @@
   <send>
     <![CDATA[
 
-      ACK sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]:[remote_port] SIP/2.0
+      ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -51,10 +51,10 @@
   <send retrans="500" start_rtd="3">
     <![CDATA[
 
-      INVITE sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -84,10 +84,10 @@
   <send>
     <![CDATA[
 
-      ACK sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]:[remote_port] SIP/2.0
+      ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 2 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
diff --git a/scenarios/invite_blockout_blst/sipp_scenario.xml b/scenarios/invite_blockout_blst/sipp_scenario.xml
index 77140475..3be1861d 100644
--- a/scenarios/invite_blockout_blst/sipp_scenario.xml
+++ b/scenarios/invite_blockout_blst/sipp_scenario.xml
@@ -4,10 +4,10 @@
   <send retrans="500" start_rtd="1" start_rtd="2">
     <![CDATA[
 
-      INVITE sip:[field1 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      INVITE sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field1 file="callee.csv"]@[field3 file="callee.csv"]>
+      To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -35,10 +35,10 @@
   <send>
     <![CDATA[
 
-      ACK sip:[field1 file="callee.csv"]@[field3 file="callee.csv"]:[remote_port] SIP/2.0
+      ACK sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field1 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -51,10 +51,10 @@
   <send retrans="500" start_rtd="3">
     <![CDATA[
 
-      INVITE sip:[field1 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      INVITE sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field1 file="callee.csv"]@[field3 file="callee.csv"]>
+      To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -84,10 +84,10 @@
   <send>
     <![CDATA[
 
-      ACK sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]:[remote_port] SIP/2.0
+      ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 2 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
diff --git a/scenarios/invite_blockout_pinoverride/sipp_scenario.xml b/scenarios/invite_blockout_pinoverride/sipp_scenario.xml
index ff42431d..7d444a5f 100644
--- a/scenarios/invite_blockout_pinoverride/sipp_scenario.xml
+++ b/scenarios/invite_blockout_pinoverride/sipp_scenario.xml
@@ -4,10 +4,10 @@
   <send retrans="500" start_rtd="1" start_rtd="2">
     <![CDATA[
 
-      INVITE sip:*80*444[field1 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      INVITE sip:*80*444[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:*80*444[field1 file="callee.csv"]@[field3 file="callee.csv"]>
+      To: <sip:*80*444[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -35,10 +35,10 @@
   <send>
     <![CDATA[
 
-      ACK sip:*80*444[field1 file="callee.csv"]@[field3 file="callee.csv"]:[remote_port] SIP/2.0
+      ACK sip:*80*444[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:*80*444[field1 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:*80*444[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -51,10 +51,10 @@
   <send retrans="500" start_rtd="3">
     <![CDATA[
 
-      INVITE sip:*80*444[field1 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      INVITE sip:*80*444[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:*80*444[field1 file="callee.csv"]@[field3 file="callee.csv"]>
+      To: <sip:*80*444[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -93,7 +93,7 @@
       ACK [next_url] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:*80*444[field1 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:*80*444[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       [routes]
       CSeq: 2 ACK
@@ -119,7 +119,7 @@
       BYE [next_url] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:*80*444[field1 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:*80*444[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 3 BYE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
diff --git a/scenarios/invite_blockout_pinoverride/sipp_scenario_responder01_reg.xml b/scenarios/invite_blockout_pinoverride/sipp_scenario_responder01_reg.xml
index 101bfbf3..d9cc4973 100644
--- a/scenarios/invite_blockout_pinoverride/sipp_scenario_responder01_reg.xml
+++ b/scenarios/invite_blockout_pinoverride/sipp_scenario_responder01_reg.xml
@@ -5,13 +5,13 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 REGISTER
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -28,14 +28,14 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 REGISTER
-      [field2 file="callee.csv"]
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      [field2 file="callee.csv" line=0]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
diff --git a/scenarios/invite_blockout_pinoverride/sipp_scenario_responder01_unreg.xml b/scenarios/invite_blockout_pinoverride/sipp_scenario_responder01_unreg.xml
index 15f0a61e..ec70b8d6 100644
--- a/scenarios/invite_blockout_pinoverride/sipp_scenario_responder01_unreg.xml
+++ b/scenarios/invite_blockout_pinoverride/sipp_scenario_responder01_unreg.xml
@@ -5,13 +5,13 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 REGISTER
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -28,14 +28,14 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 REGISTER
-      [field2 file="callee.csv"]
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      [field2 file="callee.csv" line=0]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 0
       Max-Forwards: 70
       Content-Length: 0
diff --git a/scenarios/invite_ignore_allowip/sipp_scenario.xml b/scenarios/invite_ignore_allowip/sipp_scenario.xml
index 9fc2b537..3bbb6663 100644
--- a/scenarios/invite_ignore_allowip/sipp_scenario.xml
+++ b/scenarios/invite_ignore_allowip/sipp_scenario.xml
@@ -4,10 +4,10 @@
   <send retrans="500" start_rtd="1" start_rtd="2">
     <![CDATA[
 
-      INVITE sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -35,10 +35,10 @@
   <send>
     <![CDATA[
 
-      ACK sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]:[remote_port] SIP/2.0
+      ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -51,10 +51,10 @@
   <send retrans="500" start_rtd="3">
     <![CDATA[
 
-      INVITE sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -93,7 +93,7 @@
       ACK [next_url] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       [routes]
       CSeq: 2 ACK
@@ -119,7 +119,7 @@
       BYE [next_url] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 3 BYE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
diff --git a/scenarios/invite_ignore_allowip/sipp_scenario_responder01_reg.xml b/scenarios/invite_ignore_allowip/sipp_scenario_responder01_reg.xml
index 101bfbf3..d9cc4973 100644
--- a/scenarios/invite_ignore_allowip/sipp_scenario_responder01_reg.xml
+++ b/scenarios/invite_ignore_allowip/sipp_scenario_responder01_reg.xml
@@ -5,13 +5,13 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 REGISTER
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -28,14 +28,14 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 REGISTER
-      [field2 file="callee.csv"]
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      [field2 file="callee.csv" line=0]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
diff --git a/scenarios/invite_ignore_allowip/sipp_scenario_responder01_unreg.xml b/scenarios/invite_ignore_allowip/sipp_scenario_responder01_unreg.xml
index 15f0a61e..ec70b8d6 100644
--- a/scenarios/invite_ignore_allowip/sipp_scenario_responder01_unreg.xml
+++ b/scenarios/invite_ignore_allowip/sipp_scenario_responder01_unreg.xml
@@ -5,13 +5,13 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 REGISTER
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -28,14 +28,14 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 REGISTER
-      [field2 file="callee.csv"]
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      [field2 file="callee.csv" line=0]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 0
       Max-Forwards: 70
       Content-Length: 0
diff --git a/scenarios/invite_offline/sipp_scenario.xml b/scenarios/invite_offline/sipp_scenario.xml
index b1434599..8440e757 100644
--- a/scenarios/invite_offline/sipp_scenario.xml
+++ b/scenarios/invite_offline/sipp_scenario.xml
@@ -4,10 +4,10 @@
   <send retrans="500" start_rtd="1" start_rtd="2">
     <![CDATA[
 
-      INVITE sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -34,10 +34,10 @@
   <send>
     <![CDATA[
 
-      ACK sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]:[remote_port] SIP/2.0
+      ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -50,10 +50,10 @@
   <send retrans="500" start_rtd="3">
     <![CDATA[
 
-      INVITE sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      INVITE sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -88,10 +88,10 @@
 <send>
     <![CDATA[
 
-      ACK sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]:[remote_port] SIP/2.0
+      ACK sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -104,10 +104,10 @@
   <send retrans="500" start_rtd="3">
     <![CDATA[
 
-      INVITE sip:[field1 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      INVITE sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field1 file="callee.csv"]@[field3 file="callee.csv"]>
+      To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 INVITE
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
@@ -142,10 +142,10 @@
 <send>
     <![CDATA[
 
-      ACK sip:[field1 file="callee.csv"]@[field3 file="callee.csv"]:[remote_port] SIP/2.0
+      ACK sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]:[remote_port] SIP/2.0
       [last_Via:]
       From: <sip:[field0 file="caller.csv"]@[field2 file="caller.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field1 file="callee.csv"]@[field3 file="callee.csv"]>[peer_tag_param]
+      To: <sip:[field1 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>[peer_tag_param]
       Call-ID: [call_id]
       CSeq: 1 ACK
       Contact: sip:[field0 file="caller.csv"]@[local_ip]:[local_port]
diff --git a/scenarios/register/sipp_scenario.xml b/scenarios/register/sipp_scenario.xml
index a03e3c48..407f4da5 100644
--- a/scenarios/register/sipp_scenario.xml
+++ b/scenarios/register/sipp_scenario.xml
@@ -5,13 +5,13 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 REGISTER
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -28,14 +28,14 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 REGISTER
-      [field2 file="callee.csv"]
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      [field2 file="callee.csv" line=0]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -52,14 +52,14 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 REGISTER
-      [field2 file="callee.csv"]
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      [field2 file="callee.csv" line=0]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 0
       Max-Forwards: 70
       Content-Length: 0
diff --git a/scenarios/register_allowip/sipp_scenario.xml b/scenarios/register_allowip/sipp_scenario.xml
index c8a2cdde..2ded07c1 100644
--- a/scenarios/register_allowip/sipp_scenario.xml
+++ b/scenarios/register_allowip/sipp_scenario.xml
@@ -5,13 +5,13 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 REGISTER
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:50603
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:50603
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -28,14 +28,14 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 REGISTER
-      [field2 file="callee.csv"]
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:50603
+      [field2 file="callee.csv" line=0]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:50603
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
diff --git a/scenarios/register_ignore_allowip/sipp_scenario.xml b/scenarios/register_ignore_allowip/sipp_scenario.xml
index 40970e08..0192cbba 100644
--- a/scenarios/register_ignore_allowip/sipp_scenario.xml
+++ b/scenarios/register_ignore_allowip/sipp_scenario.xml
@@ -5,13 +5,13 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 1 REGISTER
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:50603
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:50603
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -28,14 +28,14 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 REGISTER
-      [field2 file="callee.csv"]
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:50603
+      [field2 file="callee.csv" line=0]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:50603
       Expires: 600
       Max-Forwards: 70
       Content-Length: 0
@@ -52,14 +52,14 @@
   <send>
     <![CDATA[
 
-      REGISTER sip:[field0 file="callee.csv"]@[field3 file="callee.csv"] SIP/2.0
+      REGISTER sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0] SIP/2.0
       Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
-      From: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>;tag=[pid]SIPpTag00[call_number]
-      To: <sip:[field0 file="callee.csv"]@[field3 file="callee.csv"]>
+      From: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>;tag=[pid]SIPpTag00[call_number]
+      To: <sip:[field0 file="callee.csv" line=0]@[field3 file="callee.csv" line=0]>
       Call-ID: [call_id]
       CSeq: 2 REGISTER
-      [field2 file="callee.csv"]
-      Contact: sip:[field0 file="callee.csv"]@[local_ip]:[local_port]
+      [field2 file="callee.csv" line=0]
+      Contact: sip:[field0 file="callee.csv" line=0]@[local_ip]:[local_port]
       Expires: 0
       Max-Forwards: 70
       Content-Length: 0