diff --git a/app/dialplan/resources/switch/conf/dialplan/000_global.xml b/app/dialplan/resources/switch/conf/dialplan/000_global.xml
index 5da2464730..df13d9bb15 100644
--- a/app/dialplan/resources/switch/conf/dialplan/000_global.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/000_global.xml
@@ -1,9 +1,7 @@
 <context name="{v_context}">
 	<extension name="global" number="" continue="true" app_uuid="34dd307b-fffe-4ead-990c-3d070e288126">
 		<condition>
-			<action application="export" data="origination_callee_id_name=${destination_number}"/>
-			<action application="set" data="RFC2822_DATE=${strftime(%a, %d %b %Y %T %z)}"/>
 			<action application="lua" data="app.lua dialplan"/>
 		</condition>
 	</extension>
-</context>
\ No newline at end of file
+</context>
diff --git a/app/dialplan/resources/switch/conf/dialplan/010_call_direction.xml b/app/dialplan/resources/switch/conf/dialplan/010_call_direction.xml
new file mode 100644
index 0000000000..fda5027bbb
--- /dev/null
+++ b/app/dialplan/resources/switch/conf/dialplan/010_call_direction.xml
@@ -0,0 +1,7 @@
+<context name="{v_context}">
+	<extension name="global" number="" continue="true" app_uuid="3780f814-5543-4350-b65d-563512d1fe71">
+		<condition field="${call_direction}" expression="^(inbound|outbound|local)$">
+			<action application="set" data="call_direction=local"/>
+		</condition>
+	</extension>
+</context>
diff --git a/app/dialplan/resources/switch/conf/dialplan/020_variables.xml b/app/dialplan/resources/switch/conf/dialplan/020_variables.xml
new file mode 100644
index 0000000000..a5abfe6a26
--- /dev/null
+++ b/app/dialplan/resources/switch/conf/dialplan/020_variables.xml
@@ -0,0 +1,8 @@
+<context name="{v_context}">
+	<extension name="global" number="" continue="true" app_uuid="9f356fe7-8cf8-4c14-8fe2-6daf89304458">
+		<condition>
+			<action application="export" data="origination_callee_id_name=${destination_number}"/>
+			<action application="set" data="RFC2822_DATE=${strftime(%a, %d %b %Y %T %z)}"/>
+		</condition>
+	</extension>
+</context>
diff --git a/app/dialplan/resources/switch/conf/dialplan/020_call_block.xml b/app/dialplan/resources/switch/conf/dialplan/030_call_block.xml
similarity index 100%
rename from app/dialplan/resources/switch/conf/dialplan/020_call_block.xml
rename to app/dialplan/resources/switch/conf/dialplan/030_call_block.xml