diff --git a/src/mod/xml_int/mod_xml_radius/xml_radius.conf.xml b/src/mod/xml_int/mod_xml_radius/xml_radius.conf.xml
index 6349d05210..16e5df5fb6 100644
--- a/src/mod/xml_int/mod_xml_radius/xml_radius.conf.xml
+++ b/src/mod/xml_int/mod_xml_radius/xml_radius.conf.xml
@@ -74,9 +74,12 @@
       <param name="seqfile" value="/var/run/radius.seq"/>
     </connection>
     <fields>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_host" format="src-gw-ip=%s"/>
+      <param vendor="Cisco" name="h323-conf-id" variable_secondary="uuid" variable="originating_leg_uuid" format="%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="uuid" format="h323-call-id=%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_network_ip" format="src-gw-ip=%s"/>
       <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" format="src-gw-name=%s"/>
-      <param vendor="Cisco" name="h323-conf-id" variable="Core-UUID" format="%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" format="src-number-in=%s" />
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_user" format="dst-number-in=%s" />
       <param name="Called-Station-Id" variable="sip_to_user" format="%s"/>
       <param name="Calling-Station-Id" variable="sip_from_user" format="%s"/>
     </fields>
@@ -103,21 +106,27 @@
       <param name="seqfile" value="/var/run/radius.seq"/>
     </connection>
     <fields>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_host" format="src-gw-ip=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" format="src-gw-name=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_host" format="dst-gw-ip=%s"/>  
-      <param vendor="Cisco" name="h323-conf-id" variable_secondary="uuid" variable="originating_leg_uuid" format="%s"/>
-      <param vendor="Cisco" name="h323-setup-time"/>
-      <param vendor="Cisco" name="h323-connect-time"/>
       <param vendor="Cisco" name="h323-call-origin" variable="h323-call-origin" default="answer" format="%s"/>
-      <param name="Called-Station-Id" variable="sip_to_user" format="%s"/>
-      <param name="Calling-Station-Id" variable="sip_from_user" format="%s"/>
+      <param vendor="Cisco" name="h323-conf-id" variable_secondary="uuid" variable="originating_leg_uuid" format="%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="uuid" format="h323-call-id=%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_contact_host" format="src-gw-ip=%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" variable_secondary="ani" format="src-gw-name=%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" variable_secondary="ani" format="src-number-in=%s" />
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" variable_secondary="ani" format="src-number-out=%s" />
+      <param name="Calling-Station-Id" variable="sip_from_user" variable_secondary="ani" format="%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_host" format="dst-gw-ip=%s"/>  
+      <param vendor="Cisco" name="Cisco-AVPair" variable="destination_number" format="dst-gw-name=%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="destination_number" format="dst-number-in=%s" />
+      <param vendor="Cisco" name="Cisco-AVPair" variable="destination_number" format="dst-number-out=%s" />
+      <param name="Called-Station-Id" variable="destination_number" format="%s"/>
+      <param vendor="Cisco" name="h323-setup-time"/>
     </fields>
-<!--    <conditions>
-      <condition>
-	<param var="direction" regex="^outbound$"/>
-      </condition> 
-    </conditions> -->
+  <conditions>
+    <condition>
+      <!-- anti="true" will cause any leg that matches to not be logged -->
+      <param var="sip_to_host" regex="^8\.8\.8\.8" anti="true"/>
+    </condition>
+  </conditions>
   </acct_start>
   <acct_end>
     <connection name="testing">
@@ -129,25 +138,30 @@
       <param name="seqfile" value="/var/run/radius.seq"/>
     </connection>
     <fields>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_host" format="src-gw-ip=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" format="src-gw-name=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_host" format="dst-gw-ip=%s"/> 
+      <param vendor="Cisco" name="h323-call-origin" variable="h323-call-origin" default="answer" format="%s"/>
       <param vendor="Cisco" name="h323-conf-id" variable_secondary="uuid" variable="originating_leg_uuid" format="%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="uuid" format="h323-call-id=%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_contact_host" format="src-gw-ip=%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" variable_secondary="ani" format="src-gw-name=%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" variable_secondary="ani" format="src-number-in=%s" />
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" variable_secondary="ani" format="src-number-out=%s" />
+      <param name="Calling-Station-Id" variable="sip_from_user" variable_secondary="ani" format="%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_host" format="dst-gw-ip=%s"/>  
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_user" variable_secondary="dialed_extension" format="dst-gw-name=%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_user" variable_secondary="dialed_extension" format="dst-number-in=%s" />
+      <param name="Called-Station-Id" variable="destination_number" format="%s"/>
       <param vendor="Cisco" name="h323-setup-time"/>
       <param vendor="Cisco" name="h323-connect-time"/>
       <param vendor="Cisco" name="h323-disconnect-time"/>
       <param vendor="Cisco" name="h323-disconnect-cause"/>
-      <param vendor="Cisco" name="h323-call-origin" variable="h323-call-origin" format="%s" default="answer"/>
-      <param name="Called-Station-Id" variable="sip_to_user" format="%s"/>
       <param name="Acct-Session-Time" variable="billsec" format="%s"/>
-      <param name="Calling-Station-Id" variable="sip_from_user" format="%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" format="src-number-out=%s"/>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_user" format="dst-number-out=%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable_secondary="progressmsec" variable="progress_mediamsec" format="pdd-time=%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="destination_number" format="dst-number-out=%s"/>
     </fields>
-<!--    <conditions>
-      <condition>
-	<param var="direction" regex="^outbound$"/>
-      </condition> 
-    </conditions> -->
+  <conditions>
+    <condition>
+      <param var="sip_to_host" regex="^8\.8\.8\.8" anti="true"/>
+    </condition>
+  </conditions>
   </acct_end>
 </configuration>