diff --git a/app/dialplan/resources/xml/dialplan/100_call-direction.xml b/app/dialplan/resources/xml/dialplan/100_call-direction.xml
index 535496e549..664fd8b241 100644
--- a/app/dialplan/resources/xml/dialplan/100_call-direction.xml
+++ b/app/dialplan/resources/xml/dialplan/100_call-direction.xml
@@ -1,5 +1,7 @@
-<extension name="call-direction" continue="true" app_uuid="3780f814-5543-4350-b65d-563512d1fe71">
-	<condition field="${call_direction}" expression="^(inbound|outbound|local)$">
-		<anti-action application="set" data="call_direction=local"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="call-direction" continue="true" app_uuid="3780f814-5543-4350-b65d-563512d1fe71">
+		<condition field="${call_direction}" expression="^(inbound|outbound|local)$">
+			<anti-action application="set" data="call_direction=local"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/220_global-intercept.xml b/app/dialplan/resources/xml/dialplan/220_global-intercept.xml
index 13c622d4a2..02b3554fb0 100644
--- a/app/dialplan/resources/xml/dialplan/220_global-intercept.xml
+++ b/app/dialplan/resources/xml/dialplan/220_global-intercept.xml
@@ -1,7 +1,9 @@
-<extension name="global-intercept" app_uuid="59aff1f2-719c-403e-9306-5eb3a0cbd16c" enabled="false">
-	<condition field="destination_number" expression="^\*886$">
-		<action application="answer"/>
-		<action application="intercept" data="${hash(select/${domain_name}-last_dial/global)}"/>
-		<action application="sleep" data="2000"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="global-intercept" app_uuid="59aff1f2-719c-403e-9306-5eb3a0cbd16c" enabled="false">
+		<condition field="destination_number" expression="^\*886$">
+			<action application="answer"/>
+			<action application="intercept" data="${hash(select/${domain_name}-last_dial/global)}"/>
+			<action application="sleep" data="2000"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/230_group-intercept.xml b/app/dialplan/resources/xml/dialplan/230_group-intercept.xml
index 3fbc3e024e..e744e2c6f4 100644
--- a/app/dialplan/resources/xml/dialplan/230_group-intercept.xml
+++ b/app/dialplan/resources/xml/dialplan/230_group-intercept.xml
@@ -1,7 +1,9 @@
-<extension name="group-intercept" app_uuid="15332e83-12f5-44d3-8472-633736eb4b9b">
-	<condition field="destination_number" expression="^\*8$">
-		<action application="answer"/>
-		<action application="intercept" data="${hash(select/${domain_name}-last_dial/${call_group})}"/>
-		<action application="sleep" data="2000"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="group-intercept" app_uuid="15332e83-12f5-44d3-8472-633736eb4b9b">
+		<condition field="destination_number" expression="^\*8$">
+			<action application="answer"/>
+			<action application="intercept" data="${hash(select/${domain_name}-last_dial/${call_group})}"/>
+			<action application="sleep" data="2000"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/240_redial.xml b/app/dialplan/resources/xml/dialplan/240_redial.xml
index eec6b5e93f..edf6219ca4 100644
--- a/app/dialplan/resources/xml/dialplan/240_redial.xml
+++ b/app/dialplan/resources/xml/dialplan/240_redial.xml
@@ -1,5 +1,7 @@
-<extension name="redial" app_uuid="459da8c1-073a-458e-ae7e-8194342f9583">
-	<condition field="destination_number" expression="^(redial|\*870)$">
-		<action application="transfer" data="${hash(select/${domain_name}-last_dial/${caller_id_number})}"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="redial" app_uuid="459da8c1-073a-458e-ae7e-8194342f9583">
+		<condition field="destination_number" expression="^(redial|\*870)$">
+			<action application="transfer" data="${hash(select/${domain_name}-last_dial/${caller_id_number})}"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/245_page.xml b/app/dialplan/resources/xml/dialplan/245_page.xml
index 7d7467c283..e043988ff5 100644
--- a/app/dialplan/resources/xml/dialplan/245_page.xml
+++ b/app/dialplan/resources/xml/dialplan/245_page.xml
@@ -1,9 +1,11 @@
-<extension name="page" app_uuid="2011c518-696d-4878-a9b2-b217b6311311" enabled="false">
-	<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=" />
-		<action application="set" data="extension_list=1001-1003,1005" />
-		<action application="lua" data="page.lua" />
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="page" app_uuid="2011c518-696d-4878-a9b2-b217b6311311" enabled="false">
+		<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=" />
+			<action application="set" data="extension_list=1001-1003,1005" />
+			<action application="lua" data="page.lua" />
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/250_global.xml b/app/dialplan/resources/xml/dialplan/250_global.xml
index df2810ec88..7ca213239e 100644
--- a/app/dialplan/resources/xml/dialplan/250_global.xml
+++ b/app/dialplan/resources/xml/dialplan/250_global.xml
@@ -1,11 +1,13 @@
-<extension name="global" continue="true" app_uuid="34dd307b-fffe-4ead-990c-3d070e288126">
-	<condition field="${call_debug}" expression="^true$" break="never">
-		<action application="info"/>
-	</condition>
-	<condition>
-		<action application="hash" data="insert/${domain_name}-spymap/${caller_id_number}/${uuid}"/>
-		<action application="hash" data="insert/${domain_name}-last_dial/${caller_id_number}/${destination_number}"/>
-		<action application="hash" data="insert/${domain_name}-last_dial/global/${uuid}"/>
-		<action application="set" data="RFC2822_DATE=${strftime(%a, %d %b %Y %T %z)}"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="global" continue="true" app_uuid="34dd307b-fffe-4ead-990c-3d070e288126">
+		<condition field="${call_debug}" expression="^true$" break="never">
+			<action application="info"/>
+		</condition>
+		<condition>
+			<action application="hash" data="insert/${domain_name}-spymap/${caller_id_number}/${uuid}"/>
+			<action application="hash" data="insert/${domain_name}-last_dial/${caller_id_number}/${destination_number}"/>
+			<action application="hash" data="insert/${domain_name}-last_dial/global/${uuid}"/>
+			<action application="set" data="RFC2822_DATE=${strftime(%a, %d %b %Y %T %z)}"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/260_eavesdrop.xml b/app/dialplan/resources/xml/dialplan/260_eavesdrop.xml
index 51db9d1b73..c2328153a1 100644
--- a/app/dialplan/resources/xml/dialplan/260_eavesdrop.xml
+++ b/app/dialplan/resources/xml/dialplan/260_eavesdrop.xml
@@ -1,6 +1,8 @@
-<extension name="eavesdrop" app_uuid="e944af7e-8fcc-429b-a32f-0dcdce1585d8" enabled="false">
-	<condition field="destination_number" expression="^\*88(\d{2,7})$|^\*0(.*)$">
-		<action application="answer"/>
-		<action application="eavesdrop" data="${hash(select/${domain_name}-spymap/$1)}"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="eavesdrop" app_uuid="e944af7e-8fcc-429b-a32f-0dcdce1585d8" enabled="false">
+		<condition field="destination_number" expression="^\*88(\d{2,7})$|^\*0(.*)$">
+			<action application="answer"/>
+			<action application="eavesdrop" data="${hash(select/${domain_name}-spymap/$1)}"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/270_call_privacy.xml b/app/dialplan/resources/xml/dialplan/270_call_privacy.xml
index 66f101cbd8..769eb78fed 100644
--- a/app/dialplan/resources/xml/dialplan/270_call_privacy.xml
+++ b/app/dialplan/resources/xml/dialplan/270_call_privacy.xml
@@ -1,8 +1,10 @@
-<extension name="call_privacy" app_uuid="eb478e66-f637-4ae7-b1eb-9a7b87a1bd9e">
-	<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 default"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="call_privacy" app_uuid="eb478e66-f637-4ae7-b1eb-9a7b87a1bd9e">
+		<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 default"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/280_call_return.xml b/app/dialplan/resources/xml/dialplan/280_call_return.xml
index 662d10c1c3..8e27746418 100644
--- a/app/dialplan/resources/xml/dialplan/280_call_return.xml
+++ b/app/dialplan/resources/xml/dialplan/280_call_return.xml
@@ -1,5 +1,7 @@
-<extension name="call_return" app_uuid="fa516204-920f-4802-8bb1-04c6a010bfe1">
-	<condition field="destination_number" expression="^\*69$|^lcr$">
-		<action application="transfer" data="${hash(select/${domain_name}-call_return/${caller_id_number})}"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="call_return" app_uuid="fa516204-920f-4802-8bb1-04c6a010bfe1">
+		<condition field="destination_number" expression="^\*69$|^lcr$">
+			<action application="transfer" data="${hash(select/${domain_name}-call_return/${caller_id_number})}"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/290_intercept-ext.xml b/app/dialplan/resources/xml/dialplan/290_intercept-ext.xml
index e7e4976da8..c0bd78cc33 100644
--- a/app/dialplan/resources/xml/dialplan/290_intercept-ext.xml
+++ b/app/dialplan/resources/xml/dialplan/290_intercept-ext.xml
@@ -1,7 +1,9 @@
-<extension name="intercept-ext" app_uuid="2b7b2f82-edfe-4339-8cc5-7d0cf36e1e68">
-	<condition field="destination_number" expression="^\*\*(\d+)$">
-		<action application="answer"/>
-		<action application="intercept" data="${hash(select/${domain_name}-last_dial_ext/$1)}"/>
-		<action application="sleep" data="2000"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="intercept-ext" app_uuid="2b7b2f82-edfe-4339-8cc5-7d0cf36e1e68">
+		<condition field="destination_number" expression="^\*\*(\d+)$">
+			<action application="answer"/>
+			<action application="intercept" data="${hash(select/${domain_name}-last_dial_ext/$1)}"/>
+			<action application="sleep" data="2000"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/300_extension-intercom.xml b/app/dialplan/resources/xml/dialplan/300_extension-intercom.xml
index e7c08d2384..85bb44df27 100644
--- a/app/dialplan/resources/xml/dialplan/300_extension-intercom.xml
+++ b/app/dialplan/resources/xml/dialplan/300_extension-intercom.xml
@@ -1,8 +1,10 @@
-<extension name="extension-intercom" app_uuid="1b224444-de8b-448d-b2d1-19feaac3effa">
-	<condition field="destination_number" expression="^\*8(\d{2,7})$">
-		<action application="set" data="extension_list=$1"/>
-		<action application="set" data="pin_number="/>
-		<action application="set" data="mute=true"/>
-		<action application="lua" data="page.lua"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="extension-intercom" app_uuid="1b224444-de8b-448d-b2d1-19feaac3effa">
+		<condition field="destination_number" expression="^\*8(\d{2,7})$">
+			<action application="set" data="extension_list=$1"/>
+			<action application="set" data="pin_number="/>
+			<action application="set" data="mute=true"/>
+			<action application="lua" data="page.lua"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/310_send_to_voicemail.xml b/app/dialplan/resources/xml/dialplan/310_send_to_voicemail.xml
index 12a583b4e3..f849644729 100644
--- a/app/dialplan/resources/xml/dialplan/310_send_to_voicemail.xml
+++ b/app/dialplan/resources/xml/dialplan/310_send_to_voicemail.xml
@@ -1,9 +1,11 @@
-<extension name="send_to_voicemail" app_uuid="001d5dab-e0c6-4352-8f06-e9986ee7b0d8">
-	<condition field="destination_number" expression="^\*99(\d{2,7})$">
-		<action application="answer"/>
-		<action application="sleep" data="1000"/>
-		<action application="set" data="dialed_extension=$1"/>
-		<action application="export" data="dialed_extension=$1"/>
-		<action application="voicemail" data="default ${domain_name} ${dialed_extension}"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="send_to_voicemail" app_uuid="001d5dab-e0c6-4352-8f06-e9986ee7b0d8">
+		<condition field="destination_number" expression="^\*99(\d{2,7})$">
+			<action application="answer"/>
+			<action application="sleep" data="1000"/>
+			<action application="set" data="dialed_extension=$1"/>
+			<action application="export" data="dialed_extension=$1"/>
+			<action application="voicemail" data="default ${domain_name} ${dialed_extension}"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/320_vmain.xml b/app/dialplan/resources/xml/dialplan/320_vmain.xml
index 858e4cf158..90ffea9d34 100644
--- a/app/dialplan/resources/xml/dialplan/320_vmain.xml
+++ b/app/dialplan/resources/xml/dialplan/320_vmain.xml
@@ -1,8 +1,10 @@
 <!-- voicemail main extension, used when * is pressed from an external number -->
-<extension name="vmain" app_uuid="d085a1e3-c53a-4480-9ca6-6a362899a681">
-	<condition field="destination_number" expression="^vmain$|^\*4000$|^\*98$">
-		<action application="answer"/>
-		<action application="sleep" data="1000"/>
-		<action application="voicemail" data="check default ${domain_name}"/>  
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="vmain" app_uuid="d085a1e3-c53a-4480-9ca6-6a362899a681">
+		<condition field="destination_number" expression="^vmain$|^\*4000$|^\*98$">
+			<action application="answer"/>
+			<action application="sleep" data="1000"/>
+			<action application="voicemail" data="check default ${domain_name}"/>  
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/330_vmain_user.xml b/app/dialplan/resources/xml/dialplan/330_vmain_user.xml
index cdf328ede8..f433637f0b 100644
--- a/app/dialplan/resources/xml/dialplan/330_vmain_user.xml
+++ b/app/dialplan/resources/xml/dialplan/330_vmain_user.xml
@@ -1,8 +1,10 @@
 <!-- voicemail provide user extension -->
-<extension name="vmain_user" app_uuid="5d47ab13-f25d-4f62-a68e-2a7d945d05b7">
-	<condition field="destination_number" expression="^\*97$">
-		<action application="answer"/>
-		<action application="sleep" data="1000"/>
-		<action application="voicemail" data="check default ${domain_name} ${caller_id_number}"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="vmain_user" app_uuid="5d47ab13-f25d-4f62-a68e-2a7d945d05b7">
+		<condition field="destination_number" expression="^\*97$">
+			<action application="answer"/>
+			<action application="sleep" data="1000"/>
+			<action application="voicemail" data="check default ${domain_name} ${caller_id_number}"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/340_delay_echo.xml b/app/dialplan/resources/xml/dialplan/340_delay_echo.xml
index 5b8d201044..04746d41ad 100644
--- a/app/dialplan/resources/xml/dialplan/340_delay_echo.xml
+++ b/app/dialplan/resources/xml/dialplan/340_delay_echo.xml
@@ -1,6 +1,8 @@
-<extension name="delay_echo" app_uuid="fe638409-b347-46d7-9aca-489561df8b35">
-	<condition field="destination_number" expression="^\*9195$">
-		<action application="answer"/>
-		<action application="delay_echo" data="5000"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="delay_echo" app_uuid="fe638409-b347-46d7-9aca-489561df8b35">
+		<condition field="destination_number" expression="^\*9195$">
+			<action application="answer"/>
+			<action application="delay_echo" data="5000"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/350_echo.xml b/app/dialplan/resources/xml/dialplan/350_echo.xml
index 9d365e512f..90620e264d 100644
--- a/app/dialplan/resources/xml/dialplan/350_echo.xml
+++ b/app/dialplan/resources/xml/dialplan/350_echo.xml
@@ -1,6 +1,8 @@
-<extension name="echo" app_uuid="1f894dfb-0567-4e20-9026-d538bbaa5261">
-	<condition field="destination_number" expression="^\*9196$">
-		<action application="answer"/>
-		<action application="echo"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="echo" app_uuid="1f894dfb-0567-4e20-9026-d538bbaa5261">
+		<condition field="destination_number" expression="^\*9196$">
+			<action application="answer"/>
+			<action application="echo"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/360_milliwatt.xml b/app/dialplan/resources/xml/dialplan/360_milliwatt.xml
index ce1db8d4cc..ed13d993da 100644
--- a/app/dialplan/resources/xml/dialplan/360_milliwatt.xml
+++ b/app/dialplan/resources/xml/dialplan/360_milliwatt.xml
@@ -1,6 +1,8 @@
-<extension name="milliwatt" app_uuid="296acca3-d30f-42a0-ba90-5af2208ad7f8">
-	<condition field="destination_number" expression="^\*9197$">
-		<action application="answer"/>
-		<action application="playback" data="tone_stream://%(251,0,1004);loops=-1"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="milliwatt" app_uuid="296acca3-d30f-42a0-ba90-5af2208ad7f8">
+		<condition field="destination_number" expression="^\*9197$">
+			<action application="answer"/>
+			<action application="playback" data="tone_stream://%(251,0,1004);loops=-1"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/370_tone_stream.xml b/app/dialplan/resources/xml/dialplan/370_tone_stream.xml
index b6573194fc..1cf6b76720 100644
--- a/app/dialplan/resources/xml/dialplan/370_tone_stream.xml
+++ b/app/dialplan/resources/xml/dialplan/370_tone_stream.xml
@@ -1,6 +1,8 @@
-<extension name="tone_stream" app_uuid="98ccdb0b-c074-4f74-b28a-9528372faa7d">
-	<condition field="destination_number" expression="^\*9198$">
-		<action application="answer"/>
-		<action application="playback" data="tone_stream://path=${base_dir}/conf/tetris.ttml;loops=10"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="tone_stream" app_uuid="98ccdb0b-c074-4f74-b28a-9528372faa7d">
+		<condition field="destination_number" expression="^\*9198$">
+			<action application="answer"/>
+			<action application="playback" data="tone_stream://path=${base_dir}/conf/tetris.ttml;loops=10"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/380_hold_music.xml b/app/dialplan/resources/xml/dialplan/380_hold_music.xml
index 532b1ff4e9..4e0b88ae67 100644
--- a/app/dialplan/resources/xml/dialplan/380_hold_music.xml
+++ b/app/dialplan/resources/xml/dialplan/380_hold_music.xml
@@ -1,13 +1,15 @@
-<extension name="hold_music" app_uuid="b824b88a-e6da-486e-9f17-7b93cbaa318e">
-	<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 features"/>
-		<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 features"/>
-		<anti-action application="playback" data="$${hold_music}"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="hold_music" app_uuid="b824b88a-e6da-486e-9f17-7b93cbaa318e">
+		<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 features"/>
+			<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 features"/>
+			<anti-action application="playback" data="$${hold_music}"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/400_recordings.xml b/app/dialplan/resources/xml/dialplan/400_recordings.xml
index 6d2bcd199d..1f5cae961d 100644
--- a/app/dialplan/resources/xml/dialplan/400_recordings.xml
+++ b/app/dialplan/resources/xml/dialplan/400_recordings.xml
@@ -1,10 +1,12 @@
-<extension name="recordings" app_uuid="430737df-5385-42d1-b933-22600d3fb79e">
-	<condition field="destination_number" expression="^\*(732)$">
-		<action application="answer"/>
-		<action application="set" data="pin_number={v_pin_number}"/>
-		<action application="set" data="recordings_dir={v_switch_recordings_dir}"/>
-		<action application="set" data="recording_slots=true"/>
-		<action application="set" data="recording_prefix=recording"/>
-		<action application="lua" data="recordings.lua"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="recordings" app_uuid="430737df-5385-42d1-b933-22600d3fb79e">
+		<condition field="destination_number" expression="^\*(732)$">
+			<action application="answer"/>
+			<action application="set" data="pin_number={v_pin_number}"/>
+			<action application="set" data="recordings_dir={v_switch_recordings_dir}"/>
+			<action application="set" data="recording_slots=true"/>
+			<action application="set" data="recording_prefix=recording"/>
+			<action application="lua" data="recordings.lua"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/410_freeswitch_conference.xml b/app/dialplan/resources/xml/dialplan/410_freeswitch_conference.xml
index 92932f8459..a557c0bdc0 100644
--- a/app/dialplan/resources/xml/dialplan/410_freeswitch_conference.xml
+++ b/app/dialplan/resources/xml/dialplan/410_freeswitch_conference.xml
@@ -1,14 +1,16 @@
-<extension name="freeswitch_conference" app_uuid="8e3ad78e-4b48-4d36-af7e-4920a9757043" enabled="false">
-	<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>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="freeswitch_conference" app_uuid="8e3ad78e-4b48-4d36-af7e-4920a9757043" enabled="false">
+		<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>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/420_disa.xml b/app/dialplan/resources/xml/dialplan/420_disa.xml
index a90c4a1cd4..1dd4f4f643 100644
--- a/app/dialplan/resources/xml/dialplan/420_disa.xml
+++ b/app/dialplan/resources/xml/dialplan/420_disa.xml
@@ -1,8 +1,10 @@
-<extension name="disa" app_uuid="3ade2d9a-f55d-4240-bb60-b4a3ab36951c" enabled="false">
-	<condition field="destination_number" expression="^\*(3472)$">
-		<action application="answer"/>
-		<action application="set" data="pin_number={v_pin_number}"/>
-		<action application="set" data="dialplan_context={v_context}"/>
-		<action application="lua" data="disa.lua"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="disa" app_uuid="3ade2d9a-f55d-4240-bb60-b4a3ab36951c" enabled="false">
+		<condition field="destination_number" expression="^\*(3472)$">
+			<action application="answer"/>
+			<action application="set" data="pin_number={v_pin_number}"/>
+			<action application="set" data="dialplan_context={v_context}"/>
+			<action application="lua" data="disa.lua"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/430_directory.xml b/app/dialplan/resources/xml/dialplan/430_directory.xml
index c375b28198..2f1d0ccaee 100644
--- a/app/dialplan/resources/xml/dialplan/430_directory.xml
+++ b/app/dialplan/resources/xml/dialplan/430_directory.xml
@@ -1,5 +1,7 @@
-<extension name="directory" app_uuid="a223dc70-28a1-4979-834e-8af813cd8ea6">
-	<condition field="destination_number" expression="^\*411$">
-		<action application="directory" data="default ${domain_name} ${domain_name}"/> 
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="directory" app_uuid="a223dc70-28a1-4979-834e-8af813cd8ea6">
+		<condition field="destination_number" expression="^\*411$">
+			<action application="directory" data="default ${domain_name} ${domain_name}"/> 
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/440_wake-up.xml b/app/dialplan/resources/xml/dialplan/440_wake-up.xml
index 8fccece90f..d117b0c7e9 100644
--- a/app/dialplan/resources/xml/dialplan/440_wake-up.xml
+++ b/app/dialplan/resources/xml/dialplan/440_wake-up.xml
@@ -1,8 +1,10 @@
-<extension name="wake-up" app_uuid="e27abe68-41c0-4188-bb0f-67d93de0c610">
-	<condition field="destination_number" expression="^\*(925)$">
-		<action application="answer"/>
-		<action application="set" data="pin_number={v_pin_number}"/>
-		<action application="set" data="time_zone_offset=-7"/>
-		<action application="lua" data="wakeup.lua"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="wake-up" app_uuid="e27abe68-41c0-4188-bb0f-67d93de0c610">
+		<condition field="destination_number" expression="^\*(925)$">
+			<action application="answer"/>
+			<action application="set" data="pin_number={v_pin_number}"/>
+			<action application="set" data="time_zone_offset=-7"/>
+			<action application="lua" data="wakeup.lua"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/450_park_in.xml b/app/dialplan/resources/xml/dialplan/450_park_in.xml
index 8e3f309846..2c35a0d2df 100644
--- a/app/dialplan/resources/xml/dialplan/450_park_in.xml
+++ b/app/dialplan/resources/xml/dialplan/450_park_in.xml
@@ -1,12 +1,14 @@
-<extension name="park_in" app_uuid="ffb30da6-30e4-43b8-9847-2ed40e232f89" enabled="false">
-	<condition field="destination_number" expression="^5900$" >
-		<action application="set" data="park_direction=in" />
-		<action application="set" data="park_extension=5901" />
-		<action application="set" data="park_range=3" />
-		<action application="set" data="park_announce=true" />
-		<action application="set" data="park_timeout_seconds=70" />
-		<action application="set" data="park_timeout_destination=1000" />
-		<action application="set" data="park_music=$${hold_music}" />
-		<action application="lua" data="park.lua" />
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="park_in" app_uuid="ffb30da6-30e4-43b8-9847-2ed40e232f89" enabled="false">
+		<condition field="destination_number" expression="^5900$" >
+			<action application="set" data="park_direction=in" />
+			<action application="set" data="park_extension=5901" />
+			<action application="set" data="park_range=3" />
+			<action application="set" data="park_announce=true" />
+			<action application="set" data="park_timeout_seconds=70" />
+			<action application="set" data="park_timeout_destination=1000" />
+			<action application="set" data="park_music=$${hold_music}" />
+			<action application="lua" data="park.lua" />
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/455_park_out.xml b/app/dialplan/resources/xml/dialplan/455_park_out.xml
index f27b91e392..64fcc62ce1 100644
--- a/app/dialplan/resources/xml/dialplan/455_park_out.xml
+++ b/app/dialplan/resources/xml/dialplan/455_park_out.xml
@@ -1,7 +1,9 @@
-<extension name="park_out" app_uuid="cf8234b6-a039-4ec2-87bd-3db0799a3f75" enabled="false">
-	<condition field="destination_number" expression="(^5901$|^5902$|^5903$)" >
-		<action application="set" data="park_direction=out" />
-		<action application="set" data="park_extension=$1" />
-		<action application="lua" data="park.lua" />
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="park_out" app_uuid="cf8234b6-a039-4ec2-87bd-3db0799a3f75" enabled="false">
+		<condition field="destination_number" expression="(^5901$|^5902$|^5903$)" >
+			<action application="set" data="park_direction=out" />
+			<action application="set" data="park_extension=$1" />
+			<action application="lua" data="park.lua" />
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/460_park_slots.xml b/app/dialplan/resources/xml/dialplan/460_park_slots.xml
index 0c2f17fcb8..2d79b0930d 100644
--- a/app/dialplan/resources/xml/dialplan/460_park_slots.xml
+++ b/app/dialplan/resources/xml/dialplan/460_park_slots.xml
@@ -1,11 +1,13 @@
-<extension name="park_slots" app_uuid="f096f899-c78e-409c-8290-00f6d423b31c" enabled="false">
-	<condition field="destination_number" expression="(^5901$|^5902$|^5903$)" >
-		<action application="set" data="park_extension=$1" />
-		<action application="set" data="park_direction=both" />
-		<action application="set" data="park_announce=true" />
-		<action application="set" data="park_timeout_seconds=250" />
-		<action application="set" data="park_timeout_destination=1000" />
-		<action application="set" data="park_music=$${hold_music}" />
-		<action application="lua" data="park.lua" />
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="park_slots" app_uuid="f096f899-c78e-409c-8290-00f6d423b31c" enabled="false">
+		<condition field="destination_number" expression="(^5901$|^5902$|^5903$)" >
+			<action application="set" data="park_extension=$1" />
+			<action application="set" data="park_direction=both" />
+			<action application="set" data="park_announce=true" />
+			<action application="set" data="park_timeout_seconds=250" />
+			<action application="set" data="park_timeout_destination=1000" />
+			<action application="set" data="park_music=$${hold_music}" />
+			<action application="lua" data="park.lua" />
+		</condition>
+	</extension>
+</context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/999_local_extension.xml b/app/dialplan/resources/xml/dialplan/999_local_extension.xml
index 3e6bedd90a..840c8933f5 100644
--- a/app/dialplan/resources/xml/dialplan/999_local_extension.xml
+++ b/app/dialplan/resources/xml/dialplan/999_local_extension.xml
@@ -1,32 +1,34 @@
-<extension name="local_extension" app_uuid="71cf1310-b6e3-415b-8745-3cbdc8e15212">
-	<condition field="destination_number" expression="(^\d{2,7}$)">
-		<action application="set" data="dialed_extension=$1"/>
-		<action application="export" data="dialed_extension=$1"/>
-		<action application="limit" data="hash ${domain_name} $1 ${limit_max} ${limit_destination}"/>
-		<!-- bind_meta_app can have these args <key> [a|b|ab] [a|b|o|s] <app> -->
-		<action application="bind_meta_app" data="1 b s execute_extension::dx XML features"/>
-		<action application="bind_meta_app" data="2 b s record_session::$${recordings_dir}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.wav"/>
-		<action application="bind_meta_app" data="3 b s execute_extension::cf XML features"/>
-		<action application="bind_meta_app" data="4 b s execute_extension::att_xfer XML features"/>
-		<action application="set" data="ringback=${us-ring}"/>
-		<action application="set" data="transfer_ringback=$${hold_music}"/>
-		<action application="set" data="call_timeout=30"/>
-		<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="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}"/>
-		<!-- standard method -->
-		<!--<action application="bridge" data="user/${dialed_extension}@${domain_name}"/> -->
-		<!-- sofia contact -->
-		<!--<action application="bridge" data="${sofia_contact(${dialed_extension}@${domain_name})}"/>-->
-		<!-- number-alias / http://wiki.freeswitch.com/wiki/XML_User_Directory_Guide -->
-		<action application="bridge" data="user/${user_data(${destination_number}@${domain_name} attr id)}@${domain_name}"/>
-		<action application="answer"/>
-		<action application="sleep" data="1000"/>
-		<action application="voicemail" data="default ${domain_name} ${dialed_extension}"/>
-	</condition>
-</extension>
\ No newline at end of file
+<context name="{v_context}">
+	<extension name="local_extension" app_uuid="71cf1310-b6e3-415b-8745-3cbdc8e15212">
+		<condition field="destination_number" expression="(^\d{2,7}$)">
+			<action application="set" data="dialed_extension=$1"/>
+			<action application="export" data="dialed_extension=$1"/>
+			<action application="limit" data="hash ${domain_name} $1 ${limit_max} ${limit_destination}"/>
+			<!-- bind_meta_app can have these args <key> [a|b|ab] [a|b|o|s] <app> -->
+			<action application="bind_meta_app" data="1 b s execute_extension::dx XML features"/>
+			<action application="bind_meta_app" data="2 ab s record_session::$${recordings_dir}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.wav"/>
+			<action application="bind_meta_app" data="3 b s execute_extension::cf XML features"/>
+			<action application="bind_meta_app" data="4 b s execute_extension::att_xfer XML features"/>
+			<action application="set" data="ringback=${us-ring}"/>
+			<action application="set" data="transfer_ringback=$${hold_music}"/>
+			<action application="set" data="call_timeout=30"/>
+			<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="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}"/>
+			<!-- standard method -->
+			<!--<action application="bridge" data="user/${dialed_extension}@${domain_name}"/> -->
+			<!-- sofia contact -->
+			<!--<action application="bridge" data="${sofia_contact(${dialed_extension}@${domain_name})}"/>-->
+			<!-- number-alias / http://wiki.freeswitch.com/wiki/XML_User_Directory_Guide -->
+			<action application="bridge" data="user/${user_data(${destination_number}@${domain_name} attr id)}@${domain_name}"/>
+			<action application="answer"/>
+			<action application="sleep" data="1000"/>
+			<action application="voicemail" data="default ${domain_name} ${dialed_extension}"/>
+		</condition>
+	</extension>
+</context>
\ No newline at end of file