am b8a78870: am 96f93375: Add mms to the CDMA Verizon apns.

* commit 'b8a7887047ddf0c42d44feac9b69b73179013f43':
  Add mms to the CDMA Verizon apns.
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index 310e774..0a7fe11 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -20,6 +20,14 @@
 <!-- use empty string to specify no proxy or port -->
 <!-- This version must agree with that in apps/common/res/apns.xml -->
 <apns version="8">
+
+  <apn carrier="Cosmote Wireless Internet"
+      mcc="202"
+      mnc="01"
+      apn=""
+      type="ia"
+  />
+
   <apn carrier="Cosmote Wireless Internet"
       mcc="202"
       mnc="01"
@@ -40,8 +48,15 @@
   <apn carrier="Vf Mobile Internet"
       mcc="202"
       mnc="05"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="Vf Mobile Internet"
+      mcc="202"
+      mnc="05"
       apn="internet.vodafone.gr"
-      type="default,supl,dun"
+      type="default,supl"
   />
 
   <apn carrier="Vf MMS"
@@ -53,6 +68,7 @@
       mmsc="http://mms.vodafone.gr"
       mmsproxy="213.249.19.49"
       mmsport="5080"
+      authtype="1"
       type="mms"
   />
 
@@ -83,19 +99,40 @@
       type="mms"
   />
 
+  <apn carrier="Tele2 GPRS"
+      mcc="204"
+      mnc="02"
+      apn="internet.tele2.nl"
+      mmsc="http://mmsc.tele2.nl"
+      mmsproxy="193.12.40.64"
+      mmsport="8080"
+      type="default,supl,mms"
+  />
+
   <apn carrier="Vodafone NL"
       mcc="204"
       mnc="04"
       apn="live.vodafone.com"
       user="vodafone"
       password="vodafone"
+      authtype="1"
       mmsc="http://mmsc.mms.vodafone.nl"
       mmsproxy="192.168.251.150"
       mmsport="8799"
       type="default,supl,mms"
   />
 
-  <apn carrier="KPN Internet"
+  <apn carrier="KPN/Hi 4G LTE Mobiel internet"
+      mcc="204"
+      mnc="08"
+      apn="KPN4G.nl"
+      mmsc="http://mp.mobiel.kpn/mmsc"
+      mmsproxy="10.10.100.20"
+      mmsport="5080"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="KPN/Hi Mobiel Internet"
       mcc="204"
       mnc="08"
       apn="portalmmm.nl"
@@ -105,6 +142,27 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="Rabo Mobiel Int."
+      mcc="204"
+      mnc="08"
+      apn="rabo"
+      type="default,supl"
+      mvno_match_data="Rabo Mobiel"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Rabo Mobiel MMS"
+      mcc="204"
+      mnc="08"
+      apn="rabo"
+      mmsc="http://mp.mobiel.kpn/mmsc"
+      mmsproxy="10.10.100.10"
+      mmsport="5080"
+      type="mms"
+      mvno_match_data="Rabo Mobiel"
+      mvno_type="spn"
+  />
+
   <apn carrier="Telfort Internet"
       mcc="204"
       mnc="12"
@@ -118,7 +176,15 @@
   <apn carrier="T-Mobile Internet"
       mcc="204"
       mnc="16"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="T-Mobile Internet"
+      mcc="204"
+      mnc="16"
       apn="internet"
+      authtype="1"
       type="default,supl"
   />
 
@@ -128,6 +194,7 @@
       apn="mms"
       user="tmobilemms"
       password="tmobilemms"
+      authtype="1"
       mmsc="http://t-mobilemms"
       mmsproxy="10.10.10.11"
       mmsport="8080"
@@ -156,6 +223,7 @@
       mcc="204"
       mnc="16"
       apn="mms.ben"
+      authtype="1"
       mmsc="http://benmms/"
       mmsproxy="10.10.10.11"
       mmsport="8080"
@@ -164,54 +232,127 @@
       mvno_type="spn"
   />
 
-  <apn carrier="Rabo Mobiel"
+  <apn carrier="T-Mobile Internet"
       mcc="204"
       mnc="20"
-      apn="rabo.plus"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="T-Mobile Internet"
+      mcc="204"
+      mnc="20"
+      apn="internet"
+      authtype="1"
       type="default,supl"
   />
 
-  <apn carrier="Proximus MMS"
+  <apn carrier="T-Mobile MMS"
+      mcc="204"
+      mnc="20"
+      apn="mms"
+      user="tmobilemms"
+      password="tmobilemms"
+      authtype="1"
+      mmsc="http://t-mobilemms"
+      mmsproxy="10.10.10.11"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Px MMS"
       mcc="206"
       mnc="01"
-      apn="event.proximus.be"
+      apn="EVENT.PROXIMUS.BE"
       user="mms"
       password="mms"
+      authtype="1"
       mmsc="http://mmsc.proximus.be/mms"
       mmsproxy="10.55.14.75"
       mmsport="8080"
       type="mms"
   />
 
-  <apn carrier="Proximus Internet"
+  <apn carrier="Px Internet"
       mcc="206"
       mnc="01"
-      apn="internet.proximus.be"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="Px Internet"
+      mcc="206"
+      mnc="01"
+      apn="INTERNET.PROXIMUS.BE"
       type="default,supl"
   />
 
   <apn carrier="Telenet Internet"
-       mcc="206"
-       mnc="01"
-       apn="telenetwap.be"
-       type="default,supl"
-       mvno_match_data="2060188"
-       mvno_type="imsi"
+      mcc="206"
+      mnc="01"
+      apn="telenetwap.be"
+      type="default,supl"
+      mvno_match_data="2060188"
+      mvno_type="imsi"
   />
 
   <apn carrier="Telenet MMS"
-       mcc="206"
-       mnc="01"
-       apn="mms.be"
-       mmsc="http://mmsc.telenet.be"
-       mmsproxy="195.130.149.100"
-       mmsport="80"
-       type="mms"
-       mvno_match_data="2060188"
-       mvno_type="imsi"
+      mcc="206"
+      mnc="01"
+      apn="mms.be"
+      mmsc="http://mmsc.telenet.be"
+      mmsproxy="195.130.149.100"
+      mmsport="80"
+      type="mms"
+      mvno_match_data="2060188"
+      mvno_type="imsi"
   />
 
-  <apn carrier="Telenet"
+  <apn carrier="Virgin mobile"
+      mcc="206"
+      mnc="01"
+      apn="virgin-mobile.fr"
+      proxy="10.6.10.1"
+      port="8080"
+      type="default,supl"
+      mvno_match_data="52"
+      mvno_type="gid"
+  />
+
+  <apn carrier="VM MMS"
+      mcc="206"
+      mnc="01"
+      apn="virgin-mobile.fr"
+      mmsc="http://virginmms.fr"
+      mmsproxy="10.6.10.1"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="52"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MMS"
+      mcc="206"
+      mnc="01"
+      apn="mms.mobi.eastlink.ca"
+      mmsc="http://mmss.mobi.eastlink.ca"
+      mmsproxy="10.232.12.49"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="B6"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Internet"
+      mcc="206"
+      mnc="01"
+      apn="wisp.mobi.eastlink.ca"
+      type="default,supl,dun"
+      mvno_match_data="B6"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Telenet Internet"
       mcc="206"
       mnc="05"
       apn="telenetwap.be"
@@ -238,25 +379,27 @@
       type="mms"
   />
 
-  <apn carrier="Mobistar"
+  <apn carrier="Mobistar Internet"
       mcc="206"
       mnc="10"
       apn="mworld.be"
-      user="mobistar"
-      password="mobistar"
-      proxy="212.65.63.143"
-      port="8080"
       type="default,supl"
   />
 
-  <apn carrier="Base"
+  <apn carrier="BASE WAP"
+      mcc="206"
+      mnc="20"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="BASE WAP"
       mcc="206"
       mnc="20"
       apn="gprs.base.be"
       user="base"
       password="base"
-      proxy="172.31.198.37"
-      port="5080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -266,6 +409,7 @@
       apn="mms.base.be"
       user="base"
       password="base"
+      authtype="1"
       mmsc="http://mmsc.base.be"
       mmsproxy="217.72.235.1"
       mmsport="8080"
@@ -275,10 +419,17 @@
   <apn carrier="Orange World"
       mcc="208"
       mnc="01"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="Orange World"
+      mcc="208"
+      mnc="01"
       apn="orange"
       user="orange"
       password="orange"
-      authtype="2"
+      authtype="1"
       type="default,supl"
   />
 
@@ -291,7 +442,7 @@
       mmsc="http://mms.orange.fr"
       mmsproxy="192.168.10.200"
       mmsport="8080"
-      authtype="2"
+      authtype="1"
       type="mms"
   />
 
@@ -311,8 +462,11 @@
       mcc="208"
       mnc="01"
       apn="ofnew.fr"
+      proxy="192.168.10.100"
+      port="8080"
       user="orange"
       password="orange"
+      authtype="1"
       type="default,supl"
       mvno_match_data="33"
       mvno_type="gid"
@@ -327,6 +481,7 @@
       mmsc="http://mms.orange.fr"
       mmsproxy="192.168.10.200"
       mmsport="8080"
+      authtype="1"
       type="mms"
       mvno_match_data="33"
       mvno_type="gid"
@@ -338,6 +493,7 @@
       apn="ofnew.fr"
       user="orange"
       password="orange"
+      authtype="1"
       type="default,supl"
       mvno_match_data="52"
       mvno_type="gid"
@@ -352,6 +508,7 @@
       mmsc="http://mms.orange.fr"
       mmsproxy="192.168.10.200"
       mmsport="8080"
+      authtype="1"
       type="mms"
       mvno_match_data="52"
       mvno_type="gid"
@@ -363,6 +520,7 @@
       apn="ofnew.fr"
       user="orange"
       password="orange"
+      authtype="1"
       type="default,supl"
       mvno_match_data="4E"
       mvno_type="gid"
@@ -377,6 +535,7 @@
       mmsc="http://mms.orange.fr"
       mmsproxy="192.168.10.200"
       mmsport="8080"
+      authtype="1"
       type="mms"
       mvno_match_data="4E"
       mvno_type="gid"
@@ -406,21 +565,21 @@
   <apn carrier="SFR webphone"
       mcc="208"
       mnc="10"
-      apn="sl2sfr"
-      type="default,supl"
+      apn=""
+      type="ia"
   />
 
-  <apn carrier="SFR Mobile"
+  <apn carrier="SFR webphone"
       mcc="208"
       mnc="10"
-      apn="wapsfr"
+      apn="sl2sfr"
       type="default,supl"
   />
 
   <apn carrier="MMS"
       mcc="208"
       mnc="10"
-      apn="mmssfr"
+      apn="sl2sfr"
       mmsc="http://mms1"
       mmsproxy="10.151.0.1"
       mmsport="8080"
@@ -451,8 +610,6 @@
   <apn carrier="Auchan WAP"
       mcc="208"
       mnc="10"
-      proxy="192.168.21.8"
-      port="8080"
       apn="wap65"
       type="default,supl"
       mvno_match_data="A MOBILE"
@@ -516,9 +673,7 @@
   <apn carrier="Coriolis WAP"
       mcc="208"
       mnc="10"
-      proxy="192.168.21.6"
-      port="8080"
-      apn="wapcoriolis"
+      apn="fnetcoriolis"
       type="default,supl"
       mvno_match_data="12"
       mvno_type="gid"
@@ -599,16 +754,6 @@
       mvno_type="gid"
   />
 
-  <apn carrier="Bouygues Telecom"
-      mcc="208"
-      mnc="20"
-      apn="mmsbouygtel.com"
-      mmsc="http://mms.bouyguestelecom.fr/mms/wapenc"
-      mmsproxy="62.201.129.226"
-      mmsport="8080"
-      type="default,supl,mms"
-  />
-
   <apn carrier="Free"
       mcc="208"
       mnc="15"
@@ -624,6 +769,16 @@
       type="mms"
   />
 
+  <apn carrier="Bouygues Telecom"
+      mcc="208"
+      mnc="20"
+      apn="mmsbouygtel.com"
+      mmsc="http://mms.bouyguestelecom.fr/mms/wapenc"
+      mmsproxy="62.201.129.226"
+      mmsport="8080"
+      type="default,supl,mms"
+  />
+
   <apn carrier="Virgin mobile"
       mcc="208"
       mnc="23"
@@ -639,7 +794,7 @@
       mcc="208"
       mnc="23"
       apn="virgin-mobile.fr"
-      mmsc="http://mmc.omeatelecom.fr/servlets/mms"
+      mmsc="http://virginmms.fr"
       mmsproxy="10.6.10.1"
       mmsport="8080"
       type="mms"
@@ -652,6 +807,8 @@
       mnc="26"
       apn="fnetnrj"
       type="default,supl"
+      mvno_match_data="4E"
+      mvno_type="gid"
   />
 
   <apn carrier="NRJ MMS"
@@ -662,6 +819,8 @@
       mmsproxy="10.143.156.5"
       mmsport="8080"
       type="mms"
+      mvno_match_data="4E"
+      mvno_type="gid"
   />
 
   <apn carrier="Internet movil"
@@ -670,6 +829,7 @@
       apn="airtelwap.es"
       user="wap@wap"
       password="wap125"
+      authtype="1"
       type="default,supl"
   />
 
@@ -682,12 +842,20 @@
       mmsc="http://mmsc.vodafone.es/servlets/mms"
       mmsproxy="212.73.32.10"
       mmsport="80"
+      authtype="1"
       type="mms"
   />
 
   <apn carrier="Orange Internet Móvil"
       mcc="214"
       mnc="03"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="Orange Internet Móvil"
+      mcc="214"
+      mnc="03"
       apn="orangeworld"
       user="orange"
       password="orange"
@@ -699,18 +867,50 @@
       mcc="214"
       mnc="03"
       apn="orangemms"
-      proxy="172.22.188.25"
-      port="8080"
       user="orange"
       password="orange"
       mmsc="http://mms.orange.es"
       mmsproxy="172.22.188.25"
       mmsport="8080"
-      authtype="2"
+      authtype="1"
       type="mms"
   />
 
-  <apn carrier="Yoigo Navegador"
+  <apn carrier="Euskaltel Internet"
+      mcc="214"
+      mnc="03"
+      apn="internet.euskaltel.mobi"
+      user="CLIENTE"
+      password="EUSKALTEL"
+      authtype="1"
+      type="default,supl"
+      mvno_type="imsi"
+      mvno_match_data="2140359"
+  />
+
+  <apn carrier="Euskaltel MMS"
+      mcc="214"
+      mnc="03"
+      apn="euskaltelmms.euskaltel.mobi"
+      user="MMS"
+      password="EUSKALTEL"
+      authtype="1"
+      mmsc="http://mms.euskaltel.mobi"
+      mmsproxy="172.16.18.74"
+      mmsport="8080"
+      type="mms"
+      mvno_type="imsi"
+      mvno_match_data="2140359"
+  />
+
+  <apn carrier="Yoigo Internet"
+      mcc="214"
+      mnc="04"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="Yoigo Internet"
       mcc="214"
       mnc="04"
       apn="internet"
@@ -757,6 +957,7 @@
       mmsc="http://mms.euskaltel.mobi"
       mmsproxy="172.16.18.74"
       mmsport="8080"
+      authtype="1"
       type="mms"
       mvno_match_data="0008"
       mvno_type="gid"
@@ -768,6 +969,7 @@
       apn="internet.euskaltel.mobi"
       user="CLIENTE"
       password="EUSKALTEL"
+      authtype="1"
       type="default,supl"
       mvno_match_data="0008"
       mvno_type="gid"
@@ -777,6 +979,7 @@
       mcc="214"
       mnc="06"
       apn="internet.mundo-r.com"
+      authtype="1"
       type="default,supl"
       mvno_match_data="2140612"
       mvno_type="imsi"
@@ -785,10 +988,11 @@
   <apn carrier="MMS R"
       mcc="214"
       mnc="06"
-      apn="euskaltelmms.euskaltel.mobi"
+      apn="mms.mundo-r.com"
       mmsc="http://mms.mundo-r.com"
       mmsproxy="10.0.157.169"
       mmsport="8080"
+      authtype="1"
       type="mms"
       mvno_match_data="2140612"
       mvno_type="imsi"
@@ -800,6 +1004,7 @@
       apn="internet.telecable.es"
       user="telecable"
       password="telecable"
+      authtype="1"
       type="default,supl"
       mvno_match_data="2140613"
       mvno_type="imsi"
@@ -814,6 +1019,7 @@
       mmsc="http://mms.telecable.es/mms/"
       mmsproxy="212.89.0.84"
       mmsport="8080"
+      authtype="1"
       type="mms"
       mvno_match_data="2140613"
       mvno_type="imsi"
@@ -825,6 +1031,7 @@
       apn="gprs.eroskimovil.es"
       user="wap@wap"
       password="wap125"
+      authtype="1"
       type="default,supl"
       mvno_match_data="2140606"
       mvno_type="imsi"
@@ -839,23 +1046,12 @@
       mmsc="http://mms.eroskimovil.es/servlets/mms"
       mmsproxy="212.73.32.10"
       mmsport="80"
+      authtype="1"
       type="mms"
       mvno_match_data="2140606"
       mvno_type="imsi"
   />
 
-  <apn carrier="Movistar MMS"
-      mcc="214"
-      mnc="07"
-      apn="telefonica.es"
-      user="telefonica"
-      password="telefonica"
-      mmsc="http://mms.movistar.com"
-      mmsproxy="10.138.255.5"
-      mmsport="8080"
-      type="mms"
-  />
-
   <apn carrier="Movistar"
       mcc="214"
       mnc="07"
@@ -864,7 +1060,11 @@
       password="telefonica"
       proxy="10.138.255.133"
       port="8080"
-      type="default,supl"
+      mmsc="http://mms.movistar.com"
+      mmsproxy="10.138.255.5"
+      mmsport="8080"
+      authtype="1"
+      type="default,supl,mms"
   />
 
   <apn carrier="Jazztel Internet"
@@ -882,7 +1082,7 @@
       apn="jazzmms"
       user=""
       password=""
-      mmsc="http://jazztelmms.com/servlets/mms/"
+      mmsc="http://jazztelmms.com/servlets/mms"
       mmsproxy="37.132.0.10"
       mmsport="8080"
       authtype="1"
@@ -900,6 +1100,7 @@
       mmsc="http://mms.euskaltel.mobi"
       mmsproxy="172.16.18.74"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -909,6 +1110,7 @@
       apn="internet.euskaltel.mobi"
       user="CLIENTE"
       password="EUSKALTEL"
+      authtype="1"
       type="default,supl"
   />
 
@@ -950,6 +1152,16 @@
       type="mms"
   />
 
+  <apn carrier="Simyo Internet"
+      mcc="214"
+      mnc="19"
+      apn="gprs-service.com"
+      mmsc="http://217.18.32.180:8080"
+      mmsproxy="217.18.32.181"
+      mmsport="8080"
+      type="default,supl,mms"
+  />
+
   <apn carrier="Jazztel Internet"
       mcc="214"
       mnc="21"
@@ -964,7 +1176,7 @@
       user=""
       password=""
       authtype="1"
-      mmsc="http://jazztelmms.com/servlets/mms/"
+      mmsc="http://jazztelmms.com/servlets/mms"
       mmsproxy="37.132.0.10"
       mmsport="8080"
       type="mms"
@@ -987,47 +1199,137 @@
       type="default,supl"
   />
 
-  <apn carrier="T-Mobile MMS"
+  <apn carrier="Djuice MMS"
+      mcc="216"
+      mnc="01"
+      apn="mms"
+      mmsproxy="84.225.255.1"
+      mmsport="8080"
+      mmsc="http://mmsc.pgsm.hu/"
+      type="mms"
+      authtype="0"
+      mvno_match_data="Djuice"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Djuice NET"
+      mcc="216"
+      mnc="01"
+      apn="net"
+      type="default"
+      authtype="0"
+      mvno_match_data="Djuice"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Djuice WAP"
+      mcc="216"
+      mnc="01"
+      apn="wap"
+      proxy="84.225.255.1"
+      port="8080"
+      type="default"
+      authtype="0"
+      mvno_match_data="Djuice"
+      mvno_type="spn"
+  />
+
+  <apn carrier="T-Mobile H"
       mcc="216"
       mnc="30"
-      apn="mms"
-      user="mms"
-      password="mms"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="T-Mobile H MMS"
+      mcc="216"
+      mnc="30"
+      apn="internet.telekom"
       mmsc="http://mms.t-mobile.hu/servlets/mms"
       mmsproxy="212.51.126.10"
       mmsport="8080"
       type="mms"
+      authtype="1"
   />
 
-  <apn carrier="Web"
+  <apn carrier="T-Mobile H"
       mcc="216"
       mnc="30"
-      apn="wnw"
+      apn="internet.telekom"
       type="default,supl"
+      authtype="1"
   />
 
-  <apn carrier="VF internet"
+  <apn carrier="Vodafone Internet"
       mcc="216"
       mnc="70"
       apn="internet.vodafone.net"
       type="default,supl"
+      authtype="0"
+      mvno_match_data="21670xx2xxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="Vodafone MMS"
       mcc="216"
       mnc="70"
       apn="mms.vodafone.net"
-      mmsc="http://mms.vodafone.hu/servlets/mms"
       mmsproxy="80.244.97.2"
       mmsport="8080"
+      mmsc="http://mms.vodafone.hu/servlets/mms"
       type="mms"
+      authtype="0"
+      mvno_match_data="21670xx2xxx"
+      mvno_type="imsi"
   />
 
-  <apn carrier="VMAX Internet"
+  <apn carrier="Vodafone Live!"
+      mcc="216"
+      mnc="70"
+      apn="wap.vodafone.net"
+      user="vodawap"
+      password="vodawap"
+      proxy="10.9.8.7"
+      port="8080"
+      type="default,supl"
+      authtype="1"
+      mvno_match_data="21670xx2xxx"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Vodafone Internet VitaMAX"
       mcc="216"
       mnc="70"
       apn="vitamax.internet.vodafone.net"
       type="default,supl"
+      mvno_match_data="21670xx1xxx"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Vodafone MMS"
+      mcc="216"
+      mnc="70"
+      apn="mms.vodafone.net"
+      mmsproxy="80.244.97.2"
+      mmsport="8080"
+      mmsc="http://mms.vodafone.hu/servlets/mms"
+      type="mms"
+      mvno_match_data="21670xx1xxx"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Vodafone Live! VitaMAX"
+      mcc="216"
+      mnc="70"
+      apn="vitamax.wap.vodafone.net"
+      user="vodawap"
+      password="vodawap"
+      proxy="10.9.8.7"
+      port="8080"
+      type="default,supl"
+      authtype="1"
+      mvno_match_data="21670xx1xxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="HT Eronet WAP"
@@ -1087,7 +1389,7 @@
       mnc="90"
       apn="mms.bhmobile.ba"
       mmsc="http://mms.bhmobile.ba/cmmsc/post"
-      mmsproxy="195.222.56.041"
+      mmsproxy="195.222.56.41"
       mmsport="8080"
       type="mms"
   />
@@ -1099,16 +1401,24 @@
       mmsc="http://mms.t-mobile.hr/servlets/mms"
       mmsproxy="10.12.0.4"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
   <apn carrier="T-Mobile"
       mcc="219"
       mnc="01"
-      apn="web.htgprs"
-      type="default,supl"
+      apn=""
+      type="ia"
   />
 
+  <apn carrier="T-Mobile Internet"
+      mcc="219"
+      mnc="01"
+      apn="internet.ht.hr"
+      authtype="1"
+      type="default,supl"
+  />
 
   <apn carrier="Tele2"
       mcc="219"
@@ -1123,9 +1433,19 @@
   <apn carrier="Broadband"
       mcc="219"
       mnc="10"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="Broadband"
+      mcc="219"
+      mnc="10"
       apn="data.vip.hr"
       user="38591"
       password="38591"
+      authtype="1"
+      proxy="212.91.99.91"
+      port="8080"
       type="default,supl"
   />
 
@@ -1133,8 +1453,6 @@
       mcc="219"
       mnc="10"
       apn="mms.vipnet.hr"
-      user="38591"
-      password="38591"
       mmsc="http://mms.vipnet.hr/servlets/mms"
       mmsproxy="212.91.99.91"
       mmsport="8080"
@@ -1149,6 +1467,7 @@
       password="gprs"
       proxy="217.65.192.33"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1193,6 +1512,7 @@
       password="064"
       proxy="172.17.88.198"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1205,6 +1525,7 @@
       mmsc="http://mms.mts064.telekom.rs/mms/wapenc"
       mmsproxy="172.17.85.131"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -1231,6 +1552,18 @@
       type="default,supl"
   />
 
+  <apn carrier="SaskTel"
+      mcc="204"
+      mnc="04"
+      apn="pda.stm.sk.ca"
+      type="default,mms,supl,dun"
+      mmsc="http://mms.sasktel.com/"
+      mmsproxy="mig.sasktel.com"
+      mmsport="80"
+      mvno_match_data="5A"
+      mvno_type="gid"
+  />
+
   <apn carrier="Vip GPRS"
       mcc="220"
       mnc="05"
@@ -1239,6 +1572,7 @@
       password="vipmobile"
       proxy="212.15.182.82"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1251,6 +1585,7 @@
       mmsc="http://mmsc.vipmobile.rs"
       mmsproxy="212.15.182.82"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -1258,16 +1593,6 @@
       mcc="222"
       mnc="01"
       apn="wap.tim.it"
-      user="WAPTIM"
-      password="WAPTIM"
-      authtype="1"
-      type="default,supl"
-  />
-
-  <apn carrier="TIM WEB"
-      mcc="222"
-      mnc="01"
-      apn="ibox.tim.it"
       type="default,supl"
   />
 
@@ -1281,6 +1606,35 @@
       type="mms"
   />
 
+  <apn carrier="Internet"
+      mcc="222"
+      mnc="01"
+      apn="internet.windmobile.ca"
+      type="default,supl"
+      protocol="IPV4V6"
+      mvno_match_data="FFFFFF00"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MMS"
+      mcc="222"
+      mnc="01"
+      apn="mms.windmobile.ca"
+      mmsc="http://mms.windmobile.ca"
+      mmsproxy="74.115.197.70"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="FFFFFF00"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Acc. Internet da cell"
+      mcc="222"
+      mnc="10"
+      apn=""
+      type="ia"
+  />
+
   <apn carrier="MMS Vodafone"
       mcc="222"
       mnc="10"
@@ -1305,13 +1659,6 @@
       type="default,supl"
   />
 
-  <apn carrier="WIND BIZ WEB"
-      mcc="222"
-      mnc="88"
-      apn="internet.wind.biz"
-      type="default,supl"
-  />
-
   <apn carrier="WIND MMS"
       mcc="222"
       mnc="88"
@@ -1322,6 +1669,28 @@
       type="mms"
   />
 
+  <apn carrier="Internet"
+      mcc="222"
+      mnc="88"
+      apn="internet.windmobile.ca"
+      type="default,supl"
+      protocol="IPV4V6"
+      mvno_match_data="FFFFFF00"
+      mvno_type="gid"
+  />
+
+  <apn carrier="MMS"
+      mcc="222"
+      mnc="88"
+      apn="mms.windmobile.ca"
+      mmsc="http://mms.windmobile.ca"
+      mmsproxy="74.115.197.70"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="FFFFFF00"
+      mvno_type="gid"
+  />
+
   <apn carrier="3"
       mcc="222"
       mnc="99"
@@ -1347,9 +1716,17 @@
   <apn carrier="Vodafone live!"
       mcc="226"
       mnc="01"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="Vodafone live!"
+      mcc="226"
+      mnc="01"
       apn="live.vodafone.com"
       user="live"
       password="vodafone"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1362,12 +1739,20 @@
       mmsc="http://multimedia/servlets/mms"
       mmsproxy="193.230.161.231"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
   <apn carrier="Cosmote Connect Mobile"
       mcc="226"
       mnc="03"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="Cosmote Connect Mobile"
+      mcc="226"
+      mnc="03"
       apn="broadband"
       type="default,supl"
   />
@@ -1381,6 +1766,7 @@
       mmsc="http://mmsc1.mms.cosmote.ro:8002"
       mmsproxy="10.252.1.62"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -1390,6 +1776,7 @@
       apn="wnw"
       user="wnw"
       password="wnw"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1407,12 +1794,20 @@
       mcc="226"
       mnc="05"
       apn="internet"
+      authtype="1"
       type="default,supl"
   />
 
   <apn carrier="Cosmote Connect Mobile"
       mcc="226"
       mnc="06"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="Cosmote Connect Mobile"
+      mcc="226"
+      mnc="06"
       apn="broadband"
       type="default,supl"
   />
@@ -1438,6 +1833,13 @@
       type="default,supl"
   />
 
+  <apn carrier="Orange Internet"
+      mcc="226"
+      mnc="10"
+      apn=""
+      type="ia"
+  />
+
   <apn carrier="Orange MMS"
       mcc="226"
       mnc="10"
@@ -1447,6 +1849,7 @@
       mmsc="http://wap.mms.orange.ro:8002"
       mmsproxy="62.217.247.252"
       mmsport="8799"
+      authtype="1"
       type="mms"
   />
 
@@ -1457,38 +1860,6 @@
       type="default"
   />
 
-  <apn carrier="Orange MMS SN" 
-      mcc="608" 
-      mnc="01" 
-      apn="mms" 
-      user="mms" 
-      password="mms" 
-      mmsc="http://mmsalize/servlets/mms" 
-      mmsproxy="172.16.30.9" 
-      mmsport="8080" 
-      type="mms"
-  />
-
-  <apn carrier="Orange Wap SN" 
-      mcc="608" 
-      mnc="01" 
-      apn="wap" 
-      user="wap" 
-      password="wap" 
-      proxy="172.16.30.9" 
-      port="8080"
-      type="default"
-  />
-
-  <apn carrier="Orange Web SN" 
-      mcc="608" 
-      mnc="01" 
-      apn="internet" 
-      user="internet" 
-      password="internet" 
-      type="default"
-  />
-
   <apn carrier="Swisscom MMS"
       mcc="228"
       mnc="01"
@@ -1545,9 +1916,17 @@
   <apn carrier="T-Mobile CZ"
       mcc="230"
       mnc="01"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="T-Mobile CZ"
+      mcc="230"
+      mnc="01"
       apn="internet.t-mobile.cz"
       user="wap"
       password="wap"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1560,6 +1939,7 @@
       mmsc="http://mms"
       mmsproxy="10.0.0.10"
       mmsport="80"
+      authtype="1"
       type="mms"
   />
 
@@ -1587,7 +1967,6 @@
       type="default,supl"
   />
 
-
   <apn carrier="Vodafone MMS"
       mcc="230"
       mnc="03"
@@ -1597,6 +1976,7 @@
       mmsc="http://mms"
       mmsproxy="10.11.10.111"
       mmsport="80"
+      authtype="1"
       type="mms"
   />
 
@@ -1613,6 +1993,7 @@
       apn="mms"
       user="wap"
       password="wap"
+      authtype="1"
       mmsc="http://imms.orange.sk"
       mmsproxy="213.151.208.145"
       mmsport="8799"
@@ -1625,6 +2006,7 @@
       apn="orangewap"
       user="wap"
       password="wap"
+      authtype="1"
       proxy="213.151.208.156"
       port="8799"
       type="default,supl"
@@ -1634,6 +2016,7 @@
       mcc="231"
       mnc="02"
       apn="internet"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1643,6 +2026,7 @@
       apn="mms"
       user="mms"
       password="mms"
+      authtype="1"
       mmsc="http://mms"
       mmsproxy="192.168.1.1"
       mmsport="8080"
@@ -1666,21 +2050,13 @@
       type="mms"
   />
 
-  <apn carrier="A1"
+  <apn carrier="live!"
       mcc="232"
       mnc="01"
       apn="a1.net"
       user="ppp@a1plus.at"
       password="ppp"
-      type="default,supl"
-  />
-
-  <apn carrier="aonMobil"
-      mcc="232"
-      mnc="01"
-      apn="aon.at"
-      user="mobil@aon.at"
-      password="ppp"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1693,19 +2069,15 @@
       mmsc="http://mmsc.a1.net"
       mmsproxy="194.48.124.71"
       mmsport="8001"
+      authtype="1"
       type="mms"
   />
 
-  <apn carrier="aonMobil MMS"
+  <apn carrier="T-Mobile Internet"
       mcc="232"
-      mnc="01"
-      apn="mms.aon.at"
-      user="mobil@aon.at"
-      password="ppp"
-      mmsc="http://mmsc.aon.at"
-      mmsproxy="194.48.124.134"
-      mmsport="8001"
-      type="mms"
+      mnc="03"
+      apn=""
+      type="ia"
   />
 
   <apn carrier="T-Mobile Internet"
@@ -1714,6 +2086,7 @@
       apn="gprsinternet"
       user="t-mobile"
       password="tm"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1726,29 +2099,18 @@
       mmsc="http://mmsc.t-mobile.at/servlets/mms"
       mmsproxy="10.12.0.20"
       mmsport="80"
+      authtype="1"
       type="mms"
   />
 
-  <apn carrier="Orange MMS"
+  <apn carrier="Planet 3"
       mcc="232"
       mnc="05"
-      apn="orange.mms"
-      user="mms"
-      password="mms"
-      mmsc="http://mmsc.orange.at/mms/wapenc"
-      mmsproxy="194.24.128.118"
-      mmsport="8080"
-      type="mms"
-  />
-
-
-  <apn carrier="Orange Smartphone"
-      mcc="232"
-      mnc="05"
-      apn="orange.smartphone"
-      user="web"
-      password="web"
-      type="default,supl"
+      apn="drei.at"
+      mmsc="http://mmsc"
+      mmsproxy="213.94.78.133"
+      mmsport="8799"
+      type="default,supl,mms"
   />
 
   <apn carrier="tele.ring mms"
@@ -1760,6 +2122,7 @@
       mmsc="http://relay.mms.telering.at"
       mmsproxy="212.95.31.50"
       mmsport="80"
+      authtype="1"
       type="mms"
   />
 
@@ -1769,6 +2132,7 @@
       apn="web"
       user="web@telering.at"
       password="web"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1782,13 +2146,13 @@
       type="default,supl,mms"
   />
 
-
   <apn carrier="data.bob"
       mcc="232"
       mnc="11"
       apn="bob.at"
       user="data@bob.at"
       password="ppp"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1801,10 +2165,11 @@
       mmsc="http://mmsc.bob.at"
       mmsproxy="194.48.124.7"
       mmsport="8001"
+      authtype="1"
       type="mms"
   />
 
-  <apn carrier="YESSS! GPRS"
+  <apn carrier="yesss!"
       mcc="232"
       mnc="12"
       apn="web.yesss.at"
@@ -1866,19 +2231,18 @@
       apn="wap.o2.co.uk"
       user="o2wap"
       password="password"
-      proxy="193.113.200.195"
-      port="8080"
+      authtype="1"
       mmsc="http://mmsc.mms.o2.co.uk:8002"
       mmsproxy="82.132.254.1"
       mmsport="8080"
       type="mms"
   />
 
-  <apn carrier="O2 PREPAY"
+  <apn carrier="O2 Pay &amp; Go"
       mcc="234"
       mnc="10"
       apn="payandgo.o2.co.uk"
-      proxy="193.113.200.195"
+      proxy="82.132.254.1"
       port="8080"
       user="payandgo"
       password="password"
@@ -1892,11 +2256,14 @@
       mcc="234"
       mnc="10"
       apn="prepay.tesco-mobile.com"
+      proxy="193.113.200.195"
+      port="8080"
       user="tescowap"
       password="password"
       mmsc="http://mmsc.mms.o2.co.uk:8002"
-      mmsproxy="82.132.254.1"
+      mmsproxy="193.113.200.195"
       mmsport="8080"
+      authtype="1"
       type="default,supl,mms"
       mvno_match_data="0A"
       mvno_type="gid"
@@ -1978,6 +2345,7 @@
       mmsc="http://mms.vodafone.co.uk/servlets/mms"
       mmsproxy="212.183.137.12"
       mmsport="8799"
+      authtype="1"
       type="default,supl,mms"
   />
 
@@ -1990,9 +2358,73 @@
       mmsc="http://mms.vodafone.co.uk/servlets/mms"
       mmsproxy="212.183.137.12"
       mmsport="8799"
+      authtype="1"
       type="default,supl,mms"
   />
 
+  <apn carrier="ASDA WAP"
+      mcc="234"
+      mnc="15"
+      apn="asdamobiles.co.uk"
+      proxy="212.183.137.12"
+      port="8799"
+      user="wap"
+      password="wap"
+      mmsc="http://mms.asdamobiles.co.uk/servlets/mms"
+      mmsproxy="212.183.137.12"
+      mmsport="8799"
+      authtype="1"
+      type="default,supl,mms"
+      mvno_match_data="A0"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Talkmob PAYG WAP"
+      mcc="234"
+      mnc="15"
+      apn="payg.talkmobile.co.uk"
+      proxy="212.183.137.12"
+      port="8799"
+      user="wap"
+      password="wap"
+      mmsc="http://mms.talkmobile.co.uk/servlets/mms"
+      mmsproxy="212.183.137.12"
+      mmsport="8799"
+      authtype="1"
+      type="default,supl,mms"
+      mvno_match_data="C1"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Talkmob WAP"
+      mcc="234"
+      mnc="15"
+      apn="talkmobile.co.uk"
+      proxy="212.183.137.12"
+      port="8799"
+      user="wap"
+      password="wap"
+      mmsc="http://mms.talkmobile.co.uk/servlets/mms"
+      mmsproxy="212.183.137.12"
+      mmsport="8799"
+      authtype="1"
+      type="default,supl,mms"
+      mvno_match_data="C1"
+      mvno_type="gid"
+  />
+
+  <apn carrier="TalkTalk WAP"
+      mcc="234"
+      mnc="15"
+      apn="mobile.talktalk.co.uk"
+      mmsc="http://mms.talktalk.co.uk/servlets/mms"
+      mmsproxy="212.183.137.12"
+      mmsport="8799"
+      type="default,supl,mms"
+      mvno_match_data="70"
+      mvno_type="gid"
+  />
+
   <apn carrier="3"
       mcc="234"
       mnc="20"
@@ -2003,7 +2435,7 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Virgin Media"
+  <apn carrier="Virgin Media Mobile Internet"
       mcc="234"
       mnc="30"
       apn="goto.virginmobile.uk"
@@ -2011,6 +2443,7 @@
       mmsc="http://mms.virginmobile.co.uk:8002"
       mmsproxy="193.30.166.2"
       mmsport="8080"
+      authtype="1"
       type="default,supl,mms"
       mvno_match_data="28"
       mvno_type="gid"
@@ -2092,7 +2525,7 @@
       user="eesecure"
       password="secure"
       authtype="1"
-      type="default,supl"
+      type="default,supl,dun"
   />
 
   <apn carrier="EE MMS"
@@ -2230,11 +2663,23 @@
       type="mms"
   />
 
-  <apn carrier="TDC"
+  <apn carrier="3"
+      mcc="235"
+      mnc="94"
+      apn="three.co.uk"
+      mmsc="http://mms.um.three.co.uk:10021/mmsc"
+      mmsproxy="mms.three.co.uk"
+      mmsport="8799"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="TDC Internet"
       mcc="238"
       mnc="01"
       apn="internet"
       type="default,supl"
+      mvno_match_data="2380101xxxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="TDC MMS"
@@ -2245,6 +2690,29 @@
       mmsproxy="194.182.251.15"
       mmsport="8080"
       type="mms"
+      mvno_match_data="2380101xxxxxxxx"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Telmore Internet"
+      mcc="238"
+      mnc="01"
+      apn="internet"
+      type="default,supl"
+      mvno_type="spn"
+      mvno_match_data="TELMORE"
+  />
+
+  <apn carrier="Telmore MMS"
+      mcc="238"
+      mnc="01"
+      apn="mms"
+      mmsproxy="194.182.251.15"
+      mmsport="8080"
+      mmsc="http://192.168.241.114:8002"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="TELMORE"
   />
 
   <apn carrier="Telenor Internet"
@@ -2264,6 +2732,48 @@
       type="mms"
   />
 
+  <apn carrier="BiBoB Internet profil"
+      mcc="238"
+      mnc="02"
+      apn="internet.bibob.dk"
+      type="default,supl"
+      mvno_type="spn"
+      mvno_match_data="BiBoB"
+  />
+
+  <apn carrier="BiBoB"
+      mcc="238"
+      mnc="02"
+      apn="mms.bibob.dk"
+      mmsproxy="212.88.64.8"
+      mmsport="8080"
+      mmsc="http://mms.telenor.dk"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="BiBoB"
+  />
+
+  <apn carrier="CBB Internet"
+      mcc="238"
+      mnc="02"
+      apn="internet"
+      type="default,supl"
+      mvno_type="spn"
+      mvno_match_data="CBB Mobil"
+  />
+
+  <apn carrier="CBB MMS"
+      mcc="238"
+      mnc="02"
+      apn="telenor"
+      mmsproxy="212.88.64.8"
+      mmsport="8080"
+      mmsc="http://mms.telenor.dk"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="CBB Mobil"
+  />
+
   <apn carrier="3"
       mcc="238"
       mnc="06"
@@ -2274,11 +2784,22 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Telia Internet"
+  <apn carrier="Telia SurfPort"
       mcc="238"
       mnc="20"
       apn="www.internet.mtelia.dk"
       type="default,supl"
+      mvno_type="imsi"
+      mvno_match_data="2382010x"
+  />
+
+  <apn carrier="Telia SurfPort"
+      mcc="238"
+      mnc="20"
+      apn="www.internet.mtelia.dk"
+      type="default,supl"
+      mvno_type="imsi"
+      mvno_match_data="2382030x"
   />
 
   <apn carrier="Telia MMS"
@@ -2289,6 +2810,62 @@
       mmsproxy="193.209.134.131"
       mmsport="8080"
       type="mms"
+      mvno_type="imsi"
+      mvno_match_data="2382010x"
+  />
+
+  <apn carrier="Telia MMS"
+      mcc="238"
+      mnc="20"
+      apn="www.mms.mtelia.dk"
+      mmsc="http://mms.telia.dk"
+      mmsproxy="193.209.134.131"
+      mmsport="8080"
+      type="mms"
+      mvno_type="imsi"
+      mvno_match_data="2382030x"
+  />
+
+  <apn carrier="Call me Internet"
+      mcc="238"
+      mnc="20"
+      apn="webSP"
+      type="default,supl"
+      mvno_type="spn"
+      mvno_match_data="Call me"
+  />
+
+  <apn carrier="Call me MMS"
+      mcc="238"
+      mnc="20"
+      apn="mmsSP"
+      mmsproxy="193.209.134.131"
+      mmsport="8080"
+      mmsc="http://mms.telia.dk"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="Call me"
+  />
+
+  <apn carrier="DLG Tele GPRS"
+      mcc="238"
+      mnc="20"
+      apn="webSP"
+      type="default,supl"
+      mvno_type="spn"
+      mvno_match_data="DLG Tele"
+  />
+
+  <apn carrier="DLG Tele MMS"
+      mcc="238"
+      mnc="20"
+      apn="mmsSP"
+      mmsproxy="193.209.134.131"
+      mmsport="8080"
+      mmsc="http://mms.telia.dk"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="DLG Tele"
   />
 
   <apn carrier="Telenor Internet"
@@ -2308,19 +2885,17 @@
       type="mms"
   />
 
-  <apn carrier="Telia SE MMS"
+  <apn carrier="Telia MMS"
       mcc="240"
       mnc="01"
       apn="mms.telia.se"
-      user="mms"
-      password="telia"
-      mmsc="http://mmss/"
+      mmsc="http://mmss"
       mmsproxy="193.209.134.132"
-      mmsport="8080"
+      mmsport="80"
       type="mms"
   />
 
-  <apn carrier="Telia SurfPort"
+  <apn carrier="Telia"
       mcc="240"
       mnc="01"
       apn="online.telia.se"
@@ -2329,21 +2904,23 @@
 
   <apn carrier="Halebop Internet"
       mcc="240"
-      mnc="017"
+      mnc="01"
       apn="halebop.telia.se"
       type="default,supl"
+      mvno_match_data="240017xxxxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="Halebop MMS"
       mcc="240"
-      mnc="017"
+      mnc="01"
       apn="mms.telia.se"
-      user="mms"
-      password="telia"
       mmsc="http://mmss"
       mmsproxy="193.209.134.132"
-      mmsport="9201"
+      mmsport="80"
       type="mms"
+      mvno_match_data="240017xxxxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="3"
@@ -2356,100 +2933,232 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Telenor Mobilsurf"
+  <apn carrier="3"
       mcc="240"
       mnc="04"
-      apn="services.telenor.se"
-      proxy="172.30.253.241"
-      port="8799"
-      mmsc="http://mms"
-      mmsproxy="172.30.253.241"
+      apn="data.tre.se"
+      mmsc="http://mms.tre.se"
+      mmsproxy="mmsproxy.tre.se"
       mmsport="8799"
       type="default,supl,mms"
   />
 
-  <apn carrier="Telenor MMS"
+  <apn carrier="Telenor SE"
       mcc="240"
-      mnc="06"
+      mnc="04"
       apn="services.telenor.se"
       mmsc="http://mms"
-      mmsproxy="173.30.253.241"
+      mmsproxy="172.30.253.241"
       mmsport="8799"
-      type="mms"
+      type="default,supl,mms"
+      mvno_match_data="Telenor SE"
+      mvno_type="spn"
   />
 
-  <apn carrier="Telenor Mobilsurf"
+  <apn carrier="Tele2 Internet"
       mcc="240"
-      mnc="06"
-      apn="services.telenor.se"
-      proxy="173.30.253.241"
-      port="8799"
+      mnc="05"
+      apn="4g.tele2.se"
+      type="default,supl"
+      mvno_match_data="Tele2"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Tele2 MMS"
+      mcc="240"
+      mnc="05"
+      apn="4g.tele2.se"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="130.244.202.30"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="Tele2"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Tele2 Internet 3G"
+      mcc="240"
+      mnc="05"
+      apn="internet.tele2.se"
+      type="default,supl"
+      mvno_match_data="Tele2"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Tele2 MMS 3G"
+      mcc="240"
+      mnc="05"
+      apn="internet.tele2.se"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="130.244.202.30"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="Tele2"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Telia MMS"
+      mcc="240"
+      mnc="05"
+      apn="mms.telia.se"
+      mmsc="http://mmss"
+      mmsproxy="193.209.134.132"
+      mmsport="80"
+      type="mms"
+      mvno_match_data="Telia"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Telia"
+      mcc="240"
+      mnc="05"
+      apn="online.telia.se"
+      type="default,supl"
+      mvno_match_data="Telia"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Halebop Internet"
+      mcc="240"
+      mnc="05"
+      apn="halebop.telia.se"
+      type="default,supl"
+      mvno_match_data="Halebop"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Halebop MMS"
+      mcc="240"
+      mnc="05"
+      apn="mms.telia.se"
+      mmsc="http://mmss"
+      mmsproxy="193.209.134.132"
+      mmsport="80"
+      type="mms"
+      mvno_match_data="Halebop"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Tele2 Internet"
+      mcc="240"
+      mnc="07"
+      apn="4g.tele2.se"
       type="default,supl"
   />
 
-  <apn carrier="Tele2"
+  <apn carrier="Tele2 MMS"
+      mcc="240"
+      mnc="07"
+      apn="4g.tele2.se"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="130.244.202.30"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Tele2 Internet 3G"
+      mcc="240"
+      mnc="07"
+      apn="internet.tele2.se"
+      type="default,supl"
+  />
+
+  <apn carrier="Tele2 MMS 3G"
       mcc="240"
       mnc="07"
       apn="internet.tele2.se"
       mmsc="http://mmsc.tele2.se"
       mmsproxy="130.244.202.30"
       mmsport="8080"
-      type="default,supl,mms"
+      type="mms"
   />
 
-  <apn carrier="Telenor Mobilsurf"
+  <apn carrier="Tele2 Internet"
       mcc="240"
-      mnc="08"
-      apn="services.telenor.se"
-      proxy="172.30.253.241"
-      port="8799"
+      mnc="07"
+      apn="internet.tele2.no"
+      user="wap"
+      password="wap"
       type="default,supl"
+      authtype="1"
+      mvno_match_data="2400768xxxxxxxx"
+      mvno_type="imsi"
   />
 
-  <apn carrier="Telenor MMS"
+  <apn carrier="Tele2 MMS"
+      mcc="240"
+      mnc="07"
+      apn="internet.tele2.no"
+      mmsproxy="193.12.40.14"
+      mmsport="8080"
+      mmsc="http://mmsc.tele2.no"
+      type="mms"
+      mvno_match_data="2400768xxxxxxxx"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Telenor SE"
       mcc="240"
       mnc="08"
       apn="services.telenor.se"
       mmsc="http://mms"
       mmsproxy="172.30.253.241"
       mmsport="8799"
-      type="mms"
+      type="default,supl,mms"
   />
 
-  <apn carrier="Telenor MMS"
+  <apn carrier="Tele2 Internet"
       mcc="240"
-      mnc="09"
-      apn="services.telenor.se"
-      mmsc="http://mms"
-      mmsproxy="173.30.253.241"
-      mmsport="8799"
-      type="mms"
-  />
-
-  <apn carrier="TelenorMobilsurf"
-      mcc="240"
-      mnc="09"
-      apn="services.telenor.se"
-      proxy="173.30.253.241"
-      port="8799"
+      mnc="24"
+      apn="4g.tele2.se"
       type="default,supl"
+      mvno_match_data="Tele2"
+      mvno_type="spn"
   />
 
-  <apn carrier="Spring data"
+  <apn carrier="Tele2 MMS"
       mcc="240"
-      mnc="10"
-      apn="data.springmobil.se"
-      type="default,supl"
-  />
-
-  <apn carrier="Spring MMS"
-      mcc="240"
-      mnc="10"
-      apn="mms.springmobil.se"
-      mmsc="http://mms.springmobil.se"
-      mmsproxy="213.88.184.37"
+      mnc="24"
+      apn="4g.tele2.se"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="130.244.202.30"
       mmsport="8080"
       type="mms"
+      mvno_match_data="Tele2"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Tele2 Internet 3G"
+      mcc="240"
+      mnc="24"
+      apn="internet.tele2.se"
+      type="default,supl"
+      mvno_match_data="Tele2"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Tele2 MMS 3G"
+      mcc="240"
+      mnc="24"
+      apn="internet.tele2.se"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="130.244.202.30"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="Tele2"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Telenor SE"
+      mcc="240"
+      mnc="24"
+      apn="services.telenor.se"
+      mmsc="http://mms"
+      mmsproxy="172.30.253.241"
+      mmsport="8799"
+      type="default,supl,mms"
+      mvno_match_data="Telenor SE"
+      mvno_type="spn"
   />
 
   <apn carrier="Ventelo Internett"
@@ -2457,6 +3166,8 @@
       mnc="01"
       apn="internet.ventelo.no"
       type="default,supl"
+      mvno_match_data="24201700xxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="Ventelo MMS"
@@ -2469,6 +3180,9 @@
       mmsproxy="10.10.10.11"
       mmsport="8080"
       type="mms"
+      authtype="1"
+      mvno_match_data="24201700xxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="Telenor"
@@ -2481,31 +3195,38 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="NetCom MMS"
+  <apn carrier="NetCom"
       mcc="242"
       mnc="02"
-      apn="mms.netcom.no"
+      apn="netcom"
       mmsc="http://mm/"
       mmsproxy="212.169.66.4"
       mmsport="8080"
-      type="mms"
+      type="default,supl,mms"
   />
 
-  <apn carrier="NetCom Internett"
+  <apn carrier="Chess MMS"
       mcc="242"
       mnc="02"
-      apn="wap"
-      type="default,supl"
+      apn="netcom"
+      user="mms"
+      password="netcom"
+      mmsproxy="212.169.66.4"
+      mmsport="8080"
+      mmsc="http://mm/"
+      type="mms"
+      authtype="1"
+      mvno_match_data="2420256xxxxxxxx"
+      mvno_type="imsi"
   />
 
-  <apn carrier="Tele2 Internett"
+  <apn carrier="Chess Internett"
       mcc="242"
-      mnc="04"
-      apn="internet.tele2.no"
-      mmsc="http://mmsc.tele2.no"
-      mmsproxy="193.12.40.14"
-      mmsport="8080"
-      type="default,supl,mms"
+      mnc="02"
+      apn="netcom"
+      type="default,supl"
+      mvno_match_data="2420256xxxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="NwN Internet"
@@ -2536,7 +3257,7 @@
       mcc="244"
       mnc="03"
       apn="mms"
-      mmsc="http://mmsc.dnafinland.fi/"
+      mmsc="http://mmsc.dna.fi"
       mmsproxy="10.1.1.2"
       mmsport="8080"
       type="mms"
@@ -2568,7 +3289,6 @@
       type="default,supl"
   />
 
-
   <apn carrier="Elisa MMS"
       mcc="244"
       mnc="05"
@@ -2579,6 +3299,27 @@
       type="mms"
   />
 
+  <apn carrier="Saunalahti Internet"
+      mcc="244"
+      mnc="05"
+      apn="internet.saunalahti"
+      type="default,supl"
+      mvno_match_data="2440541"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Saunalahti MMS"
+      mcc="244"
+      mnc="05"
+      apn="mms.saunalahti.fi"
+      mmsc="http://mms.saunalahti.fi:8002/"
+      mmsproxy="62.142.4.197"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="2440541"
+      mvno_type="imsi"
+  />
+
   <apn carrier="TDC Internet"
       mcc="244"
       mnc="10"
@@ -2609,7 +3350,7 @@
       mcc="244"
       mnc="12"
       apn="mms"
-      mmsc="http://mmsc.dnafinland.fi/"
+      mmsc="http://mmsc.dna.fi"
       mmsproxy="10.1.1.2"
       mmsport="8080"
       type="mms"
@@ -2696,7 +3437,6 @@
       type="default,supl"
   />
 
-
   <apn carrier="SONERA MMS"
       mcc="244"
       mnc="91"
@@ -2716,6 +3456,7 @@
       mmsc="http://mms.omnitel.net:8002/"
       mmsproxy="194.176.32.149"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -2725,29 +3466,34 @@
       apn="omnitel"
       user="omni"
       password="omni"
+      authtype="1"
       type="default,supl"
   />
 
-  <apn carrier="Bite LT Internet"
+  <apn carrier="Bite Internet"
       mcc="246"
       mnc="02"
-      apn="internet"
+      apn="wap"
+      type="default,supl"
+  />
+
+  <apn carrier="Bite MMS"
+      mcc="246"
+      mnc="02"
+      apn="mms"
       user="mms@mms"
       password="mms"
       mmsc="http://mmsc/servlets/mms"
       mmsproxy="192.168.150.2"
       mmsport="8080"
-      type="default,supl,mms"
+      authtype="1"
+      type="mms"
   />
 
   <apn carrier="Tele2 Internet LT"
       mcc="246"
       mnc="03"
       apn="internet.tele2.lt"
-      user="wap"
-      password="wap"
-      proxy="130.244.196.90"
-      port="8080"
       mmsc="http://mmsc.tele2.lt/"
       mmsproxy="193.12.40.29"
       mmsport="8080"
@@ -2764,10 +3510,8 @@
   <apn carrier="LMT MMS"
       mcc="247"
       mnc="01"
-      apn="mms.lmt.lv"
+      apn="internet.lmt.lv"
       mmsc="http://mmsc.lmt.lv/mmsc"
-      mmsproxy="212.93.97.201"
-      mmsport="80"
       type="mms"
   />
 
@@ -2775,8 +3519,6 @@
       mcc="247"
       mnc="02"
       apn="internet.tele2.lv"
-      user="wap"
-      password="wap"
       type="default,supl"
   />
 
@@ -2789,6 +3531,7 @@
       mmsc="http://mmsc.tele2.lv/"
       mmsproxy="193.12.40.38"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -2808,6 +3551,7 @@
       mmsc="http://mmsc/servlets/mms"
       mmsproxy="192.168.150.2"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -2846,6 +3590,30 @@
       type="default,supl"
   />
 
+  <apn carrier="Send"
+      mcc="248"
+      mnc="01"
+      apn="send.ee"
+      mmsc="http://mms.emt.ee/servlets/mms"
+      mmsproxy="217.71.32.82"
+      mmsport="8080"
+      type="default,supl,mms"
+      mvno_match_data="248010x2"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Send"
+      mcc="248"
+      mnc="01"
+      apn="send.ee"
+      mmsc="http://mms.emt.ee/servlets/mms"
+      mmsproxy="217.71.32.82"
+      mmsport="8080"
+      type="default,supl,mms"
+      mvno_match_data="248010x3"
+      mvno_type="imsi"
+  />
+
   <apn carrier="Elisa Internet"
       mcc="248"
       mnc="02"
@@ -2907,7 +3675,7 @@
       password="mts"
       mmsc="http://mmsc"
       mmsproxy="192.168.192.192"
-      mmsport="9201"
+      mmsport="8080"
       authtype="1"
       type="mms"
   />
@@ -2916,9 +3684,8 @@
       mcc="250"
       mnc="02"
       apn="internet"
-      user="gdata"
-      password="gdata"
-      authtype="1"
+      user=""
+      password=""
       type="default,supl"
   />
 
@@ -2935,6 +3702,30 @@
       type="mms"
   />
 
+  <apn carrier="YOTA Internet"
+      mcc="250"
+      mnc="11"
+      apn="yota.ru"
+      type="default,supl"
+  />
+
+  <apn carrier="TELE2 Internet"
+      mcc="250"
+      mnc="20"
+      apn="internet.tele2.ru"
+      type="default,supl"
+  />
+
+  <apn carrier="TELE2 MMS"
+      mcc="250"
+      mnc="20"
+      apn="mms.tele2.ru"
+      mmsc="http://mmsc.tele2.ru"
+      mmsproxy="193.12.40.65"
+      mmsport="8080"
+      type="mms"
+  />
+
   <apn carrier="Beeline Internet"
       mcc="250"
       mnc="99"
@@ -2958,38 +3749,11 @@
       type="mms"
   />
 
-  <apn carrier="TELE2 Internet"
-      mcc="250"
-      mnc="20"
-      apn="internet.tele2.ru"
-      type="default,supl"
-  />
-
-  <apn carrier="TELE2 MMS"
-      mcc="250"
-      mnc="20"
-      apn="mms.tele2.ru"
-      mmsc="http://mmsc.tele2.ru"
-      mmsproxy="193.12.40.65"
-      mmsport="8080"
-      type="mms"
-  />
-
-  <apn carrier="Jeans MMS"
-      mcc="255"
-      mnc="01"
-      apn="mms.jeans.ua"
-      mmsc="http://mmsc:8002/"
-      mmsproxy="192.168.10.10"
-      mmsport="8080"
-      type="mms"
-  />
-
   <apn carrier="MTS MMS"
       mcc="255"
       mnc="01"
       apn="mms"
-      mmsc="http://mms/"
+      mmsc="http://mmsc:8002/"
       mmsproxy="192.168.10.10"
       mmsport="8080"
       type="mms"
@@ -3026,6 +3790,7 @@
       apn="mms.kyivstar.net"
       user="mms"
       password="mms"
+      authtype="1"
       mmsc="http://mms.kyivstar.net"
       mmsproxy="10.10.10.10"
       mmsport="8080"
@@ -3036,6 +3801,9 @@
       mcc="255"
       mnc="03"
       apn="www.kyivstar.net"
+      user="igprs"
+      password="internet"
+      authtype="1"
       type="default,supl"
   />
 
@@ -3045,6 +3813,7 @@
       apn="mms.djuice.com.ua"
       user="djuice"
       password="mms"
+      authtype="1"
       mmsc="http://mms.kyivstar.net"
       mmsproxy="10.10.10.10"
       mmsport="8080"
@@ -3056,20 +3825,20 @@
   <apn carrier="Djuice Internet"
       mcc="255"
       mnc="03"
-      apn="www.kyivstar.net"
+      apn="www.djuice.com.ua"
       type="default,supl"
       mvno_match_data="DJUICE"
       mvno_type="spn"
   />
 
-  <apn carrier="life:) internet"
+  <apn carrier="Life:) internet"
       mcc="255"
       mnc="06"
       apn="internet"
       type="default,supl"
   />
 
-  <apn carrier="life:) MMS"
+  <apn carrier="Life:) MMS"
       mcc="255"
       mnc="06"
       apn="mms"
@@ -3096,10 +3865,152 @@
       type="mms"
   />
 
+  <apn carrier="Velcom Internet"
+      mcc="257"
+      mnc="01"
+      apn="web.velcom.by"
+      authtype="1"
+      proxy="10.200.15.15"
+      port="8080"
+      type="default,supl"
+  />
+
+  <apn carrier="Velcom MMS"
+      mcc="257"
+      mnc="01"
+      apn="mms.velcom.by"
+      user="mms"
+      password="mms"
+      authtype="1"
+      mmsc="http://mmsc"
+      mmsproxy="10.200.15.15"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="MTS Internet"
+      mcc="257"
+      mnc="02"
+      apn="mts"
+      user="mts"
+      password="mts"
+      authtype="1"
+      type="default,supl"
+  />
+
+  <apn carrier="MTS MMS"
+      mcc="257"
+      mnc="02"
+      apn="mts"
+      user="mts"
+      password="mts"
+      authtype="1"
+      mmsc="http://mmsc"
+      mmsproxy="192.168.192.192"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="life:) Internet"
+      mcc="257"
+      mnc="04"
+      apn="internet.life.com.by"
+      authtype="1"
+      type="default,supl"
+  />
+
+  <apn carrier="life:) MMS"
+      mcc="257"
+      mnc="04"
+      apn="mms.life.com.by"
+      authtype="1"
+      mmsc="http://mms.life.com.by/mmsc/"
+      mmsproxy="10.10.10.20"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Orange_Internet_GPRS"
+      mcc="259"
+      mnc="01"
+      apn="wap.orange.md"
+      type="default,supl"
+  />
+
+  <apn carrier="Orange_MMS_GPRS"
+      mcc="259"
+      mnc="01"
+      apn="mms.orange.md"
+      mmsc="http://mms/mms"
+      mmsproxy="192.168.127.125"
+      mmsport="3128"
+      type="mms"
+  />
+
+  <apn carrier="Moldcell Internet"
+      mcc="259"
+      mnc="02"
+      apn="internet"
+      type="default,supl"
+  />
+
+  <apn carrier="Moldcell MMS"
+      mcc="259"
+      mnc="02"
+      apn="mms"
+      mmsc="http://mms.moldcell.md/cmmsc/post"
+      mmsproxy="10.0.10.10"
+      mmsport="9401"
+      type="mms"
+  />
+
+  <apn carrier="Unite Internet PrePay"
+      mcc="259"
+      mnc="05"
+      apn="internet3g.unite.md"
+      type="default,supl"
+  />
+
+  <apn carrier="Unite Internet PostPay"
+      mcc="259"
+      mnc="05"
+      apn="internet.unite.md"
+      type="default,supl"
+  />
+
+  <apn carrier="Unite MMS"
+      mcc="259"
+      mnc="05"
+      apn="mms.unite.md"
+      mmsc="http://10.32.15.68:38090/was"
+      mmsproxy="10.32.15.164"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Orange MMS"
+      apn="mms.orange.md"
+      mmsc="http://mms/mms"
+      mmsproxy="192.168.127.125"
+      mmsport="3128"
+      mcc="259"
+      mnc="01"
+      type="mms"
+  />
+
+  <apn carrier="Orange IMO"
+      apn="wap.orange.md"
+      proxy="192.168.127.124"
+      mmsport="3128"
+      mcc="259"
+      mnc="01"
+      type="mms"
+  />
+
   <apn carrier="Plus Internet"
       mcc="260"
       mnc="01"
-      apn="internet"
+      apn="plus"
       type="default,supl"
   />
 
@@ -3116,6 +4027,13 @@
   <apn carrier="T-mobile.pl"
       mcc="260"
       mnc="02"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="T-mobile.pl"
+      mcc="260"
+      mnc="02"
       apn="internet"
       type="default,supl"
   />
@@ -3147,16 +4065,17 @@
       type="mms"
   />
 
-  <apn carrier="Internet"
+  <apn carrier="Orange Internet"
       mcc="260"
       mnc="03"
       apn="Internet"
       user="internet"
       password="internet"
-      type="default"
+      authtype="1"
+      type="default,supl"
   />
 
-  <apn carrier="MMS Orange"
+  <apn carrier="Orange MMS"
       mcc="260"
       mnc="03"
       apn="mms"
@@ -3165,17 +4084,18 @@
       mmsc="http://mms.orange.pl"
       mmsproxy="192.168.6.104"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
-  <apn carrier="P4 Internet"
+  <apn carrier="Play Internet"
       mcc="260"
       mnc="06"
       apn="internet"
       type="default,supl"
   />
 
-  <apn carrier="P4 MMS"
+  <apn carrier="Play MMS"
       mcc="260"
       mnc="06"
       apn="mms"
@@ -3185,19 +4105,33 @@
       type="mms"
   />
 
-
-  <apn carrier="T-Mobile Internet"
+  <apn carrier="Telekom Internet"
       mcc="262"
       mnc="01"
-      apn="internet.t-mobile"
-      user="t-mobile"
-      password="tm"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="Telekom Internet"
+      mcc="262"
+      mnc="01"
+      apn="internet.telekom"
+      user="telekom"
+      password="telekom"
       mmsc="http://mms.t-mobile.de/servlets/mms"
       mmsproxy="172.28.23.131"
       mmsport="8008"
+      authtype="1"
       type="default,supl,mms"
   />
 
+  <apn carrier="Vodafone DE"
+      mcc="262"
+      mnc="02"
+      apn=""
+      type="ia"
+  />
+
   <apn carrier="Vodafone DE-MMS"
       mcc="262"
       mnc="02"
@@ -3221,6 +4155,7 @@
       apn="internet.eplus.de"
       user="eplus"
       password="internet"
+      authtype="1"
       type="default,supl"
   />
 
@@ -3233,6 +4168,7 @@
       mmsc="http://mms/eplus/"
       mmsproxy="212.23.97.153"
       mmsport="5080"
+      authtype="1"
       type="mms"
   />
 
@@ -3261,9 +4197,17 @@
   <apn carrier="Vodafone Net2"
       mcc="268"
       mnc="01"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="Vodafone Net2"
+      mcc="268"
+      mnc="01"
       apn="net2.vodafone.pt"
       user="vodafone"
       password="vodafone"
+      authtype="1"
       proxy="iproxy.vodafone.pt"
       port="80"
       mmsc="http://mms.vodafone.pt/servlets/mms"
@@ -3272,21 +4216,61 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Optimus Internet"
+  <apn carrier="ZON Internet"
+      mcc="268"
+      mnc="01"
+      apn=""
+      type="ia"
+      mvno_match_data="ZON"
+      mvno_type="spn"
+  />
+
+  <apn carrier="ZON Internet"
+      mcc="268"
+      mnc="01"
+      apn="internet.zon.pt"
+      type="default,supl"
+      mvno_match_data="ZON"
+      mvno_type="spn"
+  />
+
+  <apn carrier="ZON MMS"
+      mcc="268"
+      mnc="01"
+      apn="vas.zon.pt"
+      user="vas"
+      password="vas"
+      authtype="1"
+      mmsc="http://mms/servlets/mms"
+      mmsproxy="213.30.27.63"
+      mmsport="8799"
+      type="mms"
+      mvno_match_data="ZON"
+      mvno_type="spn"
+  />
+
+  <apn carrier="PortalOptimus"
+      mcc="268"
+      mnc="03"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="PortalOptimus"
       mcc="268"
       mnc="03"
       apn="umts"
-      type="default"
+      mmsc="http://mmsc:10021/mmsc"
+      mmsproxy="62.169.66.5"
+      mmsport="8799"
+      type="default,supl,mms"
   />
 
-  <apn carrier="Optimus MMS"
+  <apn carrier="tmn internet"
       mcc="268"
-      mnc="03"
-      apn="mms"
-      mmsc="http://mmsc:10021/mmsc"
-      mmsproxy="62.169.66.1"
-      mmsport="8799"
-      type="mms"
+      mnc="06"
+      apn=""
+      type="ia"
   />
 
   <apn carrier="tmn internet"
@@ -3302,6 +4286,7 @@
       apn="mmsc.tmn.pt"
       user="tmn"
       password="tmnnet"
+      authtype="1"
       mmsc="http://mmsc/"
       mmsproxy="10.111.2.16"
       mmsport="8080"
@@ -3398,19 +4383,23 @@
       mcc="272"
       mnc="03"
       apn="data.mymeteor.ie"
+      user="my"
+      password="wap"
+      authtype="1"
       type="default,supl"
   />
 
-  <apn carrier="Meteor"
+  <apn carrier="Meteor MMS"
       mcc="272"
       mnc="03"
       apn="mms.mymeteor.ie"
       user="my"
       password="wap"
+      authtype="1"
       mmsc="http://mms.mymeteor.ie"
       mmsproxy="10.85.85.85"
       mmsport="8799"
-      type="default,supl,mms"
+      type="mms"
   />
 
   <apn carrier="3"
@@ -3427,10 +4416,12 @@
       mcc="272"
       mnc="11"
       apn="tescomobile.liffeytelecom.com"
-      mmsc="http://10.1.11.68/servlets/mms"
+      mmsc="http://mmc1/servlets/mms"
       mmsproxy="10.1.11.19"
       mmsport="8080"
       type="default,supl,mms"
+      mvno_match_data="0A"
+      mvno_type="gid"
   />
 
   <apn carrier="Siminn Internet"
@@ -3542,19 +4533,20 @@
       type="default,supl"
   />
 
-  <apn carrier="M-Tel"
+  <apn carrier="MTel"
       mcc="284"
       mnc="01"
-      apn="wap-gprs.mtel.bg"
+      apn="inet-gprs.mtel.bg"
       type="default,supl"
   />
 
-  <apn carrier="M-Tel MMS"
+  <apn carrier="MTel MMS"
       mcc="284"
       mnc="01"
       apn="mms-gprs.mtel.bg"
       user="mtel"
       password="mtel"
+      authtype="1"
       mmsc="http://mmsc/"
       mmsproxy="10.150.0.33"
       mmsport="8080"
@@ -3567,6 +4559,7 @@
       apn="internet.vivacom.bg"
       user="vivacom"
       password="vivacom"
+      authtype="1"
       type="default,supl"
   />
 
@@ -3576,6 +4569,7 @@
       apn="mms.vivacom.bg"
       user="mms"
       password="mms"
+      authtype="1"
       mmsc="http://mmsc.vivacom.bg"
       mmsproxy="192.168.123.123"
       mmsport="8080"
@@ -3586,6 +4580,9 @@
       mcc="284"
       mnc="05"
       apn="globul"
+      authtype="1"
+      proxy="192.168.88.11"
+      port="8004"
       type="default,supl"
   />
 
@@ -3690,12 +4687,13 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone live!"
+  <apn carrier="Si.mobil GPRS"
       mcc="293"
       mnc="40"
       apn="internet.simobil.si"
       user="simobil"
       password="internet"
+      authtype="1"
       proxy="80.95.224.17"
       port="9201"
       type="default,supl"
@@ -3707,38 +4705,69 @@
       apn="mms.simobil.si"
       user="simobil"
       password="internet"
-      mmsc="http://mmc"
+      authtype="1"
+      mmsc="http://mmc/"
       mmsproxy="80.95.224.46"
       mmsport="9201"
       type="mms"
   />
 
-  <apn carrier="Planet"
+ <apn carrier="Mobilni Internet"
       mcc="293"
       mnc="41"
       apn="internet"
       user="mobitel"
       password="internet"
-      proxy="213.229.249.40"
-      port="8080"
-      type="default,supl"
-  />
-
-  <apn carrier="Mobitel MMS"
-      mcc="293"
-      mnc="41"
-      apn="internet"
-      user="mobitel"
-      password="internet"
+      authtype="1"
       mmsc="http://mms.mobitel.si/servlets/mms"
       mmsproxy="213.229.249.40"
       mmsport="8080"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="T2"
+      mcc="293"
+      mnc="64"
+      apn="internet.t-2.net"
+      mmsc="http://www.mms.t-2.net:8002"
+      mmsproxy="172.20.18.137"
+      mmsport="8080"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="Tusmobil Internet"
+      mcc="293"
+      mnc="70"
+      apn="internet.tusmobil.si"
+      user="tusmobil"
+      password="internet"
+      authtype="1"
+      type="default,supl"
+  />
+
+  <apn carrier="Tusmobil MMS"
+      mcc="293"
+      mnc="70"
+      apn="mms.tusmobil.si"
+      user="tusmobil"
+      password="mms"
+      authtype="1"
+      mmsc="http://mms.tusmobil.si:8002"
+      mmsproxy="91.185.221.85"
+      mmsport="8080"
       type="mms"
   />
 
   <apn carrier="T-Mobile MK Internet"
       mcc="294"
       mnc="01"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="T-Mobile MK Internet"
+      mcc="294"
+      mnc="01"
       apn="internet"
       user="internet"
       password="t-mobile"
@@ -3757,7 +4786,7 @@
       type="mms"
   />
 
-   <apn carrier="Cosmofon"
+  <apn carrier="Cosmofon"
       mcc="294"
       mnc="02"
       apn="Internet"
@@ -3828,30 +4857,72 @@
       mcc="302"
       mnc="220"
       apn="sp.telus.com"
+      type="default,mms,supl"
       mmsc="http://aliasredirect.net/proxy/mmsc"
       mmsproxy="74.49.0.18"
       mmsport="80"
-      type="default,supl,mms"
+      mvno_match_data="54"
+      mvno_type="gid"
   />
 
   <apn carrier="Koodo"
       mcc="302"
       mnc="220"
       apn="sp.koodo.com"
+      type="default,mms,supl,dun"
       mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
       mmsproxy="74.49.0.18"
       mmsport="80"
-      type="default,supl,mms"
+      mvno_match_data="4B"
+      mvno_type="gid"
   />
 
-  <apn carrier="PC Mobile"
+  <apn carrier="PC mobile"
       mcc="302"
       mnc="220"
       apn="sp.mb.com"
+      type="default,mms,supl"
       mmsc="http://aliasredirect.net/proxy/mb/mmsc"
       mmsproxy="74.49.0.18"
       mmsport="80"
-      type="default,supl,mms"
+      mvno_match_data="50"
+      mvno_type="gid"
+  />
+
+  <apn carrier="TELUS"
+      mcc="302"
+      mnc="221"
+      apn="sp.telus.com"
+      type="default,mms,supl"
+      mmsc="http://aliasredirect.net/proxy/mmsc"
+      mmsproxy="74.49.0.18"
+      mmsport="80"
+      mvno_match_data="54"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Koodo"
+      mcc="302"
+      mnc="221"
+      apn="sp.koodo.com"
+      type="default,mms,supl,dun"
+      mmsc="http://aliasredirect.net/proxy/koodo/mmsc"
+      mmsproxy="74.49.0.18"
+      mmsport="80"
+      mvno_match_data="4B"
+      mvno_type="gid"
+  />
+
+  <apn carrier="PC mobile"
+      mcc="302"
+      mnc="221"
+      apn="sp.mb.com"
+      type="default,mms,supl"
+      mmsc="http://aliasredirect.net/proxy/mb/mmsc"
+      mmsproxy="74.49.0.18"
+      mmsport="80"
+      mvno_match_data="50"
+      mvno_type="gid"
   />
 
   <apn carrier="MOWAP"
@@ -3887,17 +4958,7 @@
       mcc="302"
       mnc="270"
       apn="wisp.mobi.eastlink.ca"
-      type="default,supl"
-  />
-
-  <apn carrier="Fido Internet"
-      mcc="302"
-      mnc="370"
-      apn="fido-core-appl1.apn"
-      mmsc="http://mms.fido.ca"
-      mmsproxy="205.151.11.13"
-      mmsport="80"
-      type="default,supl,mms"
+      type="default,supl,dun"
   />
 
   <apn carrier="Internet"
@@ -3905,6 +4966,7 @@
       mnc="490"
       apn="internet.windmobile.ca"
       type="default,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="MMS"
@@ -3925,64 +4987,86 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Bell Internet"
+  <apn carrier="Videotron"
+      mcc="302"
+      mnc="510"
+      apn="media.videotron"
+      mmsc="http://media.videotron.com"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="Bell Mobility"
       mcc="302"
       mnc="610"
       apn="pda.bell.ca"
+      type="default,mms,dun,supl"
       mmsc="http://mms.bell.ca/mms/wapenc"
-      mmsproxy="web.wireless.bell.ca"
+  />
+
+  <apn carrier="MTS"
+      mcc="302"
+      mnc="370"
+      apn="sp.mts"
+      type="default,mms,supl"
+      mmsc="http://mmsc2.mts.net/"
+      mmsproxy="wapgw1.mts.net"
+      mmsport="9201"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="2C"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Fido LTE"
+      mcc="302"
+      mnc="370"
+      apn="ltemobile.apn"
+      type="default,mms,supl"
+      mmsc="http://mms.fido.ca"
+      mmsproxy="mmsproxy.fido.ca"
       mmsport="80"
-      type="default,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="MTS"
       mcc="302"
       mnc="660"
       apn="sp.mts"
+      type="default,mms,supl"
       mmsc="http://mmsc2.mts.net/"
-      mmsproxy="209.4.229.90"
-      mmsport="9401"
-      type="default,supl,mms"
+      mmsproxy="wapgw1.mts.net"
+      mmsport="9201"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="2C"
+      mvno_type="gid"
   />
 
-  <apn carrier="MTS-Roaming"
-      mcc="302"
-      mnc="370"
-      apn="sp.mts"
-      mmsc="http://mmsc2.mts.net/"
-      mmsproxy="209.4.229.90"
-      mmsport="9401"
-      type="default,supl,mms"
-  />
-
-  <apn carrier="Rogers"
+  <apn carrier="Rogers LTE"
       mcc="302"
       mnc="720"
-      apn="rogers-core-appl1.apn"
+      apn="ltemobile.apn"
+      type="default,mms,supl"
       mmsc="http://mms.gprs.rogers.com"
-      mmsproxy="10.128.1.69"
+      mmsproxy="mmsproxy.rogers.com"
       mmsport="80"
-      type="default,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="Chatr Internet"
+  <apn carrier="chatr"
       mcc="302"
       mnc="720"
       apn="chatrweb.apn"
+      type="default,mms,supl"
       mmsc="http://mms.chatrwireless.com"
       mmsproxy="205.151.11.11"
       mmsport="80"
-      type="default,mms"
-  />
-
-  <apn carrier="Chatr Internet"
-      mcc="302"
-      mnc="720"
-      apn="chatrweb.apn"
-      mmsc="http://mms.chatrwireless.com"
-      mmsproxy="205.151.11.11"
-      mmsport="80"
-      type="default,mms"
+      proxy="205.151.11.11"
+      port="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mvno_match_data="302720x94"
       mvno_type="imsi"
   />
@@ -3991,10 +5075,10 @@
       mcc="302"
       mnc="780"
       apn="pda.stm.sk.ca"
-      mmsc="http://mms.sasktel.com"
+      type="default,mms,supl,dun"
+      mmsc="http://mms.sasktel.com/"
       mmsproxy="mig.sasktel.com"
       mmsport="80"
-      type="default,supl,mms"
   />
 
   <apn carrier="myBlue Pix"
@@ -4071,6 +5155,185 @@
       type="default,supl"
   />
 
+  <!-- 1xRTT -->
+  <apn carrier="Sprint"
+      mcc="310"
+      mnc="120"
+      apn="sprint"
+      type="default,supl,mms,ims,cbs"
+      mmsc="http://mms.sprintpcs.com"
+      mmsproxy="68.28.31.7"
+      mmsport="80"
+      bearer="6"
+  />
+
+  <!-- EVDO_0 -->
+  <apn carrier="Sprint"
+      mcc="310"
+      mnc="120"
+      apn="sprint"
+      type="default,supl,mms,ims,cbs"
+      mmsc="http://mms.sprintpcs.com"
+      mmsproxy="68.28.31.7"
+      mmsport="80"
+      bearer="7"
+  />
+
+  <!-- EVDO_A -->
+  <apn carrier="Sprint"
+      mcc="310"
+      mnc="120"
+      apn="sprint"
+      type="default,supl,mms,ims,cbs"
+      mmsc="http://mms.sprintpcs.com"
+      mmsproxy="68.28.31.7"
+      mmsport="80"
+      bearer="8"
+  />
+
+  <!-- EVDO_B -->
+  <apn carrier="Sprint"
+      mcc="310"
+      mnc="120"
+      apn="sprint"
+      type="default,supl,mms,ims,cbs"
+      mmsc="http://mms.sprintpcs.com"
+      mmsproxy="68.28.31.7"
+      mmsport="80"
+      bearer="12"
+  />
+
+  <!-- IS95A -->
+  <apn carrier="Sprint"
+      mcc="310"
+      mnc="120"
+      apn="sprint"
+      type="default,supl,mms,ims,cbs"
+      mmsc="http://mms.sprintpcs.com"
+      mmsproxy="68.28.31.7"
+      mmsport="80"
+      bearer="4"
+  />
+
+  <!-- IS95B -->
+  <apn carrier="Sprint"
+      mcc="310"
+      mnc="120"
+      apn="sprint"
+      type="default,supl,mms,ims,cbs"
+      mmsc="http://mms.sprintpcs.com"
+      mmsproxy="68.28.31.7"
+      mmsport="80"
+      bearer="5"
+  />
+
+  <!-- this APN will be deleted and replaced by a new ia APN by the HFA provisioning process.
+       This is just a bootstrap APN to enable HFA -->
+  <apn carrier="OTA"
+      mcc="310"
+      mnc="120"
+      apn="otasn"
+      type="fota,ia"
+      user="null"
+      password="null"
+  />
+
+  <!-- GPRS -->
+  <apn carrier="SPCS Global"
+      mcc="310"
+      mnc="120"
+      apn="cinet.spcs"
+      mmsc="http://mms.sprintpcs.com"
+      mmsproxy="68.28.31.7"
+      mmsport="80"
+      type="default,supl,mms"
+      bearer="1"
+  />
+
+  <!-- EDGE -->
+  <apn carrier="SPCS Global"
+      mcc="310"
+      mnc="120"
+      apn="cinet.spcs"
+      mmsc="http://mms.sprintpcs.com"
+      mmsproxy="68.28.31.7"
+      mmsport="80"
+      type="default,supl,mms"
+      bearer="2"
+  />
+
+  <!-- UMTS -->
+  <apn carrier="SPCS Global"
+      mcc="310"
+      mnc="120"
+      apn="cinet.spcs"
+      mmsc="http://mms.sprintpcs.com"
+      mmsproxy="68.28.31.7"
+      mmsport="80"
+      type="default,supl,mms"
+      bearer="3"
+  />
+
+  <!-- HSDPA -->
+  <apn carrier="SPCS Global"
+      mcc="310"
+      mnc="120"
+      apn="cinet.spcs"
+      mmsc="http://mms.sprintpcs.com"
+      mmsproxy="68.28.31.7"
+      mmsport="80"
+      type="default,supl,mms"
+      bearer="9"
+  />
+
+  <!-- HSUPA -->
+  <apn carrier="SPCS Global"
+      mcc="310"
+      mnc="120"
+      apn="cinet.spcs"
+      mmsc="http://mms.sprintpcs.com"
+      mmsproxy="68.28.31.7"
+      mmsport="80"
+      type="default,supl,mms"
+      bearer="10"
+  />
+
+  <!-- HSPA -->
+  <apn carrier="SPCS Global"
+      mcc="310"
+      mnc="120"
+      apn="cinet.spcs"
+      mmsc="http://mms.sprintpcs.com"
+      mmsproxy="68.28.31.7"
+      mmsport="80"
+      type="default,supl,mms"
+      bearer="11"
+  />
+
+  <!-- HSPAP -->
+  <apn carrier="SPCS Global"
+      mcc="310"
+      mnc="120"
+      apn="cinet.spcs"
+      mmsc="http://mms.sprintpcs.com"
+      mmsproxy="68.28.31.7"
+      mmsport="80"
+      type="default,supl,mms"
+      bearer="15"
+  />
+
+  <!-- GSM -->
+  <apn carrier="SPCS Global"
+      mcc="310"
+      mnc="120"
+      apn="cinet.spcs"
+      mmsc="http://mms.sprintpcs.com"
+      mmsproxy="68.28.31.7"
+      mmsport="80"
+      type="default,supl,mms"
+      bearer="16"
+  />
+
   <apn carrier="My Multi Media"
       mcc="310"
       mnc="130"
@@ -4084,9 +5347,32 @@
   <apn carrier="T-Mobile US 160"
       mcc="310"
       mnc="160"
-      apn="epc.tmobile.com"
+      apn=""
+      type="ia"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="T-Mobile US 160"
+      mcc="310"
+      mnc="160"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 160"
+      mcc="310"
+      mnc="160"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
   />
 
   <apn carrier="DataConnect"
@@ -4111,73 +5397,302 @@
   <apn carrier="T-Mobile US 200"
       mcc="310"
       mnc="200"
-      apn="epc.tmobile.com"
+      apn=""
+      type="ia"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="T-Mobile US 200"
+      mcc="310"
+      mnc="200"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 200"
+      mcc="310"
+      mnc="200"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
   />
 
   <apn carrier="T-Mobile US 210"
       mcc="310"
       mnc="210"
-      apn="epc.tmobile.com"
+      apn=""
+      type="ia"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="T-Mobile US 210"
+      mcc="310"
+      mnc="210"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 210"
+      mcc="310"
+      mnc="210"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
   />
 
   <apn carrier="T-Mobile US 220"
       mcc="310"
       mnc="220"
-      apn="epc.tmobile.com"
+      apn=""
+      type="ia"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="T-Mobile US 220"
+      mcc="310"
+      mnc="220"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 220"
+      mcc="310"
+      mnc="220"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
   />
 
   <apn carrier="T-Mobile US 230"
       mcc="310"
       mnc="230"
-      apn="epc.tmobile.com"
+      apn=""
+      type="ia"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="T-Mobile US 230"
+      mcc="310"
+      mnc="230"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 230"
+      mcc="310"
+      mnc="230"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
   />
 
   <apn carrier="T-Mobile US 240"
       mcc="310"
       mnc="240"
-      apn="epc.tmobile.com"
+      apn=""
+      type="ia"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="T-Mobile US 240"
+      mcc="310"
+      mnc="240"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 240"
+      mcc="310"
+      mnc="240"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
   />
 
   <apn carrier="T-Mobile US 250"
       mcc="310"
       mnc="250"
-      apn="epc.tmobile.com"
-      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
+      apn=""
+      type="ia"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
-  <apn carrier="T-Mobile US"
+  <apn carrier="T-Mobile US 250"
       mcc="310"
-      mnc="260"
-      apn="epc.tmobile.com"
+      mnc="250"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 250"
+      mcc="310"
+      mnc="250"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <apn carrier="T-Mobile GPRS"
+      mcc="310"
+      mnc="260"
+      apn=""
+      type="ia"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="T-Mobile GPRS"
+      mcc="310"
+      mnc="260"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS"
+      mcc="310"
+      mnc="260"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
   />
 
   <apn carrier="T-Mobile US 270"
       mcc="310"
       mnc="270"
-      apn="epc.tmobile.com"
+      apn=""
+      type="ia"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="T-Mobile US 270"
+      mcc="310"
+      mnc="270"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 270"
+      mcc="310"
+      mnc="270"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+  <apn carrier="T-Mobile US 300"
+      mcc="310"
+      mnc="300"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 300"
+      mcc="310"
+      mnc="300"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
   />
 
   <apn carrier="T-Mobile US 310"
       mcc="310"
       mnc="310"
-      apn="epc.tmobile.com"
+      apn=""
+      type="ia"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="T-Mobile US 310"
+      mcc="310"
+      mnc="310"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 310"
+      mcc="310"
+      mnc="310"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
   />
 
   <apn carrier="Cingular 380 ATT"
@@ -4215,9 +5730,10 @@
       mcc="310"
       mnc="410"
       apn="phone"
+      type="default,mms,supl,fota"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
-      type="default,supl,mms,fota"
+      mmsport="80"
   />
 
   <apn carrier="ATT WAP"
@@ -4232,31 +5748,6 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="TracFone"
-      mcc="310"
-      mnc="410"
-      apn="tfdata"
-      mmsc="http://mms-tf.net"
-      mmsproxy="mms3.tracfone.com"
-      type="default,supl,mms"
-  />
-
-  <apn carrier="TracFone"
-      mcc="310"
-      mnc="260"
-      apn="wap.tracfone"
-      mmsc="http://mms.tracfone.com"
-      type="default,supl,mms"
-  />
-
-  <apn carrier="TracFone"
-      mcc="310"
-      mnc="260"
-      apn="simple"
-      mmsc="http://smpl.mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
-  />
-
   <apn carrier="CBW Data"
       mcc="310"
       mnc="420"
@@ -4267,6 +5758,23 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="Viaero Internet"
+      mcc="310"
+      mnc="450"
+      apn="internet.vedge.com"
+      type="default,supl"
+  />
+
+  <apn carrier="Viaero MMS"
+      mcc="310"
+      mnc="450"
+      apn="mms"
+      mmsc="http://mms.viaero.com"
+      mmsproxy="10.168.3.23"
+      mmsport="9401"
+      type="mms"
+  />
+
   <apn carrier="DataConnect"
       mcc="310"
       mnc="470"
@@ -4308,9 +5816,32 @@
   <apn carrier="T-Mobile US 490"
       mcc="310"
       mnc="490"
-      apn="epc.tmobile.com"
+      apn=""
+      type="ia"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="T-Mobile US 490"
+      mcc="310"
+      mnc="490"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 490"
+      mcc="310"
+      mnc="490"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
   />
 
   <apn carrier="GoodCall Picture Message"
@@ -4333,6 +5864,28 @@
       type="mms"
   />
 
+  <apn carrier="T-Mobile US 530"
+      mcc="310"
+      mnc="530"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 530"
+      mcc="310"
+      mnc="530"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
   <apn carrier="DobsonMMS"
       mcc="310"
       mnc="560"
@@ -4356,9 +5909,32 @@
   <apn carrier="T-Mobile US 580"
       mcc="310"
       mnc="580"
-      apn="epc.tmobile.com"
+      apn=""
+      type="ia"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="T-Mobile US 580"
+      mcc="310"
+      mnc="580"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 580"
+      mcc="310"
+      mnc="580"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
   />
 
   <apn carrier="CellularOne MMS"
@@ -4371,6 +5947,28 @@
       type="mms"
   />
 
+  <apn carrier="T-Mobile US 590"
+      mcc="310"
+      mnc="590"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 590"
+      mcc="310"
+      mnc="590"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
   <apn carrier="EpicINT"
       mcc="310"
       mnc="610"
@@ -4388,36 +5986,81 @@
       type="mms"
   />
 
+  <apn carrier="T-Mobile US 640"
+      mcc="310"
+      mnc="640"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 640"
+      mcc="310"
+      mnc="640"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
   <apn carrier="T-Mobile US 660"
       mcc="310"
       mnc="660"
-      apn="epc.tmobile.com"
-      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-      type="default,supl,mms"
+      apn=""
+      type="ia"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
 
-  <apn carrier="WEB 2"
+  <apn carrier="T-Mobile US 660"
+      mcc="310"
+      mnc="660"
+      apn="fast.t-mobile.com"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 660"
+      mcc="310"
+      mnc="660"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
+  />
+
+
+  <apn carrier="Web 2"
       mcc="310"
       mnc="770"
       apn="i2.iwireless.com"
       type="default,supl"
   />
 
+  <apn carrier="Web 1"
+      mcc="310"
+      mnc="770"
+      apn="wap1.iwireless.com"
+      proxy="209.4.229.31"
+      port="9401"
+      type="default,supl"
+  />
+
   <apn carrier="Picture Messaging"
       mcc="310"
       mnc="770"
       apn="wap1.iwireless.com"
       mmsc="http://mmsc.iwireless.dataonair.net:6672"
-      mmsproxy="209.4.229.31"
-      mmsport="9401"
-      type="mms"
-  />
-
-  <apn carrier="PIAPicture Messaging"
-      mcc="310"
-      mnc="770"
-      apn="wap9.iwireless.com"
-      mmsc="http://mmsc.iwireless.dataonair.net:6672"
       mmsproxy="209.4.229.32"
       mmsport="9401"
       type="mms"
@@ -4426,9 +6069,32 @@
   <apn carrier="T-Mobile US 800"
       mcc="310"
       mnc="800"
-      apn="epc.tmobile.com"
+      apn=""
+      type="ia"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="T-Mobile US 800"
+      mcc="310"
+      mnc="800"
+      apn="fast.t-mobile.com"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+  />
+
+  <apn carrier="MetroPCS 800"
+      mcc="310"
+      mnc="800"
+      apn="fast.metropcs.com"
+      mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
+      type="default,supl,mms"
+      protocol="IPV6"
+      roaming_protocol="IP"
+      mvno_match_data="6D"
+      mvno_type="gid"
   />
 
   <apn carrier="Internet"
@@ -4522,9 +6188,6 @@
       mcc="330"
       mnc="110"
       apn="internet.claropr.com"
-      user=""
-      password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
@@ -4532,12 +6195,9 @@
       mcc="330"
       mnc="110"
       apn="mms.claropr.com"
-      user=""
-      password=""
       mmsproxy="10.50.38.3"
       mmsport="8799"
       mmsc="http://mmsg.claropr.com:10021/mmsc"
-      authtype="1"
       type="mms"
   />
 
@@ -4590,7 +6250,7 @@
       type="mms"
   />
 
-  <apn carrier="Movistar Internet"
+  <apn carrier="Movistar INTERNET"
       mcc="334"
       mnc="030"
       apn="internet.movistar.mx"
@@ -4617,9 +6277,8 @@
       mcc="334"
       mnc="050"
       apn="web.iusacellgsm.mx"
-      user="Iusacellgsm"
-      password="Iusacellgsm"
-      authtype="0"
+      user="iusacellgsm"
+      password="iusacellgsm"
       type="default,supl,dun"
   />
 
@@ -4630,31 +6289,40 @@
       user="mmsiusacellgsm"
       password="mmsiusacellgsm"
       mmsc="http://mms.iusacell3g.com/"
-      mmsproxy="192.200.1.40"
-      mmsport="80"
-      authtype="0"
+      type="mms"
+  />
+
+  <apn carrier="INTERNET Digicel"
+      mcc="338"
+      mnc="05"
+      apn="web"
+      type="default,supl,dun"
+  />
+
+  <apn carrier="MMS Digicel"
+      mcc="338"
+      mnc="05"
+      apn="wap"
+      mmsproxy="172.16.7.12"
+      mmsport="8080"
+      mmsc="http://mms.digicelgroup.com"
       type="mms"
   />
 
   <apn carrier="INTERNET Digicel"
       mcc="338"
       mnc="050"
-      apn="web.digiceljamaica.com"
-      authtype="1"
+      apn="web"
       type="default,supl,dun"
   />
 
-
   <apn carrier="MMS Digicel"
       mcc="338"
       mnc="050"
       apn="wap"
-      user=""
-      password=""
       mmsproxy="172.16.7.12"
       mmsport="8080"
       mmsc="http://mms.digicelgroup.com"
-      authtype="1"
       type="mms"
   />
 
@@ -4662,9 +6330,6 @@
       mcc="338"
       mnc="18"
       apn="internet"
-      user=""
-      password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
@@ -4672,12 +6337,60 @@
       mcc="338"
       mnc="18"
       apn="multimedia"
-      user=""
-      password=""
       mmsproxy="10.20.5.34"
       mmsport="8799"
       mmsc="http://mmsc"
-      authtype="1"
+      type="mms"
+  />
+
+  <apn carrier="Lime Internet Prepaid"
+      mcc="338"
+      mnc="18"
+      apn="ppinternet"
+      type="default,supl,dun"
+  />
+
+  <apn carrier="Lime Prepaid MMS"
+      mcc="338"
+      mnc="18"
+      apn="ppmms"
+      mmsproxy="10.20.5.34"
+      mmsport="8799"
+      mmsc="http://mmsc"
+      type="mms"
+  />
+
+  <apn carrier="Lime Internet Postpaid"
+      mcc="338"
+      mnc="180"
+      apn="internet"
+      type="default,supl,dun"
+  />
+
+  <apn carrier="Lime Postpaid MMS"
+      mcc="338"
+      mnc="180"
+      apn="multimedia"
+      mmsproxy="10.20.5.34"
+      mmsport="8799"
+      mmsc="http://mmsc"
+      type="mms"
+  />
+
+  <apn carrier="Lime Internet Prepaid"
+      mcc="338"
+      mnc="180"
+      apn="ppinternet"
+      type="default,supl,dun"
+  />
+
+  <apn carrier="Lime Prepaid MMS"
+      mcc="338"
+      mnc="180"
+      apn="ppmms"
+      mmsproxy="10.20.5.34"
+      mmsport="8799"
+      mmsc="http://mmsc"
       type="mms"
   />
 
@@ -4750,13 +6463,11 @@
       type="mms"
   />
 
-  <apn carrier="Digicel FR"
+  <apn carrier="Digicel Web"
       mcc="340"
       mnc="20"
-      apn="wap.digicelfr.com"
-      user="wap"
-      password="wap"
-      mmsc="http://mmc.digicelfr.com/servlets/mms"
+      apn="web.digicelfr.com"
+      mmsc="http://mmc.digiceltt.com/servlets/mms"
       mmsproxy="172.20.6.12"
       mmsport="8080"
       type="default,supl,mms"
@@ -5044,7 +6755,6 @@
       mcc="368"
       mnc="01"
       apn="internet"
-      authtype="1"
       type="default,supl,dun"
   />
 
@@ -5055,8 +6765,7 @@
       apn="mms"
       mmsproxy="200.13.145.52"
       mmsport="8080"
-      mmsc="http://mms.cubacel.cu/"
-      authtype="1"
+      mmsc="http://mms.cubacel.cu"
       type="mms"
   />
 
@@ -5064,9 +6773,6 @@
       mcc="370"
       mnc="01"
       apn="orangenet.com.do"
-      user=""
-      password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
@@ -5083,26 +6789,33 @@
       type="mms"
   />
 
-  <apn carrier="INTERNET CLARO"
+  <apn carrier="Internet Móvil Claro"
       mcc="370"
       mnc="02"
       apn="internet.ideasclaro.com.do"
-      user=""
-      password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
-  <apn carrier="MMS CLARO"
+  <apn carrier="MMS"
       mcc="370"
       mnc="02"
-      apn="mms.ideasclaro.com.do"
-      user=""
-      password=""
-      mmsproxy="190.80.147.8"
-      mmsport="8080"
+      apn="internet.ideasclaro.com.do"
       mmsc="http://mms.ideasclaro.com.do/mms/wapenc"
-      authtype="1"
+      type="mms"
+  />
+
+  <apn carrier="Internet Móvil Claro"
+      mcc="370"
+      mnc="020"
+      apn="internet.ideasclaro.com.do"
+      type="default,supl,dun"
+  />
+
+  <apn carrier="MMS"
+      mcc="370"
+      mnc="020"
+      apn="internet.ideasclaro.com.do"
+      mmsc="http://mms.ideasclaro.com.do/mms/wapenc"
       type="mms"
   />
 
@@ -5451,12 +7164,41 @@
       type="mms"
   />
 
+  <apn carrier="Azercell"
+      mcc="400"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Bakcell"
+      mcc="400"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="FONEX"
+      mcc="400"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Nar Mobile"
+      mcc="400"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
   <apn carrier="Beeline Internet"
       mcc="401"
       mnc="01"
       apn="internet.beeline.kz"
       user="@internet.beeline"
       password="beeline"
+      authtype="1"
       type="default,supl"
   />
 
@@ -5466,6 +7208,7 @@
       apn="mms.beeline.kz"
       user="@mms.beeline"
       password="beeline"
+      authtype="1"
       mmsc="http://mms.beeline.kz/mms/wapenc"
       mmsproxy="172.27.6.93"
       mmsport="8080"
@@ -5513,7 +7256,37 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="B-Mobile"
+      mcc="402"
+      mnc="11"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="TashiCell"
+      mcc="402"
+      mnc="77"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Vodafone live"
+      mcc="404"
+      mnc="01"
+      apn="portalnmms"
+      proxy="10.10.1.100"
+      port="9401"
+      type="default,supl"
+  />
+
+  <apn carrier="Vodafonemobileconnect"
+      mcc="404"
+      mnc="01"
+      apn="www"
+      type="default,supl"
+  />
+
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="01"
       apn="portalnmms"
@@ -5523,19 +7296,12 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="AIRTEL LIVE"
       mcc="404"
-      mnc="01"
-      apn="www"
-      type="default,supl"
-  />
-
-  <apn carrier="VodafoneLive!"
-      mcc="404"
-      mnc="01"
-      apn="portalnmms"
-      proxy="10.10.1.100"
-      port="9401"
+      mnc="02"
+      apn="airtelfun.com"
+      proxy="100.1.200.99"
+      port="8080"
       type="default,supl"
   />
 
@@ -5546,15 +7312,6 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRTEL LIVE"
-      mcc="404"
-      mnc="02"
-      apn="airtelfun.com"
-      proxy="100.1.200.99"
-      port="8080"
-      type="default,supl"
-  />
-
   <apn carrier="Airtel MMS"
       mcc="404"
       mnc="02"
@@ -5593,7 +7350,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="04"
       apn="internet"
@@ -5619,7 +7376,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="05"
       apn="portalnmms"
@@ -5629,14 +7386,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="404"
       mnc="05"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="404"
       mnc="05"
       apn="portalnmms"
@@ -5645,7 +7402,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="07"
       apn="internet"
@@ -5694,6 +7451,7 @@
       apn="smartwap"
       proxy="10.239.221.7"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -5724,7 +7482,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="11"
       apn="portalnmms"
@@ -5734,14 +7492,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="404"
       mnc="11"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="404"
       mnc="11"
       apn="portalnmms"
@@ -5750,7 +7508,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="12"
       apn="internet"
@@ -5776,7 +7534,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="13"
       apn="portalnmms"
@@ -5786,14 +7544,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="404"
       mnc="13"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="404"
       mnc="13"
       apn="portalnmms"
@@ -5802,7 +7560,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA Punjab MMS"
+  <apn carrier="IDEA MMS"
       mcc="404"
       mnc="14"
       apn="mmsc"
@@ -5812,7 +7570,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA Punjab"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="14"
       apn="internet"
@@ -5828,7 +7586,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="15"
       apn="portalnmms"
@@ -5838,14 +7596,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="404"
       mnc="15"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="404"
       mnc="15"
       apn="portalnmms"
@@ -5913,7 +7671,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="17"
       apn="aircelmms"
@@ -5923,7 +7681,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel MMS"
+  <apn carrier="Reliance MMS"
       mcc="404"
       mnc="18"
       apn="mms"
@@ -5946,10 +7704,11 @@
       apn="smartwap"
       proxy="10.239.221.7"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="19"
       apn="internet"
@@ -5975,7 +7734,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="20"
       apn="portalnmms"
@@ -5985,14 +7744,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="404"
       mnc="20"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="404"
       mnc="20"
       apn="portalnmms"
@@ -6019,7 +7778,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="22"
       apn="internet"
@@ -6045,7 +7804,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="24"
       apn="internet"
@@ -6103,7 +7862,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="25"
       apn="aircelmms"
@@ -6113,7 +7872,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="27"
       apn="portalnmms"
@@ -6123,14 +7882,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="404"
       mnc="27"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="404"
       mnc="27"
       apn="portalnmms"
@@ -6171,7 +7930,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="28"
       apn="aircelmms"
@@ -6213,7 +7972,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="29"
       apn="aircelmms"
@@ -6223,7 +7982,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="30"
       apn="portalnmms"
@@ -6233,14 +7992,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="404"
       mnc="30"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="404"
       mnc="30"
       apn="portalnmms"
@@ -6308,7 +8067,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="33"
       apn="aircelmms"
@@ -6377,7 +8136,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="35"
       apn="aircelmms"
@@ -6387,7 +8146,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel MMS"
+  <apn carrier="Reliance MMS"
       mcc="404"
       mnc="36"
       apn="mms"
@@ -6410,6 +8169,7 @@
       apn="smartwap"
       proxy="10.239.221.7"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -6445,7 +8205,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="37"
       apn="aircelmms"
@@ -6612,7 +8372,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="43"
       apn="portalnmms"
@@ -6622,14 +8382,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="404"
       mnc="43"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="404"
       mnc="43"
       apn="portalnmms"
@@ -6638,7 +8398,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA Karnataka"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="44"
       apn="internet"
@@ -6654,7 +8414,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA Karnataka MMS"
+  <apn carrier="IDEA MMS"
       mcc="404"
       mnc="44"
       apn="mmsc"
@@ -6691,7 +8451,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="46"
       apn="portalnmms"
@@ -6701,14 +8461,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="404"
       mnc="46"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="404"
       mnc="46"
       apn="portalnmms"
@@ -6744,7 +8504,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel MMS"
+  <apn carrier="Reliance MMS"
       mcc="404"
       mnc="50"
       apn="mms"
@@ -6754,7 +8514,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel"
+  <apn carrier="Reliance Net"
       mcc="404"
       mnc="50"
       apn="smartnet"
@@ -6767,6 +8527,7 @@
       apn="smartwap"
       proxy="10.239.221.7"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -6796,7 +8557,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Reliance RTel MMS"
+  <apn carrier="Reliance MMS"
       mcc="404"
       mnc="52"
       apn="mms"
@@ -6806,7 +8567,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel"
+  <apn carrier="Reliance Net"
       mcc="404"
       mnc="52"
       apn="smartnet"
@@ -6819,6 +8580,7 @@
       apn="smartwap"
       proxy="10.239.221.7"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -6900,7 +8662,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="56"
       apn="internet"
@@ -7004,7 +8766,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="60"
       apn="portalnmms"
@@ -7014,14 +8776,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="404"
       mnc="60"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="404"
       mnc="60"
       apn="portalnmms"
@@ -7108,7 +8870,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Reliance RTel MMS"
+  <apn carrier="Reliance MMS"
       mcc="404"
       mnc="67"
       apn="mms"
@@ -7118,7 +8880,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel"
+  <apn carrier="Reliance Net"
       mcc="404"
       mnc="67"
       apn="smartnet"
@@ -7131,6 +8893,7 @@
       apn="smartwap"
       proxy="10.239.221.7"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -7427,7 +9190,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="78"
       apn="internet"
@@ -7531,7 +9294,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="82"
       apn="internet"
@@ -7557,7 +9320,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel MMS"
+  <apn carrier="Reliance MMS"
       mcc="404"
       mnc="83"
       apn="mms"
@@ -7567,7 +9330,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel"
+  <apn carrier="Reliance Net"
       mcc="404"
       mnc="83"
       apn="smartnet"
@@ -7580,10 +9343,11 @@
       apn="smartwap"
       proxy="10.239.221.7"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="84"
       apn="portalnmms"
@@ -7593,14 +9357,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="404"
       mnc="84"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="404"
       mnc="84"
       apn="portalnmms"
@@ -7609,7 +9373,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Reliance RTel MMS"
+  <apn carrier="Reliance MMS"
       mcc="404"
       mnc="85"
       apn="mms"
@@ -7619,7 +9383,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel"
+  <apn carrier="Reliance Net"
       mcc="404"
       mnc="85"
       apn="smartnet"
@@ -7632,10 +9396,11 @@
       apn="smartwap"
       proxy="10.239.221.7"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="86"
       apn="portalnmms"
@@ -7645,14 +9410,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="404"
       mnc="86"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="404"
       mnc="86"
       apn="portalnmms"
@@ -7661,7 +9426,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="87"
       apn="internet"
@@ -7687,7 +9452,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="88"
       apn="portalnmms"
@@ -7697,14 +9462,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="404"
       mnc="88"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="404"
       mnc="88"
       apn="portalnmms"
@@ -7713,7 +9478,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="89"
       apn="internet"
@@ -7798,7 +9563,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="91"
       apn="aircelmms"
@@ -8543,13 +10308,6 @@
       type="default,supl"
   />
 
-  <apn carrier="TATA DOCOMO INTERNET"
-      mcc="405"
-      mnc="025"
-      apn="TATA.DOCOMO.INTERNET"
-      type="default,supl"
-  />
-
   <apn carrier="TATA DOCOMO DIVE-IN"
       mcc="405"
       mnc="025"
@@ -8559,6 +10317,13 @@
       type="default,supl"
   />
 
+  <apn carrier="TATA DOCOMO INTERNET"
+      mcc="405"
+      mnc="025"
+      apn="TATA.DOCOMO.INTERNET"
+      type="default,supl"
+  />
+
   <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="025"
@@ -9303,7 +11068,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="66"
       apn="portalnmms"
@@ -9313,14 +11078,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="66"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="405"
       mnc="66"
       apn="portalnmms"
@@ -9329,7 +11094,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="67"
       apn="portalnmms"
@@ -9339,14 +11104,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="67"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="405"
       mnc="67"
       apn="portalnmms"
@@ -9355,7 +11120,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="70"
       apn="internet"
@@ -9381,7 +11146,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="750"
       apn="portalnmms"
@@ -9391,14 +11156,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="750"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="405"
       mnc="750"
       apn="portalnmms"
@@ -9407,7 +11172,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="751"
       apn="portalnmms"
@@ -9417,14 +11182,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="751"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="405"
       mnc="751"
       apn="portalnmms"
@@ -9433,7 +11198,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="752"
       apn="portalnmms"
@@ -9443,14 +11208,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="752"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="405"
       mnc="752"
       apn="portalnmms"
@@ -9459,7 +11224,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="753"
       apn="portalnmms"
@@ -9469,14 +11234,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="753"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="405"
       mnc="753"
       apn="portalnmms"
@@ -9485,7 +11250,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="754"
       apn="portalnmms"
@@ -9495,14 +11260,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="754"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="405"
       mnc="754"
       apn="portalnmms"
@@ -9511,7 +11276,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="755"
       apn="portalnmms"
@@ -9521,14 +11286,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="755"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="405"
       mnc="755"
       apn="portalnmms"
@@ -9537,7 +11302,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="756"
       apn="portalnmms"
@@ -9547,14 +11312,14 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Connect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="756"
       apn="www"
       type="default,supl"
   />
 
-  <apn carrier="VodafoneLive!"
+  <apn carrier="Vodafone live"
       mcc="405"
       mnc="756"
       apn="portalnmms"
@@ -9563,7 +11328,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="799"
       apn="internet"
@@ -9589,7 +11354,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL ROI"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="800"
       apn="aircelgprs"
@@ -9605,7 +11370,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL ROI MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="800"
       apn="aircelmms"
@@ -9641,7 +11406,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL Central"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="802"
       apn="aircelgprs"
@@ -9657,7 +11422,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL Central MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="802"
       apn="aircelmms"
@@ -9693,7 +11458,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL ROI"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="804"
       apn="aircelgprs"
@@ -9709,7 +11474,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL ROI MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="804"
       apn="aircelmms"
@@ -9719,7 +11484,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL ROI"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="805"
       apn="aircelgprs"
@@ -9735,7 +11500,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL ROI MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="805"
       apn="aircelmms"
@@ -9745,7 +11510,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL Central"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="806"
       apn="aircelgprs"
@@ -9761,7 +11526,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL Central MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="806"
       apn="aircelmms"
@@ -9771,7 +11536,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL Central"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="807"
       apn="aircelgprs"
@@ -9787,7 +11552,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL Central MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="807"
       apn="aircelmms"
@@ -9797,7 +11562,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL Central"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="808"
       apn="aircelgprs"
@@ -9813,7 +11578,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL Central MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="808"
       apn="aircelmms"
@@ -9849,7 +11614,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL ROI"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="810"
       apn="aircelgprs"
@@ -9865,7 +11630,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL ROI MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="810"
       apn="aircelmms"
@@ -9875,7 +11640,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL ROI"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="811"
       apn="aircelgprs"
@@ -9891,7 +11656,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL ROI MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="811"
       apn="aircelmms"
@@ -9901,7 +11666,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL Central"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="812"
       apn="aircelgprs"
@@ -9917,7 +11682,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL Central MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="812"
       apn="aircelmms"
@@ -9927,10 +11692,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="813"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -9953,10 +11719,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="814"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -9979,10 +11746,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="815"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10005,10 +11773,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="816"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10031,10 +11800,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="817"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10057,10 +11827,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="818"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10083,10 +11854,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="819"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10109,10 +11881,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="820"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10135,10 +11908,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="821"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10161,10 +11935,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="822"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10544,10 +12319,11 @@
       type="default,supl"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="844"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10570,7 +12346,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="845"
       apn="internet"
@@ -10596,7 +12372,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="846"
       apn="internet"
@@ -10622,7 +12398,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="847"
       apn="internet"
@@ -10648,7 +12424,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="848"
       apn="internet"
@@ -10674,7 +12450,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="849"
       apn="internet"
@@ -10700,7 +12476,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="850"
       apn="internet"
@@ -10726,7 +12502,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="851"
       apn="internet"
@@ -10752,7 +12528,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="852"
       apn="internet"
@@ -10778,7 +12554,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="853"
       apn="internet"
@@ -10804,10 +12580,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="875"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10830,10 +12607,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="876"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10856,10 +12634,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="877"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10882,10 +12661,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="878"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10908,10 +12688,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="879"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10934,10 +12715,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="880"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -11161,10 +12943,11 @@
       type="default,supl"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="925"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -11187,10 +12970,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="926"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -11213,10 +12997,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="927"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -11239,10 +13024,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="928"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -11265,10 +13051,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="929"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -11413,6 +13200,76 @@
       type="mms"
   />
 
+  <apn carrier="AWCC"
+      mcc="412"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Roshan"
+      mcc="412"
+      mnc="20"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MTN"
+      mcc="412"
+      mnc="40"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Etisalat"
+      mcc="412"
+      mnc="50"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Mobitel"
+      mcc="413"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Dialog"
+      mcc="413"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Etisalat"
+      mcc="413"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Airtel"
+      mcc="413"
+      mnc="05"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Hutch"
+      mcc="413"
+      mnc="08"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MPT"
+      mcc="414"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
   <apn carrier="Alfa Internet"
       mcc="415"
       mnc="01"
@@ -11654,7 +13511,116 @@
       type="mms"
   />
 
+  <apn carrier="Asiacell GPRS"
+      mcc="418"
+      mnc="05"
+      apn="net.asiacell.com"
+      type="default,supl"
+  />
 
+  <apn carrier="Asiacell MMS"
+      mcc="418"
+      mnc="05"
+      apn="wap.asiacell.com"
+      mmsc="http://192.168.107.10:19090/was"
+      mmsproxy="192.168.107.50"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="SanaTel"
+      mcc="418"
+      mnc="08"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="ZAIN-GPRS"
+      mcc="418"
+      mnc="20"
+      apn="internet"
+      user="atheer"
+      password="atheer"
+      authtype="1"
+      type="default,supl"
+  />
+
+  <apn carrier="Zain-MMS"
+      mcc="418"
+      mnc="20"
+      apn="MMS"
+      user="atheer"
+      password="atheer"
+      authtype="1"
+      mmsc="http://mms:8002/"
+      mmsproxy="172.29.11.12"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="ZainHURI - SNPT"
+      mcc="418"
+      mnc="30"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Korek 9595"
+      mcc="418"
+      mnc="40"
+      apn="internet.korek.com"
+      type="default,supl"
+  />
+
+  <apn carrier="Korek 9191"
+      mcc="418"
+      mnc="40"
+      apn="net.korek.com"
+      user="korek"
+      password="korek"
+      type="default,supl"
+  />
+
+  <apn carrier="Korek 9494"
+      mcc="418"
+      mnc="40"
+      apn="internet.korek.com"
+      type="default,supl"
+  />
+
+  <apn carrier="KOREK MMS"
+      mcc="418"
+      mnc="40"
+      apn="mms.korek.com"
+      user="korek"
+      password="korek"
+      authtype="1"
+      mmsc="http://mms.korektel.com/mms/wapenc"
+      mmsproxy="192.168.18.187"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Mobitel"
+      mcc="418"
+      mnc="45"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Itisaluna"
+      mcc="418"
+      mnc="62"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Omnnea"
+      mcc="418"
+      mnc="92"
+      apn="default"
+      type="default,supl"
+  />
 
   <apn carrier="MI"
       mcc="419"
@@ -11662,7 +13628,6 @@
       apn="pps"
       user="pps"
       password="pps"
-      authtype="0"
       type="default,supl"
   />
 
@@ -11691,9 +13656,6 @@
       type="mms"
   />
 
-
-
-
   <apn carrier="Internet Action"
       mcc="419"
       mnc="03"
@@ -11730,15 +13692,15 @@
       type="mms"
   />
 
-
-  <apn carrier="VIVA Internet"
+  <apn carrier="VIVA INTERNET"
       mcc="419"
       mnc="04"
       apn="VIVA"
+      proxy="172.16.128.228"
+      port="8080"
       type="default,supl"
   />
 
-
   <apn carrier="STC - GPRS"
       mcc="420"
       mnc="01"
@@ -11746,7 +13708,6 @@
       type="default,supl"
   />
 
-
   <apn carrier="STC MMS"
       mcc="420"
       mnc="01"
@@ -11757,8 +13718,6 @@
       type="mms"
   />
 
-
-
   <apn carrier="Mobily WEB"
       mcc="420"
       mnc="03"
@@ -11839,6 +13798,33 @@
       type="mms"
   />
 
+  <apn carrier="SabaFon"
+      mcc="421"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MTN"
+      mcc="421"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Yemen Mobile"
+      mcc="421"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="HiTS-UNITEL"
+      mcc="421"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
 
   <apn carrier="Oman Mobile MMS"
       mcc="422"
@@ -11893,6 +13879,7 @@
       mcc="424"
       mnc="02"
       apn="etisalat.ae"
+      authtype="1"
       type="default,supl"
   />
 
@@ -11902,6 +13889,7 @@
       apn="etisalat"
       proxy="10.12.0.32"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -11912,6 +13900,7 @@
       mmsc="http://mms/servlets/mms"
       mmsproxy="10.12.0.32"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -11957,83 +13946,10 @@
       type="default,supl"
   />
 
-  <apn carrier="Orange Internet UG" 
-      mcc="641" 
-      mnc="14" 
-      apn="orange.ug" 
-      type="default"
-  />
- 
-  <apn carrier="Orange MMS" 
-      mcc="641" 
-      mnc="14" 
-      apn="orangemms"
-      mmsc="http://mms/"
-      type="mms"
-  />
-
-
-  <apn carrier="Orange MMS" 
-      apn="orangemms" 
-      user="mmsc" 
-      password="mmsc" 
-      mmsc="http://10.2.1.20:8514" 
-      mmsproxy="10.2.1.20" 
-      mmsport="8080" 
-      mcc="617" 
-      mnc="01" 
-      type="mms" 
-  />
-
-  <apn carrier="Orange Internet" 
-      apn="orange" 
-      mcc="617" 
-      mnc="01" 
-      type="default" 
-  />
-
-  <apn carrier="Orange MMS" 
-      apn="mms.orange.md" 
-      mmsc="http://mms/mms" 
-      mmsproxy="192.168.127.125" 
-      mmsport="3128" 
-      mcc="259" 
-      mnc="01" 
-      type="mms" 
-  />
-
-  <apn carrier="Orange IMO" 
-      apn="wap.orange.md" 
-      proxy="192.168.127.124" 
-      mmsport="3128" 
-      mcc="259" 
-      mnc="01" 
-      type="mms" 
-  />
-
-  <apn carrier="Orange MMS" 
-      apn="orange.mms" 
-      user="orange" 
-      password="orange" 
-      mmsc="http://10.10.10.35:38090/was" 
-      mmsproxy="10.10.10.36" 
-      mmsport="8080" 
-      mcc="614" 
-      mnc="04" 
-      type="mms" 
-  />
-
-  <apn carrier="Orange Internet" 
-      apn="orange.ne" 
-      mcc="614" 
-      mnc="04" 
-      type="default" 
-  />
-
   <apn carrier="Cellcom Internet"
       mcc="425"
       mnc="02"
-      apn="Sphone"
+      apn="sphone"
       type="default,supl"
   />
 
@@ -12108,14 +14024,14 @@
       type="mms"
   />
 
-  <apn carrier="Net HOT mobile"
+  <apn carrier="Internet HOT mobile"
       mcc="425"
       mnc="07"
       apn="net.hotm"
       type="default,supl"
   />
 
-  <apn carrier="Mms HOT mobile"
+  <apn carrier="MMS HOT mobile"
       mcc="425"
       mnc="07"
       apn="mms.hotm"
@@ -12125,13 +14041,6 @@
       type="mms"
   />
 
-  <apn carrier="PC HOT mobile"
-      mcc="425"
-      mnc="07"
-      apn="pc.hotm"
-      type="default,supl"
-  />
-
   <apn carrier="GolanTelecom Internet"
       mcc="425"
       mnc="08"
@@ -12157,6 +14066,23 @@
       type="default,supl,mms"
   />
 
+  <apn carrier="Home Cellular Internet"
+      mcc="425"
+      mnc="15"
+      apn="hcminternet"
+      type="default,supl"
+  />
+
+  <apn carrier="Home Cellular MMS"
+      mcc="425"
+      mnc="15"
+      apn="hcmMMS"
+      mmsc="http://82.166.164.229:9000/mmsc"
+      mmsproxy="82.166.164.229"
+      mmsport="8898"
+      type="mms"
+  />
+
   <apn carrier="Rami Levi 3G"
       mcc="425"
       mnc="16"
@@ -12310,6 +14236,62 @@
       type="mms"
   />
 
+  <apn carrier="Unitel"
+      mcc="428"
+      mnc="88"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Skytel"
+      mcc="428"
+      mnc="91"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="G.Mobile"
+      mcc="428"
+      mnc="98"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MobiCom"
+      mcc="428"
+      mnc="99"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Namaste / NT Mobile"
+      mcc="429"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Ncell"
+      mcc="429"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Sky/C-Phone"
+      mcc="429"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="SmartCell"
+      mcc="429"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
   <apn carrier="MCI-GPRS"
       mcc="432"
       mnc="11"
@@ -12409,7 +14391,7 @@
       mmsc="http://192.168.193.134:38090/was"
       mmsproxy="192.168.194.73"
       mmsport="8080"
-       type="mms"
+      type="mms"
   />
 
   <apn carrier="MCI-GPRS"
@@ -12428,7 +14410,156 @@
       type="mms"
   />
 
-  <!-- APNs for Japanese phone carriers -->
+  <apn carrier="Beeline-UZB Internet"
+      mcc="434"
+      mnc="04"
+      apn="internet.beeline.uz"
+      user="beeline"
+      password="beeline"
+      authtype="1"
+      type="default,supl"
+  />
+
+  <apn carrier="Beeline-UZB MMS"
+      mcc="434"
+      mnc="04"
+      apn="mms.beeline.uz"
+      user="beeline"
+      password="beeline"
+      authtype="1"
+      mmsc="http://mms"
+      mmsproxy="172.30.30.166"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="UCELL Internet"
+      mcc="434"
+      mnc="05"
+      apn="internet"
+      type="default,supl"
+  />
+
+  <apn carrier="UCELL MMS"
+      mcc="434"
+      mnc="05"
+      apn="mms"
+      mmsc="http://mmsc:8002/"
+      mmsproxy="10.64.164.10"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Perfectum Mobile"
+      mcc="434"
+      mnc="06"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MTS-UZB Internet"
+      mcc="434"
+      mnc="07"
+      apn="net.mts.uz"
+      user="mts"
+      password="mts"
+      authtype="1"
+      type="default,supl"
+  />
+
+  <apn carrier="MTS-UZB MMS"
+      mcc="434"
+      mnc="07"
+      apn="mms.mts.uz"
+      mmsc="http://mmsc/was"
+      mmsproxy="10.10.0.10"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Tcell"
+      mcc="436"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Tcell"
+      mcc="436"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Megafon"
+      mcc="436"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Babilon-M"
+      mcc="436"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Tacom"
+      mcc="436"
+      mnc="05"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Tcell"
+      mcc="436"
+      mnc="12"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Beeline"
+      mcc="437"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Fonex"
+      mcc="437"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MegaCom"
+      mcc="437"
+      mnc="05"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="O!"
+      mcc="437"
+      mnc="09"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MTS (BARASH Communication)"
+      mcc="438"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="TM-Cell"
+      mcc="438"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
 
   <apn carrier="mopera U"
       mcc="440"
@@ -12449,7 +14580,7 @@
       password="bmobile"
       authtype="3"
       mmsc=""
-   />
+  />
 
   <apn carrier="b-mobile 3G・4G U300"
       mcc="440"
@@ -12495,42 +14626,144 @@
       mmsc=""
   />
 
-  <apn carrier="plus.softbank"
+  <apn carrier="Application"
       mcc="440"
       mnc="20"
-      apn="plus.softbank"
-      user="plus"
-      server=""
-      password="softbank"
-      mmsc=""
+      apn="plus.acs.jp"
+      user="plusw6q9tattkmpk"
+      password="msfbbam83bsdetxb"
+      mmsproxy="andmms.plusacs.ne.jp"
+      mmsport="8080"
+      mmsc="http://mms-s"
+      type="default,mms,supl"
+      authtype="2"
   />
 
-  <apn carrier="SK Telecom"
+  <apn carrier="SKT LTE INTERNET"
       mcc="450"
       mnc="05"
-      apn="web.sktelecom.com"
+      apn="lte.sktelecom.com"
+      type="ia,default,mms,supl,fota,cbs"
       mmsc="http://omms.nate.com:9082/oma_mms"
       mmsproxy="smart.nate.com"
       mmsport="9093"
-      type="default,supl,mms"
+      server="*"
   />
 
-  <apn carrier="SK Telecom (Roaming)"
+  <apn carrier="SKT 3G INTERNET"
+      mcc="450"
+      mnc="05"
+      apn="web.sktelecom.com"
+      type="default,mms,supl,fota,cbs"
+      mmsc="http://omms.nate.com:9082/oma_mms"
+      mmsproxy="smart.nate.com"
+      mmsport="9093"
+      server="*"
+  />
+
+  <apn carrier="SKT LTE Roaming"
+      mcc="450"
+      mnc="05"
+      apn="lte-roaming.sktelecom.com"
+      mmsc="http://omms.nate.com:9082/oma_mms"
+      mmsproxy="smart.nate.com"
+      mmsport="9093"
+      server="*"
+  />
+
+  <apn carrier="SKT 3G Roaming"
       mcc="450"
       mnc="05"
       apn="roaming.sktelecom.com"
       mmsc="http://omms.nate.com:9082/oma_mms"
       mmsproxy="smart.nate.com"
       mmsport="9093"
-      type="default,supl,mms"
+      server="*"
   />
 
-  <apn carrier="KT-HSDPA"
+  <apn carrier="SKT 3G INTERNET"
+      mcc="450"
+      mnc="11"
+      apn="web.sktelecom.com"
+      type="default,mms,supl,fota,cbs"
+      mmsc="http://omms.nate.com:9082/oma_mms"
+      mmsproxy="smart.nate.com"
+      mmsport="9093"
+      server="*"
+  />
+
+  <apn carrier="SKT LTE Roaming"
+      mcc="450"
+      mnc="11"
+      apn="lte-roaming.sktelecom.com"
+      mmsc="http://omms.nate.com:9082/oma_mms"
+      mmsproxy="smart.nate.com"
+      mmsport="9093"
+      server="*"
+  />
+
+  <apn carrier="SKT 3G Roaming"
+      mcc="450"
+      mnc="11"
+      apn="roaming.sktelecom.com"
+      mmsc="http://omms.nate.com:9082/oma_mms"
+      mmsproxy="smart.nate.com"
+      mmsport="9093"
+      server="*"
+  />
+
+  <apn carrier="LG uplus IMS"
+      mcc="450"
+      mnc="06"
+      apn="ims.lguplus.co.kr"
+      type="ia,ims"
+      mmsc="http://omammsc.uplus.co.kr:9084"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="LG uplus"
+      mcc="450"
+      mnc="06"
+      apn="internet.lguplus.co.kr"
+      type="default,mms,supl,fota,cbs"
+      mmsc="http://omammsc.uplus.co.kr:9084"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="LG uplus LTE Roaming"
+      mcc="450"
+      mnc="06"
+      apn="lte-roaming.lguplus.co.kr"
+      mmsc="http://omammsc.uplus.co.kr:9084"
+      authtype="0"
+  />
+
+  <apn carrier="LG uplus Roaming"
+      mcc="450"
+      mnc="06"
+      apn="wroaming.lguplus.co.kr"
+      mmsc="http://omammsc.uplus.co.kr:9084"
+      authtype="0"
+  />
+
+  <apn carrier="KT LTE INTERNET"
+      mcc="450"
+      mnc="08"
+      apn="lte150.ktfwing.com"
+      type="ia,default,mms,supl,fota,cbs"
+      mmsc="http://mmsc.ktfwing.com:9082"
+      port="80"
+      server="*"
+  />
+
+  <apn carrier="KT 3G INTERNET"
       mcc="450"
       mnc="08"
       apn="alwayson-r6.ktfwing.com"
+      type="default,mms,supl,fota,cbs"
       mmsc="http://mmsc.ktfwing.com:9082"
-      type="default,supl,mms"
+      port="80"
+      server="*"
   />
 
   <apn carrier="Mobi-wap-gprs 2"
@@ -12650,14 +14883,14 @@
       type="mms"
   />
 
-  <apn carrier="Beeline-wap-gprs2"
+  <apn carrier="Gmobile-wap-gprs2"
       mcc="452"
       mnc="07"
       apn="internet"
       type="default,supl"
   />
 
-  <apn carrier="Beeline-wap-gprs"
+  <apn carrier="Gmobile-wap-gprs"
       mcc="452"
       mnc="07"
       apn="internet"
@@ -12666,7 +14899,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Beeline-gprs-mms"
+  <apn carrier="Gmobile-gprs-mms"
       mcc="452"
       mnc="07"
       apn="mms"
@@ -12676,7 +14909,7 @@
       type="mms"
   />
 
-  <apn carrier="Beeline MMS"
+  <apn carrier="Gmobile MMS"
       mcc="452"
       mnc="07"
       apn="mms"
@@ -12715,45 +14948,80 @@
       type="mms"
   />
 
-  <apn carrier="one2free"
+  <apn carrier="1O1O"
       mcc="454"
       mnc="00"
-      apn="hkcsl"
+      apn="mobile"
       mmsproxy="192.168.59.51"
       mmsport="8080"
       mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="one2free"
+      mcc="454"
+      mnc="00"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="NWMOBILE"
+      mcc="454"
+      mnc="00"
+      apn="NWMOBILE"
+      mmsproxy="192.168.59.61"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
       type="default,supl,mms"
   />
 
   <apn carrier="1O1O"
       mcc="454"
-      mnc="00"
-      apn="hkcsl"
+      mnc="02"
+      apn="mobile"
       mmsproxy="192.168.59.51"
       mmsport="8080"
       mmsc="http://192.168.58.171:8002"
-      type="default,supl,mms"
-  />
-
-  <apn carrier="NWMobile Data"
-      mcc="454"
-      mnc="00"
-      apn="NWMOBILE"
-      proxy="192.168.59.61"
-      port="8080"
-      mmsproxy="192.168.59.61"
-      mmsport="8080"
-      mmsc="http://192.168.58.171:8002"
+      authtype="3"
       type="default,supl,mms"
   />
 
   <apn carrier="one2free"
       mcc="454"
       mnc="02"
-      apn="hkcsl"
-      mmsc="http://192.168.58.171:8002"
+      apn="mobile"
       mmsproxy="192.168.59.51"
       mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="NWMOBILE"
+      mcc="454"
+      mnc="02"
+      apn="NWMOBILE"
+      mmsproxy="192.168.59.61"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="3 LTE"
+      mcc="454"
+      mnc="03"
+      apn="mobile.lte.three.com.hk"
+      mmsc="http://mms.um.three.com.hk:10021/mmsc"
+      mmsproxy="mms.three.com.hk"
+      mmsport="8799"
+      authtype="1"
       type="default,supl,mms"
   />
 
@@ -12762,8 +15030,9 @@
       mnc="03"
       apn="mobile.three.com.hk"
       mmsc="http://mms.um.three.com.hk:10021/mmsc"
-      mmsproxy="172.20.97.116"
+      mmsproxy="mms.three.com.hk"
       mmsport="8799"
+      authtype="1"
       type="default,supl,mms"
   />
 
@@ -12793,6 +15062,7 @@
       mmsc="http://mms.smartone.com/server"
       mmsproxy="10.9.9.9"
       mmsport="8080"
+      authtype="3"
       type="default,supl,mms"
   />
 
@@ -12803,6 +15073,7 @@
       mmsc="http://192.168.58.171:8002"
       mmsproxy="192.168.59.51"
       mmsport="8080"
+      authtype="3"
       type="default,supl,mms"
   />
 
@@ -12821,6 +15092,21 @@
       type="default,supl"
   />
 
+  <apn carrier="CMHK MMS"
+      mcc="454"
+      mnc="13"
+      apn="cmhk"
+      mmsc="http://mms.hk.chinamobile.com/mms"
+      type="mms"
+  />
+
+  <apn carrier="CMHK Data"
+      mcc="454"
+      mnc="13"
+      apn="cmhk"
+      type="default,supl"
+  />
+
   <apn carrier="SmarTone"
       mcc="454"
       mnc="15"
@@ -12828,26 +15114,19 @@
       mmsproxy="10.9.9.9"
       mmsport="8080"
       mmsc="http://mms.smartone.com/server"
+      authtype="3"
       type="default,supl,mms"
   />
 
-  <apn carrier="PCCW 2G GPRS"
+  <apn carrier="PCCW-HKT"
       mcc="454"
       mnc="16"
-      apn="pccwdata"
-      proxy="10.131.2.8"
-      port="8080"
-      type="default,supl"
-  />
-
-  <apn carrier="PCCW 2G MMS"
-      mcc="454"
-      mnc="16"
-      apn="pccwmms"
-      mmsc="http://mmsc.mms.pccwmobile.com:8002/"
-      mmsproxy="10.131.2.8"
+      apn="pccw"
+      mmsc="http://3gmms.pccwmobile.com:8080/was"
+      mmsproxy="10.140.14.10"
       mmsport="8080"
-      type="mms"
+      authtype="1"
+      type="default,supl,mms"
   />
 
   <apn carrier="SmarTone"
@@ -12857,26 +15136,51 @@
       mmsproxy="10.9.9.9"
       mmsport="8080"
       mmsc="http://mms.smartone.com/server"
+      authtype="3"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="1O1O"
+      mcc="454"
+      mnc="18"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
       type="default,supl,mms"
   />
 
   <apn carrier="one2free"
       mcc="454"
       mnc="18"
-      apn="hkcsl"
-      mmsc="http://192.168.58.171:8002"
+      apn="mobile"
       mmsproxy="192.168.59.51"
       mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
       type="default,supl,mms"
   />
 
-  <apn carrier="PCCW 3G"
+  <apn carrier="NWMOBILE"
+      mcc="454"
+      mnc="18"
+      apn="NWMOBILE"
+      mmsproxy="192.168.59.61"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="PCCW-HKT"
       mcc="454"
       mnc="19"
       apn="pccw"
       mmsc="http://3gmms.pccwmobile.com:8080/was"
       mmsproxy="10.140.14.10"
       mmsport="8080"
+      authtype="1"
       type="default,supl,mms"
   />
 
@@ -12884,11 +15188,10 @@
       mcc="455"
       mnc="00"
       apn="smartgprs"
-      proxy="10.9.9.29"
-      port="8080"
-      mmsc="http://mms.smartone.com.mo/dmog/mo"
+      mmsc="http://momms.smartone.com/dmog/mo"
       mmsproxy="10.9.9.29"
       mmsport="8080"
+      authtype="3"
       type="default,supl,mms"
   />
 
@@ -12896,8 +15199,6 @@
       mcc="455"
       mnc="01"
       apn="ctm-mobile"
-      proxy="192.168.99.2"
-      port="8080"
       type="default,supl"
   />
 
@@ -12915,8 +15216,6 @@
       mcc="455"
       mnc="01"
       apn="ctmprepaid"
-      proxy="192.168.99.2"
-      port="8080"
       mmsc="http://mms.wap.ctm.net:8002"
       mmsproxy="192.168.99.3"
       mmsport="8080"
@@ -12930,6 +15229,7 @@
       mmsc="http://mms.three.com.mo:10021/mmsc"
       mmsproxy="mms.three.com.mo"
       mmsport="8080"
+      authtype="1"
       type="default,supl,mms"
   />
 
@@ -12937,8 +15237,6 @@
       mcc="455"
       mnc="04"
       apn="ctm-mobile"
-      proxy="192.168.99.2"
-      port="8080"
       type="default,supl"
   />
 
@@ -12956,8 +15254,6 @@
       mcc="455"
       mnc="04"
       apn="ctmprepaid"
-      proxy="192.168.99.2"
-      port="8080"
       mmsc="http://mms.wap.ctm.net:8002"
       mmsproxy="192.168.99.3"
       mmsport="8080"
@@ -12971,9 +15267,101 @@
       mmsc="http://mms.three.com.mo:10021/mmsc"
       mmsproxy="mms.three.com.mo"
       mmsport="8080"
+      authtype="1"
       type="default,supl,mms"
   />
 
+  <apn carrier="Cellcard"
+      mcc="456"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Smart"
+      mcc="456"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="qb"
+      mcc="456"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Star-Cell"
+      mcc="456"
+      mnc="05"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Smart"
+      mcc="456"
+      mnc="06"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Metfone"
+      mcc="456"
+      mnc="08"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Beeline"
+      mcc="456"
+      mnc="09"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Excell"
+      mcc="456"
+      mnc="11"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Cellcard"
+      mcc="456"
+      mnc="18"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="LTC"
+      mcc="457"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="ETL"
+      mcc="457"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Unitel"
+      mcc="457"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Beeline"
+      mcc="457"
+      mnc="08"
+      apn="default"
+      type="default,supl"
+  />
+
   <apn carrier="中国移动 (China Mobile) GPRS"
       mcc="460"
       mnc="00"
@@ -13107,7 +15495,7 @@
       apn="fetnet01"
       mmsc="http://mms"
       mmsproxy="210.241.199.199"
-      mmsport="8080"
+      mmsport="9201"
       type="mms"
   />
 
@@ -13200,13 +15588,6 @@
       type="mms"
   />
 
-  <apn carrier="台灣大哥大(TW Mobile) (twm)"
-      mcc="466"
-      mnc="97"
-      apn="twm"
-      type="default,supl"
-  />
-
   <apn carrier="台灣大哥大(TW Mobile) (Internet)"
       mcc="466"
       mnc="97"
@@ -13241,6 +15622,20 @@
       type="mms"
   />
 
+  <apn carrier="Dhiraagu"
+      mcc="472"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Wataniya"
+      mcc="472"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
   <apn carrier="DiGi Internet"
       mcc="502"
       mnc="10"
@@ -13257,40 +15652,43 @@
       mmsc="http://mms.digi.com.my/servlets/mms"
       mmsproxy="203.92.128.160"
       mmsport="80"
+      authtype="1"
       type="mms"
   />
 
-  <apn carrier="Maxis 3G"
+  <apn carrier="Maxis Internet"
       mcc="502"
       mnc="12"
-      apn="unet"
+      apn="max4g"
       user="maxis"
       password="wap"
       mmsproxy="202.75.133.49"
       mmsport="80"
       mmsc="http://172.16.74.100:10021/mmsc"
+      authtype="1"
       type="default,supl,mms"
   />
 
-  <apn carrier="Celcom 3G"
+  <apn carrier="Celcom Internet"
       mcc="502"
       mnc="13"
-      apn="celcom3g"
+      apn="celcom4g"
       mmsproxy="10.128.1.242"
       mmsport="8080"
       mmsc="http://mms.celcom.net.my"
       type="default,supl,mms"
   />
 
-  <apn carrier="Maxis 3G"
+  <apn carrier="Maxis Internet"
       mcc="502"
       mnc="142"
-      apn="unet"
+      apn="max4g"
       user="maxis"
       password="wap"
       mmsproxy="202.75.133.49"
       mmsport="80"
       mmsc="http://172.16.74.100:10021/mmsc"
+      authtype="1"
       type="default,supl,mms"
   />
 
@@ -13310,13 +15708,14 @@
       mmsc="http://mms.digi.com.my/servlets/mms"
       mmsproxy="203.92.128.160"
       mmsport="80"
+      authtype="1"
       type="mms"
   />
 
-  <apn carrier="Celcom 3G"
+  <apn carrier="Celcom Internet"
       mcc="502"
       mnc="145"
-      apn="celcom3g"
+      apn="celcom4g"
       mmsproxy="10.128.1.242"
       mmsport="8080"
       mmsc="http://mms.celcom.net.my"
@@ -13339,25 +15738,27 @@
       mmsc="http://mms.digi.com.my/servlets/mms"
       mmsproxy="203.92.128.160"
       mmsport="80"
+      authtype="1"
       type="mms"
   />
 
-  <apn carrier="Maxis 3G"
+  <apn carrier="Maxis Internet"
       mcc="502"
       mnc="147"
-      apn="unet"
+      apn="max4g"
       user="maxis"
       password="wap"
       mmsproxy="202.75.133.49"
       mmsport="80"
       mmsc="http://172.16.74.100:10021/mmsc"
+      authtype="1"
       type="default,supl,mms"
   />
 
-  <apn carrier="Celcom 3G"
+  <apn carrier="Celcom Internet"
       mcc="502"
       mnc="148"
-      apn="celcom3g"
+      apn="celcom4g"
       mmsproxy="10.128.1.242"
       mmsport="8080"
       mmsc="http://mms.celcom.net.my"
@@ -13373,6 +15774,7 @@
       mmsc="http://mms.digi.com.my/servlets/mms"
       mmsproxy="203.92.128.160"
       mmsport="80"
+      authtype="1"
       type="mms"
   />
 
@@ -13383,19 +15785,20 @@
       type="default,supl"
   />
 
-  <apn carrier="Maxis 3G"
+  <apn carrier="Maxis Internet"
       mcc="502"
       mnc="17"
-      apn="unet"
+      apn="max4g"
       user="maxis"
       password="wap"
       mmsproxy="202.75.133.49"
       mmsport="80"
       mmsc="http://172.16.74.100:10021/mmsc"
+      authtype="1"
       type="default,supl,mms"
   />
 
-  <apn carrier="U Mobile 3G"
+  <apn carrier="U Mobile Internet"
       mcc="502"
       mnc="18"
       apn="my3g"
@@ -13405,26 +15808,16 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Celcom 3G"
+  <apn carrier="Celcom Internet"
       mcc="502"
       mnc="19"
-      apn="celcom3g"
+      apn="celcom4g"
       mmsproxy="10.128.1.242"
       mmsport="8080"
       mmsc="http://mms.celcom.net.my"
       type="default,supl,mms"
   />
 
-  <apn carrier="Telstra MMS"
-      mcc="505"
-      mnc="01"
-      apn="telstra.mms"
-      mmsc="http://mmsc.telstra.com:8002"
-      mmsproxy="10.1.1.180"
-      mmsport="80"
-      type="mms"
-  />
-
   <apn carrier="Telstra Internet"
       mcc="505"
       mnc="01"
@@ -13432,6 +15825,16 @@
       type="default,supl"
   />
 
+  <apn carrier="Telstra MMS"
+      mcc="505"
+      mnc="01"
+      apn="telstra.mms"
+      type="mms"
+      mmsc="http://mmsc.telstra.com:8002/"
+      mmsproxy="10.1.1.180"
+      mmsport="80"
+  />
+
   <apn carrier="Optus Yes Internet"
       mcc="505"
       mnc="02"
@@ -13439,6 +15842,19 @@
       type="default,supl"
   />
 
+  <apn carrier="Optus Business Mobile Broadband"
+      mcc="505"
+      mnc="02"
+      apn="yesbusiness"
+  />
+
+  <apn carrier="Optus Internet"
+      mcc="505"
+      mnc="02"
+      apn="internet"
+      type="default"
+  />
+
   <apn carrier="Optus MMS"
       mcc="505"
       mnc="02"
@@ -13449,6 +15865,29 @@
       type="mms"
   />
 
+  <apn carrier="Virgin Internet"
+      mcc="505"
+      mnc="02"
+      apn="virgininternet"
+      type="default"
+      proxy="202.139.83.152"
+      port="8070"
+      mvno_match_data="505029"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Virgin MMS"
+      mcc="505"
+      mnc="02"
+      apn="virginmms"
+      type="mms"
+      mmsc="http://mms.virginvibe.com.au:8002"
+      mmsproxy="202.139.83.152"
+      mmsport="8070"
+      mvno_match_data="505029"
+      mvno_type="imsi"
+  />
+
   <apn carrier="Vodafone live!"
       mcc="505"
       mnc="03"
@@ -13459,33 +15898,6 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Planet 3"
-      mcc="505"
-      mnc="06"
-      apn="3services"
-      mmsc="http://mmsc.three.net.au:10021/mmsc"
-      mmsproxy="10.176.57.25"
-      mmsport="8799"
-      type="default,supl,mms"
-  />
-
-  <apn carrier="VF AU PXT"
-      mcc="505"
-      mnc="07"
-      apn="live.vodafone.com"
-      mmsc="http://pxt.vodafone.net.au/pxtsend"
-      mmsproxy="10.202.2.60"
-      mmsport="8080"
-      type="mms"
-  />
-
-  <apn carrier="VF Internet"
-      mcc="505"
-      mnc="07"
-      apn="vfinternet.au"
-      type="default,supl"
-  />
-
   <apn carrier="Telstra MMS"
       mcc="505"
       mnc="11"
@@ -13503,23 +15915,6 @@
       type="default,supl"
   />
 
-  <apn carrier="3Internet"
-      mcc="505"
-      mnc="12"
-      apn="3netaccess"
-      type="default,supl"
-  />
-
-  <apn carrier="3"
-      mcc="505"
-      mnc="12"
-      apn="3services"
-      mmsc="http://mmsc.three.net.au:10021/mmsc"
-      mmsproxy="10.176.57.25"
-      mmsport="8799"
-      type="default,supl,mms"
-  />
-
   <apn carrier="Telstra MMS"
       mcc="505"
       mnc="71"
@@ -13554,23 +15949,6 @@
       type="default,supl"
   />
 
-  <apn carrier="VF AU PXT"
-      mcc="505"
-      mnc="88"
-      apn="live.vodafone.com"
-      mmsc="http://pxt.vodafone.net.au/pxtsend"
-      mmsproxy="10.202.2.60"
-      mmsport="8080"
-      type="mms"
-  />
-
-  <apn carrier="VF Internet"
-      mcc="505"
-      mnc="88"
-      apn="vfinternet.au"
-      type="default,supl"
-  />
-
   <apn carrier="Optus Internet"
       mcc="505"
       mnc="90"
@@ -13588,10 +15966,20 @@
       type="mms"
   />
 
+  <apn carrier="Vodafone Live!"
+      mcc="505"
+      mnc="99"
+      apn="live.vodafone.com"
+      mmsc="http://pxt.vodafone.net.au/pxtsend"
+      mmsproxy="10.202.2.60"
+      mmsport="8080"
+  />
+
   <apn carrier="Indosat-SNS"
       mcc="510"
       mnc="01"
       apn="indosatgprs"
+      authtype="1"
       type="default,supl"
   />
 
@@ -13613,6 +16001,7 @@
       apn="indosatmms"
       user="indosat"
       password="indosat"
+      authtype="1"
       mmsc="http://mmsc.indosat.com"
       mmsproxy="10.19.19.19"
       mmsport="8080"
@@ -13623,6 +16012,7 @@
       mcc="510"
       mnc="08"
       apn="AXIS"
+      authtype="1"
       type="default,supl"
   />
 
@@ -13635,6 +16025,7 @@
       proxy="10.8.3.8"
       port="8080"
       type="default,supl"
+      authtype="1"
   />
 
   <apn carrier="AXISmms"
@@ -13647,6 +16038,7 @@
       mmsproxy="10.8.3.8"
       mmsport="8080"
       type="mms"
+      authtype="1"
   />
 
   <apn carrier="TSEL-SNS"
@@ -13685,6 +16077,7 @@
       mcc="510"
       mnc="11"
       apn="internet"
+      authtype="1"
       type="default,supl"
   />
 
@@ -13738,6 +16131,7 @@
       mcc="510"
       mnc="89"
       apn="3gprs"
+      authtype="1"
       type="default,supl"
   />
 
@@ -13766,6 +16160,27 @@
       type="mms"
   />
 
+  <apn carrier="Telin"
+      mcc="514"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Timor Telecom"
+      mcc="514"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Viettel Timor-Leste"
+      mcc="514"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
   <apn carrier="myGlobe Internet"
       mcc="515"
       mnc="02"
@@ -13799,6 +16214,13 @@
       type="mms"
   />
 
+  <apn carrier="SMARTLTE"
+      mcc="515"
+      mnc="03"
+      apn="smartlte"
+      type="default,supl"
+  />
+
   <apn carrier="SMART INTERNET"
       mcc="515"
       mnc="03"
@@ -13825,13 +16247,6 @@
       type="mms"
   />
 
-  <apn carrier="Streaming"
-      mcc="515"
-      mnc="03"
-      apn="internet"
-      type="default,supl"
-  />
-
   <apn carrier="Sun Internet"
       mcc="515"
       mnc="05"
@@ -13855,6 +16270,13 @@
       type="default,supl"
   />
 
+  <apn carrier="Sun Streaming"
+      mcc="515"
+      mnc="05"
+      apn="minternet"
+      type="default,supl"
+  />
+
   <apn carrier="SUN MMS"
       mcc="515"
       mnc="05"
@@ -13865,30 +16287,6 @@
       type="mms"
   />
 
-  <apn carrier="Sun Streaming"
-      mcc="515"
-      mnc="05"
-      apn="minterenet"
-      type="default,supl"
-  />
-
-  <apn carrier="Redinternet"
-      mcc="515"
-      mnc="18"
-      apn="redinternet"
-      type="default,supl"
-  />
-
-  <apn carrier="Redmms"
-      mcc="515"
-      mnc="18"
-      apn="real.globe.com.ph"
-      mmsc="http://10.102.61.193:8002/mmsc"
-      mmsproxy="10.138.3.35"
-      mmsport="8080"
-      type="mms"
-  />
-
   <apn carrier="CAT3G INTERNET"
       mcc="520"
       mnc="00"
@@ -13912,6 +16310,7 @@
       apn="internet"
       user="true"
       password="true"
+      authtype="1"
       type="default,supl"
       mvno_match_data="01"
       mvno_type="gid"
@@ -13923,6 +16322,7 @@
       apn="hmms"
       user="true"
       password="true"
+      authtype="1"
       mmsc="http://mms.trueh.com:8002/"
       mmsproxy="10.4.7.39"
       mmsport="8080"
@@ -13949,6 +16349,64 @@
       type="mms"
   />
 
+  <apn carrier="AIS Internet"
+      mcc="520"
+      mnc="03"
+      apn="internet"
+      authtype="0"
+      type="default,supl"
+  />
+
+  <apn carrier="AIS MMS"
+      mcc="520"
+      mnc="03"
+      apn="multimedia"
+      mmsc="http://mms.mobilelife.co.th"
+      mmsproxy="203.170.229.34"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="TRUE-H INTERNET"
+      mcc="520"
+      mnc="04"
+      apn="internet"
+      user="true"
+      password="true"
+      authtype="1"
+      type="default,supl"
+  />
+
+  <apn carrier="TRUE-H MMS"
+      mcc="520"
+      mnc="04"
+      apn="hmms"
+      user="true"
+      password="true"
+      authtype="1"
+      mmsc="http://mms.trueh.com:8002/"
+      mmsproxy="10.4.7.39"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="dtac Internet"
+      mcc="520"
+      mnc="05"
+      apn="www.dtac.co.th"
+      type="default,supl"
+  />
+
+  <apn carrier="dtac MMS"
+      mcc="520"
+      mnc="05"
+      apn="mms"
+      mmsc="http://mms2.dtac.co.th:8002/"
+      mmsproxy="10.10.10.10"
+      mmsport="8080"
+      type="mms"
+  />
+
   <apn carrier="TOT 3G Internet"
       mcc="520"
       mnc="15"
@@ -13971,7 +16429,7 @@
       mnc="18"
       apn="mms"
       mmsc="http://mms.dtac.co.th:8002/"
-      mmsproxy="203.155.200.133"
+      mmsproxy="10.10.10.10"
       mmsport="8080"
       type="mms"
   />
@@ -13983,41 +16441,40 @@
       type="default,supl"
   />
 
-  <apn carrier="TRUE Internet"
+  <apn carrier="TRUE INTERNET"
       mcc="520"
       mnc="99"
       apn="internet"
+      user="true"
+      password="true"
+      authtype="1"
       type="default,supl"
   />
 
   <apn carrier="TRUE MMS"
       mcc="520"
       mnc="99"
-      apn="mms"
+      apn="hmms"
       user="true"
       password="true"
-      authtype="0"
+      authtype="1"
       mmsc="http://mms.truelife.com:8002/"
       mmsproxy="10.4.7.39"
       mmsport="8080"
       type="mms"
   />
 
-
-
-  <apn carrier="IDEAS (PostPaid)"
+  <apn carrier="SingTel (PostPaid)"
       mcc="525"
       mnc="01"
       apn="e-ideas"
-      user="65IDEAS"
-      password="IDEAS"
       mmsproxy="165.21.42.84"
       mmsport="8080"
       mmsc="http://mms.singtel.com:10021/mmsc"
       type="default,supl,mms"
   />
 
-  <apn carrier="IDEAS (PrePaid)"
+  <apn carrier="SingTel (PrePaid)"
       mcc="525"
       mnc="01"
       apn="hicard"
@@ -14027,19 +16484,17 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="IDEAS (PostPaid)"
+  <apn carrier="SingTel (PostPaid)"
       mcc="525"
       mnc="02"
       apn="e-ideas"
-      user="65IDEAS"
-      password="IDEAS"
       mmsproxy="165.21.42.84"
       mmsport="8080"
       mmsc="http://mms.singtel.com:10021/mmsc"
       type="default,supl,mms"
   />
 
-  <apn carrier="IDEAS (PrePaid)"
+  <apn carrier="SingTel (PrePaid)"
       mcc="525"
       mnc="02"
       apn="hicard"
@@ -14064,6 +16519,7 @@
       password="user123"
       proxy="172.16.1.23"
       port="8081"
+      authtype="1"
       type="default,supl"
   />
 
@@ -14076,6 +16532,7 @@
       mmsc="http://mmsgw:8002"
       mmsproxy="172.16.14.10"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -14092,6 +16549,7 @@
       apn="miworld"
       user="65"
       password="user123"
+      authtype="1"
       proxy="172.16.1.23"
       port="8081"
       type="default,supl"
@@ -14103,24 +16561,21 @@
       apn="miworld"
       user="65"
       password="user123"
+      authtype="1"
       mmsc="http://mmsgw:8002"
       mmsproxy="172.16.14.10"
       mmsport="8080"
       type="mms"
   />
 
-  <apn carrier="Gee!3G/GPRS"
+  <apn carrier="SH Data Postpaid"
       mcc="525"
       mnc="05"
       apn="shwap"
-      user="star"
-      password="hub"
-      proxy="10.12.1.2"
-      port="80"
       type="default,supl"
   />
 
-  <apn carrier="Gee! MMS(3G)"
+  <apn carrier="SH MMS Postpaid"
       mcc="525"
       mnc="05"
       apn="shmms"
@@ -14130,6 +16585,20 @@
       type="mms"
   />
 
+  <apn carrier="B-Mobile"
+      mcc="528"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="DSTCom"
+      mcc="528"
+      mnc="11"
+      apn="default"
+      type="default,supl"
+  />
+
   <apn carrier="VFNZ Gateway"
       mcc="530"
       mnc="01"
@@ -14190,6 +16659,200 @@
       type="mms"
   />
 
+  <apn carrier="Digicel"
+      mcc="536"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="BeMobile"
+      mcc="537"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="PNG WAP"
+      mcc="537"
+      mnc="03"
+      apn="wap.digicelpng.com"
+      proxy="10.149.83.116"
+      port="8080"
+      type="default,supl"
+  />
+
+  <apn carrier="PNG WEB"
+      mcc="537"
+      mnc="03"
+      apn="internet.digicelpng.com"
+      type="default,supl"
+  />
+
+  <apn carrier="PNG MMS"
+      mcc="537"
+      mnc="03"
+      apn="wap.digicelpng.com"
+      mmsc="http://mms.digicelpng.com:8990"
+      mmsproxy="10.149.83.116"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="U-Call"
+      mcc="539"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Shoreline Communication"
+      mcc="539"
+      mnc="43"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Digicel"
+      mcc="539"
+      mnc="88"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="BREEZE"
+      mcc="540"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="BeMobile"
+      mcc="540"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="AIL"
+      mcc="541"
+      mnc="00"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="SMILE"
+      mcc="541"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Digicel"
+      mcc="541"
+      mnc="05"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Vodafone"
+      mcc="542"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Digicel"
+      mcc="542"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Bluesky"
+      mcc="544"
+      mnc="11"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Kiribati - TSKL"
+      mcc="545"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Kiribati - Frigate Net"
+      mcc="545"
+      mnc="09"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Mobilis"
+      mcc="546"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Vini"
+      mcc="547"
+      mnc="20"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Telecom Cook"
+      mcc="548"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Digicel"
+      mcc="549"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Bluesky"
+      mcc="549"
+      mnc="27"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="FSMTC"
+      mcc="550"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MINTA"
+      mcc="551"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="PNCC"
+      mcc="552"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Palau Mobile"
+      mcc="552"
+      mnc="80"
+      apn="default"
+      type="default,supl"
+  />
+
   <apn carrier="Mobinil Web"
       mcc="602"
       mnc="01"
@@ -14270,6 +16933,94 @@
       type="mms"
   />
 
+  <apn carrier="mobilis wap"
+      mcc="603"
+      mnc="01"
+      apn="wap"
+      proxy="172.25.49.2"
+      port="8080"
+      user="wap"
+      password="wap"
+      authtype="1"
+      type="default,supl"
+  />
+
+  <apn carrier="Mobilis internet"
+      mcc="603"
+      mnc="01"
+      apn="internet"
+      user="internet"
+      password="internet"
+      authtype="1"
+      type="default,supl"
+  />
+
+  <apn carrier="Mobilis mms"
+      mcc="603"
+      mnc="01"
+      apn="mms"
+      user="mms"
+      password="mms"
+      authtype="1"
+      mmsc="http://172.25.49.9/servlets/mms"
+      mmsproxy="172.25.49.2"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="djezzy.internet"
+      mcc="603"
+      mnc="02"
+      apn="djezzy.internet"
+      type="default,supl"
+  />
+
+  <apn carrier="djezzy.mms"
+      mcc="603"
+      mnc="02"
+      apn="djezzy.mms"
+      user="mms"
+      password="mms"
+      mmsc="http://172.24.97.152:6021/mmsc"
+      mmsproxy="172.24.97.158"
+      mmsport="8799"
+      type="mms"
+  />
+
+  <apn carrier="nedjmawap"
+      mcc="603"
+      mnc="03"
+      apn="nedjmawap"
+      proxy="192.168.52.2"
+      port="3128"
+      user="wap"
+      password="wap"
+      authtype="1"
+      type="default,supl"
+  />
+
+  <apn carrier="Nedjma.dz"
+      mcc="603"
+      mnc="03"
+      apn="internet"
+      user="nedjma"
+      password="nedjma"
+      type="default,supl"
+  />
+
+  <apn carrier="nedjmamms"
+      mcc="603"
+      mnc="03"
+      apn="nedjmamms"
+      user="mms"
+      password="mms"
+      authtype="1"
+      mmsc="http://10.10.111.1"
+      mmsproxy="192.168.52.3"
+      mmsport="3128"
+      type="mms"
+  />
+
   <apn carrier="Internet"
       mcc="604"
       mnc="00"
@@ -14364,7 +17115,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Orange MMS"
+  <apn carrier="MMS Orange"
       mcc="605"
       mnc="01"
       apn="mms.otun"
@@ -14387,6 +17138,7 @@
       apn="gprs.tn"
       user="gprs"
       password="gprs"
+      authtype="1"
       type="default,supl"
   />
 
@@ -14396,20 +17148,18 @@
       apn="mms.tn"
       user="mms@tt1"
       password="mms"
+      authtype="1"
       mmsc="http://192.168.0.3:19090/was"
       mmsproxy="192.168.0.2"
       mmsport="8080"
       type="mms"
   />
 
-  <apn carrier="internet Tunisiana"
+  <apn carrier="Tunisiana-Internet"
       mcc="605"
       mnc="03"
       apn="internet.tunisiana.com"
-      user="internet"
-      password="internet"
-      proxy="10.3.2.99"
-      port="80"
+      authtype="1"
       type="default,supl"
   />
 
@@ -14419,12 +17169,486 @@
       apn="mms.tunisiana.com"
       user="mms"
       password="mms"
+      authtype="1"
       mmsc="http://mmsc.tunisiana.com"
       mmsproxy="10.3.2.100"
       mmsport="80"
       type="mms"
   />
 
+  <apn carrier="Libyana"
+      mcc="606"
+      mnc="00"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Madar"
+      mcc="606"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Al-Jeel Phone"
+      mcc="606"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Libya Phone"
+      mcc="606"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Hatef Libya"
+      mcc="606"
+      mnc="06"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Gamcel"
+      mcc="607"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Africel"
+      mcc="607"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Comium"
+      mcc="607"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="QCell"
+      mcc="607"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
+    <apn carrier="Orange MMS SN"
+      mcc="608"
+      mnc="01"
+      apn="mms"
+      user="mms"
+      password="mms"
+      mmsc="http://mmsalize/servlets/mms"
+      mmsproxy="172.16.30.9"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Orange Wap SN"
+      mcc="608"
+      mnc="01"
+      apn="wap"
+      user="wap"
+      password="wap"
+      proxy="172.16.30.9"
+      port="8080"
+      type="default"
+  />
+
+  <apn carrier="Orange Web SN"
+      mcc="608"
+      mnc="01"
+      apn="internet"
+      user="internet"
+      password="internet"
+      type="default"
+  />
+
+  <apn carrier="Tigo Internet SN"
+      mcc="608"
+      mnc="02"
+      apn="web.sentel.com"
+      type="default,supl"
+  />
+
+  <apn carrier="Expresso Internet SN"
+      mcc="608"
+      mnc="03"
+      apn="expresso"
+      user="wap"
+      password="wap"
+      proxy="10.71.123.69"
+      port="8080"
+      type="default"
+  />
+
+  <apn carrier="Mattel"
+      mcc="609"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Chinguitel"
+      mcc="609"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Mauritel"
+      mcc="609"
+      mnc="10"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Orange ML MMS"
+      mcc="610"
+      mnc="02"
+      apn="mms"
+      user="mms"
+      password="mms"
+      mmsc="http://10.109.6.2/servlets/mms"
+      mmsproxy="10.109.4.35"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Orange Wap ML"
+      mcc="610"
+      mnc="02"
+      apn="wap"
+      user="wap"
+      password="wap"
+      proxy="10.109.4.35"
+      port="8080"
+      type="default"
+  />
+
+  <apn carrier="Orange S.A."
+      mcc="611"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Sotelgui"
+      mcc="611"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Telecel Guinee"
+      mcc="611"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MTN"
+      mcc="611"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Cellcom"
+      mcc="611"
+      mnc="05"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Moov Internet CI"
+      mcc="612"
+      mnc="02"
+      apn="moov"
+      user="web"
+      password="web"
+      proxy="10.172.11.17"
+      port="8080"
+      type="default"
+  />
+
+  <apn carrier="OWORLD CI"
+      mcc="612"
+      mnc="03"
+      apn="orangeciwap"
+      user="wap"
+      password="wap"
+      proxy="172.20.4.33"
+      port="8080"
+      type="default"
+  />
+
+  <apn carrier="Omms CI"
+      mcc="612"
+      mnc="03"
+      apn="orangecimms"
+      user="mms"
+      password="mms"
+      mmsc="http://172.20.6.1/servlets/mms"
+      mmsproxy="172.20.4.33"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="Koz Internet CI"
+      mcc="612"
+      mnc="04"
+      apn="gprs.koz.ci"
+      user="web"
+      password="web"
+      proxy="10.20.3.10"
+      port="8080"
+      type="default"
+  />
+
+  <apn carrier="MTN Internet CI"
+      mcc="612"
+      mnc="05"
+      apn="web.mtn.ci"
+      user="vide"
+      password="vide"
+      type="default"
+  />
+
+  <apn carrier="Telmob"
+      mcc="613"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Airtel"
+      mcc="613"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Telecel Faso"
+      mcc="613"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Orange MMS"
+      apn="orange.mms"
+      user="orange"
+      password="orange"
+      mmsc="http://10.10.10.35:38090/was"
+      mmsproxy="10.10.10.36"
+      mmsport="8080"
+      mcc="614"
+      mnc="04"
+      type="mms"
+  />
+
+  <apn carrier="Orange Internet"
+      apn="orange.ne"
+      mcc="614"
+      mnc="04"
+      type="default"
+  />
+
+  <apn carrier="Togo Cell"
+      mcc="615"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Moov"
+      mcc="615"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Libercom"
+      mcc="616"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Moov"
+      mcc="616"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MTN"
+      mcc="616"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="BBCOM"
+      mcc="616"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Glo"
+      mcc="616"
+      mnc="05"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Orange MMS"
+      apn="orangemms"
+      user="mmsc"
+      password="mmsc"
+      mmsc="http://10.2.1.20:8514"
+      mmsproxy="10.2.1.20"
+      mmsport="8080"
+      mcc="617"
+      mnc="01"
+      type="mms"
+  />
+
+  <apn carrier="Orange Internet"
+      apn="orange"
+      mcc="617"
+      mnc="01"
+      type="default"
+  />
+
+  <apn carrier="Lonestar Cell"
+      mcc="618"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Libercell"
+      mcc="618"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Comium"
+      mcc="618"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Cellcom"
+      mcc="618"
+      mnc="07"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="LIBTELCO"
+      mcc="618"
+      mnc="20"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Airtel"
+      mcc="619"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Tigo"
+      mcc="619"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Africell"
+      mcc="619"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Comium"
+      mcc="619"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Africell"
+      mcc="619"
+      mnc="05"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Mobitel"
+      mcc="619"
+      mnc="25"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MTN Internet GH"
+      apn="internet"
+      mcc="620"
+      mnc="01"
+      type="default"
+  />
+
+  <apn carrier="Vodafone Internet GH"
+      apn="browse"
+      mcc="620"
+      mnc="02"
+      type="default"
+  />
+
+  <apn carrier="Tigo Internet GH"
+      apn="web.tigo.com.gh"
+      mcc="620"
+      mnc="03"
+      type="default"
+  />
+
+  <apn carrier="Airtel Internet GH"
+      apn="wap"
+      mcc="620"
+      mnc="06"
+      proxy="10.93.85.88"
+      port="9201"
+      type="default"
+  />
+
+  <apn carrier="Glo Internet GH"
+      apn="glowap"
+      mcc="620"
+      mnc="07"
+      user="glo"
+      password="glo"
+      authtype="1"
+      proxy="10.161.85.4"
+      port="8799"
+      type="default"
+  />
+
   <apn carrier="Airtel Internet"
       mcc="621"
       mnc="20"
@@ -14523,7 +17747,7 @@
       type="default,supl"
   />
 
-<apn carrier="etisalat MMS"
+  <apn carrier="etisalat MMS"
       mcc="621"
       mnc="60"
       apn="etisalat"
@@ -14531,7 +17755,344 @@
       type="mms"
   />
 
-  <apn carrier="safaricom Wap"
+  <apn carrier="Airtel"
+      mcc="622"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Tawali"
+      mcc="622"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Tigo"
+      mcc="622"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Salam"
+      mcc="622"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="CTP"
+      mcc="623"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="TC"
+      mcc="623"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Orange"
+      mcc="623"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Nationlink"
+      mcc="623"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="CVMOVEL"
+      mcc="625"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="T+"
+      mcc="625"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="CSTmovel"
+      mcc="626"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Orange GQ"
+      mcc="627"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Hits GQ"
+      mcc="627"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Libertis"
+      mcc="628"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Moov"
+      mcc="628"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Airtel"
+      mcc="628"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Azur"
+      mcc="628"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Airtel"
+      mcc="629"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Libertis Telecom"
+      mcc="629"
+      mnc="10"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Vodacom Internet CD"
+      mcc="630"
+      mnc="01"
+      apn="vodanet"
+      port="8080"
+      type="default"
+  />
+
+  <apn carrier="Tigo Internet CD"
+      mcc="630"
+      mnc="89"
+      apn="wap.tigo.cd"
+      type="default"
+  />
+
+  <apn carrier="UNITEL"
+      mcc="631"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MOVICEL"
+      mcc="631"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Areeba"
+      mcc="632"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Orange"
+      mcc="632"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Guinetel"
+      mcc="632"
+      mnc="07"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Cable &amp; Wireless"
+      mcc="633"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Mediatech International"
+      mcc="633"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Airtel"
+      mcc="633"
+      mnc="10"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Zain SD"
+      mcc="634"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MTN"
+      mcc="634"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Sudani One"
+      mcc="634"
+      mnc="07"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Privet Network"
+      mcc="634"
+      mnc="09"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MTN"
+      mcc="635"
+      mnc="10"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Rwandatel"
+      mcc="635"
+      mnc="12"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Tigo"
+      mcc="635"
+      mnc="13"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Airtel"
+      mcc="635"
+      mnc="14"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="ETH-MTN"
+      mcc="636"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Telesom"
+      mcc="637"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Somafone"
+      mcc="637"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Nationlink"
+      mcc="637"
+      mnc="10"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Hormuud"
+      mcc="637"
+      mnc="25"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Golis"
+      mcc="637"
+      mnc="30"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Unittel"
+      mcc="637"
+      mnc="57"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Nationlink Telecom"
+      mcc="637"
+      mnc="60"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Somtel"
+      mcc="637"
+      mnc="71"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Telcom"
+      mcc="637"
+      mnc="82"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Evatis"
+      mcc="638"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="safaricom GPRS"
       mcc="639"
       mnc="02"
       apn="safaricom"
@@ -14556,6 +18117,25 @@
       type="mms"
   />
 
+
+  <apn carrier="Airtel Internet"
+      mcc="639"
+      mnc="03"
+      apn="internet"
+      type="default,supl"
+  />
+
+  <apn carrier="Airtel mms"
+      mcc="639"
+      mnc="03"
+      apn="mms"
+      mmsc="http://mms.ke.airtel.com:8002"
+      mmsproxy="172.30.9.8"
+      mmsport="8080"
+      authtype="1"
+      type="mms"
+  />
+
   <apn carrier="Airtel"
       mcc="639"
       mnc="03"
@@ -14563,10 +18143,10 @@
       type="default,supl"
   />
 
-  <apn carrier="Celtel mms"
+  <apn carrier="mms"
       mcc="639"
       mnc="03"
-      apn="mms"
+      apn="ke.celtel.com"
       mmsproxy="172.30.8.50"
       mmsport="8080"
       mmsc="http://mms.ke.celtel.com/servlets/mms"
@@ -14579,7 +18159,10 @@
       apn="Internet"
       proxy="10.4.16.6"
       port="8080"
-      type="default,supl"
+      mmsproxy="10.4.16.6"
+      mmsport="8080"
+      mmsc="http://10.4.16.22/servlets/mms"
+      type="default,supl,mms"
   />
 
   <apn carrier="Yu WAP"
@@ -14613,6 +18196,7 @@
       mmsproxy="10.36.17.130"
       mmsport="8080"
       mmsc="http://10.36.16.5/servlets/mms"
+      authtype="1"
       type="mms"
   />
 
@@ -14633,6 +18217,139 @@
       type="mms"
   />
 
+  <apn carrier="Airtel Internet UG"
+      apn="internet"
+      mcc="641"
+      mnc="01"
+      type="default"
+  />
+
+  <apn carrier="MTN Internet UG"
+      apn="yellopix.mtn.co.ug"
+      mcc="641"
+      mnc="10"
+      proxy="10.120.0.138"
+      port="8080"
+      type="default"
+  />
+
+  <apn carrier="UTL Internet UG"
+      apn="utweb"
+      mcc="641"
+      mnc="11"
+      proxy="10.76.101.51"
+      port="8080"
+      type="default"
+  />
+
+  <apn carrier="Orange Internet UG"
+      mcc="641"
+      mnc="14"
+      apn="orange.ug"
+      type="default"
+  />
+
+  <apn carrier="Orange MMS"
+      mcc="641"
+      mnc="14"
+      apn="orangemms"
+      mmsc="http://mms/"
+      type="mms"
+  />
+
+  <apn carrier="Warid Telecom Internet UG"
+      apn="web.waridtel.co.ug"
+      mcc="641"
+      mnc="22"
+      proxy="10.5.27.80"
+      port="8080"
+      type="default"
+  />
+
+  <apn carrier="Spacetel"
+      mcc="642"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Tempo"
+      mcc="642"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Onatel"
+      mcc="642"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Smart Mobile"
+      mcc="642"
+      mnc="07"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="HiTs Telecom"
+      mcc="642"
+      mnc="08"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Leo"
+      mcc="642"
+      mnc="82"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="mCel"
+      mcc="643"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Movitel"
+      mcc="643"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Vodacom"
+      mcc="643"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Airtel"
+      mcc="645"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MTN"
+      mcc="645"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="ZAMTEL"
+      mcc="645"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
   <apn carrier="Orange World re"
       mcc="647"
       mnc="00"
@@ -14709,6 +18426,76 @@
       type="default,supl"
   />
 
+  <apn carrier="Coriolis WAP"
+      mcc="647"
+      mnc="10"
+      apn="fnetcoriolis"
+      type="default,supl"
+      mvno_match_data="12"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Coriolis MMS"
+      mcc="647"
+      mnc="10"
+      mmsc="http://mmscoriolis"
+      mmsproxy="10.143.156.6"
+      mmsport="8080"
+      apn="mmscoriolis"
+      type="mms"
+      mvno_match_data="12"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Telecel"
+      mcc="648"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Econet"
+      mcc="648"
+      mnc="04"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="MTC"
+      mcc="649"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="switch"
+      mcc="649"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Leo"
+      mcc="649"
+      mnc="03"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="TNM"
+      mcc="650"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Airtel"
+      mcc="650"
+      mnc="10"
+      apn="default"
+      type="default,supl"
+  />
+
   <apn carrier="VCL Internet GPRS"
       mcc="651"
       mnc="01"
@@ -14726,6 +18513,37 @@
       type="mms"
   />
 
+  <apn carrier="Swazi MTN"
+      mcc="653"
+      mnc="10"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="HURI - SNPT"
+      mcc="654"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="LTE.Vodacom"
+      mcc="655"
+      mnc="01"
+      apn="lte.vodacom.za"
+      type="default,supl"
+  />
+
+  <apn carrier="MMS.Vodacom"
+      mcc="655"
+      mnc="01"
+      apn="lte.vodacom.za"
+      mmsc="http://mmsc.vodacom4me.co.za"
+      mmsproxy="196.6.128.13"
+      mmsport="8080"
+      type="mms"
+  />
+
   <apn carrier="Smart.Vodacom"
       mcc="655"
       mnc="01"
@@ -14743,14 +18561,14 @@
       type="mms"
   />
 
-  <apn carrier="8.ta internet"
+  <apn carrier="Telkom Mobile Internet"
       mcc="655"
       mnc="02"
       apn="internet"
       type="default,supl"
   />
 
-  <apn carrier="8.ta MMS"
+  <apn carrier="Telkom Mobile MMS"
       mcc="655"
       mnc="02"
       apn="mms"
@@ -14786,63 +18604,6 @@
       proxy="196.31.116.241"
       port="8080"
       type="default,supl"
-  />
-
-  <apn carrier="VIRGIN_INTERNET_2"
-      mcc="655"
-      mnc="07"
-      apn="vdata"
-      proxy="196.31.116.241"
-      port="9201"
-      type="default,supl"
-  />
-
-  <apn carrier="Virgin_MMS_1"
-      mcc="655"
-      mnc="07"
-      apn="vmms"
-      mmsc="http://mms.virginmobile.co.za"
-      mmsproxy="196.31.116.242"
-      mmsport="8080"
-      type="mms"
-  />
-
-  <apn carrier="Virgin_MMS_2"
-      mcc="655"
-      mnc="07"
-      apn="vmms"
-      mmsc="http://mms.virginmobile.co.za"
-      mmsproxy="196.31.116.242"
-      mmsport="9201"
-      type="mms"
-  />
-
-  <apn carrier="RBM Internet"
-      mcc="655"
-      mnc="07"
-      apn="mobile.redbullmobile.co.za"
-      proxy="196.31.116.250"
-      port="8080"
-      type="default,supl"
-  />
-
-  <apn carrier="Redbull MMS"
-      mcc="655"
-      mnc="07"
-      apn="mms"
-      mmsc="http://mms.cmobile.co.za/"
-      mmsproxy="196.31.116.250"
-      mmsport="8080"
-      type="mms"
-  />
-
-  <apn carrier="VIRGIN_INTERNET_1"
-      mcc="655"
-      mnc="07"
-      apn="vdata"
-      proxy="196.31.116.241"
-      port="8080"
-      type="default,supl"
       mvno_match_data="6550710"
       mvno_type="imsi"
   />
@@ -14928,13 +18689,31 @@
       type="mms"
   />
 
-  <apn carrier="INTERNET CLARO"
+  <apn carrier="Eritel"
+      mcc="657"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="DigiCell"
+      mcc="702"
+      mnc="67"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Smart"
+      mcc="702"
+      mnc="99"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="Internet CLARO"
       mcc="704"
       mnc="01"
       apn="internet.ideasclaro"
-      user=""
-      password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
@@ -14942,22 +18721,16 @@
       mcc="704"
       mnc="01"
       apn="mms.ideasclaro"
-      user=""
-      password=""
       mmsproxy="216.230.133.66"
       mmsport="8080"
       mmsc="http://mms.ideasclaro.com:8002"
-      authtype="1"
       type="mms"
   />
 
-  <apn carrier="BROADBAND TIGO"
+  <apn carrier="Broadband TIGO"
       mcc="704"
       mnc="02"
       apn="broadband.tigo.gt"
-      user=""
-      password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
@@ -14965,12 +18738,9 @@
       mcc="704"
       mnc="02"
       apn="mms.tigo.gt"
-      user=""
-      password=""
       mmsproxy="10.16.17.12"
       mmsport="8888"
       mmsc="http://mms"
-      authtype="1"
       type="mms"
   />
 
@@ -15020,13 +18790,10 @@
       type="mms"
   />
 
-  <apn carrier="INTERNET CLARO"
+  <apn carrier="Internet CLARO"
       mcc="706"
       mnc="01"
       apn="internet.ideasclaro"
-      user=""
-      password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
@@ -15034,58 +18801,43 @@
       mcc="706"
       mnc="01"
       apn="mms.ideasclaro"
-      user=""
-      password=""
       mmsproxy="216.230.133.66"
       mmsport="8080"
       mmsc="http://mms.ideasclaro.com:8002"
-      authtype="1"
       type="mms"
   />
 
-  <apn carrier="El Salvaldor Digicel"
+  <apn carrier="Digicel Internet"
       mcc="706"
       mnc="02"
       apn="web.digicelsv.com"
-      user=""
-      password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
-  <apn carrier="MMS El Salvador"
+  <apn carrier="MMS"
       mcc="706"
       mnc="02"
       apn="wap.digicelsv.com"
-      user=""
-      password=""
       mmsproxy="172.26.5.12"
       mmsport="8080"
-      mmsc="http://172.26.5.132/servlets/mms"
-      authtype="1"
+      mmsc="http://mmc.digiceljamaica.com/servlets/mms"
       type="mms"
   />
 
-  <apn carrier="BROADBAND TIGO"
+  <apn carrier="Internet Tigo"
       mcc="706"
       mnc="03"
-      apn="broadband.tigo.sv"
-      user=""
-      password=""
-      authtype="1"
+      apn="internet.tigo.sv"
       type="default,supl,dun"
   />
 
-  <apn carrier="MMS TIGO"
+  <apn carrier="MMS Tigo"
       mcc="706"
       mnc="03"
       apn="mms.tigo.sv"
-      user=""
-      password=""
       mmsproxy="10.16.17.12"
       mmsport="8888"
       mmsc="http://mms"
-      authtype="1"
       type="mms"
   />
 
@@ -15122,7 +18874,7 @@
       type="default,supl,dun"
   />
 
-  <apn carrier="Movistar MMS2"
+  <apn carrier="Movistar MMS"
       mcc="706"
       mnc="040"
       apn="mms.movistar.sv"
@@ -15137,24 +18889,35 @@
 
   <apn carrier="Internet Claro"
       mcc="708"
+      mnc="00"
+      apn="internet.ideasclaro"
+      type="default,supl,dun"
+  />
+
+  <apn carrier="MMS Claro"
+      mcc="708"
+      mnc="00"
+      apn="mms.ideasclaro"
+      mmsproxy="10.6.32.2"
+      mmsport="8080"
+      mmsc="http://10.6.32.27/servlets/mms"
+      type="mms"
+  />
+
+  <apn carrier="Internet Claro"
+      mcc="708"
       mnc="001"
-      apn="web.megatel.hn"
-      user="webmegatel"
-      password="webmegatel"
-      authtype="1"
+      apn="internet.ideasclaro"
       type="default,supl,dun"
   />
 
   <apn carrier="MMS Claro"
       mcc="708"
       mnc="001"
-      apn="mms.megatel.hn"
-      user="mmsmegatel"
-      password="mmsmegatel"
+      apn="mms.ideasclaro"
       mmsproxy="10.6.32.2"
       mmsport="8080"
       mmsc="http://10.6.32.27/servlets/mms"
-      authtype="1"
       type="mms"
   />
 
@@ -15162,9 +18925,6 @@
       mcc="708"
       mnc="02"
       apn="internet.tigo.hn"
-      user=""
-      password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
@@ -15172,12 +18932,9 @@
       mcc="708"
       mnc="02"
       apn="mms.tigo.hn"
-      user=""
-      password=""
       mmsproxy="10.16.17.12"
       mmsport="8888"
       mmsc="http://mms"
-      authtype="1"
       type="mms"
   />
 
@@ -15185,9 +18942,6 @@
       mcc="708"
       mnc="020"
       apn="internet.tigo.hn"
-      user=""
-      password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
@@ -15195,32 +18949,29 @@
       mcc="708"
       mnc="020"
       apn="mms.tigo.hn"
-      user=""
-      password=""
       mmsproxy="10.16.17.12"
       mmsport="8888"
       mmsc="http://mms"
-      authtype="1"
       type="mms"
   />
 
-  <apn carrier="INTERNET"
+  <apn carrier="Enitel WEB"
       mcc="710"
       mnc="21"
-      apn="web.emovil"
-      user="webemovil"
-      password="webemovil"
+      apn="internet.ideasalo.ni"
+      user="internet"
+      password="internet"
       authtype="1"
       type="default,supl,dun"
   />
 
 
-  <apn carrier="MMS"
+  <apn carrier="Enitel MMS"
       mcc="710"
       mnc="21"
-      apn="mms.emovil"
-      user="mmsemovil"
-      password="mmsemovil"
+      apn="mms.indeasalo.ni"
+      user="mms"
+      password="mms"
       mmsproxy="10.6.32.2"
       mmsport="8080"
       mmsc="http://10.6.32.27/servlets/mms"
@@ -15230,6 +18981,29 @@
 
   <apn carrier="Movistar INTERNET"
       mcc="710"
+      mnc="30"
+      apn="internet.movistar.ni"
+      user="movistarni"
+      password="movistarni"
+      authtype="1"
+      type="default,supl,dun"
+  />
+
+  <apn carrier="Movistar MMS"
+      mcc="710"
+      mnc="30"
+      apn="mms.movistar.ni"
+      user="movistarni"
+      password="movistarni"
+      mmsproxy="10.12.23.1"
+      mmsport="80"
+      mmsc="http://mms.movistar.ni"
+      authtype="1"
+      type="mms"
+  />
+
+  <apn carrier="Movistar INTERNET"
+      mcc="710"
       mnc="300"
       apn="internet.movistar.ni"
       user="movistarni"
@@ -15251,23 +19025,23 @@
       type="mms"
   />
 
-
-  <apn carrier="INTERNET"
+  <apn carrier="Enitel WEB"
       mcc="710"
-      mnc="730"
-      apn="web.emovil"
-      user="webemovil"
-      password="webemovil"
+      mnc="73"
+      apn="internet.ideasalo.ni"
+      user="internet"
+      password="internet"
       authtype="1"
       type="default,supl,dun"
   />
 
-  <apn carrier="MMS"
+
+  <apn carrier="Enitel MMS"
       mcc="710"
-      mnc="730"
-      apn="mms.emovil"
-      user="mmsemovil"
-      password="mmsemovil"
+      mnc="73"
+      apn="mms.indeasalo.ni"
+      user="mms"
+      password="mms"
       mmsproxy="10.6.32.2"
       mmsport="8080"
       mmsc="http://10.6.32.27/servlets/mms"
@@ -15275,63 +19049,74 @@
       type="mms"
   />
 
-  <apn carrier="Kolbi"
-      mcc="712"
-      mnc="01"
-      apn="kolbi3g"
-      user=""
-      password=""
+  <apn carrier="Enitel WEB"
+      mcc="710"
+      mnc="730"
+      apn="internet.ideasalo.ni"
+      user="internet"
+      password="internet"
       authtype="1"
       type="default,supl,dun"
   />
 
-  <apn carrier="Multimedia"
+
+  <apn carrier="Enitel MMS"
+      mcc="710"
+      mnc="730"
+      apn="mms.indeasalo.ni"
+      user="mms"
+      password="mms"
+      mmsproxy="10.6.32.2"
+      mmsport="8080"
+      mmsc="http://10.6.32.27/servlets/mms"
+      authtype="1"
+      type="mms"
+  />
+
+  <apn carrier="Kolbi 3G"
       mcc="712"
       mnc="01"
       apn="kolbi3g"
-      user=""
-      password=""
-      mmsproxy="10.184.202.24"
-      mmsport="8080"
-      mmsc="http://mmsice"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="Kolbi"
-      mcc="712"
-      mnc="02"
-      apn="kolbi3g"
-      user=""
-      password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
-  <apn carrier="Multimedia"
+  <apn carrier="Kolbi Multimedia"
       mcc="712"
-      mnc="02"
-      apn="kolbi3g"
-      user=""
-      password=""
+      mnc="01"
+      apn="kolbimundo"
       mmsproxy="10.184.202.24"
       mmsport="8080"
       mmsc="http://mmsice"
-      authtype="1"
       type="mms"
   />
 
-  <apn carrier="INTERNET CLARO"
+  <apn carrier="Kolbi 3G"
+      mcc="712"
+      mnc="02"
+      apn="kolbi3g"
+      type="default,supl,dun"
+  />
+
+  <apn carrier="Kolbi Multimedia"
+      mcc="712"
+      mnc="02"
+      apn="kolbimundo"
+      mmsproxy="10.184.202.24"
+      mmsport="8080"
+      mmsc="http://mmsice"
+      type="mms"
+  />
+
+  <apn carrier="Internet CLARO CR"
       mcc="712"
       mnc="03"
       apn="internet.ideasclaro"
       user=""
       password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
-  <apn carrier="MMS CLARO"
+  <apn carrier="MMS CLARO CR"
       mcc="712"
       mnc="03"
       apn="mms.ideasclaro"
@@ -15340,7 +19125,6 @@
       mmsproxy="216.230.133.66"
       mmsport="8080"
       mmsc="http://mms.ideasclaro.com:8002"
-      authtype="1"
       type="mms"
   />
 
@@ -15367,15 +19151,51 @@
       type="mms"
   />
 
+  <apn carrier="Internet Tuyo"
+      mcc="712"
+      mnc="019"
+      apn="tm7datos"
+      type="default,supl,dun"
+  />
+
+  <apn carrier="MMS Tuyo"
+      mcc="712"
+      mnc="019"
+      apn="tm7mms"
+      mmsproxy="10.186.181.5"
+      mmsport="3128"
+      mmsc="http://mmsc.tuyomovil.com:1981"
+      type="mms"
+  />
+
+  <apn carrier="Internet Tuyo"
+      mcc="712"
+      mnc="190"
+      apn="tm7datos"
+      type="default,supl,dun"
+  />
+
+  <apn carrier="MMS Tuyo"
+      mcc="712"
+      mnc="190"
+      apn="tm7mms"
+      mmsproxy="10.186.181.5"
+      mmsport="3128"
+      mmsc="http://mmsc.tuyomovil.com:1981"
+      type="mms"
+  />
+
+  <apn carrier="Internet Fulmovil"
+      mcc="712"
+      mnc="20"
+      apn="datos.fulmovil.cr"
+      type="default,supl,dun"
+  />
+
   <apn carrier="Wap"
       mcc="714"
       mnc="01"
       apn="apn01.cwpanama.com.pa"
-      proxy="172.25.3.5"
-      port="8080"
-      user=""
-      password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
@@ -15383,11 +19203,31 @@
       mcc="714"
       mnc="01"
       apn="apn02.cwpanama.com.pa"
-      user=""
-      password=""
       mmsproxy="172.25.3.5"
       mmsport="8080"
       mmsc="http://mms.zonamovil.com.pa"
+      type="mms"
+  />
+
+  <apn carrier="Movistar INTERNET"
+      mcc="714"
+      mnc="02"
+      apn="internet.movistar.pa"
+      user="movistarpa"
+      password="movistarpa"
+      authtype="1"
+      type="default,supl,dun"
+  />
+
+  <apn carrier="Movistar MMS"
+      mcc="714"
+      mnc="02"
+      apn="mms.movistar.pa"
+      user="movistarpamms"
+      password="movistarpa"
+      mmsproxy="10.12.21.1"
+      mmsport="80"
+      mmsc="http://mms.movistar.pa"
       authtype="1"
       type="mms"
   />
@@ -15438,26 +19278,20 @@
       type="mms"
   />
 
-  <apn carrier="INTERNET Panama"
+  <apn carrier="Digicel Internet"
       mcc="714"
       mnc="04"
       apn="web.digicelpanama.com"
-      user=""
-      password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
-  <apn carrier="MMS Panama"
+  <apn carrier="MMS"
       mcc="714"
       mnc="04"
       apn="wap.digicelpanama.com"
-      user=""
-      password=""
       mmsproxy="172.27.99.99"
       mmsport="8080"
       mmsc="http://mmc.digicelpanama.com/servlets/mms"
-      authtype="1"
       type="mms"
   />
 
@@ -15536,23 +19370,8 @@
       mcc="722"
       mnc="31"
       apn="igprs.claro.com.ar"
-      user="ctigprs"
-      password="ctigprs999"
-      authtype="1"
-      type="default,supl,dun"
-  />
-
-  <apn carrier="MMS GPRS AR"
-      mcc="722"
-      mnc="31"
-      apn="mms.ctimovil.com.ar"
-      user="ctimms"
-      password="ctimms999"
-      mmsproxy="170.51.255.240"
-      mmsport="8080"
-      mmsc="http://mms.ctimovil.com.ar"
-      authtype="1"
-      type="mms"
+      mmsc="http://mms.claro.com.ar"
+      type="default,supl,dun,mms"
   />
 
   <apn carrier="Claro AR"
@@ -15619,6 +19438,7 @@
       mmsproxy="200.179.66.242"
       mmsport="8080"
       authtype="1"
+      protocol="IPV4V6"
       type="default,supl,mms"
   />
 
@@ -15632,6 +19452,7 @@
       mmsproxy="200.179.66.242"
       mmsport="8080"
       authtype="1"
+      protocol="IPV4V6"
       type="default,supl,mms"
   />
 
@@ -15645,6 +19466,7 @@
       mmsproxy="200.179.66.242"
       mmsport="8080"
       authtype="1"
+      protocol="IPV4V6"
       type="default,supl,mms"
   />
 
@@ -15654,7 +19476,6 @@
       apn="java.claro.com.br"
       user="claro"
       password="claro"
-      authtype="1"
       type="default,supl"
   />
 
@@ -15681,6 +19502,7 @@
       mmsproxy="200.142.130.104"
       mmsport="80"
       authtype="1"
+      protocol="IPV4V6"
       type="mms"
   />
 
@@ -15691,37 +19513,18 @@
       user="vivo"
       password="vivo"
       authtype="1"
+      protocol="IPV4V6"
       type="default,supl"
   />
 
-  <apn carrier="SCTL MMS"
-      mcc="724"
-      mnc="07"
-      apn="mms.sercomtel.com.br"
-      user="sercomtel"
-      password="sercomtel"
-      mmsc="http://mms.claro.com.br"
-      mmsproxy="200.169.126.10"
-      mmsport="8799"
-      type="mms"
-  />
-
-  <apn carrier="SCTL GPRS"
-      mcc="724"
-      mnc="07"
-      apn="sercomtel.com.br"
-      user="sercomtel"
-      password="sercomtel"
-      type="default,supl"
-  />
-
-
   <apn carrier="Vivo Internet"
       mcc="724"
       mnc="10"
       apn="zap.vivo.com.br"
       user="vivo"
       password="vivo"
+      authtype="1"
+      protocol="IPV4V6"
       type="default,supl"
   />
 
@@ -15735,6 +19538,7 @@
       mmsproxy="200.142.130.104"
       mmsport="80"
       authtype="1"
+      protocol="IPV4V6"
       type="mms"
   />
 
@@ -15748,6 +19552,7 @@
       mmsproxy="200.142.130.104"
       mmsport="80"
       authtype="1"
+      protocol="IPV4V6"
       type="mms"
   />
 
@@ -15758,119 +19563,77 @@
       user="vivo"
       password="vivo"
       authtype="1"
+      protocol="IPV4V6"
       type="default,supl"
   />
 
 
-  <apn carrier="BrT Modem"
+  <apn carrier="Oi GPRS Internet"
       mcc="724"
       mnc="16"
-      apn="brt.br"
-      user="brt"
-      password="brt"
-      authtype="1"
-      type="default,supl"
-  />
-
-  <apn carrier="BrT MMS"
-      mcc="724"
-      mnc="16"
-      apn="mms.brt.br"
-      user="brt"
-      password="brt"
-      mmsc="http://mms.brasiltelecom.com.br/"
-      mmsproxy="200.96.8.29"
-      mmsport="8080"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="TelemigC GPRS"
-      mcc="724"
-      mnc="19"
-      apn="gprs.telemigcelular.com.br"
-      user="celular"
-      password="celular"
-      type="default,supl"
-  />
-
-  <apn carrier="MMS Telemig"
-      mcc="724"
-      mnc="19"
-      apn="mmsgprs.telemigcelular.com.br"
-      user="celular"
-      password="celular"
-      mmsc="http://mms.telemigcelular.com.br"
-      mmsproxy="200.192.230.142"
-      mmsport="8080"
-      type="mms"
-  />
-
-  <apn carrier="Vivo Internet"
-      mcc="724"
-      mnc="23"
-      apn="zap.vivo.com.br"
-      user="vivo"
-      password="vivo"
-      authtype="1"
-      type="default,supl"
-  />
-
-
-  <apn carrier="Vivo MMS"
-      mcc="724"
-      mnc="23"
-      apn="mms.vivo.com.br"
-      user="vivo"
-      password="vivo"
-      mmsc="http://termnat.vivomms.com.br:8088/mms"
-      mmsproxy="200.142.130.104"
-      mmsport="80"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="AmazôniaC GPRS"
-      mcc="724"
-      mnc="24"
-      apn="gprs.amazoniacelular.com.br"
-      user="celular"
-      password="celular"
-      authtype="1"
-      type="default,supl,dun"
-  />
-
-  <apn carrier="AmazôniaC MMS"
-      mcc="724"
-      mnc="24"
-      apn="mmsgprs.amazoniacelular.com.br"
-      user="celular"
-      password="celular"
-      mmsc="http://mms.amazoniacelular.com.br"
-      mmsproxy="200.192.230.142"
-      mmsport="8080"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="OI GPRS"
-      mcc="724"
-      mnc="31"
       apn="gprs.oi.com.br"
-      authtype="1"
+      protocol="IPV4V6"
       type="default,supl"
   />
 
-  <apn carrier="OI MMS"
+  <apn carrier="MMS GPRS"
       mcc="724"
-      mnc="31"
+      mnc="16"
       apn="mmsgprs.oi.com.br"
       user="oimms"
-      password="oimms"
+      password="oioioi"
       mmsc="http://200.222.42.204:8002"
       mmsproxy="192.168.10.50"
       mmsport="3128"
       authtype="1"
+      protocol="IPV4V6"
+      type="mms"
+  />
+
+  <apn carrier="Vivo Internet"
+      mcc="724"
+      mnc="23"
+      apn="zap.vivo.com.br"
+      user="vivo"
+      password="vivo"
+      authtype="1"
+      protocol="IPV4V6"
+      type="default,supl"
+  />
+
+  <apn carrier="Vivo MMS"
+      mcc="724"
+      mnc="23"
+      apn="mms.vivo.com.br"
+      user="vivo"
+      password="vivo"
+      mmsc="http://termnat.vivomms.com.br:8088/mms"
+      mmsproxy="200.142.130.104"
+      mmsport="80"
+      authtype="1"
+      protocol="IPV4V6"
+      type="mms"
+  />
+
+  <apn carrier="Oi GPRS Internet"
+      mcc="724"
+      mnc="31"
+      apn="gprs.oi.com.br"
+      protocol="IPV4V6"
+      type="default,supl"
+  />
+
+  <apn carrier="MMS GPRS"
+      mcc="724"
+      mnc="31"
+      apn="mmsgprs.oi.com.br"
+      user="oimms"
+      password="oioioi"
+      mmsc="http://200.222.42.204:8002"
+      mmsproxy="192.168.10.50"
+      mmsport="3128"
+      authtype="1"
+      protocol="IPV4V6"
       type="mms"
   />
 
@@ -15924,8 +19687,6 @@
       mcc="730"
       mnc="02"
       apn="wap.tmovil.cl"
-      proxy="172.17.8.11"
-      port="8080"
       user="wap"
       password="wap"
       authtype="1"
@@ -15945,7 +19706,7 @@
       type="mms"
   />
 
-  <apn carrier="BAM Claro"
+  <apn carrier="Banda Ancha Movil"
       mcc="730"
       mnc="03"
       apn="bam.clarochile.cl"
@@ -16000,16 +19761,6 @@
       type="default,supl,dun"
   />
 
-  <apn carrier="Bam"
-      mcc="730"
-      mnc="08"
-      apn="bam.vtr.com"
-      user="vtr"
-      password="vtr"
-      authtype="2"
-      type="default,supl,dun"
-  />
-
   <apn carrier="MMS"
       mcc="730"
       mnc="08"
@@ -16046,7 +19797,7 @@
       type="mms"
   />
 
-  <apn carrier="WEB Comcel 3GSM"
+  <apn carrier="COMCEL"
       mcc="732"
       mnc="101"
       apn="internet.comcel.com.co"
@@ -16138,12 +19889,11 @@
       type="mms"
   />
 
-  <apn carrier="Digitel GSM"
+  <apn carrier="Digitel 412"
       mcc="734"
       mnc="01"
-      apn="gprsweb.digitel.ve"
+      apn="internet.digitel.ve"
       type="default,supl,dun"
-      authtype="1"
   />
 
   <apn carrier="MMS"
@@ -16153,15 +19903,13 @@
       mmsproxy="10.99.0.10"
       mmsport="8080"
       mmsc="http://mms.412.com.ve/servlets/mms"
-      authtype="1"
       type="mms"
   />
 
-  <apn carrier="Digitel GSM"
+  <apn carrier="Digitel 412"
       mcc="734"
       mnc="02"
-      apn="gprsweb.digitel.ve"
-      authtype="1"
+      apn="internet.digitel.ve"
       type="default,supl,dun"
   />
 
@@ -16172,15 +19920,13 @@
       mmsproxy="10.99.0.10"
       mmsport="8080"
       mmsc="http://mms.412.com.ve/servlets/mms"
-      authtype="1"
       type="mms"
   />
 
-  <apn carrier="Digitel GSM"
+  <apn carrier="Digitel 412"
       mcc="734"
       mnc="03"
-      apn="gprsweb.digitel.ve"
-      authtype="1"
+      apn="internet.digitel.ve"
       type="default,supl,dun"
   />
 
@@ -16191,7 +19937,6 @@
       mmsproxy="10.99.0.10"
       mmsport="8080"
       mmsc="http://mms.412.com.ve/servlets/mms"
-      authtype="1"
       type="mms"
   />
 
@@ -16199,7 +19944,6 @@
       mcc="734"
       mnc="04"
       apn="internet.movistar.ve"
-      authtype="1"
       type="default,supl,dun"
   />
 
@@ -16210,7 +19954,6 @@
       mmsproxy="200.35.64.73"
       mmsport="9001"
       mmsc="http://mms.movistar.com.ve:8088/mms"
-      authtype="1"
       type="mms"
   />
 
@@ -16220,7 +19963,6 @@
       apn="wap.movistar.ve"
       mmsproxy="200.35.64.73"
       mmsport="9001"
-      authtype="1"
       type="default,supl,dun"
   />
 
@@ -16228,7 +19970,6 @@
       mcc="734"
       mnc="06"
       apn="int.movilnet.com.ve"
-      authtype="1"
       type="default,supl,dun"
   />
 
@@ -16239,7 +19980,6 @@
       mmsproxy="192.168.16.12"
       mmsport="8080"
       mmsc="http://mms2.movilnet.com.ve/servlets/mms"
-      authtype="1"
       type="mms"
   />
 
@@ -16249,7 +19989,7 @@
       apn="internet.nuevatel.com"
       user=""
       password=""
-      proxy="192.168.101.004"
+      proxy="192.168.101.4"
       port="3128"
       authtype="1"
       type="default,supl,dun"
@@ -16261,7 +20001,7 @@
       apn="mms.nuevatel.com"
       user=""
       password=""
-      mmsproxy="192.168.101.004"
+      mmsproxy="192.168.101.4"
       mmsport="3128"
       mmsc="http://mmsgw.nuevatel.com:1981"
       authtype="1"
@@ -16293,7 +20033,7 @@
       type="mms"
   />
 
-   <apn carrier="WAPTIGO"
+  <apn carrier="WAPTIGO"
       mcc="736"
       mnc="03"
       apn="wap.tigo.bo"
@@ -16318,6 +20058,20 @@
       type="mms"
   />
 
+  <apn carrier="Digicel"
+      mcc="738"
+      mnc="01"
+      apn="default"
+      type="default,supl"
+  />
+
+  <apn carrier="GT&amp;T Cellink Plus"
+      mcc="738"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
   <apn carrier="Movistar INTERNET"
       mcc="740"
       mnc="00"
@@ -16341,72 +20095,60 @@
       type="mms"
   />
 
-  <apn carrier="Claro Internet"
+  <apn carrier="Internet Claro"
       mcc="740"
       mnc="01"
-      apn="internet.porta.com.ec"
-      user=""
-      password=""
-      authtype="1"
+      apn="internet.claro.com.ec"
       type="default,supl,dun"
   />
 
   <apn carrier="MMS Claro"
       mcc="740"
       mnc="01"
-      apn="mms.porta.com.ec"
+      apn="mms.claro.com.ec"
       user="portamms"
       password="portamms2003"
       mmsproxy="216.250.208.94"
       mmsport="8799"
-      mmsc="http://iesmms.porta.com.ec"
+      mmsc="http://iesmms.porta.com.ec/"
       authtype="1"
       type="mms"
   />
 
-  <apn carrier="Claro Internet"
+  <apn carrier="Internet Claro"
       mcc="740"
       mnc="010"
-      apn="internet.porta.com.ec"
-      user=""
-      password=""
-      authtype="1"
+      apn="internet.claro.com.ec"
       type="default,supl,dun"
   />
 
   <apn carrier="MMS Claro"
       mcc="740"
       mnc="010"
-      apn="mms.porta.com.ec"
+      apn="mms.claro.com.ec"
       user="portamms"
       password="portamms2003"
       mmsproxy="216.250.208.94"
       mmsport="8799"
-      mmsc="http://iesmms.porta.com.ec"
+      mmsc="http://iesmms.porta.com.ec/"
       authtype="1"
       type="mms"
   />
 
-  <apn carrier="ALEGRO 3G"
+  <apn carrier="CNT 3G"
       mcc="740"
       mnc="02"
       apn="internet3gsp.alegro.net.ec"
-      user=""
-      password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
-  <apn carrier="MMS Alegro"
+  <apn carrier="CNT MMS"
       mcc="740"
       mnc="02"
       apn="mms.alegro.net.ec"
-      user=""
-      password=""
       mmsproxy="10.4.85.3"
       mmsport="8080"
       mmsc="http://mms.alegro.net.ec/mms/"
-      authtype="1"
       type="mms"
   />
 
@@ -16498,6 +20240,13 @@
       type="mms"
   />
 
+  <apn carrier="Telesur"
+      mcc="746"
+      mnc="02"
+      apn="default"
+      type="default,supl"
+  />
+
   <apn carrier="wapANCEL"
       mcc="748"
       mnc="01"
@@ -16577,165 +20326,102 @@
       type="mms"
   />
 
-  <apn carrier="Orange Armenia MMS" 
-      mcc="283" 
-      mnc="10" 
-      apn="mms" 
-      mmsc="http://mms/" 
-      mmsproxy="192.168.220.251" 
-      mmsport="3128" 
-      type="mms" 
+  <apn carrier="Orange Armenia MMS"
+      mcc="283"
+      mnc="10"
+      apn="mms"
+      mmsc="http://mms/"
+      mmsproxy="192.168.220.251"
+      mmsport="3128"
+      type="mms"
       authtype="1"
   />
 
-  <apn carrier="Orange Armenia Internet" 
-      mcc="283" 
-      mnc="10" 
-      apn="Internet" 
-      type="default" 
+  <apn carrier="Orange Armenia Internet"
+      mcc="283"
+      mnc="10"
+      apn="Internet"
+      type="default"
       authtype="1"
   />
 
-  <apn carrier="Orange BW MMS" 
-      mcc="652" 
-      mnc="02" 
-      apn="mms.orange.co.bw" 
-      mmsc="http://10.0.0.242/servlets/mms" 
-      mmsproxy="10.0.0.226" 
-      mmsport="8080" 
-      type="mms"
-  />
-
-  <apn carrier="Orange WAP BW" 
-      mcc="652" 
-      mnc="02" 
-      apn="internet.orange.co.bw"
-      proxy="10.0.0.226" 
-      port="8080"  
-      type="default"
-  />
-
-  <apn carrier="Orangeweb" 
-      mcc="340" 
-      mnc="01" 
-      apn="orangeweb" 
-      user="orange" 
-      password="orange" 
-      type="default"
-  />
-
-  <apn carrier="Omms CI" 
-      mcc="612" 
-      mnc="03" 
-      apn="orangecimms" 
-      user="mms" 
-      password="mms"
-      mmsc="http://172.20.6.1/servlets/mms" 
-      mmsproxy="172.20.4.33" 
-      mmsport="8080" 
-      type="mms"
-  />
-
-  <apn carrier="OWORLD CI" 
-      mcc="612" 
-      mnc="03" 
-      apn="orangeciwap" 
-      user="wap" 
-      password="wap" 
-      proxy="172.20.4.33" 
-      port="8080" 
-      type="default"
-  />
-
-  <apn carrier="Orange DO MMS" 
-      mcc="370" 
-      mnc="01" 
-      apn="orangeworld" 
-      mmsc="http://mmr.orangewi.com/servlets/mms" 
-      mmsproxy="172.16.126.70" 
+  <apn carrier="Orange BW MMS"
+      mcc="652"
+      mnc="02"
+      apn="mms.orange.co.bw"
+      mmsc="http://10.0.0.242/servlets/mms"
+      mmsproxy="10.0.0.226"
       mmsport="8080"
       type="mms"
   />
 
-  <apn carrier="Orange DO" 
-      mcc="370" 
-      mnc="01" 
-      apn="orangenet.com.do" 
+  <apn carrier="Orange WAP BW"
+      mcc="652"
+      mnc="02"
+      apn="internet.orange.co.bw"
+      proxy="10.0.0.226"
+      port="8080"
       type="default"
   />
 
-  <apn carrier="Orange CM" 
-      mcc="624" 
-      mnc="02" 
-      apn="orangecmgprs" 
-      user="orange" 
+  <apn carrier="Orangeweb"
+      mcc="340"
+      mnc="01"
+      apn="orangeweb"
+      user="orange"
       password="orange"
-      proxy="192.168.122.101" 
-      port="8080" 
-      mmsc="http://mms.orange.cm" 
-      mmsproxy="192.168.122.101" 
-      mmsport="8080" 
+      type="default"
+  />
+
+  <apn carrier="Orange CM"
+      mcc="624"
+      mnc="02"
+      apn="orangecmgprs"
+      user="orange"
+      password="orange"
+      proxy="192.168.122.101"
+      port="8080"
+      mmsc="http://mms.orange.cm"
+      mmsproxy="192.168.122.101"
+      mmsport="8080"
       type="default,mms"
   />
 
-  <apn carrier="Orange net KE" 
-      mcc="639" 
-      mnc="07" 
-      apn="bew.orange.co.ke" 
+  <apn carrier="Orange net KE"
+      mcc="639"
+      mnc="07"
+      apn="bew.orange.co.ke"
       type="default"
   />
 
-  <apn carrier="Orange RE" 
-      mcc="647" 
-      mnc="00" 
-      apn="orangerun" 
-      user="orange" 
-      password="orange" 
+  <apn carrier="Orange RE"
+      mcc="647"
+      mnc="00"
+      apn="orangerun"
+      user="orange"
+      password="orange"
       type="default"
   />
 
-  <apn carrier="Orange MG MMS" 
-      mcc="646" 
-      mnc="02" 
-      apn="orangemms" 
-      user="mms" 
-      password="orange" 
-      mmsc="http://10.152.10.70.38090" 
-      mmsproxy="10.150.0.115" 
-      mmsport="8080" 
+  <apn carrier="Orange MG MMS"
+      mcc="646"
+      mnc="02"
+      apn="orangemms"
+      user="mms"
+      password="orange"
+      mmsc="http://10.152.10.70.38090"
+      mmsproxy="10.150.0.115"
+      mmsport="8080"
       type="mms"
   />
 
   <apn carrier="Orange World MG"
-      mcc="646" 
-      mnc="02" 
-      apn="orangeworld" 
-      user="world" 
-      password="orange" 
-      proxy="10.150.0.115" 
-      port="8080" 
-      type="default"
-  />
-
-  <apn carrier="Orange ML MMS" 
-      mcc="610" 
-      mnc="02" 
-      apn="mms" 
-      user="mms" 
-      password="mms"
-      mmsc="http://10.109.6.2/servlets/mms" 
-      mmsproxy="10.109.4.35" 
-      mmsport="8080" 
-      type="mms"
-  />
-
-  <apn carrier="Orange Wap ML" 
-      mcc="610" 
-      mnc="02" 
-      apn="wap" 
-      user="wap" 
-      password="wap" 
-      proxy="10.109.4.35" 
+      mcc="646"
+      mnc="02"
+      apn="orangeworld"
+      user="world"
+      password="orange"
+      proxy="10.150.0.115"
       port="8080"
       type="default"
   />
diff --git a/overlays/location/frameworks/base/core/res/res/values/config.xml b/overlays/location/frameworks/base/core/res/res/values/config.xml
index a70c931..7d93c43 100644
--- a/overlays/location/frameworks/base/core/res/res/values/config.xml
+++ b/overlays/location/frameworks/base/core/res/res/values/config.xml
@@ -29,7 +29,7 @@
        verify location providers are allowed to be loaded.
     -->
     <string-array name="config_locationProviderPackageNames" translatable="false">
-        <item>com.google.android.location</item>
+        <item>com.google.android.gms</item>
         <item>com.android.location.fused</item>
     </string-array>
 </resources>