diff --git a/conf/dialplan/default/01_provider.com.xml b/conf/dialplan/default/01_provider.com.xml
new file mode 100644
index 0000000000..1531ba9c40
--- /dev/null
+++ b/conf/dialplan/default/01_provider.com.xml
@@ -0,0 +1,30 @@
+<include>
+
+  <extension name="local.provider.com">
+    <condition field="${toll_allow}" expression="local"/>
+    <condition field="destination_number" expression="^(\d{7})$">
+      <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/>
+      <action application="set" data="effective_caller_id_name=${outbound_caller_id_name}"/>
+      <action application="bridge" data="sofia/gateway/${default_gateway}/1${default_areacode}$1"/>
+    </condition>
+  </extension>
+
+  <extension name="domestic.provider.com">
+    <condition field="${toll_allow}" expression="domestic"/>
+    <condition field="destination_number" expression="^(\d{11})$">
+      <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/>
+      <action application="set" data="effective_caller_id_name=${outbound_caller_id_name}"/>
+      <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/>
+    </condition>
+  </extension>
+
+  <extension name="international.provider.com">
+    <condition field="${toll_allow}" expression="international"/>
+    <condition field="destination_number" expression="^(011\d{10+})$">
+      <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/>
+      <action application="set" data="effective_caller_id_name=${outbound_caller_id_name}"/>
+      <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/>
+    </condition>
+  </extension>
+
+</include>
diff --git a/conf/directory/default.xml b/conf/directory/default.xml
index 675f3ba6e5..2f386a2523 100644
--- a/conf/directory/default.xml
+++ b/conf/directory/default.xml
@@ -26,6 +26,8 @@
 
     <variables>
       <variable name="record_stereo" value="true"/>
+      <variable name="default_gateway" value="asterlink.com"/>
+      <variable name="default_areacode" value="918"/>
     </variables>
 
     <X-PRE-PROCESS cmd="include" data="default/*.xml"/>
diff --git a/conf/directory/default/1000.xml b/conf/directory/default/1000.xml
index d230325c4c..732b993290 100644
--- a/conf/directory/default/1000.xml
+++ b/conf/directory/default/1000.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1000"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1000"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1000"/>
       <variable name="effective_caller_id_number" value="1000"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1001.xml b/conf/directory/default/1001.xml
index 387f430e97..dd88ea4024 100644
--- a/conf/directory/default/1001.xml
+++ b/conf/directory/default/1001.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1001"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1001"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1001"/>
       <variable name="effective_caller_id_number" value="1001"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1002.xml b/conf/directory/default/1002.xml
index 9f1c7a218b..a1ac8db0a7 100644
--- a/conf/directory/default/1002.xml
+++ b/conf/directory/default/1002.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1002"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1002"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1002"/>
       <variable name="effective_caller_id_number" value="1002"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1003.xml b/conf/directory/default/1003.xml
index 4f190d3bf9..022932615a 100644
--- a/conf/directory/default/1003.xml
+++ b/conf/directory/default/1003.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1003"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1003"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1003"/>
       <variable name="effective_caller_id_number" value="1003"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1004.xml b/conf/directory/default/1004.xml
index be0f8753ad..b652b495eb 100644
--- a/conf/directory/default/1004.xml
+++ b/conf/directory/default/1004.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1004"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1004"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1004"/>
       <variable name="effective_caller_id_number" value="1004"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1005.xml b/conf/directory/default/1005.xml
index 2137021aa7..2cd7ca8373 100644
--- a/conf/directory/default/1005.xml
+++ b/conf/directory/default/1005.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1005"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1005"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1005"/>
       <variable name="effective_caller_id_number" value="1005"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1006.xml b/conf/directory/default/1006.xml
index 117f6f7060..1972a990ca 100644
--- a/conf/directory/default/1006.xml
+++ b/conf/directory/default/1006.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1006"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1006"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1006"/>
       <variable name="effective_caller_id_number" value="1006"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1007.xml b/conf/directory/default/1007.xml
index f190e5f16e..752d41126c 100644
--- a/conf/directory/default/1007.xml
+++ b/conf/directory/default/1007.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1007"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1007"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1007"/>
       <variable name="effective_caller_id_number" value="1007"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1008.xml b/conf/directory/default/1008.xml
index a95d328550..7c7910ccb1 100644
--- a/conf/directory/default/1008.xml
+++ b/conf/directory/default/1008.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1008"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1008"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1008"/>
       <variable name="effective_caller_id_number" value="1008"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1009.xml b/conf/directory/default/1009.xml
index 3385ba7137..5155549286 100644
--- a/conf/directory/default/1009.xml
+++ b/conf/directory/default/1009.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1009"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1009"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1009"/>
       <variable name="effective_caller_id_number" value="1009"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1010.xml b/conf/directory/default/1010.xml
index da04a3b7f6..c3fc596824 100644
--- a/conf/directory/default/1010.xml
+++ b/conf/directory/default/1010.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1010"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1010"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1010"/>
       <variable name="effective_caller_id_number" value="1010"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1011.xml b/conf/directory/default/1011.xml
index d847ecc55b..b1a38312c3 100644
--- a/conf/directory/default/1011.xml
+++ b/conf/directory/default/1011.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1011"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1011"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1011"/>
       <variable name="effective_caller_id_number" value="1011"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1012.xml b/conf/directory/default/1012.xml
index 0b5f27d9f7..d7c5e3e413 100644
--- a/conf/directory/default/1012.xml
+++ b/conf/directory/default/1012.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1012"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1012"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1012"/>
       <variable name="effective_caller_id_number" value="1012"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1013.xml b/conf/directory/default/1013.xml
index 8516fd76c9..520b89ea94 100644
--- a/conf/directory/default/1013.xml
+++ b/conf/directory/default/1013.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1013"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1013"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1013"/>
       <variable name="effective_caller_id_number" value="1013"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1014.xml b/conf/directory/default/1014.xml
index baae3bcd90..c079bedcaa 100644
--- a/conf/directory/default/1014.xml
+++ b/conf/directory/default/1014.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1014"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1014"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1014"/>
       <variable name="effective_caller_id_number" value="1014"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1015.xml b/conf/directory/default/1015.xml
index 99df131ce5..1b10e45a52 100644
--- a/conf/directory/default/1015.xml
+++ b/conf/directory/default/1015.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1015"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1015"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1015"/>
       <variable name="effective_caller_id_number" value="1015"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1016.xml b/conf/directory/default/1016.xml
index bdfcbc827c..902fe7a423 100644
--- a/conf/directory/default/1016.xml
+++ b/conf/directory/default/1016.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1016"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1016"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1016"/>
       <variable name="effective_caller_id_number" value="1016"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1017.xml b/conf/directory/default/1017.xml
index 86dc0a14bc..4869cd81a2 100644
--- a/conf/directory/default/1017.xml
+++ b/conf/directory/default/1017.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1017"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1017"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1017"/>
       <variable name="effective_caller_id_number" value="1017"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1018.xml b/conf/directory/default/1018.xml
index 3d0d3e194b..50f6b45a18 100644
--- a/conf/directory/default/1018.xml
+++ b/conf/directory/default/1018.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1018"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1018"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1018"/>
       <variable name="effective_caller_id_number" value="1018"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/1019.xml b/conf/directory/default/1019.xml
index e7bc07fb62..fd27c35b75 100644
--- a/conf/directory/default/1019.xml
+++ b/conf/directory/default/1019.xml
@@ -5,10 +5,13 @@
       <param name="vm-password" value="1019"/>
     </params>
     <variables>
+      <variable name="toll_allow" value="domestic,international,local"/>
       <variable name="accountcode" value="1019"/>
       <variable name="user_context" value="default"/>
       <variable name="effective_caller_id_name" value="Extension 1019"/>
       <variable name="effective_caller_id_number" value="1019"/>
+      <variable name="external_caller_id_name" value="Acme Corporation"/>
+      <variable name="external_caller_id_number" value="5552566639"/>
     </variables>
   </user>
 </include>
diff --git a/conf/directory/default/default.xml b/conf/directory/default/default.xml
index 0aa293ff4c..57b155a5c5 100644
--- a/conf/directory/default/default.xml
+++ b/conf/directory/default/default.xml
@@ -5,7 +5,7 @@
       <!-- set these to take advantage of a dialplan localized to this user -->
       <variable name="numbering_plan" value="US"/>
       <variable name="default_gateway" value="asterlink.com"/>
-      <variable name="default_area_code" value="918"/>
+      <variable name="default_areacode" value="918"/>
     </variables>
   </user>
 </include>