From 4fe99907e1a8ff91eded4c541066060cc7e7270f Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Mon, 27 Mar 2023 14:14:36 -0600
Subject: [PATCH] Move context to an extension attribute

---
 .../conf/dialplan/010_caller_details.xml      |   2 +-
 .../switch/conf/dialplan/010_user_exists.xml  |   2 +-
 .../conf/dialplan/015_caller_details.xml      |   2 +-
 .../conf/dialplan/018_global-variables.xml    |   2 +-
 .../conf/dialplan/020_domain-variables.xml    |   2 +-
 .../switch/conf/dialplan/025_call_limit.xml   |   2 +-
 .../switch/conf/dialplan/030_is_loopback.xml  |   2 +-
 .../conf/dialplan/035_call_direction.xml      |   2 +-
 .../switch/conf/dialplan/035_is_local.xml     |   2 +-
 .../switch/conf/dialplan/040_call_block.xml   |   2 +-
 .../dialplan/045_call_recording_on_demand.xml |   2 +-
 .../switch/conf/dialplan/050_user_record.xml  |   2 +-
 .../conf/dialplan/055_rtp_has_crypto.xml      |   2 +-
 .../switch/conf/dialplan/060_redial.xml       |   2 +-
 .../switch/conf/dialplan/070_speed_dial.xml   |   2 +-
 .../conf/dialplan/080_default_caller_id.xml   |   2 +-
 .../conf/dialplan/080_user_hold_music.xml     |  18 ++--
 .../conf/dialplan/085_bind_digit_action.xml   |  47 ++++----
 .../switch/conf/dialplan/200_agent_status.xml |  30 +++---
 .../conf/dialplan/210_agent_status_id.xml     |   2 +-
 .../conf/dialplan/215_agent_status_break.xml  |  34 +++---
 .../switch/conf/dialplan/220_provision.xml    |  28 ++---
 .../conf/dialplan/230_group-intercept.xml     |  28 ++---
 .../switch/conf/dialplan/240_page.xml         |  32 +++---
 .../switch/conf/dialplan/250_conf-xfer.xml    | 100 +++++++++---------
 .../conf/dialplan/250_page-extension.xml      |  22 ++--
 .../dialplan/25_click_to_call_auto_answer.xml |  16 +--
 .../switch/conf/dialplan/260_eavesdrop.xml    |  16 ++-
 .../switch/conf/dialplan/270_call_privacy.xml |  18 ++--
 .../switch/conf/dialplan/280_call_return.xml  |  12 +--
 .../dialplan/290_intercept-ext-polycom.xml    |  14 ++-
 .../conf/dialplan/290_intercept-ext.xml       |  22 ++--
 .../switch/conf/dialplan/290_number_queue.xml |  26 +++--
 .../resources/switch/conf/dialplan/300_dx.xml |  16 ++-
 .../switch/conf/dialplan/310_att_xfer.xml     |  22 ++--
 .../dialplan/310_extension-to-voicemail.xml   |  30 +++---
 .../conf/dialplan/310_send_to_voicemail.xml   |  26 +++--
 .../switch/conf/dialplan/320_vmain.xml        |  46 ++++----
 .../switch/conf/dialplan/320_xfer_vm.xml      |  20 ++--
 .../switch/conf/dialplan/330_is_transfer.xml  |  16 ++-
 .../switch/conf/dialplan/330_vmain_user.xml   |   2 +-
 .../resources/switch/conf/dialplan/340_cf.xml |  14 ++-
 .../switch/conf/dialplan/340_delay_echo.xml   |  14 ++-
 .../switch/conf/dialplan/350_echo.xml         |  14 ++-
 .../switch/conf/dialplan/350_please_hold.xml  |  19 ++--
 .../conf/dialplan/360_is_zrtp_secure.xml      |  17 ++-
 .../switch/conf/dialplan/360_milliwatt.xml    |  14 ++-
 .../switch/conf/dialplan/370_is_secure.xml    |  18 ++--
 .../switch/conf/dialplan/370_tone_stream.xml  |  14 ++-
 .../switch/conf/dialplan/380_hold_music.xml   |  29 +++--
 .../switch/conf/dialplan/400_recordings.xml   |  22 ++--
 .../dialplan/410_freeswitch_conference.xml    |  30 +++---
 .../switch/conf/dialplan/420_disa.xml         |  31 +++---
 .../switch/conf/dialplan/430_directory.xml    |  12 +--
 .../switch/conf/dialplan/440_wake-up.xml      |  18 ++--
 .../switch/conf/dialplan/470_valet_park.xml   |  52 +++++----
 .../conf/dialplan/470_valet_park_auto.xml     |  16 ++-
 .../conf/dialplan/474_valet_park_in.xml       |  22 ++--
 .../conf/dialplan/475_valet_park_out.xml      |  14 ++-
 .../switch/conf/dialplan/480_operator.xml     |  20 ++--
 .../conf/dialplan/485_operator-forward.xml    |  18 ++--
 .../conf/dialplan/490_do-not-disturb.xml      |  38 ++++---
 .../switch/conf/dialplan/495_call_screen.xml  |  32 +++---
 .../switch/conf/dialplan/500_call-forward.xml |  56 +++++-----
 .../conf/dialplan/500_ring-group-forward.xml  |  23 ++--
 .../507_call_forward_not_registered.xml       |  16 ++-
 .../switch/conf/dialplan/510_follow-me.xml    |  14 ++-
 .../conf/dialplan/515_call-forward-all.xml    |  38 ++++---
 .../dialplan/520_follow-me-destinations.xml   |   4 +-
 .../530_talking_clock_date_and_time.xml       |  18 ++--
 .../conf/dialplan/540_talking_clock_time.xml  |  16 +--
 .../conf/dialplan/550_talking_clock_date.xml  |  18 ++--
 .../conf/dialplan/560_extension_queue.xml     |  26 +++--
 .../conf/dialplan/570_nway_conference.xml     |   6 +-
 .../switch/conf/dialplan/870_cidlookup.xml    |  24 ++---
 .../conf/dialplan/890_local_extension.xml     |  60 +++++------
 .../switch/conf/dialplan/895_bxfer-return.xml |  11 +-
 .../switch/conf/dialplan/900_voicemail.xml    |  22 ++--
 .../switch/conf/dialplan/999_not-found.xml    |  14 ++-
 79 files changed, 711 insertions(+), 808 deletions(-)

diff --git a/app/dialplans/resources/switch/conf/dialplan/010_caller_details.xml b/app/dialplans/resources/switch/conf/dialplan/010_caller_details.xml
index 479bf62641..00ac5b4778 100644
--- a/app/dialplans/resources/switch/conf/dialplan/010_caller_details.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/010_caller_details.xml
@@ -1,5 +1,5 @@
 <context name="public">
-	<extension name="caller-details" continue="true" app_uuid="b1cd7509-5576-469a-892d-d0cfb66a4197" global="true" order="10">
+	<extension name="caller-details" context="public" continue="true" app_uuid="b1cd7509-5576-469a-892d-d0cfb66a4197" global="true" order="10">
 		<condition field="" expression="" break="never">
 			<action application="set" data="caller_destination=${sip_to_user}" inline="true"/>
 			<action application="set" data="caller_id_name=${caller_id_name}" inline="true"/>
diff --git a/app/dialplans/resources/switch/conf/dialplan/010_user_exists.xml b/app/dialplans/resources/switch/conf/dialplan/010_user_exists.xml
index 528b4296f8..d9fddc9430 100644
--- a/app/dialplans/resources/switch/conf/dialplan/010_user_exists.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/010_user_exists.xml
@@ -1,5 +1,5 @@
 <context name="${domain_name}">
-	<extension name="user_exists" number="" continue="true" app_uuid="897845b0-1f13-444c-84fe-432fd47338ca" global="true" order="10">
+	<extension name="user_exists" number="" context="${domain_name}" continue="true" app_uuid="897845b0-1f13-444c-84fe-432fd47338ca" global="true" order="10">
 		<condition field="${loopback_leg}" expression="^B$" break="never">
 			<action application="set" data="domain_name=${context}" inline="true"/>
 		</condition>
diff --git a/app/dialplans/resources/switch/conf/dialplan/015_caller_details.xml b/app/dialplans/resources/switch/conf/dialplan/015_caller_details.xml
index fc5d205c37..f9c376455e 100644
--- a/app/dialplans/resources/switch/conf/dialplan/015_caller_details.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/015_caller_details.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="caller-details" continue="true" app_uuid="5c491a3e-f587-44df-970a-cd4352aa6f64" order="15">
+	<extension name="caller-details" context="${domain_name}" continue="true" app_uuid="5c491a3e-f587-44df-970a-cd4352aa6f64" order="15">
 		<condition field="${caller_destination}" expression="^$" break="never">
 			<action application="set" data="caller_destination=${destination_number}" inline="true"/>
 			<action application="set" data="caller_id_name=${caller_id_name}" inline="true"/>
diff --git a/app/dialplans/resources/switch/conf/dialplan/018_global-variables.xml b/app/dialplans/resources/switch/conf/dialplan/018_global-variables.xml
index c30095d378..d0a332523c 100644
--- a/app/dialplans/resources/switch/conf/dialplan/018_global-variables.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/018_global-variables.xml
@@ -1,5 +1,5 @@
 <context name="${domain_name}">
-	<extension name="global-variables" number="" continue="true" app_uuid="d49ee3bd-5085-4619-a2f9-2b62c8c461c5" global="true" order="18">
+	<extension name="global-variables" number="" context="${domain_name}" continue="true" app_uuid="d49ee3bd-5085-4619-a2f9-2b62c8c461c5" global="true" order="18">
 		<condition>
 			<action application="set" data="RFC2822_DATE=${strftime(%a, %d %b %Y %T %z)}"/>
 		</condition>
diff --git a/app/dialplans/resources/switch/conf/dialplan/020_domain-variables.xml b/app/dialplans/resources/switch/conf/dialplan/020_domain-variables.xml
index 35a05b3d74..6117b44b78 100644
--- a/app/dialplans/resources/switch/conf/dialplan/020_domain-variables.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/020_domain-variables.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="domain-variables" number="" continue="true" app_uuid="9f356fe7-8cf8-4c14-8fe2-6daf89304458" order="20">
+	<extension name="domain-variables" number="" context="${domain_name}" continue="true" app_uuid="9f356fe7-8cf8-4c14-8fe2-6daf89304458" order="20">
 		<condition>
 			<action application="export" data="origination_callee_id_name=${destination_number}" enabled="true"/>
 			<action application="set" data="operator=1000" inline="true" enabled="true"/>
diff --git a/app/dialplans/resources/switch/conf/dialplan/025_call_limit.xml b/app/dialplans/resources/switch/conf/dialplan/025_call_limit.xml
index af50bcb421..16bc6eb1c9 100644
--- a/app/dialplans/resources/switch/conf/dialplan/025_call_limit.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/025_call_limit.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="call-limit" number="" continue="true" app_uuid="4670c44c-45dd-4bae-97ba-b0dfe0aca639" enabled="false" order="25">
+	<extension name="call-limit" number="" context="${domain_name}" continue="true" app_uuid="4670c44c-45dd-4bae-97ba-b0dfe0aca639" enabled="false" order="25">
 		<condition field="${call_direction}" expression="^(inbound|outbound)$">
 			<action application="limit" data="hash inbound ${domain_uuid} ${max_calls} !USER_BUSY"/>
 		</condition>
diff --git a/app/dialplans/resources/switch/conf/dialplan/030_is_loopback.xml b/app/dialplans/resources/switch/conf/dialplan/030_is_loopback.xml
index 6e405e2c1f..d175d2a711 100644
--- a/app/dialplans/resources/switch/conf/dialplan/030_is_loopback.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/030_is_loopback.xml
@@ -1,5 +1,5 @@
 <context name="${domain_name}">
-  <extension name="is_loopback" number="" continue="true" app_uuid="1dcf888f-c367-46b7-b809-f2de918c266c" global="true" order="30">
+  <extension name="is_loopback" number="" context="${domain_name}" continue="true" app_uuid="1dcf888f-c367-46b7-b809-f2de918c266c" global="true" order="30">
 	<condition field="${is_follow_me_loopback}" expression="true">
 		<action application="set" data="from_orig_user_exists=${user_exists id ${username} ${domain_name}}" inline="true"/>
 	</condition>
diff --git a/app/dialplans/resources/switch/conf/dialplan/035_call_direction.xml b/app/dialplans/resources/switch/conf/dialplan/035_call_direction.xml
index 4199107a4b..32d7fb43ef 100644
--- a/app/dialplans/resources/switch/conf/dialplan/035_call_direction.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/035_call_direction.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="call-direction" number="" continue="true" app_uuid="3780f814-5543-4350-b65d-563512d1fe71" enabled="true" order="35">
+	<extension name="call-direction" number="" context="${domain_name}" continue="true" app_uuid="3780f814-5543-4350-b65d-563512d1fe71" enabled="true" order="35">
 		<condition field="${call_direction}" expression="^$" break="never">
 			<action application="export" data="call_direction=local" inline="true"/>
 		</condition>
diff --git a/app/dialplans/resources/switch/conf/dialplan/035_is_local.xml b/app/dialplans/resources/switch/conf/dialplan/035_is_local.xml
index 6aa6d7032d..910f6b9646 100644
--- a/app/dialplans/resources/switch/conf/dialplan/035_is_local.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/035_is_local.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="is_local" number="" continue="true" app_uuid="a1685b18-21aa-4d77-9f95-c0013b7286a3" enabled="false" order="35">
+	<extension name="is_local" number="" context="${domain_name}" continue="true" app_uuid="a1685b18-21aa-4d77-9f95-c0013b7286a3" enabled="false" order="35">
 		<condition field="${user_exists}" expression="false">
 			<action application="lua" data="app.lua is_local"/>
 		</condition>
diff --git a/app/dialplans/resources/switch/conf/dialplan/040_call_block.xml b/app/dialplans/resources/switch/conf/dialplan/040_call_block.xml
index a73a790960..5ef252fbff 100644
--- a/app/dialplans/resources/switch/conf/dialplan/040_call_block.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/040_call_block.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="call_block" number="" continue="true" app_uuid="b1b31930-d0ee-4395-a891-04df94599f1f" enabled="false" order="40">
+	<extension name="call_block" number="" context="${domain_name}" continue="true" app_uuid="b1b31930-d0ee-4395-a891-04df94599f1f" enabled="false" order="40">
 		<condition field="${call_direction}" expression="^(inbound|outbound)$" >
 			<action application="lua" data="app.lua call_block"/>
 		</condition>
diff --git a/app/dialplans/resources/switch/conf/dialplan/045_call_recording_on_demand.xml b/app/dialplans/resources/switch/conf/dialplan/045_call_recording_on_demand.xml
index 1d62e10365..80265ddb94 100644
--- a/app/dialplans/resources/switch/conf/dialplan/045_call_recording_on_demand.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/045_call_recording_on_demand.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="call_recording_on_demand" number="" continue="true" app_uuid="3746fc9c-f331-48c0-82d8-a80b1bfffa06" enabled="false" order="45">
+	<extension name="call_recording_on_demand" number="" context="${domain_name}" continue="true" app_uuid="3746fc9c-f331-48c0-82d8-a80b1bfffa06" enabled="false" order="45">
 		<condition field="${sip_authorized}" expression="true" break="never">
 			<action application="set" data="bind_target=both" inline="true"/>
 			<!-- set to peer to prevent manipulate of call by caller -->
diff --git a/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml b/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml
index a72826bbfd..01ee7038d5 100644
--- a/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="user_record" number="" continue="true" app_uuid="43539dd3-d555-4498-835a-3245a0b184ca" enabled="true" order="50">
+	<extension name="user_record" number="" context="${domain_name}" continue="true" app_uuid="43539dd3-d555-4498-835a-3245a0b184ca" enabled="true" order="50">
 		<condition field="${user_exists}" expression="^true$" break="never"/>
 		<condition field="${user_record}" expression="^all$" break="never">
 			<action application="set" data="record_session=true" inline="true"/>
diff --git a/app/dialplans/resources/switch/conf/dialplan/055_rtp_has_crypto.xml b/app/dialplans/resources/switch/conf/dialplan/055_rtp_has_crypto.xml
index b1ec3070f8..5bb4e20945 100644
--- a/app/dialplans/resources/switch/conf/dialplan/055_rtp_has_crypto.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/055_rtp_has_crypto.xml
@@ -1,5 +1,5 @@
 <context name="${domain_name}">
-	<extension name="rtp_has_crypto" number="" continue="true" app_uuid="e23d96cc-20db-4fa5-98a0-a75c402fa291" global="true" order="55">
+	<extension name="rtp_has_crypto" number="" context="${domain_name}" continue="true" app_uuid="e23d96cc-20db-4fa5-98a0-a75c402fa291" global="true" order="55">
 		<condition field="${rtp_has_crypto}" expression="^(AEAD_AES_256_GCM_8|AEAD_AES_128_GCM_8|AES_CM_256_HMAC_SHA1_80|AES_CM_192_HMAC_SHA1_80|AES_CM_128_HMAC_SHA1_80|AES_CM_256_HMAC_SHA1_32|AES_CM_192_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_32|AES_CM_128_NULL_AUTH)$">
 			<action application="set" data="rtp_secure_media=optional" inline="true"/>
 			<action application="export" data="rtp_secure_media=optional" inline="true"/>
diff --git a/app/dialplans/resources/switch/conf/dialplan/060_redial.xml b/app/dialplans/resources/switch/conf/dialplan/060_redial.xml
index faa5837550..01fbc0acc3 100644
--- a/app/dialplans/resources/switch/conf/dialplan/060_redial.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/060_redial.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="redial" number="*870" continue="true" app_uuid="459da8c1-073a-458e-ae7e-8194342f9583" order="60">
+	<extension name="redial" number="*870" context="${domain_name}" continue="true" app_uuid="459da8c1-073a-458e-ae7e-8194342f9583" order="60">
 		<condition field="destination_number" expression="^(redial|\*870)$" break="on-true">
 			<action application="transfer" data="${hash(select/${domain_name}-last_dial/${caller_id_number})}"/>
 		</condition>
diff --git a/app/dialplans/resources/switch/conf/dialplan/070_speed_dial.xml b/app/dialplans/resources/switch/conf/dialplan/070_speed_dial.xml
index 1275cdc46d..ceccf57d5b 100644
--- a/app/dialplans/resources/switch/conf/dialplan/070_speed_dial.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/070_speed_dial.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="speed_dial" number="*0[ext]" continue="false" app_uuid="1a4a2611-01e3-4582-982b-4ada4d314ea3" enabled="true" order="70">
+	<extension name="speed_dial" number="*0[ext]" context="${domain_name}" continue="false" app_uuid="1a4a2611-01e3-4582-982b-4ada4d314ea3" enabled="true" order="70">
 		<condition field="destination_number" expression="^\*0(.*)$">
 			<action application="set" data="permissions=false"/>
 			<action application="lua" data="app.lua speed_dial $1"/>
diff --git a/app/dialplans/resources/switch/conf/dialplan/080_default_caller_id.xml b/app/dialplans/resources/switch/conf/dialplan/080_default_caller_id.xml
index 8e9ae02651..e8e300bdb7 100644
--- a/app/dialplans/resources/switch/conf/dialplan/080_default_caller_id.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/080_default_caller_id.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="default_caller_id" number="" continue="true" app_uuid="9660e536-976d-47cb-872e-85957c51bd3d" order="80">
+	<extension name="default_caller_id" number="" context="${domain_name}" continue="true" app_uuid="9660e536-976d-47cb-872e-85957c51bd3d" order="80">
 		<condition field="${call_direction}" expression="outbound"/>
 		<condition field="${emergency_caller_id_name}" expression="^$" break="never">
 			<action application="set" data="emergency_caller_id_name=${default_emergency_caller_id_name}" inline="true"/>
diff --git a/app/dialplans/resources/switch/conf/dialplan/080_user_hold_music.xml b/app/dialplans/resources/switch/conf/dialplan/080_user_hold_music.xml
index 363bf2556e..ec6e073f12 100644
--- a/app/dialplans/resources/switch/conf/dialplan/080_user_hold_music.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/080_user_hold_music.xml
@@ -1,9 +1,9 @@
-<context name="{v_context}">
-	<extension name="user_hold_music" number="" continue="true" app_uuid="3ace0990-ef23-45b2-a81d-a5857a671e74" order="80">
-		<condition field="${user_exists}" expression="true"/>
-		<condition field="${hold_music}" expression="^$"/>
-		<condition field="${from_user_exists}" expression="false">
-			<action application="set" data="hold_music=${user_data ${destination_number}@${domain_name} var hold_music}" inline="true"/>
-		</condition>
-	</extension>
-</context>
+
+<extension name="user_hold_music" number="" context="${domain_name}" continue="true" app_uuid="3ace0990-ef23-45b2-a81d-a5857a671e74" order="80">
+	<condition field="${user_exists}" expression="true"/>
+	<condition field="${hold_music}" expression="^$"/>
+	<condition field="${from_user_exists}" expression="false">
+		<action application="set" data="hold_music=${user_data ${destination_number}@${domain_name} var hold_music}" inline="true"/>
+	</condition>
+</extension>
+
diff --git a/app/dialplans/resources/switch/conf/dialplan/085_bind_digit_action.xml b/app/dialplans/resources/switch/conf/dialplan/085_bind_digit_action.xml
index 497fa6a745..7e74d69728 100644
--- a/app/dialplans/resources/switch/conf/dialplan/085_bind_digit_action.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/085_bind_digit_action.xml
@@ -1,25 +1,24 @@
 
-<context name="{v_context}">
-	<extension name="bind_digit_action" number="" continue="true" app_uuid="7e007a4d-886b-4cdf-81f4-da9eb4689f1c" enabled="false" order="85">
-		<condition field="${from_user_exists}" expression="true" break="never">
-			<action application="set" data="bind_target=self" inline="true"/>
-			<action application="set" data="bind_action_target=self" inline="true"/>
-			<!-- The caller here is remote so only assign feature codes to internal recipient -->
-			<anti-action application="set" data="bind_target=peer" inline="true"/>
-			<anti-action application="set" data="bind_action_target=peer" inline="true"/>
-		</condition>
-		<condition>
-			<!-- <action application="export" data="conf_xfer_number=xfer-${create_uuid foo}-${domain_name}"/>-->
-			<action application="bind_digit_action" data="local,*1,exec:execute_extension,dx XML ${context},${bind_target},${bind_action_target}"/>
-			<action application="bind_digit_action" data="local,*3,exec:execute_extension,cf XML ${context},${bind_target},${bind_action_target}"/>
-			<action application="bind_digit_action" data="local,*4,exec:execute_extension,att_xfer XML ${context},${bind_target},${bind_action_target}"/>
-			<!-- <action application="bind_digit_action" data="local,*0,exec:execute_extension,conf_xfer_from_dialplan XML conf-xfer@${domain_name},${bind_target},${bind_action_target}"/> -->
-			<action application="digit_action_set_realm" data="local"/>
-		</condition>
-		<condition field="${user_exists}" expression="true"/>
-		<condition field="${from_user_exists}" expression="true">
-			<action application="set" data="bridge_pre_execute_bleg_app=lua"/>
-			<action application="set" data="bridge_pre_execute_bleg_data=bind_digit_bleg.lua ${context}"/>
-		</condition>
-	</extension>
-</context>
+<extension name="bind_digit_action" number="" context="${domain_name}" continue="true" app_uuid="7e007a4d-886b-4cdf-81f4-da9eb4689f1c" enabled="false" order="85">
+	<condition field="${from_user_exists}" expression="true" break="never">
+		<action application="set" data="bind_target=self" inline="true"/>
+		<action application="set" data="bind_action_target=self" inline="true"/>
+		<!-- The caller here is remote so only assign feature codes to internal recipient -->
+		<anti-action application="set" data="bind_target=peer" inline="true"/>
+		<anti-action application="set" data="bind_action_target=peer" inline="true"/>
+	</condition>
+	<condition>
+		<!-- <action application="export" data="conf_xfer_number=xfer-${create_uuid foo}-${domain_name}"/>-->
+		<action application="bind_digit_action" data="local,*1,exec:execute_extension,dx XML ${context},${bind_target},${bind_action_target}"/>
+		<action application="bind_digit_action" data="local,*3,exec:execute_extension,cf XML ${context},${bind_target},${bind_action_target}"/>
+		<action application="bind_digit_action" data="local,*4,exec:execute_extension,att_xfer XML ${context},${bind_target},${bind_action_target}"/>
+		<!-- <action application="bind_digit_action" data="local,*0,exec:execute_extension,conf_xfer_from_dialplan XML conf-xfer@${domain_name},${bind_target},${bind_action_target}"/> -->
+		<action application="digit_action_set_realm" data="local"/>
+	</condition>
+	<condition field="${user_exists}" expression="true"/>
+	<condition field="${from_user_exists}" expression="true">
+		<action application="set" data="bridge_pre_execute_bleg_app=lua"/>
+		<action application="set" data="bridge_pre_execute_bleg_data=bind_digit_bleg.lua ${context}"/>
+	</condition>
+</extension>
+
diff --git a/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml b/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml
index 91d3e8d5ad..b0400b388b 100644
--- a/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml
@@ -1,15 +1,15 @@
-<context name="{v_context}">
-	<extension name="agent_status" number="*22" continue="false" app_uuid="2eb032c5-c79d-4096-ac90-8a47fe40f411" order="200">
-		<condition field="destination_number" expression="^\*22$" break="on-true">
-			<action application="set" data="agent_id=${sip_from_user}" enabled="true"/>
-			<action application="set" data="agent_authorized=true" enabled="false"/>
-			<action application="lua" data="app.lua agent_status" enabled="true"/>
-		</condition>
-		<condition field="destination_number" expression="^(?:agent\+|\*22)(.+)$">
-			<action application="set" data="agent_id=$1" enabled="true"/>
-			<action application="set" data="agent_name=$1" enabled="false"/>
-			<action application="set" data="agent_authorized=true" enabled="false"/>
-			<action application="lua" data="app.lua agent_status" enabled="true"/>
-		</condition>
-	</extension>
-</context>
+
+<extension name="agent_status" number="*22" context="${domain_name}" continue="false" app_uuid="2eb032c5-c79d-4096-ac90-8a47fe40f411" order="200">
+	<condition field="destination_number" expression="^\*22$" break="on-true">
+		<action application="set" data="agent_id=${sip_from_user}" enabled="true"/>
+		<action application="set" data="agent_authorized=true" enabled="false"/>
+		<action application="lua" data="app.lua agent_status" enabled="true"/>
+	</condition>
+	<condition field="destination_number" expression="^(?:agent\+|\*22)(.+)$">
+		<action application="set" data="agent_id=$1" enabled="true"/>
+		<action application="set" data="agent_name=$1" enabled="false"/>
+		<action application="set" data="agent_authorized=true" enabled="false"/>
+		<action application="lua" data="app.lua agent_status" enabled="true"/>
+	</condition>
+</extension>
+
diff --git a/app/dialplans/resources/switch/conf/dialplan/210_agent_status_id.xml b/app/dialplans/resources/switch/conf/dialplan/210_agent_status_id.xml
index 0ed125d23c..fd1e55fc22 100644
--- a/app/dialplans/resources/switch/conf/dialplan/210_agent_status_id.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/210_agent_status_id.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="agent_status_id" number="*23" continue="false" app_uuid="feb0ee6e-0ea5-41fc-a9c1-189daf2d4161" order="210">
+	<extension name="agent_status_id" number="*23" context="${domain_name}" continue="false" app_uuid="feb0ee6e-0ea5-41fc-a9c1-189daf2d4161" order="210">
 		<condition field="destination_number" expression="^\*23$">
 			<action application="set" data="agent_id="/>
 			<action application="lua" data="app.lua agent_status"/>
diff --git a/app/dialplans/resources/switch/conf/dialplan/215_agent_status_break.xml b/app/dialplans/resources/switch/conf/dialplan/215_agent_status_break.xml
index 50dcfbc1d6..eb276bb439 100644
--- a/app/dialplans/resources/switch/conf/dialplan/215_agent_status_break.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/215_agent_status_break.xml
@@ -1,17 +1,17 @@
-<context name="{v_context}">
-	<extension name="agent-status-break" number="*24" continue="false" app_uuid="17a937f4-82f1-4a0f-b3a8-213db15127cf" order="215">
-		<condition field="destination_number" expression="^\*24$" break="on-true">
-			<action application="set" data="agent_id=${sip_from_user}" enabled="true"/>
-			<action application="set" data="agent_authorized=true" enabled="false"/>
-			<action application="set" data="agent_action=break" enabled="true"/>
-			<action application="lua" data="app.lua agent_status" enabled="true"/>
-		</condition>
-		<condition field="destination_number" expression="^(?:agent\+|\*24)(.+)$">
-			<action application="set" data="agent_id=$1" enabled="true"/>
-			<action application="set" data="agent_name=$1" enabled="false"/>
-			<action application="set" data="agent_authorized=true" enabled="false"/>
-			<action application="set" data="agent_action=break" enabled="true"/>
-			<action application="lua" data="app.lua agent_status" enabled="true"/>
-		</condition>
-	</extension>
-</context>
+
+<extension name="agent-status-break" number="*24" context="${domain_name}" continue="false" app_uuid="17a937f4-82f1-4a0f-b3a8-213db15127cf" order="215">
+	<condition field="destination_number" expression="^\*24$" break="on-true">
+		<action application="set" data="agent_id=${sip_from_user}" enabled="true"/>
+		<action application="set" data="agent_authorized=true" enabled="false"/>
+		<action application="set" data="agent_action=break" enabled="true"/>
+		<action application="lua" data="app.lua agent_status" enabled="true"/>
+	</condition>
+	<condition field="destination_number" expression="^(?:agent\+|\*24)(.+)$">
+		<action application="set" data="agent_id=$1" enabled="true"/>
+		<action application="set" data="agent_name=$1" enabled="false"/>
+		<action application="set" data="agent_authorized=true" enabled="false"/>
+		<action application="set" data="agent_action=break" enabled="true"/>
+		<action application="lua" data="app.lua agent_status" enabled="true"/>
+	</condition>
+</extension>
+
diff --git a/app/dialplans/resources/switch/conf/dialplan/220_provision.xml b/app/dialplans/resources/switch/conf/dialplan/220_provision.xml
index 138f10d354..86a7a1588f 100644
--- a/app/dialplans/resources/switch/conf/dialplan/220_provision.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/220_provision.xml
@@ -1,14 +1,14 @@
-<context name="{v_context}">
-	<extension name="provision" number="*11,*12" continue="false" app_uuid="d31d267d-7235-4887-a01b-d59f3a1dfcca" enabled="false" order="220">
-		<condition field="destination_number" expression="^\*11$" break="on-true">
-			<action application="set" data="reboot=true"/>
-			<action application="set" data="action=login"/>
-			<action application="lua" data="app.lua provision"/>
-		</condition>
-		<condition field="destination_number" expression="^\*12$">
-			<action application="set" data="reboot=true"/>
-			<action application="set" data="action=logout"/>
-			<action application="lua" data="app.lua provision"/>
-		</condition>
-	</extension>
-</context>
+
+<extension name="provision" number="*11,*12" context="${domain_name}" continue="false" app_uuid="d31d267d-7235-4887-a01b-d59f3a1dfcca" enabled="false" order="220">
+	<condition field="destination_number" expression="^\*11$" break="on-true">
+		<action application="set" data="reboot=true"/>
+		<action application="set" data="action=login"/>
+		<action application="lua" data="app.lua provision"/>
+	</condition>
+	<condition field="destination_number" expression="^\*12$">
+		<action application="set" data="reboot=true"/>
+		<action application="set" data="action=logout"/>
+		<action application="lua" data="app.lua provision"/>
+	</condition>
+</extension>
+
diff --git a/app/dialplans/resources/switch/conf/dialplan/230_group-intercept.xml b/app/dialplans/resources/switch/conf/dialplan/230_group-intercept.xml
index 6bc0b22fc7..df04ab4f36 100644
--- a/app/dialplans/resources/switch/conf/dialplan/230_group-intercept.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/230_group-intercept.xml
@@ -1,14 +1,14 @@
-<context name="{v_context}">
-	<extension name="group-intercept" number="*8" continue="false" app_uuid="15332e83-12f5-44d3-8472-633736eb4b9b" order="230">
-		<condition field="destination_number" expression="^\*8$"/>
-		<!-- if it is call from another node then needed UUID already in sip header       -->
-		<!-- So we can just do intercept without calling Lua script again on current node -->
-		<condition field="${sip_h_X-intercept_uuid}" expression="^(.+)$" break="on-true">
-			<action application="intercept" data="$1"/>
-		</condition>
-		<condition>
-			<action application="answer"/>
-			<action application="lua" data="intercept_group.lua inbound"/>
-		</condition>
-	</extension>
-</context>
+
+<extension name="group-intercept" number="*8" context="${domain_name}" continue="false" app_uuid="15332e83-12f5-44d3-8472-633736eb4b9b" order="230">
+	<condition field="destination_number" expression="^\*8$"/>
+	<!-- if it is call from another node then needed UUID already in sip header       -->
+	<!-- So we can just do intercept without calling Lua script again on current node -->
+	<condition field="${sip_h_X-intercept_uuid}" expression="^(.+)$" break="on-true">
+		<action application="intercept" data="$1"/>
+	</condition>
+	<condition>
+		<action application="answer"/>
+		<action application="lua" data="intercept_group.lua inbound"/>
+	</condition>
+</extension>
+
diff --git a/app/dialplans/resources/switch/conf/dialplan/240_page.xml b/app/dialplans/resources/switch/conf/dialplan/240_page.xml
index d06b5bd3ce..bcc51850ee 100644
--- a/app/dialplans/resources/switch/conf/dialplan/240_page.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/240_page.xml
@@ -1,17 +1,17 @@
-<context name="{v_context}">
-	<extension name="page" number="*724" continue="false" app_uuid="2011c518-696d-4878-a9b2-b217b6311311" enabled="false" order="240">
-		<condition field="destination_number" expression="^\*724$" >
-			<action application="set" data="caller_id_name=Page" />
-			<action application="set" data="caller_id_number=" />
-			<action application="set" data="pin_number={v_pin_number}" />
-			<action application="set" data="destinations=101-103,105" />
-			<action application="set" data="moderator=false" />
-			<action application="set" data="mute=true" />
-			<action application="set" data="check_destination_status=true" enabled="false" />
-			<action application="set" data="api_hangup_hook=conference page-${destination_number}@${domain_name} kick all" enabled="false"/>
-			<action application="set" data="execute_on_answer=sched_hangup +80 allotted_timeout" enabled="false"/>
-			<action application="lua" data="page.lua" />
-		</condition>
-	</extension>
-</context>
+
+<extension name="page" number="*724" context="${domain_name}" continue="false" app_uuid="2011c518-696d-4878-a9b2-b217b6311311" enabled="false" order="240">
+	<condition field="destination_number" expression="^\*724$" >
+		<action application="set" data="caller_id_name=Page" />
+		<action application="set" data="caller_id_number=" />
+		<action application="set" data="pin_number={v_pin_number}" />
+		<action application="set" data="destinations=101-103,105" />
+		<action application="set" data="moderator=false" />
+		<action application="set" data="mute=true" />
+		<action application="set" data="check_destination_status=true" enabled="false" />
+		<action application="set" data="api_hangup_hook=conference page-${destination_number}@${domain_name} kick all" enabled="false"/>
+		<action application="set" data="execute_on_answer=sched_hangup +80 allotted_timeout" enabled="false"/>
+		<action application="lua" data="page.lua" />
+	</condition>
+</extension>
+
 
diff --git a/app/dialplans/resources/switch/conf/dialplan/250_conf-xfer.xml b/app/dialplans/resources/switch/conf/dialplan/250_conf-xfer.xml
index 698d2289b1..d890ff66d1 100644
--- a/app/dialplans/resources/switch/conf/dialplan/250_conf-xfer.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/250_conf-xfer.xml
@@ -10,63 +10,63 @@ Control DTMF sequence
 	`##` transfer `self` to enter number and hangup `peer` leg
 	`*#` transfer `self` to conference room and hangup `peer` leg
 -->
-<context name="conf-xfer@{v_context}">
-	<extension name="conf-xfer" number="" continue="false" app_uuid="04e6a380-a27e-4032-bedf-f5b2249ea54d" enabled="false" order="250">
 
-		<condition field="destination_number" expression="^conf_add_begin$" break="on-true">
-			<action application="set" data="api_result=${conference(${conf_xfer_number} unmute ${conference_member_id} quiet)}"/>
-			<action application="bind_digit_action" data="conf-xfer,*0,api:lua,transfer2.lua ${uuid} conf_enter_number::XML::conf-xfer@${domain_name} conf_enter_to::XML::conf-xfer@${domain_name}"/>
-			<action application="bind_digit_action" data="conf-xfer,##,api:lua,transfer2.lua ${uuid} conf_enter_number::XML::conf-xfer@${domain_name} ::KILL::"/>
-			<action application="bind_digit_action" data="conf-xfer,*#,api:lua,transfer2.lua ${uuid} conf_add_end::XML::conf-xfer@${domain_name} ::KILL::"/>
-			<action application="bind_digit_action" data="conf,*#,exec:execute_extension,conf_add_begin XML conf-xfer@${domain_name}"/>
-			<action application="bind_digit_action" data="none,NONE,api:sleep,1"/>
-			<action application="set" data="continue_on_fail=true"/>
-			<action application="transfer" data="conf_enter_number XML conf-xfer@${domain_name}"/>
-		</condition>
+<extension name="conf-xfer" number="" context="conf-xfer@${domain_name}" continue="false" app_uuid="04e6a380-a27e-4032-bedf-f5b2249ea54d" enabled="false" order="250">
 
-		<condition field="destination_number" expression="^conf_add_end$" break="on-true">
-			<action application="digit_action_set_realm" data="conf"/>
-			<action application="set" data="api_result=${conference(${conf_xfer_number} mute ${conference_member_id})}"/>
-			<action application="conference" data="${conf_xfer_number}@page"/>
-		</condition>
+	<condition field="destination_number" expression="^conf_add_begin$" break="on-true">
+		<action application="set" data="api_result=${conference(${conf_xfer_number} unmute ${conference_member_id} quiet)}"/>
+		<action application="bind_digit_action" data="conf-xfer,*0,api:lua,transfer2.lua ${uuid} conf_enter_number::XML::conf-xfer@${domain_name} conf_enter_to::XML::conf-xfer@${domain_name}"/>
+		<action application="bind_digit_action" data="conf-xfer,##,api:lua,transfer2.lua ${uuid} conf_enter_number::XML::conf-xfer@${domain_name} ::KILL::"/>
+		<action application="bind_digit_action" data="conf-xfer,*#,api:lua,transfer2.lua ${uuid} conf_add_end::XML::conf-xfer@${domain_name} ::KILL::"/>
+		<action application="bind_digit_action" data="conf,*#,exec:execute_extension,conf_add_begin XML conf-xfer@${domain_name}"/>
+		<action application="bind_digit_action" data="none,NONE,api:sleep,1"/>
+		<action application="set" data="continue_on_fail=true"/>
+		<action application="transfer" data="conf_enter_number XML conf-xfer@${domain_name}"/>
+	</condition>
 
-		<condition field="destination_number" expression="^conf_enter_number$" break="on-true">
-			<action application="digit_action_set_realm" data="none"/>
-			<action application="read" data="2 11 'tone_stream://%(10000,0,350,440)' target_num 30000 #"/>
-			<action application="execute_extension" data="conf_bridge_${target_num} XML conf-xfer@${domain_name}"/>
-		</condition>
+	<condition field="destination_number" expression="^conf_add_end$" break="on-true">
+		<action application="digit_action_set_realm" data="conf"/>
+		<action application="set" data="api_result=${conference(${conf_xfer_number} mute ${conference_member_id})}"/>
+		<action application="conference" data="${conf_xfer_number}@page"/>
+	</condition>
 
-		<condition field="destination_number" expression="^conf_bridge_$" break="on-true">
-			<action application="execute_extension" data="conf_add_end  XML conf-xfer@${domain_name}"/>
-		</condition>
+	<condition field="destination_number" expression="^conf_enter_number$" break="on-true">
+		<action application="digit_action_set_realm" data="none"/>
+		<action application="read" data="2 11 'tone_stream://%(10000,0,350,440)' target_num 30000 #"/>
+		<action application="execute_extension" data="conf_bridge_${target_num} XML conf-xfer@${domain_name}"/>
+	</condition>
 
-		<condition field="destination_number" expression="^conf_bridge_\*$" break="on-true">
-			<action application="execute_extension" data="conf_add_end XML conf-xfer@${domain_name}"/>
-		</condition>
+	<condition field="destination_number" expression="^conf_bridge_$" break="on-true">
+		<action application="execute_extension" data="conf_add_end  XML conf-xfer@${domain_name}"/>
+	</condition>
 
-		<condition field="destination_number" expression="^conf_bridge_(\d{2,7})$" break="on-true">
-			<action application="digit_action_set_realm" data="conf-xfer"/>
-			<action application="bridge" data="{conf_xfer_number=${conf_xfer_number},transfer_after_bridge=conf_enter_to:XML:conf-xfer@${domain_name}}user/$1@${domain_name}"/>
-			<action application="execute_extension" data="conf_enter_number  XML conf-xfer@${domain_name}"/>
-		</condition>
+	<condition field="destination_number" expression="^conf_bridge_\*$" break="on-true">
+		<action application="execute_extension" data="conf_add_end XML conf-xfer@${domain_name}"/>
+	</condition>
 
-		<condition field="destination_number" expression="^conf_bridge_" break="on-true">
-			<action application="playback" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
-			<action application="execute_extension" data="conf_enter_number XML conf-xfer@${domain_name}"/>
-		</condition>
+	<condition field="destination_number" expression="^conf_bridge_(\d{2,7})$" break="on-true">
+		<action application="digit_action_set_realm" data="conf-xfer"/>
+		<action application="bridge" data="{conf_xfer_number=${conf_xfer_number},transfer_after_bridge=conf_enter_to:XML:conf-xfer@${domain_name}}user/$1@${domain_name}"/>
+		<action application="execute_extension" data="conf_enter_number  XML conf-xfer@${domain_name}"/>
+	</condition>
 
-		<condition field="destination_number" expression="^conf_enter_to$" break="on-true">
-			<action application="unbind_meta_app" data=""/>
-			<action application="bind_digit_action" data="conf,*#,exec:execute_extension,conf_add_begin XML conf-xfer@${domain_name}"/>
-			<action application="digit_action_set_realm" data="conf"/>
-			<action application="answer" data=""/>
-			<action application="playback" data="tone_stream://L=1;%(500, 0, 640)"/>
-			<action application="conference" data="${conf_xfer_number}@page"/>
-		</condition>
+	<condition field="destination_number" expression="^conf_bridge_" break="on-true">
+		<action application="playback" data="voicemail/vm-that_was_an_invalid_ext.wav"/>
+		<action application="execute_extension" data="conf_enter_number XML conf-xfer@${domain_name}"/>
+	</condition>
 
-		<condition field="destination_number" expression="^conf_xfer_from_dialplan$">
-			<action application="lua" data="transfer2.lua ${uuid} conf_add_begin::XML::conf-xfer@${domain_name} conf_enter_to::XML::conf-xfer@${domain_name}"/>
-		</condition>
+	<condition field="destination_number" expression="^conf_enter_to$" break="on-true">
+		<action application="unbind_meta_app" data=""/>
+		<action application="bind_digit_action" data="conf,*#,exec:execute_extension,conf_add_begin XML conf-xfer@${domain_name}"/>
+		<action application="digit_action_set_realm" data="conf"/>
+		<action application="answer" data=""/>
+		<action application="playback" data="tone_stream://L=1;%(500, 0, 640)"/>
+		<action application="conference" data="${conf_xfer_number}@page"/>
+	</condition>
+
+	<condition field="destination_number" expression="^conf_xfer_from_dialplan$">
+		<action application="lua" data="transfer2.lua ${uuid} conf_add_begin::XML::conf-xfer@${domain_name} conf_enter_to::XML::conf-xfer@${domain_name}"/>
+	</condition>
+
+</extension>
 
-	</extension>
-</context>
diff --git a/app/dialplans/resources/switch/conf/dialplan/250_page-extension.xml b/app/dialplans/resources/switch/conf/dialplan/250_page-extension.xml
index f157bc9445..8881e7b23b 100644
--- a/app/dialplans/resources/switch/conf/dialplan/250_page-extension.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/250_page-extension.xml
@@ -1,11 +1,11 @@
-<context name="{v_context}">
-	<extension name="page-extension" number="*8[ext]" continue="false" app_uuid="1b224444-de8b-448d-b2d1-19feaac3effa" order="250">
-		<condition field="destination_number" expression="^\*8(\d{2,7})$">
-			<action application="set" data="destinations=$1"/>
-			<action application="set" data="pin_number={v_pin_number}"/>
-			<action application="set" data="mute=true"/>
-			<action application="set" data="moderator=false" />
-			<action application="lua" data="page.lua"/>
-		</condition>
-	</extension>
-</context>
+
+<extension name="page-extension" number="*8[ext]" context="${domain_name}" continue="false" app_uuid="1b224444-de8b-448d-b2d1-19feaac3effa" order="250">
+	<condition field="destination_number" expression="^\*8(\d{2,7})$">
+		<action application="set" data="destinations=$1"/>
+		<action application="set" data="pin_number={v_pin_number}"/>
+		<action application="set" data="mute=true"/>
+		<action application="set" data="moderator=false" />
+		<action application="lua" data="page.lua"/>
+	</condition>
+</extension>
+
diff --git a/app/dialplans/resources/switch/conf/dialplan/25_click_to_call_auto_answer.xml b/app/dialplans/resources/switch/conf/dialplan/25_click_to_call_auto_answer.xml
index 4791c6f174..73bce7ac4e 100644
--- a/app/dialplans/resources/switch/conf/dialplan/25_click_to_call_auto_answer.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/25_click_to_call_auto_answer.xml
@@ -1,9 +1,9 @@
-<context name="{v_context}">
-  <extension name="clear_sip_auto_answer" app_uuid="90c51470-dc31-11e3-9c1a-0800200c9a66" continue="true" order="25">
-    <condition field="${click_to_call}" expression="true" />
-    <condition field="${sip_h_Call-Info}" expression="answer-after=0" >
-      <action application="export" data="sip_h_Call-Info="/>
-    </condition>
-  </extension>
-</context>
+
+<extension name="clear_sip_auto_answer" context="${domain_name}" continue="true" app_uuid="90c51470-dc31-11e3-9c1a-0800200c9a66" order="25">
+	<condition field="${click_to_call}" expression="true" />
+	<condition field="${sip_h_Call-Info}" expression="answer-after=0" >
+		<action application="export" data="sip_h_Call-Info="/>
+	</condition>
+</extension>
+
 
diff --git a/app/dialplans/resources/switch/conf/dialplan/260_eavesdrop.xml b/app/dialplans/resources/switch/conf/dialplan/260_eavesdrop.xml
index 8ee5e726b9..b0a08bfbc2 100644
--- a/app/dialplans/resources/switch/conf/dialplan/260_eavesdrop.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/260_eavesdrop.xml
@@ -1,9 +1,7 @@
-<context name="{v_context}">
-	<extension name="eavesdrop" number="*33[ext]" continue="false" app_uuid="e944af7e-8fcc-429b-a32f-0dcdce1585d8" order="260">
-		<condition field="destination_number" expression="^\*33(\d{2,7})$">
-			<action application="answer"/>
-			<action application="set" data="pin_number={v_pin_number}"/>
-			<action application="lua" data="eavesdrop.lua $1"/>
-		</condition>
-	</extension>
-</context>
+<extension name="eavesdrop" number="*33[ext]" context="${domain_name}" continue="false" app_uuid="e944af7e-8fcc-429b-a32f-0dcdce1585d8" order="260">
+	<condition field="destination_number" expression="^\*33(\d{2,7})$">
+		<action application="answer"/>
+		<action application="set" data="pin_number={v_pin_number}"/>
+		<action application="lua" data="eavesdrop.lua $1"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/270_call_privacy.xml b/app/dialplans/resources/switch/conf/dialplan/270_call_privacy.xml
index c98f558ed3..072efc43b6 100644
--- a/app/dialplans/resources/switch/conf/dialplan/270_call_privacy.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/270_call_privacy.xml
@@ -1,10 +1,8 @@
-<context name="{v_context}">
-	<extension name="call_privacy" number="*67[d+]" continue="false" app_uuid="eb478e66-f637-4ae7-b1eb-9a7b87a1bd9e" order="270">
-		<condition field="destination_number" expression="^\*67(\d+)$">
-			<action application="privacy" data="full"/>
-			<action application="set" data="sip_h_Privacy=id"/>
-			<action application="set" data="privacy=yes"/>
-			<action application="transfer" data="$1 XML ${context}"/>
-		</condition>
-	</extension>
-</context>
+<extension name="call_privacy" number="*67[d+]" context="${domain_name}" continue="false" app_uuid="eb478e66-f637-4ae7-b1eb-9a7b87a1bd9e" order="270">
+	<condition field="destination_number" expression="^\*67(\d+)$">
+		<action application="privacy" data="full"/>
+		<action application="set" data="sip_h_Privacy=id"/>
+		<action application="set" data="privacy=yes"/>
+		<action application="transfer" data="$1 XML ${context}"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/280_call_return.xml b/app/dialplans/resources/switch/conf/dialplan/280_call_return.xml
index fdf475fbcc..ba34a57381 100644
--- a/app/dialplans/resources/switch/conf/dialplan/280_call_return.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/280_call_return.xml
@@ -1,7 +1,5 @@
-<context name="{v_context}">
-	<extension name="call_return" number="*69" continue="false" app_uuid="fa516204-920f-4802-8bb1-04c6a010bfe1" order="280">
-		<condition field="destination_number" expression="^\*69$">
-			<action application="transfer" data="${hash(select/${domain_name}-call_return/${caller_id_number})}"/>
-		</condition>
-	</extension>
-</context>
+<extension name="call_return" number="*69" context="${domain_name}" continue="false" app_uuid="fa516204-920f-4802-8bb1-04c6a010bfe1" order="280">
+	<condition field="destination_number" expression="^\*69$">
+		<action application="transfer" data="${hash(select/${domain_name}-call_return/${caller_id_number})}"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/290_intercept-ext-polycom.xml b/app/dialplans/resources/switch/conf/dialplan/290_intercept-ext-polycom.xml
index 4d368905bf..77a16aee11 100644
--- a/app/dialplans/resources/switch/conf/dialplan/290_intercept-ext-polycom.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/290_intercept-ext-polycom.xml
@@ -1,8 +1,6 @@
-<context name="${domain_name}">
-	<extension name="intercept-ext-polycom" number="*97[ext]" continue="false" app_uuid="07493266-2b99-400a-8fde-3e1a9d11f575" global="true" order="290">
-		<condition field="destination_number" expression="^\*97(\d+)$">
-			<action application="answer"/>
-			<action application="lua" data="intercept.lua $1"/>
-		</condition>
-	</extension>
-</context>
+<extension name="intercept-ext-polycom" number="*97[ext]" context="${domain_name}" continue="false" app_uuid="07493266-2b99-400a-8fde-3e1a9d11f575" global="true" order="290">
+	<condition field="destination_number" expression="^\*97(\d+)$">
+		<action application="answer"/>
+		<action application="lua" data="intercept.lua $1"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/290_intercept-ext.xml b/app/dialplans/resources/switch/conf/dialplan/290_intercept-ext.xml
index 4b5e53123a..00c4a97ade 100644
--- a/app/dialplans/resources/switch/conf/dialplan/290_intercept-ext.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/290_intercept-ext.xml
@@ -1,12 +1,10 @@
-<context name="{v_context}">
-	<extension name="intercept-ext" number="**[ext]" continue="false" app_uuid="2b7b2f82-edfe-4339-8cc5-7d0cf36e1e68" order="290">
-		<condition field="destination_number" expression="^\*\*(\d+)$" break="on-true">
-			<action application="answer"/>
-			<action application="lua" data="intercept.lua $1"/>
-		</condition>
-		<condition field="destination_number" expression="^\*\*$"/>
-		<condition field="${sip_h_X-intercept_uuid}" expression="^(.+)$" break="on-true">
-			<action application="intercept" data="$1"/>
-		</condition>
-	</extension>
-</context>
+<extension name="intercept-ext" number="**[ext]" context="${domain_name}" continue="false" app_uuid="2b7b2f82-edfe-4339-8cc5-7d0cf36e1e68" order="290">
+	<condition field="destination_number" expression="^\*\*(\d+)$" break="on-true">
+		<action application="answer"/>
+		<action application="lua" data="intercept.lua $1"/>
+	</condition>
+	<condition field="destination_number" expression="^\*\*$"/>
+	<condition field="${sip_h_X-intercept_uuid}" expression="^(.+)$" break="on-true">
+		<action application="intercept" data="$1"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/290_number_queue.xml b/app/dialplans/resources/switch/conf/dialplan/290_number_queue.xml
index 29633ae809..60754c8e01 100644
--- a/app/dialplans/resources/switch/conf/dialplan/290_number_queue.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/290_number_queue.xml
@@ -1,14 +1,12 @@
-<context name="{v_context}">
-	<extension name="number_queue" number="*800[ext]" app_uuid="eb837d10-890d-11e3-baa8-0800200c9a66" order="290">
-		<condition field="destination_number" expression="^\*800(.*)$" >
-			<action application="set" data="fifo_music=$${hold_music}" />
-			<action application="set" data="extension_queue=queue_$1@${domain_name}" />
-			<action application="set" data="fifo_simo=1" />
-			<action application="set" data="fifo_timeout=30" />
-			<action application="set" data="fifo_lag=10" />
-			<action application="set" data="fifo_destroy_after_use=true" />
-			<action application="set" data="fifo_extension_member=$1@${domain_name}" />
-			<action application="lua" data="extension_queue.lua" />
-		</condition>
-	</extension>
-</context>
+<extension name="number_queue" number="*800[ext]" context="${domain_name}" app_uuid="eb837d10-890d-11e3-baa8-0800200c9a66" order="290">
+	<condition field="destination_number" expression="^\*800(.*)$" >
+		<action application="set" data="fifo_music=$${hold_music}" />
+		<action application="set" data="extension_queue=queue_$1@${domain_name}" />
+		<action application="set" data="fifo_simo=1" />
+		<action application="set" data="fifo_timeout=30" />
+		<action application="set" data="fifo_lag=10" />
+		<action application="set" data="fifo_destroy_after_use=true" />
+		<action application="set" data="fifo_extension_member=$1@${domain_name}" />
+		<action application="lua" data="extension_queue.lua" />
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/300_dx.xml b/app/dialplans/resources/switch/conf/dialplan/300_dx.xml
index 418b8bfefe..62c05a5868 100644
--- a/app/dialplans/resources/switch/conf/dialplan/300_dx.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/300_dx.xml
@@ -1,10 +1,8 @@
 <!-- In call Transfer for phones without a transfer button -->
-<context name="{v_context}">
-	<extension name="dx" number="dx" continue="false" app_uuid="ddcf7740-78ca-4035-8c19-e2df10cebf67" order="300">
-		<condition field="destination_number" expression="^dx$">
-			<action application="answer"/>
-			<action application="read" data="2 6 'tone_stream://%(10000,0,350,440)' digits 5000 #"/>
-			<action application="transfer" data="-bleg ${digits}"/>
-		</condition>
-	</extension>
-</context>
+<extension name="dx" number="dx" context="${domain_name}" continue="false" app_uuid="ddcf7740-78ca-4035-8c19-e2df10cebf67" order="300">
+	<condition field="destination_number" expression="^dx$">
+		<action application="answer"/>
+		<action application="read" data="2 6 'tone_stream://%(10000,0,350,440)' digits 5000 #"/>
+		<action application="transfer" data="-bleg ${digits}"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/310_att_xfer.xml b/app/dialplans/resources/switch/conf/dialplan/310_att_xfer.xml
index 7677363616..930661dd36 100644
--- a/app/dialplans/resources/switch/conf/dialplan/310_att_xfer.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/310_att_xfer.xml
@@ -1,12 +1,10 @@
-<context name="{v_context}">
-	<extension name="att_xfer" number="att_xfer" continue="false" app_uuid="7bd7a113-0afc-406a-b4a7-33077c22ac39" order="310">
-		<condition field="destination_number" expression="^att_xfer$">
-			<action application="read" data="2 6 'tone_stream://%(10000,0,350,440)' digits 30000 #"/>
-			<action application="set" data="origination_cancel_key=#"/>
-			<!-- sends it to the correct domain but public context-->
-			<!--<action application="set" data="domain_name=${transfer_context}"/>-->
-			<!--<action application="att_xfer" data="sofia/internal/${digits}@${transfer_context}"/>-->
-			<action application="att_xfer" data="user/${digits}@${domain_name}"/>
-		</condition>
-	</extension>
-</context>
+<extension name="att_xfer" number="att_xfer" context="${domain_name}" continue="false" app_uuid="7bd7a113-0afc-406a-b4a7-33077c22ac39" order="310">
+	<condition field="destination_number" expression="^att_xfer$">
+		<action application="read" data="2 6 'tone_stream://%(10000,0,350,440)' digits 30000 #"/>
+		<action application="set" data="origination_cancel_key=#"/>
+		<!-- sends it to the correct domain but public context-->
+		<!--<action application="set" data="domain_name=${transfer_context}"/>-->
+		<!--<action application="att_xfer" data="sofia/internal/${digits}@${transfer_context}"/>-->
+		<action application="att_xfer" data="user/${digits}@${domain_name}"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/310_extension-to-voicemail.xml b/app/dialplans/resources/switch/conf/dialplan/310_extension-to-voicemail.xml
index 3e7a906a13..a6ec749abf 100644
--- a/app/dialplans/resources/switch/conf/dialplan/310_extension-to-voicemail.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/310_extension-to-voicemail.xml
@@ -1,16 +1,14 @@
-<context name="${domain_name}">
-	<extension name="extension-to-voicemail" number="[ext]" continue="false" app_uuid="8a2e7b81-996c-4d6b-87df-b879b972a572" global="true" order="310">
-		<condition field="${user_exists}" expression="^true$" />
-		<condition field="username" expression="^${caller_id_number}$" />
-		<condition field="destination_number" expression="^${caller_id_number}$">
-			<action application="answer"/>
-			<action application="sleep" data="1000"/>
-			<action application="set" data="record_append=false"/>
-			<action application="set" data="voicemail_action=check"/>
-			<action application="set" data="voicemail_id=${caller_id_number}"/>
-			<action application="set" data="voicemail_profile=default"/>
-			<action application="lua" data="app.lua voicemail"/>
-			<!--<action application="voicemail" data="default ${domain_name} ${caller_id_number}"/>-->
-		</condition>
-	</extension>
-</context>
+<extension name="extension-to-voicemail" number="[ext]" context="${domain_name}" continue="false" app_uuid="8a2e7b81-996c-4d6b-87df-b879b972a572" global="true" order="310">
+	<condition field="${user_exists}" expression="^true$" />
+	<condition field="username" expression="^${caller_id_number}$" />
+	<condition field="destination_number" expression="^${caller_id_number}$">
+		<action application="answer"/>
+		<action application="sleep" data="1000"/>
+		<action application="set" data="record_append=false"/>
+		<action application="set" data="voicemail_action=check"/>
+		<action application="set" data="voicemail_id=${caller_id_number}"/>
+		<action application="set" data="voicemail_profile=default"/>
+		<action application="lua" data="app.lua voicemail"/>
+		<!--<action application="voicemail" data="default ${domain_name} ${caller_id_number}"/>-->
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/310_send_to_voicemail.xml b/app/dialplans/resources/switch/conf/dialplan/310_send_to_voicemail.xml
index 030ba35e9c..6148031f86 100644
--- a/app/dialplans/resources/switch/conf/dialplan/310_send_to_voicemail.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/310_send_to_voicemail.xml
@@ -1,14 +1,12 @@
-<context name="{v_context}">
-	<extension name="send_to_voicemail" number="*99[ext]" continue="false" app_uuid="001d5dab-e0c6-4352-8f06-e9986ee7b0d8" order="310">
-		<condition field="destination_number" expression="^\*99(\d{2,10})$">
-			<action application="answer"/>
-			<action application="sleep" data="1000"/>
-			<action application="set" data="voicemail_action=save"/>
-			<action application="set" data="voicemail_id=$1"/>
-			<action application="set" data="voicemail_profile=default"/>
-			<action application="set" data="send_to_voicemail=true" />
-			<action application="lua" data="app.lua voicemail"/>
-			<!--<action application="voicemail" data="default ${domain_name} ${dialed_extension}"/>-->
-		</condition>
-	</extension>
-</context>
+<extension name="send_to_voicemail" number="*99[ext]" context="${domain_name}" continue="false" app_uuid="001d5dab-e0c6-4352-8f06-e9986ee7b0d8" order="310">
+	<condition field="destination_number" expression="^\*99(\d{2,10})$">
+		<action application="answer"/>
+		<action application="sleep" data="1000"/>
+		<action application="set" data="voicemail_action=save"/>
+		<action application="set" data="voicemail_id=$1"/>
+		<action application="set" data="voicemail_profile=default"/>
+		<action application="set" data="send_to_voicemail=true" />
+		<action application="lua" data="app.lua voicemail"/>
+		<!--<action application="voicemail" data="default ${domain_name} ${dialed_extension}"/>-->
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/320_vmain.xml b/app/dialplans/resources/switch/conf/dialplan/320_vmain.xml
index 8afca94699..9afafb1900 100644
--- a/app/dialplans/resources/switch/conf/dialplan/320_vmain.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/320_vmain.xml
@@ -1,25 +1,23 @@
 <!-- voicemail main extension, used when * is pressed from an external number -->
-<context name="{v_context}">
-	<extension name="vmain" number="*98" continue="false" app_uuid="d085a1e3-c53a-4480-9ca6-6a362899a681" order="320">
-		<condition field="destination_number" expression="^vmain$|^\*4000$|^\*98$" break="never">
-			<action application="answer"/>
-			<action application="sleep" data="1000"/>
-			<action application="set" data="record_append=false"/>
-			<action application="set" data="voicemail_action=check"/>
-			<action application="set" data="voicemail_profile=default"/>
-			<action application="set" data="voicemail_authorized=false"/>
-			<action application="lua" data="app.lua voicemail"/>
-			<!--<action application="voicemail" data="check default ${domain_name}"/>-->
-		</condition>
-		<condition field="destination_number" expression="^(vmain$|^\*4000$|^\*98|voicemail\+)(\d{2,12})$">
-			<action application="answer"/>
-			<action application="sleep" data="1000"/>
-			<action application="set" data="record_append=false"/>
-			<action application="set" data="voicemail_action=check"/>
-			<action application="set" data="voicemail_id=$2"/>
-			<action application="set" data="voicemail_profile=default"/>
-			<action application="set" data="voicemail_authorized=false"/>
-			<action application="lua" data="app.lua voicemail"/>
-		</condition>		
-	</extension>
-</context>
+<extension name="vmain" number="*98" context="${domain_name}" continue="false" app_uuid="d085a1e3-c53a-4480-9ca6-6a362899a681" order="320">
+	<condition field="destination_number" expression="^vmain$|^\*4000$|^\*98$" break="never">
+		<action application="answer"/>
+		<action application="sleep" data="1000"/>
+		<action application="set" data="record_append=false"/>
+		<action application="set" data="voicemail_action=check"/>
+		<action application="set" data="voicemail_profile=default"/>
+		<action application="set" data="voicemail_authorized=false"/>
+		<action application="lua" data="app.lua voicemail"/>
+		<!--<action application="voicemail" data="check default ${domain_name}"/>-->
+	</condition>
+	<condition field="destination_number" expression="^(vmain$|^\*4000$|^\*98|voicemail\+)(\d{2,12})$">
+		<action application="answer"/>
+		<action application="sleep" data="1000"/>
+		<action application="set" data="record_append=false"/>
+		<action application="set" data="voicemail_action=check"/>
+		<action application="set" data="voicemail_id=$2"/>
+		<action application="set" data="voicemail_profile=default"/>
+		<action application="set" data="voicemail_authorized=false"/>
+		<action application="lua" data="app.lua voicemail"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/320_xfer_vm.xml b/app/dialplans/resources/switch/conf/dialplan/320_xfer_vm.xml
index 4f2a91f482..7f32147d4f 100644
--- a/app/dialplans/resources/switch/conf/dialplan/320_xfer_vm.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/320_xfer_vm.xml
@@ -1,11 +1,9 @@
-<context name="{v_context}">
-	<extension name="xfer_vm" number="xfer_vm" continue="false" app_uuid="44a4b26d-9e13-41dc-8405-7ff2e4a215e0" order="320">
-		<condition field="destination_number" expression="^xfer_vm$">
-			<action application="read" data="2 6 'tone_stream://%(10000,0,350,440)' digits 30000 #"/>
-			<action application="set" data="origination_cancel_key=#"/>
-			<action application="set" data="domain_name=${transfer_context}"/>
-			<action application="export" data="domain_name=${transfer_context}"/>
-			<action application="transfer" data="-bleg *99${digits} XML ${transfer_context}"/>
-		</condition>
-	</extension>
-</context>
+<extension name="xfer_vm" number="xfer_vm" context="${domain_name}" continue="false" app_uuid="44a4b26d-9e13-41dc-8405-7ff2e4a215e0" order="320">
+	<condition field="destination_number" expression="^xfer_vm$">
+		<action application="read" data="2 6 'tone_stream://%(10000,0,350,440)' digits 30000 #"/>
+		<action application="set" data="origination_cancel_key=#"/>
+		<action application="set" data="domain_name=${transfer_context}"/>
+		<action application="export" data="domain_name=${transfer_context}"/>
+		<action application="transfer" data="-bleg *99${digits} XML ${transfer_context}"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/330_is_transfer.xml b/app/dialplans/resources/switch/conf/dialplan/330_is_transfer.xml
index a47b98a84e..25d92aada1 100644
--- a/app/dialplans/resources/switch/conf/dialplan/330_is_transfer.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/330_is_transfer.xml
@@ -1,9 +1,7 @@
-<context name="{v_context}">
-	<extension name="is_transfer" number="is_transfer" continue="false" app_uuid="da8e22c7-9e07-4ff5-a28b-faf35ba8d411" order="330">
-		<condition field="destination_number" expression="^is_transfer$"/>
-		<condition field="${digits}" expression="^(\d+)$">
-			<action application="transfer" data="-aleg ${digits} XML ${context}"/>
-			<anti-action application="eval" data="cancel transfer"/>
-		</condition>
-	</extension>
-</context>
+<extension name="is_transfer" number="is_transfer" context="${domain_name}" continue="false" app_uuid="da8e22c7-9e07-4ff5-a28b-faf35ba8d411" order="330">
+	<condition field="destination_number" expression="^is_transfer$"/>
+	<condition field="${digits}" expression="^(\d+)$">
+		<action application="transfer" data="-aleg ${digits} XML ${context}"/>
+		<anti-action application="eval" data="cancel transfer"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/330_vmain_user.xml b/app/dialplans/resources/switch/conf/dialplan/330_vmain_user.xml
index 9bf06b56ac..0f24c9c00b 100644
--- a/app/dialplans/resources/switch/conf/dialplan/330_vmain_user.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/330_vmain_user.xml
@@ -1,6 +1,6 @@
 <!-- voicemail provide user extension -->
 <context name="{v_context}">
-	<extension name="vmain_user" number="*97" continue="false" app_uuid="5d47ab13-f25d-4f62-a68e-2a7d945d05b7" order="330">
+	<extension name="vmain_user" number="*97" context="${domain_name}" continue="false" app_uuid="5d47ab13-f25d-4f62-a68e-2a7d945d05b7" order="330">
 		<condition field="destination_number" expression="^\*97$">
 			<action application="answer"/>
 			<action application="sleep" data="1000"/>
diff --git a/app/dialplans/resources/switch/conf/dialplan/340_cf.xml b/app/dialplans/resources/switch/conf/dialplan/340_cf.xml
index 5f1cbf5a66..fae75afda9 100644
--- a/app/dialplans/resources/switch/conf/dialplan/340_cf.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/340_cf.xml
@@ -1,9 +1,7 @@
 <!-- Used to transfer both legs into a conference -->
-<context name="{v_context}">
-	<extension name="cf" number="cf" continue="false" app_uuid="f13df3df-bfb4-4c11-bee1-6548cd983729" order="340">
-		<condition field="destination_number" expression="^cf$">
-			<action application="answer"/>
-			<action application="transfer" data="-both 30${dialed_extension:2} XML ${context}"/>
-		</condition>
-	</extension>
-</context>
+<extension name="cf" number="cf" context="${domain_name}" continue="false" app_uuid="f13df3df-bfb4-4c11-bee1-6548cd983729" order="340">
+	<condition field="destination_number" expression="^cf$">
+		<action application="answer"/>
+		<action application="transfer" data="-both 30${dialed_extension:2} XML ${context}"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/340_delay_echo.xml b/app/dialplans/resources/switch/conf/dialplan/340_delay_echo.xml
index 9c2a745461..5849299bf3 100644
--- a/app/dialplans/resources/switch/conf/dialplan/340_delay_echo.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/340_delay_echo.xml
@@ -1,8 +1,6 @@
-<context name="{v_context}">
-	<extension name="delay_echo" number="*9195" continue="false" app_uuid="fe638409-b347-46d7-9aca-489561df8b35" order="340">
-		<condition field="destination_number" expression="^\*9195$">
-			<action application="answer"/>
-			<action application="delay_echo" data="5000"/>
-		</condition>
-	</extension>
-</context>
+<extension name="delay_echo" number="*9195" context="${domain_name}" continue="false" app_uuid="fe638409-b347-46d7-9aca-489561df8b35" order="340">
+	<condition field="destination_number" expression="^\*9195$">
+		<action application="answer"/>
+		<action application="delay_echo" data="5000"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/350_echo.xml b/app/dialplans/resources/switch/conf/dialplan/350_echo.xml
index 5c086cd474..802c076b9b 100644
--- a/app/dialplans/resources/switch/conf/dialplan/350_echo.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/350_echo.xml
@@ -1,8 +1,6 @@
-<context name="{v_context}">
-	<extension name="echo" number="*9196" continue="false" app_uuid="1f894dfb-0567-4e20-9026-d538bbaa5261" order="350">
-		<condition field="destination_number" expression="^\*9196$">
-			<action application="answer"/>
-			<action application="echo"/>
-		</condition>
-	</extension>
-</context>
+<extension name="echo" number="*9196" context="${domain_name}" continue="false" app_uuid="1f894dfb-0567-4e20-9026-d538bbaa5261" order="350">
+	<condition field="destination_number" expression="^\*9196$">
+		<action application="answer"/>
+		<action application="echo"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/350_please_hold.xml b/app/dialplans/resources/switch/conf/dialplan/350_please_hold.xml
index 3c14b55dc6..beacd028b4 100644
--- a/app/dialplans/resources/switch/conf/dialplan/350_please_hold.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/350_please_hold.xml
@@ -1,10 +1,9 @@
-<context name="{v_context}">
-	<extension name="please_hold" number="" continue="true" app_uuid="c3ea29d1-db41-421e-91b7-b0984e50bcae" enabled="false" order="350">
-		<condition field="${user_exists}" expression="^true$">
-			<action application="set" data="transfer_ringback=$${hold_music}"/>
-			<action application="answer"/>
-			<action application="sleep" data="1500"/>
-			<action application="playback" data="ivr/ivr-hold_connect_call.wav"/>
-		</condition>
-	</extension>
-</context>
+<extension name="please_hold" number="" context="${domain_name}" continue="true" app_uuid="c3ea29d1-db41-421e-91b7-b0984e50bcae" enabled="false" order="350">
+	<condition field="${user_exists}" expression="^true$">
+		<action application="set" data="transfer_ringback=$${hold_music}"/>
+		<action application="answer"/>
+		<action application="sleep" data="1500"/>
+		<action application="playback" data="ivr/ivr-hold_connect_call.wav"/>
+	</condition>
+</extension>
+
diff --git a/app/dialplans/resources/switch/conf/dialplan/360_is_zrtp_secure.xml b/app/dialplans/resources/switch/conf/dialplan/360_is_zrtp_secure.xml
index ccd022e9ec..b06770dabf 100644
--- a/app/dialplans/resources/switch/conf/dialplan/360_is_zrtp_secure.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/360_is_zrtp_secure.xml
@@ -1,9 +1,8 @@
-<context name="{v_context}">
-	<extension name="is_zrtp_secure" number="" continue="true" app_uuid="951808c2-b778-404d-bd17-50b5df4b88f4" order="360">
-		<condition field="${zrtp_secure_media_confirmed}" expression="^true$">
-			<action application="sleep" data="1000"/>
-			<action application="playback" data="misc/call_secured.wav"/>
-			<anti-action application="eval" data="not_secure"/>
-		</condition>
-	</extension>
-</context>
+<extension name="is_zrtp_secure" number="" context="${domain_name}" continue="true" app_uuid="951808c2-b778-404d-bd17-50b5df4b88f4" order="360">
+	<condition field="${zrtp_secure_media_confirmed}" expression="^true$">
+		<action application="sleep" data="1000"/>
+		<action application="playback" data="misc/call_secured.wav"/>
+		<anti-action application="eval" data="not_secure"/>
+	</condition>
+</extension>
+
diff --git a/app/dialplans/resources/switch/conf/dialplan/360_milliwatt.xml b/app/dialplans/resources/switch/conf/dialplan/360_milliwatt.xml
index fdde66d6e8..d75b597ab5 100644
--- a/app/dialplans/resources/switch/conf/dialplan/360_milliwatt.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/360_milliwatt.xml
@@ -1,8 +1,6 @@
-<context name="{v_context}">
-	<extension name="milliwatt" number="*9197" continue="false" app_uuid="296acca3-d30f-42a0-ba90-5af2208ad7f8" order="360">
-		<condition field="destination_number" expression="^\*9197$">
-			<action application="answer"/>
-			<action application="playback" data="{loops=-1}tone_stream://%(251,0,1004)"/>
-		</condition>
-	</extension>
-</context>
+<extension name="milliwatt" number="*9197" context="${domain_name}" continue="false" app_uuid="296acca3-d30f-42a0-ba90-5af2208ad7f8" order="360">
+	<condition field="destination_number" expression="^\*9197$">
+		<action application="answer"/>
+		<action application="playback" data="{loops=-1}tone_stream://%(251,0,1004)"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/370_is_secure.xml b/app/dialplans/resources/switch/conf/dialplan/370_is_secure.xml
index ef8a1ae77a..7b3f9d3f2f 100644
--- a/app/dialplans/resources/switch/conf/dialplan/370_is_secure.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/370_is_secure.xml
@@ -1,11 +1,9 @@
 <!-- Only Truly consider it secure if its TLS and SRTP -->
-<context name="{v_context}">
-	<extension name="is_secure" number="is_secure" continue="true" app_uuid="b57306e0-36df-4048-b182-7ad0f69d8c03" order="370">
-		<condition field="${sip_via_protocol}" expression="tls"/>
-		<condition field="${sip_secure_media_confirmed}" expression="^true$">
-			<action application="sleep" data="1000"/>
-			<action application="playback" data="misc/call_secured.wav"/>
-			<anti-action application="eval" data="not_secure"/>
-		</condition>
-	</extension>
-</context>
+<extension name="is_secure" number="is_secure" context="${domain_name}" continue="true" app_uuid="b57306e0-36df-4048-b182-7ad0f69d8c03" order="370">
+	<condition field="${sip_via_protocol}" expression="tls"/>
+	<condition field="${sip_secure_media_confirmed}" expression="^true$">
+		<action application="sleep" data="1000"/>
+		<action application="playback" data="misc/call_secured.wav"/>
+		<anti-action application="eval" data="not_secure"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/370_tone_stream.xml b/app/dialplans/resources/switch/conf/dialplan/370_tone_stream.xml
index eddbe1e0e7..17640095ce 100644
--- a/app/dialplans/resources/switch/conf/dialplan/370_tone_stream.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/370_tone_stream.xml
@@ -1,8 +1,6 @@
-<context name="{v_context}">
-	<extension name="tone_stream" number="*9198" continue="false" app_uuid="98ccdb0b-c074-4f74-b28a-9528372faa7d" order="370">
-		<condition field="destination_number" expression="^\*9198$">
-			<action application="answer"/>
-			<action application="playback" data="{loops=10}tone_stream://path=${conf_dir}/tetris.ttml"/>
-		</condition>
-	</extension>
-</context>
+<extension name="tone_stream" number="*9198" context="${domain_name}" continue="false" app_uuid="98ccdb0b-c074-4f74-b28a-9528372faa7d" order="370">
+	<condition field="destination_number" expression="^\*9198$">
+		<action application="answer"/>
+		<action application="playback" data="{loops=10}tone_stream://path=${conf_dir}/tetris.ttml"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/380_hold_music.xml b/app/dialplans/resources/switch/conf/dialplan/380_hold_music.xml
index 0fe634d4f3..99c227ff84 100644
--- a/app/dialplans/resources/switch/conf/dialplan/380_hold_music.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/380_hold_music.xml
@@ -1,15 +1,14 @@
-<context name="{v_context}">
-	<extension name="hold_music" number="*9664" continue="false" app_uuid="b824b88a-e6da-486e-9f17-7b93cbaa318e" order="380">
-		<condition field="destination_number" expression="^\*9664$"/>
-		<condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$">
-			<action application="answer"/>
-			<action application="execute_extension" data="is_secure XML ${context}"/>
-			<action application="playback" data="$${hold_music}"/>
-			<anti-action application="set" data="zrtp_secure_media=true"/>
-			<anti-action application="answer"/>
-			<anti-action application="playback" data="silence_stream://2000"/>
-			<anti-action application="execute_extension" data="is_zrtp_secure XML ${context}"/>
-			<anti-action application="playback" data="$${hold_music}"/>
-		</condition>
-	</extension>
-</context>
+<extension name="hold_music" number="*9664" context="${domain_name}" continue="false" app_uuid="b824b88a-e6da-486e-9f17-7b93cbaa318e" order="380">
+	<condition field="destination_number" expression="^\*9664$"/>
+	<condition field="${sip_has_crypto}" expression="^(AES_CM_128_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_80)$">
+		<action application="answer"/>
+		<action application="execute_extension" data="is_secure XML ${context}"/>
+		<action application="playback" data="$${hold_music}"/>
+		<anti-action application="set" data="zrtp_secure_media=true"/>
+		<anti-action application="answer"/>
+		<anti-action application="playback" data="silence_stream://2000"/>
+		<anti-action application="execute_extension" data="is_zrtp_secure XML ${context}"/>
+		<anti-action application="playback" data="$${hold_music}"/>
+	</condition>
+</extension>
+
diff --git a/app/dialplans/resources/switch/conf/dialplan/400_recordings.xml b/app/dialplans/resources/switch/conf/dialplan/400_recordings.xml
index 49a77b69ad..a5e2bd6172 100644
--- a/app/dialplans/resources/switch/conf/dialplan/400_recordings.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/400_recordings.xml
@@ -1,12 +1,10 @@
-<context name="{v_context}">
-	<extension name="recordings" number="*732" continue="false" app_uuid="430737df-5385-42d1-b933-22600d3fb79e" order="400">
-		<condition field="destination_number" expression="^\*(732)$">
-			<action application="answer"/>
-			<action application="set" data="pin_number={v_pin_number}"/>
-			<action application="set" data="recording_id="/>
-			<action application="set" data="recording_prefix=recording"/>
-			<action application="set" data="record_append=false"/>
-			<action application="lua" data="recordings.lua"/>
-		</condition>
-	</extension>
-</context>
+<extension name="recordings" number="*732" context="${domain_name}" continue="false" app_uuid="430737df-5385-42d1-b933-22600d3fb79e" order="400">
+	<condition field="destination_number" expression="^\*(732)$">
+		<action application="answer"/>
+		<action application="set" data="pin_number={v_pin_number}"/>
+		<action application="set" data="recording_id="/>
+		<action application="set" data="recording_prefix=recording"/>
+		<action application="set" data="record_append=false"/>
+		<action application="lua" data="recordings.lua"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/410_freeswitch_conference.xml b/app/dialplans/resources/switch/conf/dialplan/410_freeswitch_conference.xml
index 2a107c658d..0dd79c78e0 100644
--- a/app/dialplans/resources/switch/conf/dialplan/410_freeswitch_conference.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/410_freeswitch_conference.xml
@@ -1,16 +1,14 @@
-<context name="{v_context}">
-	<extension name="freeswitch_conference" number="*9888" continue="false" app_uuid="8e3ad78e-4b48-4d36-af7e-4920a9757043" enabled="false" order="410">
-		<condition field="destination_number" expression="^\*9(888|8888|1616|3232)$">
-			<action application="export" data="hold_music=silence"/>
-			<!--
-				 This will take the SAS from the b-leg and send it to the display on the a-leg phone.
-				 Known working with Polycom and Snom maybe others.
-			-->
-			<!--
-			<action application="set" data="exec_after_bridge_app=${sched_api(+4 zrtp expand uuid_display ${uuid} \${uuid_getvar(\${uuid_getvar(${uuid} signal_bond)} zrtp_sas1_string )}  \${uuid_getvar(\${uuid_getvar(${uuid} signal_bond)} zrtp_sas2_string )} )}"/>
-			<action application="export" data="nolocal:zrtp_secure_media=true"/>
-			-->
-			<action application="bridge" data="sofia/${use_profile}/$1@conference.freeswitch.org"/>
-		</condition>
-	</extension>
-</context>
+<extension name="freeswitch_conference" number="*9888" context="${domain_name}" continue="false" app_uuid="8e3ad78e-4b48-4d36-af7e-4920a9757043" enabled="false" order="410">
+	<condition field="destination_number" expression="^\*9(888|8888|1616|3232)$">
+		<action application="export" data="hold_music=silence"/>
+		<!--
+				This will take the SAS from the b-leg and send it to the display on the a-leg phone.
+				Known working with Polycom and Snom maybe others.
+		-->
+		<!--
+		<action application="set" data="exec_after_bridge_app=${sched_api(+4 zrtp expand uuid_display ${uuid} \${uuid_getvar(\${uuid_getvar(${uuid} signal_bond)} zrtp_sas1_string )}  \${uuid_getvar(\${uuid_getvar(${uuid} signal_bond)} zrtp_sas2_string )} )}"/>
+		<action application="export" data="nolocal:zrtp_secure_media=true"/>
+		-->
+		<action application="bridge" data="sofia/${use_profile}/$1@conference.freeswitch.org"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/420_disa.xml b/app/dialplans/resources/switch/conf/dialplan/420_disa.xml
index 87e30ac1f9..0f973278d2 100644
--- a/app/dialplans/resources/switch/conf/dialplan/420_disa.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/420_disa.xml
@@ -1,17 +1,16 @@
-<context name="{v_context}">
-	<extension name="disa" number="*3472" continue="false" app_uuid="3ade2d9a-f55d-4240-bb60-b4a3ab36951c" enabled="false" order="420">
-		<condition field="destination_number" expression="^\*(3472)$">
-			<action application="answer" enabled="true"/>
-			<action application="set" data="pin_number={v_pin_number}" enabled="true"/>
-			<action application="set" data="dialplan_context=${context}" enabled="true"/>
-			<action application="set" data="outbound_caller_id_name=" enabled="false"/>
-			<action application="set" data="outbound_caller_id_number=" enabled="false"/>
-			<action application="set" data="predefined_destination=" enabled="false"/>
-			<action application="set" data="fallback_destination=" enabled="false"/>
-			<action application="set" data="digit_min_length=" enabled="false"/>
-			<action application="set" data="digit_max_length=" enabled="false"/>
-			<action application="lua" data="disa.lua" enabled="true"/>
-		</condition>
-	</extension>
-</context>
+<extension name="disa" number="*3472" context="${domain_name}" continue="false" app_uuid="3ade2d9a-f55d-4240-bb60-b4a3ab36951c" enabled="false" order="420">
+	<condition field="destination_number" expression="^\*(3472)$">
+		<action application="answer" enabled="true"/>
+		<action application="set" data="pin_number={v_pin_number}" enabled="true"/>
+		<action application="set" data="dialplan_context=${context}" enabled="true"/>
+		<action application="set" data="outbound_caller_id_name=" enabled="false"/>
+		<action application="set" data="outbound_caller_id_number=" enabled="false"/>
+		<action application="set" data="predefined_destination=" enabled="false"/>
+		<action application="set" data="fallback_destination=" enabled="false"/>
+		<action application="set" data="digit_min_length=" enabled="false"/>
+		<action application="set" data="digit_max_length=" enabled="false"/>
+		<action application="lua" data="disa.lua" enabled="true"/>
+	</condition>
+</extension>
+
 
diff --git a/app/dialplans/resources/switch/conf/dialplan/430_directory.xml b/app/dialplans/resources/switch/conf/dialplan/430_directory.xml
index debfc5fc8e..e936501d41 100644
--- a/app/dialplans/resources/switch/conf/dialplan/430_directory.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/430_directory.xml
@@ -1,7 +1,5 @@
-<context name="{v_context}">
-	<extension name="directory" number="*411" continue="false" app_uuid="a223dc70-28a1-4979-834e-8af813cd8ea6" order="430">
-		<condition field="destination_number" expression="^\*411$">
-			<action application="lua" data="directory.lua"/>
-		</condition>
-	</extension>
-</context>
+<extension name="directory" number="*411" context="${domain_name}" continue="false" app_uuid="a223dc70-28a1-4979-834e-8af813cd8ea6" order="430">
+	<condition field="destination_number" expression="^\*411$">
+		<action application="lua" data="directory.lua"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/440_wake-up.xml b/app/dialplans/resources/switch/conf/dialplan/440_wake-up.xml
index 3e0ebf792e..6b02b148f1 100644
--- a/app/dialplans/resources/switch/conf/dialplan/440_wake-up.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/440_wake-up.xml
@@ -1,10 +1,8 @@
-<context name="{v_context}">
-	<extension name="wake-up" number="*925" continue="false" app_uuid="e27abe68-41c0-4188-bb0f-67d93de0c610" order="440">
-		<condition field="destination_number" expression="^\*(925)$">
-			<action application="answer"/>
-			<action application="set" data="wakeup_call_sound=${sounds_dir}/${default_language}/${default_dialect}/${default_voice}/ivr/ivr-wakey_wakey_sunshine.wav" enabled="false"/>
-			<action application="set" data="time_zone_offset=-7"/>
-			<action application="lua" data="wakeup.lua"/>
-		</condition>
-	</extension>
-</context>
+<extension name="wake-up" number="*925" context="${domain_name}" continue="false" app_uuid="e27abe68-41c0-4188-bb0f-67d93de0c610" order="440">
+	<condition field="destination_number" expression="^\*(925)$">
+		<action application="answer"/>
+		<action application="set" data="wakeup_call_sound=${sounds_dir}/${default_language}/${default_dialect}/${default_voice}/ivr/ivr-wakey_wakey_sunshine.wav" enabled="false"/>
+		<action application="set" data="time_zone_offset=-7"/>
+		<action application="lua" data="wakeup.lua"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/470_valet_park.xml b/app/dialplans/resources/switch/conf/dialplan/470_valet_park.xml
index ca6bb4cc97..e48ed98189 100644
--- a/app/dialplans/resources/switch/conf/dialplan/470_valet_park.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/470_valet_park.xml
@@ -1,27 +1,25 @@
-<context name="{v_context}">
-	<extension name="valet_park" number="park+*5901-*5999" continue="false" app_uuid="3cc8363d-5ce3-48aa-8ac1-143cf297c4f7" enabled="true" order="470">
-		<condition field="destination_number" expression="^(park)?\+?\*(59[0-9][0-9])$" break="never"/>
-		<condition field="${sip_h_Referred-By}" expression="sip:(.*)@.*" break="never">
-			<action application="set" data="referred_by_user=$1" inline="true"/>
-		</condition>
-		<condition field="destination_number" expression="^(park)?\+?\*(59[0-9][0-9])$" break="never">
-			<action application="set" data="park_in_use=false" inline="true"/>
-			<action application="set" data="park_lot=$2" inline="true"/>
-			<action application="info" data=""/>
-		</condition>
-		<condition field="destination_number" expression="^(park)?\+?\*(59[0-9][0-9])$"/>
-		<condition field="${referred_by_user}" expression="^.+$" break="never">
-			<action application="set" data="valet_info_park=${valet_info park@${domain_name}}|\*${park_lot}" inline="true"/>
-			<action application="set" data="park_in_use=${regex ${valet_info park@${domain_name}}|\*${park_lot}}" inline="true"/>
-		</condition>
-		<condition field="${park_in_use}" expression="true" break="never">
-			<action application="transfer" data="${referred_by_user} XML ${context}"/>
-			<anti-action application="set" data="effective_caller_id_name=${cond ${regex ${direction} | inbound} == true ? 'park#${caller_id_name}' : 'park#${callee_id_name}'}" inline="true"/>
-			<anti-action application="set" data="valet_parking_timeout=900"/>
-			<anti-action application="set" data="valet_hold_music=${hold_music}"/>
-			<anti-action application="set" data="valet_parking_orbit_exten=${cond ${regex ${referred_by_user} | ^$} == true ? ${sip_from_user} : ${referred_by_user}}"/>
-			<anti-action application="answer" data=""/>
-			<anti-action application="valet_park" data="park@${domain_name} *${park_lot}"/>
-		</condition>
-	</extension>
-</context>
+<extension name="valet_park" number="park+*5901-*5999" context="${domain_name}" continue="false" app_uuid="3cc8363d-5ce3-48aa-8ac1-143cf297c4f7" enabled="true" order="470">
+	<condition field="destination_number" expression="^(park)?\+?\*(59[0-9][0-9])$" break="never"/>
+	<condition field="${sip_h_Referred-By}" expression="sip:(.*)@.*" break="never">
+		<action application="set" data="referred_by_user=$1" inline="true"/>
+	</condition>
+	<condition field="destination_number" expression="^(park)?\+?\*(59[0-9][0-9])$" break="never">
+		<action application="set" data="park_in_use=false" inline="true"/>
+		<action application="set" data="park_lot=$2" inline="true"/>
+		<action application="info" data=""/>
+	</condition>
+	<condition field="destination_number" expression="^(park)?\+?\*(59[0-9][0-9])$"/>
+	<condition field="${referred_by_user}" expression="^.+$" break="never">
+		<action application="set" data="valet_info_park=${valet_info park@${domain_name}}|\*${park_lot}" inline="true"/>
+		<action application="set" data="park_in_use=${regex ${valet_info park@${domain_name}}|\*${park_lot}}" inline="true"/>
+	</condition>
+	<condition field="${park_in_use}" expression="true" break="never">
+		<action application="transfer" data="${referred_by_user} XML ${context}"/>
+		<anti-action application="set" data="effective_caller_id_name=${cond ${regex ${direction} | inbound} == true ? 'park#${caller_id_name}' : 'park#${callee_id_name}'}" inline="true"/>
+		<anti-action application="set" data="valet_parking_timeout=900"/>
+		<anti-action application="set" data="valet_hold_music=${hold_music}"/>
+		<anti-action application="set" data="valet_parking_orbit_exten=${cond ${regex ${referred_by_user} | ^$} == true ? ${sip_from_user} : ${referred_by_user}}"/>
+		<anti-action application="answer" data=""/>
+		<anti-action application="valet_park" data="park@${domain_name} *${park_lot}"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/470_valet_park_auto.xml b/app/dialplans/resources/switch/conf/dialplan/470_valet_park_auto.xml
index c83e05d7a1..97c007e0bd 100644
--- a/app/dialplans/resources/switch/conf/dialplan/470_valet_park_auto.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/470_valet_park_auto.xml
@@ -1,9 +1,7 @@
-<context name="{v_context}">
-	<extension name="valet_park_auto" number="park+5900" continue="false" app_uuid="c192ee50-084d-40d8-8d9a-6959369382c8" enabled="false" order="470">
-		<condition field="destination_number" expression="^(?:(?:park\+\*?)|(?:\*))(5900)$"/>
-		<condition field="${sip_h_Referred-By}" expression="sip:(.*)@.*" break="never">
-			<action application="valet_park" data="5900@${domain_name} auto in 5901 5999"/>
-			<anti-action application="valet_park" data="5900@${domain_name} auto out 5901 5999"/>
-		</condition>
-	</extension>
-</context>
+<extension name="valet_park_auto" number="park+5900" context="${domain_name}" continue="false" app_uuid="c192ee50-084d-40d8-8d9a-6959369382c8" enabled="false" order="470">
+	<condition field="destination_number" expression="^(?:(?:park\+\*?)|(?:\*))(5900)$"/>
+	<condition field="${sip_h_Referred-By}" expression="sip:(.*)@.*" break="never">
+		<action application="valet_park" data="5900@${domain_name} auto in 5901 5999"/>
+		<anti-action application="valet_park" data="5900@${domain_name} auto out 5901 5999"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/474_valet_park_in.xml b/app/dialplans/resources/switch/conf/dialplan/474_valet_park_in.xml
index 0edeecf145..08275b1811 100644
--- a/app/dialplans/resources/switch/conf/dialplan/474_valet_park_in.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/474_valet_park_in.xml
@@ -1,12 +1,10 @@
-<context name="{v_context}">
-	<extension name="valet_park_in" number="5900" continue="false" app_uuid="2ed78bcf-0b40-485d-9815-aa0568dd4edc" enabled="false" order="470">
-		<condition field="destination_number" expression="^(park\+)?(5900)$">
-			<action application="answer" data="" enabled="true"/>
-			<action application="set" data="valet_announce_slot=disable" enabled="false"/>
-			<action application="set" data="valet_hold_music=${hold_music}" enabled="true"/>
-			<action application="set" data="valet_parking_orbit_exten=${referred_by_user}" enabled="true"/>
-			<action application="set" data="valet_parking_timeout=900" enabled="true"/>
-			<action application="valet_park" data="5900@${domain_name} auto in 5901 5999" enabled="true"/>
-		</condition>
-	</extension>
-</context>
+<extension name="valet_park_in" number="5900" context="${domain_name}" continue="false" app_uuid="2ed78bcf-0b40-485d-9815-aa0568dd4edc" enabled="false" order="470">
+	<condition field="destination_number" expression="^(park\+)?(5900)$">
+		<action application="answer" data="" enabled="true"/>
+		<action application="set" data="valet_announce_slot=disable" enabled="false"/>
+		<action application="set" data="valet_hold_music=${hold_music}" enabled="true"/>
+		<action application="set" data="valet_parking_orbit_exten=${referred_by_user}" enabled="true"/>
+		<action application="set" data="valet_parking_timeout=900" enabled="true"/>
+		<action application="valet_park" data="5900@${domain_name} auto in 5901 5999" enabled="true"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml b/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml
index 195bc7c549..ec00260185 100644
--- a/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml
@@ -1,8 +1,6 @@
-<context name="{v_context}">
-	<extension name="valet_park_out" number="5901-5999" continue="false" app_uuid="242130d4-61d6-4daf-9dd1-b139a2b3b166" enabled="false" order="475">
-		<condition field="destination_number" expression="^(?:park\+)?(59[0-9][0-9])$">
-			<action application="answer"/>
-			<action application="valet_park" data="5900@${domain_name} $1"/>
-		</condition>
-	</extension>
-</context>
+<extension name="valet_park_out" number="5901-5999" context="${domain_name}" continue="false" app_uuid="242130d4-61d6-4daf-9dd1-b139a2b3b166" enabled="false" order="475">
+	<condition field="destination_number" expression="^(?:park\+)?(59[0-9][0-9])$">
+		<action application="answer"/>
+		<action application="valet_park" data="5900@${domain_name} $1"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/480_operator.xml b/app/dialplans/resources/switch/conf/dialplan/480_operator.xml
index 9c74cbe8ed..77cc9b8faa 100644
--- a/app/dialplans/resources/switch/conf/dialplan/480_operator.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/480_operator.xml
@@ -1,11 +1,9 @@
-<context name="{v_context}">
-	<extension name="operator" number="0" continue="false" app_uuid="0e1cd2d7-9d84-4959-8b6c-0cb23de4de59" enabled="false" order="480">
-		<condition field="destination_number" expression="^0$|^operator$">
-			<action application="export" data="transfer_context={v_context}" enabled="true"/>
-			<action application="bind_meta_app" data="4 ab s execute_extension::att_xfer XML ${context}" enabled="false"/>
-			<action application="bind_meta_app" data="5 ab s execute_extension::xfer_vm XML ${context}" enabled="false"/>
-			<action application="set" data="domain_name={v_context}" enabled="true"/>
-			<action application="transfer" data="${operator} XML {v_context}" enabled="true"/>
-		</condition>
-	</extension>
-</context>
+<extension name="operator" number="0" context="${domain_name}" continue="false" app_uuid="0e1cd2d7-9d84-4959-8b6c-0cb23de4de59" enabled="false" order="480">
+	<condition field="destination_number" expression="^0$|^operator$">
+		<action application="export" data="transfer_context={v_context}" enabled="true"/>
+		<action application="bind_meta_app" data="4 ab s execute_extension::att_xfer XML ${context}" enabled="false"/>
+		<action application="bind_meta_app" data="5 ab s execute_extension::xfer_vm XML ${context}" enabled="false"/>
+		<action application="set" data="domain_name={v_context}" enabled="true"/>
+		<action application="transfer" data="${operator} XML {v_context}" enabled="true"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/485_operator-forward.xml b/app/dialplans/resources/switch/conf/dialplan/485_operator-forward.xml
index c46fbc87d9..26aa9dbad8 100644
--- a/app/dialplans/resources/switch/conf/dialplan/485_operator-forward.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/485_operator-forward.xml
@@ -1,10 +1,8 @@
-<context name="{v_context}">
-	<extension name="operator-forward" number="*000" continue="false" app_uuid="a90d3639-3b82-4905-a65d-85f58b6c4a19" enabled="true" order="485">
-		<condition field="destination_number" expression="^\*000$" >
-			<action application="set" data="dial_string=loopback/operator/{v_context}/XML" />
-			<action application="set" data="direction=both" />
-			<action application="set" data="extension=true" />
-			<action application="lua" data="dial_string.lua" />
-		</condition>
-	</extension>
-</context>
+<extension name="operator-forward" number="*000" context="${domain_name}" continue="false" app_uuid="a90d3639-3b82-4905-a65d-85f58b6c4a19" enabled="true" order="485">
+	<condition field="destination_number" expression="^\*000$" >
+		<action application="set" data="dial_string=loopback/operator/${context}/XML" />
+		<action application="set" data="direction=both" />
+		<action application="set" data="extension=true" />
+		<action application="lua" data="dial_string.lua" />
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/490_do-not-disturb.xml b/app/dialplans/resources/switch/conf/dialplan/490_do-not-disturb.xml
index 9abee17d50..90a81e940b 100644
--- a/app/dialplans/resources/switch/conf/dialplan/490_do-not-disturb.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/490_do-not-disturb.xml
@@ -1,20 +1,18 @@
-<context name="{v_context}">
-	<extension name="do-not-disturb" number="*77,*78,*79" continue="false" app_uuid="df32d982-e39e-4ae5-a46d-aed1893873f2" enabled="true" order="490">
-		<condition field="destination_number" expression="^\*77$" break="on-true">
-			<action application="set" data="enabled=toggle"/>
-			<action application="lua" data="do_not_disturb.lua"/>
-		</condition>
-		<condition field="destination_number" expression="^\*78$|\*363$" break="on-true">
-			<action application="set" data="enabled=true"/>
-			<action application="lua" data="do_not_disturb.lua"/>
-		</condition>
-		<condition field="destination_number" expression="^\*79$" break="on-true">
-			<action application="set" data="enabled=false"/>
-			<action application="lua" data="do_not_disturb.lua"/>
-		</condition>
-		<condition field="destination_number" expression="^dnd\+${caller_id_number}$" break="on-true">
-			<action application="set" data="enabled=toggle"/>
-			<action application="lua" data="do_not_disturb.lua"/>
-		</condition>
-	</extension>
-</context>
+<extension name="do-not-disturb" number="*77,*78,*79" context="${domain_name}" continue="false" app_uuid="df32d982-e39e-4ae5-a46d-aed1893873f2" enabled="true" order="490">
+	<condition field="destination_number" expression="^\*77$" break="on-true">
+		<action application="set" data="enabled=toggle"/>
+		<action application="lua" data="do_not_disturb.lua"/>
+	</condition>
+	<condition field="destination_number" expression="^\*78$|\*363$" break="on-true">
+		<action application="set" data="enabled=true"/>
+		<action application="lua" data="do_not_disturb.lua"/>
+	</condition>
+	<condition field="destination_number" expression="^\*79$" break="on-true">
+		<action application="set" data="enabled=false"/>
+		<action application="lua" data="do_not_disturb.lua"/>
+	</condition>
+	<condition field="destination_number" expression="^dnd\+${caller_id_number}$" break="on-true">
+		<action application="set" data="enabled=toggle"/>
+		<action application="lua" data="do_not_disturb.lua"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/495_call_screen.xml b/app/dialplans/resources/switch/conf/dialplan/495_call_screen.xml
index e2f38c26e2..5cc7f81115 100644
--- a/app/dialplans/resources/switch/conf/dialplan/495_call_screen.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/495_call_screen.xml
@@ -1,17 +1,15 @@
-<context name="{v_context}">
-	<extension name="call_screen" number="[ext]" continue="true" app_uuid="b26a08a5-a062-42ca-b90f-d47f905dd876" order="495">
-		<condition field="${call_screen_enabled}" expression="^true$"/>
-		<condition field="${call_direction}" expression="^inbound$">
-			<action application="set" data="call_screen_file=/tmp/${domain_name}-${caller_id_number}.${record_ext}" inline="true"/>
-			<action application="answer"/>
-			<action application="sleep" data="1000"/>
-			<action application="phrase" data="voicemail_record_name"/>
-			<action application="playback" data="tone_stream://%(500, 0, 640)"/>
-			<action application="set" data="playback_terminators=#*0123456789"/>
-			<action application="record" data="${call_screen_file} 7 200 2"/>
-			<action application="set" data="group_confirm_key=1"/>
-			<action application="set" data="fail_on_single_reject=true"/>
-			<action application="set" data="group_confirm_file=phrase:screen_confirm:${call_screen_file}"/>
-		</condition>
-	</extension>
-</context>
+<extension name="call_screen" number="[ext]" context="${domain_name}" continue="true" app_uuid="b26a08a5-a062-42ca-b90f-d47f905dd876" order="495">
+	<condition field="${call_screen_enabled}" expression="^true$"/>
+	<condition field="${call_direction}" expression="^inbound$">
+		<action application="set" data="call_screen_file=/tmp/${domain_name}-${caller_id_number}.${record_ext}" inline="true"/>
+		<action application="answer"/>
+		<action application="sleep" data="1000"/>
+		<action application="phrase" data="voicemail_record_name"/>
+		<action application="playback" data="tone_stream://%(500, 0, 640)"/>
+		<action application="set" data="playback_terminators=#*0123456789"/>
+		<action application="record" data="${call_screen_file} 7 200 2"/>
+		<action application="set" data="group_confirm_key=1"/>
+		<action application="set" data="fail_on_single_reject=true"/>
+		<action application="set" data="group_confirm_file=phrase:screen_confirm:${call_screen_file}"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml b/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml
index 12cbe2f995..8b1f0ae715 100644
--- a/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml
@@ -1,29 +1,27 @@
-<context name="{v_context}">
-	<extension name="call-forward" number="*72,*73,*74" continue="false" app_uuid="b4b32fb4-0181-4876-9bec-b9dff1299d60" enabled="true" order="500">
-		<condition field="destination_number" expression="^\*72(\d{2,20})$" break="on-true">
-			<action application="set" data="request_id=false"/>
-			<action application="set" data="enabled=true"/>
-			<action application="lua" data="call_forward.lua $1"/>
-		</condition>
-		<condition field="destination_number" expression="^\*72$" break="on-true">
-			<action application="set" data="request_id=false"/>
-			<action application="set" data="enabled=true"/>
-			<action application="lua" data="call_forward.lua"/>
-		</condition>
-		<condition field="destination_number" expression="^\*73$" break="on-true">
-			<action application="set" data="request_id=false"/>
-			<action application="set" data="enabled=false"/>
-			<action application="lua" data="call_forward.lua"/>
-		</condition>
-		<condition field="destination_number" expression="^\*74$" break="on-true">
-			<action application="set" data="request_id=false"/>
-			<action application="set" data="enabled=toggle"/>
-			<action application="lua" data="call_forward.lua"/>
-		</condition>
-		<condition field="destination_number" expression="^forward\+(\Q${caller_id_number}\E)(?:\/(\d+))?$" break="on-true">
-			<action application="set" data="enabled=toggle"/>
-			<action application="set" data="forward_all_destination=$2"/>
-			<action application="lua" data="call_forward.lua"/>
-		</condition>
-	</extension>
-</context>
+<extension name="call-forward" number="*72,*73,*74" context="${domain_name}" continue="false" app_uuid="b4b32fb4-0181-4876-9bec-b9dff1299d60" enabled="true" order="500">
+	<condition field="destination_number" expression="^\*72(\d{2,20})$" break="on-true">
+		<action application="set" data="request_id=false"/>
+		<action application="set" data="enabled=true"/>
+		<action application="lua" data="call_forward.lua $1"/>
+	</condition>
+	<condition field="destination_number" expression="^\*72$" break="on-true">
+		<action application="set" data="request_id=false"/>
+		<action application="set" data="enabled=true"/>
+		<action application="lua" data="call_forward.lua"/>
+	</condition>
+	<condition field="destination_number" expression="^\*73$" break="on-true">
+		<action application="set" data="request_id=false"/>
+		<action application="set" data="enabled=false"/>
+		<action application="lua" data="call_forward.lua"/>
+	</condition>
+	<condition field="destination_number" expression="^\*74$" break="on-true">
+		<action application="set" data="request_id=false"/>
+		<action application="set" data="enabled=toggle"/>
+		<action application="lua" data="call_forward.lua"/>
+	</condition>
+	<condition field="destination_number" expression="^forward\+(\Q${caller_id_number}\E)(?:\/(\d+))?$" break="on-true">
+		<action application="set" data="enabled=toggle"/>
+		<action application="set" data="forward_all_destination=$2"/>
+		<action application="lua" data="call_forward.lua"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/500_ring-group-forward.xml b/app/dialplans/resources/switch/conf/dialplan/500_ring-group-forward.xml
index f2016400ca..799283613d 100644
--- a/app/dialplans/resources/switch/conf/dialplan/500_ring-group-forward.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/500_ring-group-forward.xml
@@ -1,13 +1,10 @@
-<context name="{v_context}">
-	<extension name="ring-group-forward" number="*75" continue="false" app_uuid="738cba74-4fa1-4e85-9c50-1bbdbc25346c" enabled="true" order="500">
-		<condition field="destination_number" expression="^\*75$" break="on-true">
-			<action application="set" data="pin_number={v_pin_number}"/>
-			<action application="set" data="enabled=toggle"/>
-			<action application="set" data="ring_group_number="/>
-			<action application="set" data="forward_destination="/>
-			<action application="set" data="forward_reset=true"/>
-			<action application="lua" data="app/ring_groups/resources/scripts/call_forward.lua"/>
-		</condition>
-	</extension>
-</context>
-
+<extension name="ring-group-forward" number="*75" context="${domain_name}" continue="false" app_uuid="738cba74-4fa1-4e85-9c50-1bbdbc25346c" enabled="true" order="500">
+	<condition field="destination_number" expression="^\*75$" break="on-true">
+		<action application="set" data="pin_number={v_pin_number}"/>
+		<action application="set" data="enabled=toggle"/>
+		<action application="set" data="ring_group_number="/>
+		<action application="set" data="forward_destination="/>
+		<action application="set" data="forward_reset=true"/>
+		<action application="lua" data="app/ring_groups/resources/scripts/call_forward.lua"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/507_call_forward_not_registered.xml b/app/dialplans/resources/switch/conf/dialplan/507_call_forward_not_registered.xml
index d55fbff95c..773a83e3ae 100644
--- a/app/dialplans/resources/switch/conf/dialplan/507_call_forward_not_registered.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/507_call_forward_not_registered.xml
@@ -1,9 +1,7 @@
-<context name="${domain_name}">
-	<extension name="call-forward-not-registered" number="" app_uuid="b2035288-b899-4bcd-8b8f-8175ce8ec9e3" global="true" order="507">
-		<condition field="${user_exists}" expression="true"/>
-		<condition field="${forward_user_not_registered_enabled}" expression="true"/>
-		<condition field="${sofia_contact */${destination_number}@${domain_name}}" expression="error/user_not_registered">
-			<action application="transfer" data="${forward_user_not_registered_destination} XML ${domain_name}"/>
-		</condition>
-	</extension>
-</context>
+<extension name="call-forward-not-registered" number="" context="${domain_name}" app_uuid="b2035288-b899-4bcd-8b8f-8175ce8ec9e3" global="true" order="507">
+	<condition field="${user_exists}" expression="true"/>
+	<condition field="${forward_user_not_registered_enabled}" expression="true"/>
+	<condition field="${sofia_contact */${destination_number}@${domain_name}}" expression="error/user_not_registered">
+		<action application="transfer" data="${forward_user_not_registered_destination} XML ${domain_name}"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/510_follow-me.xml b/app/dialplans/resources/switch/conf/dialplan/510_follow-me.xml
index 0593606ee4..1a855cb414 100644
--- a/app/dialplans/resources/switch/conf/dialplan/510_follow-me.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/510_follow-me.xml
@@ -1,8 +1,6 @@
-<context name="{v_context}">
-	<extension name="follow-me" number="*21" continue="false" app_uuid="b8c28c75-1a03-4dad-9a53-980ca5f487f0" enabled="true" order="510">
-		<condition field="destination_number" expression="^\*21$">
-			<action application="answer"/>
-			<action application="lua" data="follow_me.lua"/>
-		</condition>
-	</extension>
-</context>
+<extension name="follow-me" number="*21" context="${domain_name}" continue="false" app_uuid="b8c28c75-1a03-4dad-9a53-980ca5f487f0" enabled="true" order="510">
+	<condition field="destination_number" expression="^\*21$">
+		<action application="answer"/>
+		<action application="lua" data="follow_me.lua"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/515_call-forward-all.xml b/app/dialplans/resources/switch/conf/dialplan/515_call-forward-all.xml
index acedec23f2..955577a597 100644
--- a/app/dialplans/resources/switch/conf/dialplan/515_call-forward-all.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/515_call-forward-all.xml
@@ -1,20 +1,18 @@
-<context name="${domain_name}">
-	<extension name="call-forward-all" number="" app_uuid="57cf8f1f-9a2e-4996-bd80-d9300249b1ca" global="true" order="515">
-		<condition field="${forward_all_enabled}" expression="true"/>
-		<condition field="${call_direction}" expression="^local$" break="on-true">
-			<action application="set" data="outbound_caller_id_name=${user_data ${destination_number}@${domain_name} var outbound_caller_id_name}" inline="true" enabled="false"/>
-			<action application="set" data="outbound_caller_id_number=${user_data ${destination_number}@${domain_name} var outbound_caller_id_number}" inline="true" enabled="false"/>
-			<action application="set" data="accountcode=${user_data ${destination_number}@${domain_name} var accountcode}" inline="true" enabled="true"/>
-			<action application="transfer" data="${forward_all_destination} XML ${domain_name}" enabled="true"/>
-		</condition>
-		<condition field="${forward_all_enabled}" expression="true"/>
-		<condition field="${call_direction}" expression="^inbound$" break="on-true">
-			<action application="set" data="outbound_caller_id_name=${user_data ${destination_number}@${domain_name} var outbound_caller_id_name}" inline="true" enabled="false"/>
-			<action application="set" data="outbound_caller_id_number=${user_data ${destination_number}@${domain_name} var outbound_caller_id_number}" inline="true" enabled="false"/>
-			<action application="set" data="outbound_caller_id_name=${caller_id_name}" inline="true" enabled="true"/>
-			<action application="set" data="outbound_caller_id_number=${caller_id_number}" inline="true" enabled="true"/>
-			<action application="set" data="sip_h_Diversion=&lt;sip:${caller_destination}@${external_sip_ip}:5060&gt;;reason=unconditional" enabled="false"/>
-			<action application="transfer" data="${forward_all_destination} XML ${domain_name}" enabled="true"/>
-		</condition>
-	</extension>
-</context>
+<extension name="call-forward-all" number="" context="${domain_name}" continue="false" app_uuid="57cf8f1f-9a2e-4996-bd80-d9300249b1ca" global="true" order="515">
+	<condition field="${forward_all_enabled}" expression="true"/>
+	<condition field="${call_direction}" expression="^local$" break="on-true">
+		<action application="set" data="outbound_caller_id_name=${user_data ${destination_number}@${domain_name} var outbound_caller_id_name}" inline="true" enabled="false"/>
+		<action application="set" data="outbound_caller_id_number=${user_data ${destination_number}@${domain_name} var outbound_caller_id_number}" inline="true" enabled="false"/>
+		<action application="set" data="accountcode=${user_data ${destination_number}@${domain_name} var accountcode}" inline="true" enabled="true"/>
+		<action application="transfer" data="${forward_all_destination} XML ${domain_name}" enabled="true"/>
+	</condition>
+	<condition field="${forward_all_enabled}" expression="true"/>
+	<condition field="${call_direction}" expression="^inbound$" break="on-true">
+		<action application="set" data="outbound_caller_id_name=${user_data ${destination_number}@${domain_name} var outbound_caller_id_name}" inline="true" enabled="false"/>
+		<action application="set" data="outbound_caller_id_number=${user_data ${destination_number}@${domain_name} var outbound_caller_id_number}" inline="true" enabled="false"/>
+		<action application="set" data="outbound_caller_id_name=${caller_id_name}" inline="true" enabled="true"/>
+		<action application="set" data="outbound_caller_id_number=${caller_id_number}" inline="true" enabled="true"/>
+		<action application="set" data="sip_h_Diversion=&lt;sip:${caller_destination}@${external_sip_ip}:5060&gt;;reason=unconditional" enabled="false"/>
+		<action application="transfer" data="${forward_all_destination} XML ${domain_name}" enabled="true"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/520_follow-me-destinations.xml b/app/dialplans/resources/switch/conf/dialplan/520_follow-me-destinations.xml
index e356272278..528028553b 100644
--- a/app/dialplans/resources/switch/conf/dialplan/520_follow-me-destinations.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/520_follow-me-destinations.xml
@@ -1,5 +1,4 @@
-<context name="${domain_name}">
-<extension name="follow-me-destinations" continue="false" app_uuid="846bbc43-683b-49e9-b697-c4714b17c528" global="true" order="520">
+<extension name="follow-me-destinations" context="${domain_name}" continue="false" app_uuid="846bbc43-683b-49e9-b697-c4714b17c528" global="true" order="520">
 	<condition field="${user_exists}" expression="^true$"/>
 	<condition field="${follow_me_enabled}" expression="^true$">
 		<action application="set" data="outbound_caller_id_name=${user_data ${destination_number}@${domain_name} var outbound_caller_id_name}" inline="true" enabled="false"/>
@@ -8,4 +7,3 @@
 		<action application="lua" data="app.lua follow_me"/>
 	</condition>
 </extension>
-</context>
diff --git a/app/dialplans/resources/switch/conf/dialplan/530_talking_clock_date_and_time.xml b/app/dialplans/resources/switch/conf/dialplan/530_talking_clock_date_and_time.xml
index a0858b16df..f5487efa7d 100644
--- a/app/dialplans/resources/switch/conf/dialplan/530_talking_clock_date_and_time.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/530_talking_clock_date_and_time.xml
@@ -1,10 +1,8 @@
-<context name="${domain_name}">
-  <extension name="talking clock date and time" number="*9172" app_uuid="3ce3d9a1-c7bd-45f6-a81f-37f526b4fe73" global="true" order="530">
-    <condition field="destination_number" expression="^\*9172$">
-      <action application="answer"/>
-      <action application="sleep" data="1000"/>
-      <action application="say" data="${default_language} CURRENT_DATE_TIME pronounced ${strepoch()}"/>
-      <action application="hangup"/>
-    </condition>
-  </extension>
-</context>
+<extension name="talking clock date and time" number="*9172" context="${domain_name}" app_uuid="3ce3d9a1-c7bd-45f6-a81f-37f526b4fe73" global="true" order="530">
+	<condition field="destination_number" expression="^\*9172$">
+		<action application="answer"/>
+		<action application="sleep" data="1000"/>
+		<action application="say" data="${default_language} CURRENT_DATE_TIME pronounced ${strepoch()}"/>
+		<action application="hangup"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/540_talking_clock_time.xml b/app/dialplans/resources/switch/conf/dialplan/540_talking_clock_time.xml
index a43a36dc59..d2af6f0f52 100644
--- a/app/dialplans/resources/switch/conf/dialplan/540_talking_clock_time.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/540_talking_clock_time.xml
@@ -1,10 +1,10 @@
 <context name="${domain_name}">
-  <extension name="talking clock time" number="*9170" app_uuid="ce1786ff-1965-4c18-998a-27a381623534" global="true" order="540">
-    <condition field="destination_number" expression="^\*9170$">
-      <action application="answer"/>
-      <action application="sleep" data="1000"/>
-      <action application="say" data="${default_language} CURRENT_TIME pronounced ${strepoch()}"/>
-      <action application="hangup"/>
-    </condition>
-  </extension>
+	<extension name="talking clock time" number="*9170" context="${domain_name}" app_uuid="ce1786ff-1965-4c18-998a-27a381623534" global="true" order="540">
+		<condition field="destination_number" expression="^\*9170$">
+			<action application="answer"/>
+			<action application="sleep" data="1000"/>
+			<action application="say" data="${default_language} CURRENT_TIME pronounced ${strepoch()}"/>
+			<action application="hangup"/>
+		</condition>
+	</extension>
 </context>
diff --git a/app/dialplans/resources/switch/conf/dialplan/550_talking_clock_date.xml b/app/dialplans/resources/switch/conf/dialplan/550_talking_clock_date.xml
index 33ac6bd2f7..7c5e22771a 100644
--- a/app/dialplans/resources/switch/conf/dialplan/550_talking_clock_date.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/550_talking_clock_date.xml
@@ -1,10 +1,8 @@
-<context name="${domain_name}">
-  <extension name="talking clock date" number="*9171" app_uuid="780e174b-a645-478e-b53c-0eb08b9a043c" global="true" order="550">
-    <condition field="destination_number" expression="^\*9171$">
-      <action application="answer"/>
-      <action application="sleep" data="1000"/>
-      <action application="say" data="${default_language} CURRENT_DATE pronounced ${strepoch()}"/>
-      <action application="hangup"/>
-    </condition>
-  </extension>
-</context>
+<extension name="talking clock date" number="*9171" context="${domain_name}" continue="false" app_uuid="780e174b-a645-478e-b53c-0eb08b9a043c" global="true" order="550">
+	<condition field="destination_number" expression="^\*9171$">
+		<action application="answer"/>
+		<action application="sleep" data="1000"/>
+		<action application="say" data="${default_language} CURRENT_DATE pronounced ${strepoch()}"/>
+		<action application="hangup"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/560_extension_queue.xml b/app/dialplans/resources/switch/conf/dialplan/560_extension_queue.xml
index 026f0a8ab1..67629c784e 100644
--- a/app/dialplans/resources/switch/conf/dialplan/560_extension_queue.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/560_extension_queue.xml
@@ -1,14 +1,12 @@
-<context name="{v_context}">
-	<extension name="extension_queue" continue="false" app_uuid="854df474-bf40-419e-9ba7-3bd27a52d98a" enabled="false" order="560">
-		<condition field="${user_exists}" expression="^true$">
-			<action application="answer" data=""/>
-			<action application="set" data="fifo_simo=1"/>
-			<action application="set" data="fifo_timeout=1"/>
-			<action application="set" data="fifo_lag=1"/>
-			<action application="set" data="fifo_destroy_after_use=true"/>
-			<action application="set" data="fifo_music=local_stream://default"/>
-			<action application="set" data="result=${fifo_member(add ${destination_number}@${domain_name} {fifo_member_wait=nowait}user/${destination_number}@${domain_name}"/>
-			<action application="fifo" data="${destination_number}@${domain_name} in"/>
-		</condition>
-	</extension>
-</context>
+<extension name="extension_queue" context="${domain_name}" continue="false" app_uuid="854df474-bf40-419e-9ba7-3bd27a52d98a" enabled="false" order="560">
+	<condition field="${user_exists}" expression="^true$">
+		<action application="answer" data=""/>
+		<action application="set" data="fifo_simo=1"/>
+		<action application="set" data="fifo_timeout=1"/>
+		<action application="set" data="fifo_lag=1"/>
+		<action application="set" data="fifo_destroy_after_use=true"/>
+		<action application="set" data="fifo_music=local_stream://default"/>
+		<action application="set" data="result=${fifo_member(add ${destination_number}@${domain_name} {fifo_member_wait=nowait}user/${destination_number}@${domain_name}"/>
+		<action application="fifo" data="${destination_number}@${domain_name} in"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/570_nway_conference.xml b/app/dialplans/resources/switch/conf/dialplan/570_nway_conference.xml
index acf6bf3132..1c5df56720 100644
--- a/app/dialplans/resources/switch/conf/dialplan/570_nway_conference.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/570_nway_conference.xml
@@ -1,7 +1,5 @@
-<context name="{v_context}">
-	<extension name="nway_conference" number="nway" continue="false" app_uuid="20617852-b069-4ace-9137-3d6a16588f6f" enabled="false" order="570">
+<extension name="nway_conference" number="nway" context="${domain_name}" continue="false" app_uuid="20617852-b069-4ace-9137-3d6a16588f6f" enabled="false" order="570">
 	<condition field="destination_number" expression="^nway">
 		<action application="conference" data="${destination_number}@${domain_name}+flags{mintwo}"/>
 	</condition>
-	</extension>
-</context>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/870_cidlookup.xml b/app/dialplans/resources/switch/conf/dialplan/870_cidlookup.xml
index 271987da9f..b56dbf3f80 100644
--- a/app/dialplans/resources/switch/conf/dialplan/870_cidlookup.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/870_cidlookup.xml
@@ -1,13 +1,11 @@
-<context name="{v_context}">
-	<extension name="cidlookup" number="" continue="true" app_uuid="a0cb498c-6e09-441f-83ea-a7684565c44e" enabled="false" order="870">
-		<condition field="${user_exists}" expression="^true$" break="never"/>
-		<condition field="${call_direction}" expression="^inbound$" break="never"/>
-		<condition field="${module_exists(mod_cidlookup)}" expression="^true$" break="never"/>
-		<condition field="caller_id_number" expression="^\+?1?(\d{10})$" break="never">
-			<action application="set" data="cidlookup_caller_id_name=${cidlookup(1$1)}" inline="true"/>
-		</condition>
-		<condition field="${cidlookup_caller_id_name}" expression="^(?!UNKNOWN)">
-			<action application="set" data="effective_caller_id_name=${cidlookup_caller_id_name}" inline="true"/>
-		</condition>
-	</extension>
-</context>
+<extension name="cidlookup" number="" context="${domain_name}" continue="true" app_uuid="a0cb498c-6e09-441f-83ea-a7684565c44e" enabled="false" order="870">
+	<condition field="${user_exists}" expression="^true$" break="never"/>
+	<condition field="${call_direction}" expression="^inbound$" break="never"/>
+	<condition field="${module_exists(mod_cidlookup)}" expression="^true$" break="never"/>
+	<condition field="caller_id_number" expression="^\+?1?(\d{10})$" break="never">
+		<action application="set" data="cidlookup_caller_id_name=${cidlookup(1$1)}" inline="true"/>
+	</condition>
+	<condition field="${cidlookup_caller_id_name}" expression="^(?!UNKNOWN)">
+		<action application="set" data="effective_caller_id_name=${cidlookup_caller_id_name}" inline="true"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/890_local_extension.xml b/app/dialplans/resources/switch/conf/dialplan/890_local_extension.xml
index 12430c3b9c..ba8b5e1d2b 100644
--- a/app/dialplans/resources/switch/conf/dialplan/890_local_extension.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/890_local_extension.xml
@@ -1,31 +1,29 @@
-<context name="${domain_name}">
-	<extension name="local_extension" number="[ext]" continue="true" app_uuid="71cf1310-b6e3-415b-8745-3cbdc8e15212" global="true" order="890">
-		<condition field="${user_exists}" expression="true">
-			<!--<action application="pre_answer"/>-->
-			<action application="export" data="dialed_extension=${destination_number}" inline="true"/>
-			<action application="limit" data="hash ${domain_name} ${destination_number} ${limit_max} ${limit_destination}" inline="false" />
-		</condition>
-		<condition>
-			<!--<action application="set" data="ringback=${ringback}"/>-->
-			<action application="set" data="hangup_after_bridge=true"/>
-			<!--<action application="set" data="continue_on_fail=NORMAL_TEMPORARY_FAILURE,USER_BUSY,NO_ANSWER,TIMEOUT,NO_ROUTE_DESTINATION"/> -->
-			<action application="set" data="continue_on_fail=true"/>
-			<action application="set" data="initial_callee_id_name=${user_data(${dialed_extension}@${domain_name} var effective_caller_id_name)}"/>
-			<action application="hash" data="insert/${domain_name}-call_return/${dialed_extension}/${caller_id_number}"/>
-			<action application="hash" data="insert/${domain_name}-last_dial_ext/${dialed_extension}/${uuid}"/>
-			<action application="set" data="called_party_call_group=${user_data(${dialed_extension}@${domain_name} var call_group)}"/>
-			<!--<action application="export" data="nolocal:sip_secure_media=${user_data(${dialed_extension}@${domain_name} var sip_secure_media)}"/>-->
-			<action application="hash" data="insert/${domain_name}-last_dial/${called_party_call_group}/${uuid}"/>
-			<action application="set" data="api_hangup_hook=lua app.lua hangup"/>
-			<action application="export" data="domain_name=${domain_name}"/>
-			<!-- standard method -->
-			<action application="bridge" data="user/${destination_number}@${domain_name}"/>
-			<!-- sofia contact -->
-			<!--<action application="bridge" data="${sofia_contact(${dialed_extension}@${domain_name})}"/>-->
-			<!-- number-alias / https://confluence.freeswitch.org/display/FREESWITCH/XML+User+Directory -->
-			<!--<action application="bridge" data="user/${user_data(${destination_number}@${domain_name} attr id)}@${domain_name}"/> -->
-			<!-- handles bridge failures before answer -->
-			<action application="lua" data="app.lua failure_handler"/>
-		</condition>
-	</extension>
-</context>
+<extension name="local_extension" number="[ext]" context="${domain_name}" continue="true" app_uuid="71cf1310-b6e3-415b-8745-3cbdc8e15212" global="true" order="890">
+	<condition field="${user_exists}" expression="true">
+		<!--<action application="pre_answer"/>-->
+		<action application="export" data="dialed_extension=${destination_number}" inline="true"/>
+		<action application="limit" data="hash ${domain_name} ${destination_number} ${limit_max} ${limit_destination}" inline="false" />
+	</condition>
+	<condition>
+		<!--<action application="set" data="ringback=${ringback}"/>-->
+		<action application="set" data="hangup_after_bridge=true"/>
+		<!--<action application="set" data="continue_on_fail=NORMAL_TEMPORARY_FAILURE,USER_BUSY,NO_ANSWER,TIMEOUT,NO_ROUTE_DESTINATION"/> -->
+		<action application="set" data="continue_on_fail=true"/>
+		<action application="set" data="initial_callee_id_name=${user_data(${dialed_extension}@${domain_name} var effective_caller_id_name)}"/>
+		<action application="hash" data="insert/${domain_name}-call_return/${dialed_extension}/${caller_id_number}"/>
+		<action application="hash" data="insert/${domain_name}-last_dial_ext/${dialed_extension}/${uuid}"/>
+		<action application="set" data="called_party_call_group=${user_data(${dialed_extension}@${domain_name} var call_group)}"/>
+		<!--<action application="export" data="nolocal:sip_secure_media=${user_data(${dialed_extension}@${domain_name} var sip_secure_media)}"/>-->
+		<action application="hash" data="insert/${domain_name}-last_dial/${called_party_call_group}/${uuid}"/>
+		<action application="set" data="api_hangup_hook=lua app.lua hangup"/>
+		<action application="export" data="domain_name=${domain_name}"/>
+		<!-- standard method -->
+		<action application="bridge" data="user/${destination_number}@${domain_name}"/>
+		<!-- sofia contact -->
+		<!--<action application="bridge" data="${sofia_contact(${dialed_extension}@${domain_name})}"/>-->
+		<!-- number-alias / https://confluence.freeswitch.org/display/FREESWITCH/XML+User+Directory -->
+		<!--<action application="bridge" data="user/${user_data(${destination_number}@${domain_name} attr id)}@${domain_name}"/> -->
+		<!-- handles bridge failures before answer -->
+		<action application="lua" data="app.lua failure_handler"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/895_bxfer-return.xml b/app/dialplans/resources/switch/conf/dialplan/895_bxfer-return.xml
index 5cf95b1d29..41faf8eb93 100644
--- a/app/dialplans/resources/switch/conf/dialplan/895_bxfer-return.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/895_bxfer-return.xml
@@ -1,7 +1,6 @@
-<context name="${domain_name}">
-	<extension name="bxfer-return" number="" continue="false" app_uuid="e68d77c6-d504-41f9-8a1c-ec5ee4dfa793" global="true" enabled="true" order="895">
-    		<condition field="${user_exists}" expression="true"/>
-    		<condition field="${sip_refer_to}" expression="@">
-        	<action application="transfer" data="${sip_to_user} XML ${domain_name}"/>
-    	</condition>
+<extension name="bxfer-return" number="" context="${domain_name}" continue="false" app_uuid="e68d77c6-d504-41f9-8a1c-ec5ee4dfa793" global="true" enabled="true" order="895">
+	<condition field="${user_exists}" expression="true"/>
+	<condition field="${sip_refer_to}" expression="@">
+		<action application="transfer" data="${sip_to_user} XML ${domain_name}"/>
+	</condition>
 </extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/900_voicemail.xml b/app/dialplans/resources/switch/conf/dialplan/900_voicemail.xml
index 55e06f5104..b45ed8144a 100644
--- a/app/dialplans/resources/switch/conf/dialplan/900_voicemail.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/900_voicemail.xml
@@ -1,12 +1,10 @@
-<context name="${domain_name}">
-	<extension name="voicemail" number="[ext]" continue="false" app_uuid="e3c14f2f-7697-4b5d-9c62-2443c0e22bf2" global="true" order="900">
-		<condition field="${user_exists}" expression="true">
-			<!--<action application="voicemail" data="default ${domain_name} ${dialed_extension}"/>-->
-			<action application="set" data="record_append=false" inline="true"/>
-			<action application="set" data="voicemail_action=save" inline="true"/>
-			<action application="set" data="voicemail_id=${destination_number}" inline="true"/>
-			<action application="set" data="voicemail_profile=default" inline="true"/>
-			<action application="lua" data="app.lua voicemail"/>
-		</condition>
-	</extension>
-</context>
+<extension name="voicemail" number="[ext]" context="${domain_name}" continue="false" app_uuid="e3c14f2f-7697-4b5d-9c62-2443c0e22bf2" global="true" order="900">
+	<condition field="${user_exists}" expression="true">
+		<!--<action application="voicemail" data="default ${domain_name} ${dialed_extension}"/>-->
+		<action application="set" data="record_append=false" inline="true"/>
+		<action application="set" data="voicemail_action=save" inline="true"/>
+		<action application="set" data="voicemail_id=${destination_number}" inline="true"/>
+		<action application="set" data="voicemail_profile=default" inline="true"/>
+		<action application="lua" data="app.lua voicemail"/>
+	</condition>
+</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/999_not-found.xml b/app/dialplans/resources/switch/conf/dialplan/999_not-found.xml
index f1e51c7e96..842fe2ffe8 100644
--- a/app/dialplans/resources/switch/conf/dialplan/999_not-found.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/999_not-found.xml
@@ -1,8 +1,6 @@
-<context name="public">
-        <extension name="not-found" continue="false" app_uuid="23d198e5-7a8e-4af7-b573-2d166c1c24ff" global="true" order="999">
-                <condition field="" expression="">
-                        <action application="set" data="call_direction=inbound" inline="true"/>
-                        <action application="log" data="WARNING [inbound routes] 404 not found ${sip_network_ip}"/>
-                </condition>
-        </extension>
-</context>
+<extension name="not-found" context="public" continue="false" app_uuid="23d198e5-7a8e-4af7-b573-2d166c1c24ff" global="true" order="999">
+	<condition field="" expression="">
+		<action application="set" data="call_direction=inbound" inline="true"/>
+		<action application="log" data="WARNING [inbound routes] 404 not found ${sip_network_ip}"/>
+	</condition>
+</extension>