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 00ac5b4778..66d04ec7f9 100644
--- a/app/dialplans/resources/switch/conf/dialplan/010_caller_details.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/010_caller_details.xml
@@ -1,9 +1,7 @@
-<context name="public">
-	<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"/>
-			<action application="set" data="caller_id_number=${caller_id_number}"/>
-		</condition>
-	</extension>
-</context>
+<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"/>
+		<action application="set" data="caller_id_number=${caller_id_number}"/>
+	</condition>
+</extension>
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 d9fddc9430..68df906820 100644
--- a/app/dialplans/resources/switch/conf/dialplan/010_user_exists.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/010_user_exists.xml
@@ -1,33 +1,31 @@
-<context name="${domain_name}">
-	<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>
-		<condition field="" expression="" break="">
-			<action application="set" data="user_exists=${user_exists id ${destination_number} ${domain_name}}" inline="true"/>
-			<action application="set" data="from_user_exists=${user_exists id ${sip_from_user} ${sip_from_host}}" inline="true"/>
-		</condition>
-		<condition field="${user_exists}" expression="^true$" break="">
-			<action application="set" data="extension_uuid=${user_data ${destination_number}@${domain_name} var extension_uuid}" inline="true"/>
-			<action application="set" data="extension_caller_id_name=${user_data ${destination_number}@${domain_name} var effective_caller_id_name}" inline="true"/>
-			<action application="set" data="extension_caller_id_number=${user_data ${destination_number}@${domain_name} var effective_caller_id_number}" inline="true"/>
-			<action application="set" data="forward_all_enabled=${user_data ${destination_number}@${domain_name} var forward_all_enabled}" inline="true"/>
-			<action application="set" data="forward_all_destination=${user_data ${destination_number}@${domain_name} var forward_all_destination}" inline="true"/>
-			<action application="set" data="forward_busy_enabled=${user_data ${destination_number}@${domain_name} var forward_busy_enabled}" inline="true"/>
-			<action application="set" data="forward_busy_destination=${user_data ${destination_number}@${domain_name} var forward_busy_destination}" inline="true"/>
-			<action application="set" data="forward_no_answer_enabled=${user_data ${destination_number}@${domain_name} var forward_no_answer_enabled}" inline="true"/>
-			<action application="set" data="forward_no_answer_destination=${user_data ${destination_number}@${domain_name} var forward_no_answer_destination}" inline="true"/>
-			<action application="set" data="forward_user_not_registered_enabled=${user_data ${destination_number}@${domain_name} var forward_user_not_registered_enabled}" inline="true"/>
-			<action application="set" data="forward_user_not_registered_destination=${user_data ${destination_number}@${domain_name} var forward_user_not_registered_destination}" inline="true"/>
-			<action application="set" data="forward_all_enabled=${user_data ${destination_number}@${domain_name} var forward_all_enabled}" inline="true"/>
-			<action application="set" data="follow_me_enabled=${user_data ${destination_number}@${domain_name} var follow_me_enabled}" inline="true"/>
-			<action application="set" data="do_not_disturb=${user_data ${destination_number}@${domain_name} var do_not_disturb}" inline="true"/>
-			<action application="set" data="call_timeout=${user_data ${destination_number}@${domain_name} var call_timeout}" inline="true"/>
-			<action application="set" data="missed_call_app=${user_data ${destination_number}@${domain_name} var missed_call_app}" inline="true"/>
-			<action application="set" data="missed_call_data=${user_data ${destination_number}@${domain_name} var missed_call_data}" inline="true"/>
-			<action application="set" data="toll_allow=${user_data ${destination_number}@${domain_name} var toll_allow}" inline="true"/>
-			<action application="set" data="call_screen_enabled=${user_data ${destination_number}@${domain_name} var call_screen_enabled}" inline="true"/>
-			<action application="set" data="user_record=${user_data ${destination_number}@${domain_name} var user_record}" inline="true"/>
-		</condition>
-	</extension>
-</context>
+<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>
+	<condition field="" expression="" break="">
+		<action application="set" data="user_exists=${user_exists id ${destination_number} ${domain_name}}" inline="true"/>
+		<action application="set" data="from_user_exists=${user_exists id ${sip_from_user} ${sip_from_host}}" inline="true"/>
+	</condition>
+	<condition field="${user_exists}" expression="^true$" break="">
+		<action application="set" data="extension_uuid=${user_data ${destination_number}@${domain_name} var extension_uuid}" inline="true"/>
+		<action application="set" data="extension_caller_id_name=${user_data ${destination_number}@${domain_name} var effective_caller_id_name}" inline="true"/>
+		<action application="set" data="extension_caller_id_number=${user_data ${destination_number}@${domain_name} var effective_caller_id_number}" inline="true"/>
+		<action application="set" data="forward_all_enabled=${user_data ${destination_number}@${domain_name} var forward_all_enabled}" inline="true"/>
+		<action application="set" data="forward_all_destination=${user_data ${destination_number}@${domain_name} var forward_all_destination}" inline="true"/>
+		<action application="set" data="forward_busy_enabled=${user_data ${destination_number}@${domain_name} var forward_busy_enabled}" inline="true"/>
+		<action application="set" data="forward_busy_destination=${user_data ${destination_number}@${domain_name} var forward_busy_destination}" inline="true"/>
+		<action application="set" data="forward_no_answer_enabled=${user_data ${destination_number}@${domain_name} var forward_no_answer_enabled}" inline="true"/>
+		<action application="set" data="forward_no_answer_destination=${user_data ${destination_number}@${domain_name} var forward_no_answer_destination}" inline="true"/>
+		<action application="set" data="forward_user_not_registered_enabled=${user_data ${destination_number}@${domain_name} var forward_user_not_registered_enabled}" inline="true"/>
+		<action application="set" data="forward_user_not_registered_destination=${user_data ${destination_number}@${domain_name} var forward_user_not_registered_destination}" inline="true"/>
+		<action application="set" data="forward_all_enabled=${user_data ${destination_number}@${domain_name} var forward_all_enabled}" inline="true"/>
+		<action application="set" data="follow_me_enabled=${user_data ${destination_number}@${domain_name} var follow_me_enabled}" inline="true"/>
+		<action application="set" data="do_not_disturb=${user_data ${destination_number}@${domain_name} var do_not_disturb}" inline="true"/>
+		<action application="set" data="call_timeout=${user_data ${destination_number}@${domain_name} var call_timeout}" inline="true"/>
+		<action application="set" data="missed_call_app=${user_data ${destination_number}@${domain_name} var missed_call_app}" inline="true"/>
+		<action application="set" data="missed_call_data=${user_data ${destination_number}@${domain_name} var missed_call_data}" inline="true"/>
+		<action application="set" data="toll_allow=${user_data ${destination_number}@${domain_name} var toll_allow}" inline="true"/>
+		<action application="set" data="call_screen_enabled=${user_data ${destination_number}@${domain_name} var call_screen_enabled}" inline="true"/>
+		<action application="set" data="user_record=${user_data ${destination_number}@${domain_name} var user_record}" inline="true"/>
+	</condition>
+</extension>
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 f9c376455e..1825fa3f74 100644
--- a/app/dialplans/resources/switch/conf/dialplan/015_caller_details.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/015_caller_details.xml
@@ -1,9 +1,7 @@
-<context name="{v_context}">
-	<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"/>
-			<action application="set" data="caller_id_number=${caller_id_number}"/>
-		</condition>
-	</extension>
-</context>
+<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"/>
+		<action application="set" data="caller_id_number=${caller_id_number}"/>
+	</condition>
+</extension>
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 d0a332523c..691471a7ab 100644
--- a/app/dialplans/resources/switch/conf/dialplan/018_global-variables.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/018_global-variables.xml
@@ -1,7 +1,5 @@
-<context name="${domain_name}">
-	<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>
-	</extension>
-</context>
+<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>
+</extension>
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 6117b44b78..bf47e0514a 100644
--- a/app/dialplans/resources/switch/conf/dialplan/020_domain-variables.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/020_domain-variables.xml
@@ -1,8 +1,6 @@
-<context name="{v_context}">
-	<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"/>
-		</condition>
-	</extension>
-</context>
+<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"/>
+	</condition>
+</extension>
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 16bc6eb1c9..64f531c1d8 100644
--- a/app/dialplans/resources/switch/conf/dialplan/025_call_limit.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/025_call_limit.xml
@@ -1,7 +1,5 @@
-<context name="{v_context}">
-	<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>
-	</extension>
-</context>
+<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>
+</extension>
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 d175d2a711..cd42fcf99c 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,4 @@
-<context name="${domain_name}">
-  <extension name="is_loopback" number="" context="${domain_name}" 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>
@@ -7,5 +6,4 @@
 		<action application="set" data="outbound_caller_id_number=${user_data ${username}@${domain} var outbound_caller_id_number}" inline="true"/>
 		<action application="set" data="outbound_caller_id_name=${user_data ${username}@${domain} var outbound_caller_id_name}" inline="true"/>
 	</condition>
-  </extension>
-</context>
+</extension>
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 32d7fb43ef..57b958434f 100644
--- a/app/dialplans/resources/switch/conf/dialplan/035_call_direction.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/035_call_direction.xml
@@ -1,7 +1,5 @@
-<context name="{v_context}">
-	<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>
-	</extension>
-</context>
+<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>
+</extension>
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 910f6b9646..c618c9a184 100644
--- a/app/dialplans/resources/switch/conf/dialplan/035_is_local.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/035_is_local.xml
@@ -1,7 +1,5 @@
-<context name="{v_context}">
-	<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>
-	</extension>
-</context>
+<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>
+</extension>
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 5ef252fbff..a4b5b2f4b5 100644
--- a/app/dialplans/resources/switch/conf/dialplan/040_call_block.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/040_call_block.xml
@@ -1,7 +1,5 @@
-<context name="{v_context}">
-	<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>
-	</extension>
-</context>
+<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>
+</extension>
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 80265ddb94..d3c5be67af 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,15 +1,13 @@
-<context name="{v_context}">
-	<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 -->
-			<anti-action application="set" data="bind_target=peer" inline="true"/>
-		</condition>
-		<condition>
-			<action application="bind_digit_action" data="local,*2,exec:record_session,$${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},${bind_target}"/>
-			<action application="digit_action_set_realm" data="local"/>
-			<action application="bind_digit_action" data="local,*5,api:uuid_record,${uuid} mask ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},${bind_target}"/>
-			<action application="bind_digit_action" data="local,*6,api:uuid_record,${uuid} unmask ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},${bind_target}"/>
-		</condition>
-	</extension>
-</context>
+<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 -->
+		<anti-action application="set" data="bind_target=peer" inline="true"/>
+	</condition>
+	<condition>
+		<action application="bind_digit_action" data="local,*2,exec:record_session,$${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},${bind_target}"/>
+		<action application="digit_action_set_realm" data="local"/>
+		<action application="bind_digit_action" data="local,*5,api:uuid_record,${uuid} mask ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},${bind_target}"/>
+		<action application="bind_digit_action" data="local,*6,api:uuid_record,${uuid} unmask ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},${bind_target}"/>
+	</condition>
+</extension>
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 01ee7038d5..898be2c83f 100644
--- a/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml
@@ -1,59 +1,58 @@
-<context name="{v_context}">
-	<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"/>
-		</condition>
-		<condition field="${user_exists}" expression="^true$" break="never"/>
-		<condition field="${call_direction}" expression="^inbound$" break="never"/>
-		<condition field="${user_record}" expression="^inbound$" break="never">
-			<action application="set" data="record_session=true" inline="true"/>
-		</condition>
-		<condition field="${user_exists}" expression="^true$" break="never"/>
-		<condition field="${call_direction}" expression="^outbound$" break="never"/>
-		<condition field="${user_record}" expression="^outbound$" break="never">
-			<action application="set" data="record_session=true" inline="true"/>
-		</condition>
-		<condition field="${user_exists}" expression="^true$" break="never"/>
-		<condition field="${call_direction}" expression="^local$" break="never"/>
-		<condition field="${user_record}" expression="^local$" break="never">
-			<action application="set" data="record_session=true" inline="true"/>
-		</condition>
-		<condition field="${from_user_exists}" expression="^true$" break="never">
-			<action application="set" data="from_user_record=${user_data ${sip_from_user}@${sip_from_host} var user_record}" inline="true"/>
-		</condition>
-		<condition field="${from_user_exists}" expression="^true$" break="never"/>
-		<condition field="${from_user_record}" expression="^all$" break="never">
-			<action application="set" data="record_session=true" inline="true"/>
-		</condition>
-		<condition field="${from_user_exists}" expression="^true$" break="never"/>
-		<condition field="${call_direction}" expression="^inbound$" break="never"/>
-		<condition field="${from_user_record}" expression="^inbound$" break="never">
-			<action application="set" data="record_session=true" inline="true"/>
-		</condition>
-		<condition field="${from_user_exists}" expression="^true$" break="never"/>
-		<condition field="${call_direction}" expression="^outbound$" break="never"/>
-		<condition field="${from_user_record}" expression="^outbound$" break="never">
-			<action application="set" data="record_session=true" inline="true"/>
-		</condition>
-		<condition field="${from_user_exists}" expression="^true$" break="never"/>
-		<condition field="${call_direction}" expression="^local$" break="never"/>
-		<condition field="${from_user_record}" expression="^local$" break="never">
-			<action application="set" data="record_session=true" inline="true"/>
-		</condition>
-		<condition field="${record_session}" expression="^true$">
-			<action application="set" data="record_path=${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}" inline="true" enabled="true"/>
-			<action application="set" data="record_name=${uuid}.${record_ext}" inline="true" enabled="true"/>
-			<!--<action application="set" data="record_name=${destination_number}-${caller_id_number}_${strftime(%Y-%m-%d %H:%M)}.${record_ext}" inline="true" enabled="true"/>-->
-			<action application="mkdir" data="${record_path}" enabled="true"/>
-			<action application="set" data="recording_follow_transfer=true" inline="true" enabled="true"/>
-			<action application="bind_digit_action" data="local,*5,api:uuid_record,${uuid} mask ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},both,self" enabled="true"/>
-			<action application="bind_digit_action" data="local,*6,api:uuid_record,${uuid} unmask ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},both,self" enabled="true"/>
-			<action application="set" data="record_append=true" inline="true" enabled="true"/>
-			<action application="set" data="record_in_progress=true" inline="true" enabled="true"/>
-			<action application="set" data="api_on_answer=uuid_record ${uuid} start ${record_path}/${record_name}" inline="false" enabled="false"/>
-			<action application="set" data="RECORD_ANSWER_REQ=true" enabled="true"/>
-			<action application="record_session" data="${record_path}/${record_name}" enabled="true"/>
-		</condition>
-	</extension>
-</context>
+<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"/>
+	</condition>
+	<condition field="${user_exists}" expression="^true$" break="never"/>
+	<condition field="${call_direction}" expression="^inbound$" break="never"/>
+	<condition field="${user_record}" expression="^inbound$" break="never">
+		<action application="set" data="record_session=true" inline="true"/>
+	</condition>
+	<condition field="${user_exists}" expression="^true$" break="never"/>
+	<condition field="${call_direction}" expression="^outbound$" break="never"/>
+	<condition field="${user_record}" expression="^outbound$" break="never">
+		<action application="set" data="record_session=true" inline="true"/>
+	</condition>
+	<condition field="${user_exists}" expression="^true$" break="never"/>
+	<condition field="${call_direction}" expression="^local$" break="never"/>
+	<condition field="${user_record}" expression="^local$" break="never">
+		<action application="set" data="record_session=true" inline="true"/>
+	</condition>
+	<condition field="${from_user_exists}" expression="^true$" break="never">
+		<action application="set" data="from_user_record=${user_data ${sip_from_user}@${sip_from_host} var user_record}" inline="true"/>
+	</condition>
+	<condition field="${from_user_exists}" expression="^true$" break="never"/>
+	<condition field="${from_user_record}" expression="^all$" break="never">
+		<action application="set" data="record_session=true" inline="true"/>
+	</condition>
+	<condition field="${from_user_exists}" expression="^true$" break="never"/>
+	<condition field="${call_direction}" expression="^inbound$" break="never"/>
+	<condition field="${from_user_record}" expression="^inbound$" break="never">
+		<action application="set" data="record_session=true" inline="true"/>
+	</condition>
+	<condition field="${from_user_exists}" expression="^true$" break="never"/>
+	<condition field="${call_direction}" expression="^outbound$" break="never"/>
+	<condition field="${from_user_record}" expression="^outbound$" break="never">
+		<action application="set" data="record_session=true" inline="true"/>
+	</condition>
+	<condition field="${from_user_exists}" expression="^true$" break="never"/>
+	<condition field="${call_direction}" expression="^local$" break="never"/>
+	<condition field="${from_user_record}" expression="^local$" break="never">
+		<action application="set" data="record_session=true" inline="true"/>
+	</condition>
+	<condition field="${record_session}" expression="^true$">
+		<action application="set" data="record_path=${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}" inline="true" enabled="true"/>
+		<action application="set" data="record_name=${uuid}.${record_ext}" inline="true" enabled="true"/>
+		<!--<action application="set" data="record_name=${destination_number}-${caller_id_number}_${strftime(%Y-%m-%d %H:%M)}.${record_ext}" inline="true" enabled="true"/>-->
+		<action application="mkdir" data="${record_path}" enabled="true"/>
+		<action application="set" data="recording_follow_transfer=true" inline="true" enabled="true"/>
+		<action application="bind_digit_action" data="local,*5,api:uuid_record,${uuid} mask ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},both,self" enabled="true"/>
+		<action application="bind_digit_action" data="local,*6,api:uuid_record,${uuid} unmask ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},both,self" enabled="true"/>
+		<action application="set" data="record_append=true" inline="true" enabled="true"/>
+		<action application="set" data="record_in_progress=true" inline="true" enabled="true"/>
+		<action application="set" data="api_on_answer=uuid_record ${uuid} start ${record_path}/${record_name}" inline="false" enabled="false"/>
+		<action application="set" data="RECORD_ANSWER_REQ=true" enabled="true"/>
+		<action application="record_session" data="${record_path}/${record_name}" enabled="true"/>
+	</condition>
+</extension>
+
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 5bb4e20945..4a771a6026 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,8 +1,7 @@
-<context name="${domain_name}">
-	<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"/>
-		</condition>
-	</extension>
-</context>
+<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"/>
+	</condition>
+</extension>
+
diff --git a/app/dialplans/resources/switch/conf/dialplan/060_redial.xml b/app/dialplans/resources/switch/conf/dialplan/060_redial.xml
index 01fbc0acc3..4be501298b 100644
--- a/app/dialplans/resources/switch/conf/dialplan/060_redial.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/060_redial.xml
@@ -1,10 +1,8 @@
-<context name="{v_context}">
-	<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>
-		<condition field="" expression="" break="never">
-			<action application="hash" data="insert/${domain_name}-last_dial/${caller_id_number}/${destination_number}"/>
-		</condition>
-	</extension>
-</context>
+<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>
+	<condition field="" expression="" break="never">
+		<action application="hash" data="insert/${domain_name}-last_dial/${caller_id_number}/${destination_number}"/>
+	</condition>
+</extension>
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 ceccf57d5b..0acdc711b9 100644
--- a/app/dialplans/resources/switch/conf/dialplan/070_speed_dial.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/070_speed_dial.xml
@@ -1,8 +1,7 @@
-<context name="{v_context}">
-	<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"/>
-		</condition>
-	</extension>
-</context>
+<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"/>
+	</condition>
+</extension>
+
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 e8e300bdb7..b3d8934548 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,22 +1,20 @@
-<context name="{v_context}">
-	<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"/>
-		</condition>
-		<condition field="${call_direction}" expression="outbound"/>
-		<condition field="${emergency_caller_id_number}" expression="^$" break="never">
-			<action application="set" data="emergency_caller_id_number=${default_emergency_caller_id_number}" inline="true"/>
-		</condition>
-		<condition field="${call_direction}" expression="outbound"/>
-		<condition field="${loopback_leg}" expression="^$"/>
-		<condition field="${outbound_caller_id_name}" expression="^$" break="never">
-			<action application="set" data="outbound_caller_id_name=${default_outbound_caller_id_name}" inline="true"/>
-		</condition>
-		<condition field="${call_direction}" expression="outbound"/>
-		<condition field="${loopback_leg}" expression="^$"/>
-		<condition field="${outbound_caller_id_number}" expression="^$" break="never">
-			<action application="set" data="outbound_caller_id_number=${default_outbound_caller_id_number}" inline="true"/>
-		</condition>
-	</extension>
-</context>
+<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"/>
+	</condition>
+	<condition field="${call_direction}" expression="outbound"/>
+	<condition field="${emergency_caller_id_number}" expression="^$" break="never">
+		<action application="set" data="emergency_caller_id_number=${default_emergency_caller_id_number}" inline="true"/>
+	</condition>
+	<condition field="${call_direction}" expression="outbound"/>
+	<condition field="${loopback_leg}" expression="^$"/>
+	<condition field="${outbound_caller_id_name}" expression="^$" break="never">
+		<action application="set" data="outbound_caller_id_name=${default_outbound_caller_id_name}" inline="true"/>
+	</condition>
+	<condition field="${call_direction}" expression="outbound"/>
+	<condition field="${loopback_leg}" expression="^$"/>
+	<condition field="${outbound_caller_id_number}" expression="^$" break="never">
+		<action application="set" data="outbound_caller_id_number=${default_outbound_caller_id_number}" inline="true"/>
+	</condition>
+</extension>
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 ec6e073f12..659a90442f 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,4 +1,3 @@
-
 <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="^$"/>
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 7e74d69728..e80e33c55e 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,4 +1,3 @@
-
 <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"/>
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 b0400b388b..5bc46868e0 100644
--- a/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml
@@ -1,4 +1,3 @@
-
 <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"/>
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 fd1e55fc22..60f230fb18 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,8 +1,6 @@
-<context name="{v_context}">
-	<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"/>
-		</condition>
-	</extension>
-</context>
+<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"/>
+	</condition>
+</extension>
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 eb276bb439..cfefa310e3 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,4 +1,3 @@
-
 <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"/>
diff --git a/app/dialplans/resources/switch/conf/dialplan/220_provision.xml b/app/dialplans/resources/switch/conf/dialplan/220_provision.xml
index 86a7a1588f..877577060e 100644
--- a/app/dialplans/resources/switch/conf/dialplan/220_provision.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/220_provision.xml
@@ -1,4 +1,3 @@
-
 <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"/>
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 df04ab4f36..c3553a51e4 100644
--- a/app/dialplans/resources/switch/conf/dialplan/230_group-intercept.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/230_group-intercept.xml
@@ -1,4 +1,3 @@
-
 <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       -->
diff --git a/app/dialplans/resources/switch/conf/dialplan/240_page.xml b/app/dialplans/resources/switch/conf/dialplan/240_page.xml
index bcc51850ee..077b103f07 100644
--- a/app/dialplans/resources/switch/conf/dialplan/240_page.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/240_page.xml
@@ -1,4 +1,3 @@
-
 <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" />
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 8881e7b23b..6c68f548e1 100644
--- a/app/dialplans/resources/switch/conf/dialplan/250_page-extension.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/250_page-extension.xml
@@ -1,4 +1,3 @@
-
 <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"/>
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 73bce7ac4e..82a8565038 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,4 +1,3 @@
-
 <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" >