diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
old mode 100644
new mode 100755
index 534a1bd..a37a329
--- 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://mmc.omeatelecom.fr/servlets/mms"
+      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,23 +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"
+      authtype="1"
       proxy="172.31.198.37"
       port="5080"
       type="default,supl"
@@ -266,6 +411,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 +421,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 +444,7 @@
       mmsc="http://mms.orange.fr"
       mmsproxy="192.168.10.200"
       mmsport="8080"
-      authtype="2"
+      authtype="1"
       type="mms"
   />
 
@@ -311,8 +464,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 +483,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 +495,7 @@
       apn="ofnew.fr"
       user="orange"
       password="orange"
+      authtype="1"
       type="default,supl"
       mvno_match_data="52"
       mvno_type="gid"
@@ -352,6 +510,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 +522,7 @@
       apn="ofnew.fr"
       user="orange"
       password="orange"
+      authtype="1"
       type="default,supl"
       mvno_match_data="4E"
       mvno_type="gid"
@@ -377,6 +537,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,6 +567,13 @@
   <apn carrier="SFR webphone"
       mcc="208"
       mnc="10"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="SFR webphone"
+      mcc="208"
+      mnc="10"
       apn="sl2sfr"
       type="default,supl"
   />
@@ -420,7 +588,7 @@
   <apn carrier="MMS"
       mcc="208"
       mnc="10"
-      apn="mmssfr"
+      apn="sl2sfr"
       mmsc="http://mms1"
       mmsproxy="10.151.0.1"
       mmsport="8080"
@@ -451,8 +619,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 +682,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 +763,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 +778,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"
@@ -652,6 +816,8 @@
       mnc="26"
       apn="fnetnrj"
       type="default,supl"
+      mvno_match_data="4E"
+      mvno_type="gid"
   />
 
   <apn carrier="NRJ MMS"
@@ -662,6 +828,8 @@
       mmsproxy="10.143.156.5"
       mmsport="8080"
       type="mms"
+      mvno_match_data="4E"
+      mvno_type="gid"
   />
 
   <apn carrier="Internet movil"
@@ -670,6 +838,7 @@
       apn="airtelwap.es"
       user="wap@wap"
       password="wap125"
+      authtype="1"
       type="default,supl"
   />
 
@@ -682,12 +851,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 +876,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 +966,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 +978,7 @@
       apn="internet.euskaltel.mobi"
       user="CLIENTE"
       password="EUSKALTEL"
+      authtype="1"
       type="default,supl"
       mvno_match_data="0008"
       mvno_type="gid"
@@ -777,6 +988,7 @@
       mcc="214"
       mnc="06"
       apn="internet.mundo-r.com"
+      authtype="1"
       type="default,supl"
       mvno_match_data="2140612"
       mvno_type="imsi"
@@ -785,10 +997,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 +1013,7 @@
       apn="internet.telecable.es"
       user="telecable"
       password="telecable"
+      authtype="1"
       type="default,supl"
       mvno_match_data="2140613"
       mvno_type="imsi"
@@ -814,6 +1028,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 +1040,7 @@
       apn="gprs.eroskimovil.es"
       user="wap@wap"
       password="wap125"
+      authtype="1"
       type="default,supl"
       mvno_match_data="2140606"
       mvno_type="imsi"
@@ -839,23 +1055,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 +1069,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"
@@ -900,6 +1109,7 @@
       mmsc="http://mms.euskaltel.mobi"
       mmsproxy="172.16.18.74"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -909,6 +1119,7 @@
       apn="internet.euskaltel.mobi"
       user="CLIENTE"
       password="EUSKALTEL"
+      authtype="1"
       type="default,supl"
   />
 
@@ -950,6 +1161,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"
@@ -987,47 +1208,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"
@@ -1099,16 +1410,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 +1442,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 +1462,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 +1476,7 @@
       password="gprs"
       proxy="217.65.192.33"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1193,6 +1521,7 @@
       password="064"
       proxy="172.17.88.198"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1205,6 +1534,7 @@
       mmsc="http://mms.mts064.telekom.rs/mms/wapenc"
       mmsproxy="172.17.85.131"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -1231,6 +1561,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 +1581,7 @@
       password="vipmobile"
       proxy="212.15.182.82"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1251,6 +1594,7 @@
       mmsc="http://mmsc.vipmobile.rs"
       mmsproxy="212.15.182.82"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -1258,16 +1602,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 +1615,35 @@
       type="mms"
   />
 
+  <apn carrier="Internet"
+      mcc="222"
+      mnc="01"
+      apn="internet.windmobile.ca"
+      type="default,supl"
+      protocol="IPV4V6"
+      mvno_match_data="FFFF"
+      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="FFFF"
+      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 +1668,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 +1678,28 @@
       type="mms"
   />
 
+  <apn carrier="Internet"
+      mcc="222"
+      mnc="88"
+      apn="internet.windmobile.ca"
+      type="default,supl"
+      protocol="IPV4V6"
+      mvno_match_data="FFFF"
+      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="FFFF"
+      mvno_type="gid"
+  />
+
   <apn carrier="3"
       mcc="222"
       mnc="99"
@@ -1350,6 +1728,7 @@
       apn="live.vodafone.com"
       user="live"
       password="vodafone"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1362,12 +1741,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 +1768,7 @@
       mmsc="http://mmsc1.mms.cosmote.ro:8002"
       mmsproxy="10.252.1.62"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -1390,6 +1778,7 @@
       apn="wnw"
       user="wnw"
       password="wnw"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1407,12 +1796,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 +1835,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 +1851,7 @@
       mmsc="http://wap.mms.orange.ro:8002"
       mmsproxy="62.217.247.252"
       mmsport="8799"
+      authtype="1"
       type="mms"
   />
 
@@ -1513,9 +1918,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"
   />
 
@@ -1528,6 +1941,7 @@
       mmsc="http://mms"
       mmsproxy="10.0.0.10"
       mmsport="80"
+      authtype="1"
       type="mms"
   />
 
@@ -1565,6 +1979,7 @@
       mmsc="http://mms"
       mmsproxy="10.11.10.111"
       mmsport="80"
+      authtype="1"
       type="mms"
   />
 
@@ -1640,15 +2055,7 @@
       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"
   />
 
@@ -1661,19 +2068,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"
@@ -1682,6 +2085,7 @@
       apn="gprsinternet"
       user="t-mobile"
       password="tm"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1694,6 +2098,7 @@
       mmsc="http://mmsc.t-mobile.at/servlets/mms"
       mmsproxy="10.12.0.20"
       mmsport="80"
+      authtype="1"
       type="mms"
   />
 
@@ -1706,16 +2111,17 @@
       mmsc="http://mmsc.orange.at/mms/wapenc"
       mmsproxy="194.24.128.118"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
-
   <apn carrier="Orange Smartphone"
       mcc="232"
       mnc="05"
       apn="orange.smartphone"
       user="web"
       password="web"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1728,6 +2134,7 @@
       mmsc="http://relay.mms.telering.at"
       mmsproxy="212.95.31.50"
       mmsport="80"
+      authtype="1"
       type="mms"
   />
 
@@ -1737,6 +2144,7 @@
       apn="web"
       user="web@telering.at"
       password="web"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1757,6 +2165,7 @@
       apn="bob.at"
       user="data@bob.at"
       password="ppp"
+      authtype="1"
       type="default,supl"
   />
 
@@ -1769,6 +2178,7 @@
       mmsc="http://mmsc.bob.at"
       mmsproxy="194.48.124.7"
       mmsport="8001"
+      authtype="1"
       type="mms"
   />
 
@@ -1846,7 +2256,7 @@
       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"
@@ -1860,11 +2270,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"
@@ -1946,6 +2359,7 @@
       mmsc="http://mms.vodafone.co.uk/servlets/mms"
       mmsproxy="212.183.137.12"
       mmsport="8799"
+      authtype="1"
       type="default,supl,mms"
   />
 
@@ -1958,9 +2372,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"
@@ -1971,7 +2449,7 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Virgin Media"
+  <apn carrier="Virgin Media Mobile Internet"
       mcc="234"
       mnc="30"
       apn="goto.virginmobile.uk"
@@ -1979,6 +2457,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"
@@ -1987,6 +2466,13 @@
   <apn carrier="EE Internet"
       mcc="234"
       mnc="30"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="EE Internet"
+      mcc="234"
+      mnc="30"
       apn="everywhere"
       user="eesecure"
       password="secure"
@@ -2056,11 +2542,18 @@
   <apn carrier="EE Internet"
       mcc="234"
       mnc="33"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="EE Internet"
+      mcc="234"
+      mnc="33"
       apn="everywhere"
       user="eesecure"
       password="secure"
       authtype="1"
-      type="default,supl"
+      type="default,supl,dun"
   />
 
   <apn carrier="EE MMS"
@@ -2198,11 +2691,13 @@
       type="mms"
   />
 
-  <apn carrier="TDC"
+  <apn carrier="TDC Internet"
       mcc="238"
       mnc="01"
       apn="internet"
       type="default,supl"
+      mvno_match_data="2380101xxxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="TDC MMS"
@@ -2213,6 +2708,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"
@@ -2232,6 +2750,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"
@@ -2242,11 +2802,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"
@@ -2257,6 +2828,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"
@@ -2297,21 +2924,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"
@@ -2324,35 +2953,98 @@
       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"
-      mcc="240"
-      mnc="06"
-      apn="services.telenor.se"
-      mmsc="http://mms"
-      mmsproxy="173.30.253.241"
-      mmsport="8799"
-      type="mms"
-  />
-
   <apn carrier="Telenor Mobilsurf"
       mcc="240"
-      mnc="06"
+      mnc="04"
       apn="services.telenor.se"
-      proxy="173.30.253.241"
-      port="8799"
+      mmsc="http://mms"
+      mmsproxy="172.30.253.241"
+      mmsport="8799"
+      type="default,supl,mms"
+      mvno_match_data="Telenor SE"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Tele2 Internet 4G"
+      mcc="240"
+      mnc="05"
+      apn="4g.tele2.se"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="130.244.202.30"
+      mmsport="8080"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="Tele2"
+      mcc="240"
+      mnc="05"
+      apn="internet.tele2.se"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="130.244.202.30"
+      mmsport="8080"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="Telia SE 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 SurfPort"
+      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 4G"
+      mcc="240"
+      mnc="07"
+      apn="4g.tele2.se"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="130.244.202.30"
+      mmsport="8080"
+      type="default,supl,mms"
   />
 
   <apn carrier="Tele2"
@@ -2365,42 +3057,38 @@
       type="default,supl,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 Mobilsurf"
       mcc="240"
       mnc="08"
       apn="services.telenor.se"
       mmsc="http://mms"
       mmsproxy="172.30.253.241"
       mmsport="8799"
-      type="mms"
-  />
-
-  <apn carrier="Telenor MMS"
-      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"
-      type="default,supl"
+      type="default,supl,mms"
   />
 
   <apn carrier="Spring data"
@@ -2420,11 +3108,45 @@
       type="mms"
   />
 
+  <apn carrier="Tele2 Internet 4G"
+      mcc="240"
+      mnc="24"
+      apn="4g.tele2.se"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="130.244.202.30"
+      mmsport="8080"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="Tele2"
+      mcc="240"
+      mnc="24"
+      apn="internet.tele2.se"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="130.244.202.30"
+      mmsport="8080"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="Telenor Mobilsurf"
+      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"
       mcc="242"
       mnc="01"
       apn="internet.ventelo.no"
       type="default,supl"
+      mvno_match_data="24201700xxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="Ventelo MMS"
@@ -2437,6 +3159,9 @@
       mmsproxy="10.10.10.11"
       mmsport="8080"
       type="mms"
+      authtype="1"
+      mvno_match_data="24201700xxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="Telenor"
@@ -2449,21 +3174,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"
+      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="Chess Internett"
+      mcc="242"
+      mnc="02"
+      apn="netcom"
       type="default,supl"
+      mvno_match_data="2420256xxxxxxxx"
+      mvno_type="imsi"
   />
 
   <apn carrier="Tele2 Internett"
@@ -2504,7 +3246,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"
@@ -2536,7 +3278,6 @@
       type="default,supl"
   />
 
-
   <apn carrier="Elisa MMS"
       mcc="244"
       mnc="05"
@@ -2547,6 +3288,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"
@@ -2577,7 +3339,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"
@@ -2664,7 +3426,6 @@
       type="default,supl"
   />
 
-
   <apn carrier="SONERA MMS"
       mcc="244"
       mnc="91"
@@ -2684,6 +3445,7 @@
       mmsc="http://mms.omnitel.net:8002/"
       mmsproxy="194.176.32.149"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -2693,29 +3455,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"
@@ -2734,8 +3501,6 @@
       mnc="01"
       apn="mms.lmt.lv"
       mmsc="http://mmsc.lmt.lv/mmsc"
-      mmsproxy="212.93.97.201"
-      mmsport="80"
       type="mms"
   />
 
@@ -2743,8 +3508,6 @@
       mcc="247"
       mnc="02"
       apn="internet.tele2.lv"
-      user="wap"
-      password="wap"
       type="default,supl"
   />
 
@@ -2757,6 +3520,7 @@
       mmsc="http://mmsc.tele2.lv/"
       mmsproxy="193.12.40.38"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -2776,6 +3540,7 @@
       mmsc="http://mmsc/servlets/mms"
       mmsproxy="192.168.150.2"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -2814,6 +3579,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"
@@ -2875,7 +3664,7 @@
       password="mts"
       mmsc="http://mmsc"
       mmsproxy="192.168.192.192"
-      mmsport="9201"
+      mmsport="8080"
       authtype="1"
       type="mms"
   />
@@ -2884,9 +3673,8 @@
       mcc="250"
       mnc="02"
       apn="internet"
-      user="gdata"
-      password="gdata"
-      authtype="1"
+      user=""
+      password=""
       type="default,supl"
   />
 
@@ -2903,6 +3691,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"
@@ -2926,38 +3738,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"
@@ -2994,6 +3779,7 @@
       apn="mms.kyivstar.net"
       user="mms"
       password="mms"
+      authtype="1"
       mmsc="http://mms.kyivstar.net"
       mmsproxy="10.10.10.10"
       mmsport="8080"
@@ -3004,6 +3790,9 @@
       mcc="255"
       mnc="03"
       apn="www.kyivstar.net"
+      user="igprs"
+      password="internet"
+      authtype="1"
       type="default,supl"
   />
 
@@ -3013,6 +3802,7 @@
       apn="mms.djuice.com.ua"
       user="djuice"
       password="mms"
+      authtype="1"
       mmsc="http://mms.kyivstar.net"
       mmsproxy="10.10.10.10"
       mmsport="8080"
@@ -3024,20 +3814,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"
@@ -3064,6 +3854,129 @@
       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"
@@ -3086,7 +3999,7 @@
   <apn carrier="Plus Internet"
       mcc="260"
       mnc="01"
-      apn="internet"
+      apn="plus"
       type="default,supl"
   />
 
@@ -3103,6 +4016,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"
   />
@@ -3134,16 +4054,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"
@@ -3152,17 +4073,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"
@@ -3172,19 +4094,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"
@@ -3208,6 +4144,7 @@
       apn="internet.eplus.de"
       user="eplus"
       password="internet"
+      authtype="1"
       type="default,supl"
   />
 
@@ -3220,6 +4157,7 @@
       mmsc="http://mms/eplus/"
       mmsproxy="212.23.97.153"
       mmsport="5080"
+      authtype="1"
       type="mms"
   />
 
@@ -3248,9 +4186,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"
@@ -3259,21 +4205,54 @@
       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,mms"
+      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.030.027.063"
+      mmsport="8799"
+      type="mms"
+      mvno_match_data="ZON"
+      mvno_type="spn"
+  />
+
+  <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"
@@ -3289,6 +4268,7 @@
       apn="mmsc.tmn.pt"
       user="tmn"
       password="tmnnet"
+      authtype="1"
       mmsc="http://mmsc/"
       mmsproxy="10.111.2.16"
       mmsport="8080"
@@ -3529,19 +4509,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"
@@ -3554,6 +4535,7 @@
       apn="internet.vivacom.bg"
       user="vivacom"
       password="vivacom"
+      authtype="1"
       type="default,supl"
   />
 
@@ -3563,6 +4545,7 @@
       apn="mms.vivacom.bg"
       user="mms"
       password="mms"
+      authtype="1"
       mmsc="http://mmsc.vivacom.bg"
       mmsproxy="192.168.123.123"
       mmsport="8080"
@@ -3573,6 +4556,9 @@
       mcc="284"
       mnc="05"
       apn="globul"
+      authtype="1"
+      proxy="192.168.88.11"
+      port="8004"
       type="default,supl"
   />
 
@@ -3726,6 +4712,13 @@
   <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"
@@ -3744,7 +4737,7 @@
       type="mms"
   />
 
-   <apn carrier="Cosmofon"
+  <apn carrier="Cosmofon"
       mcc="294"
       mnc="02"
       apn="Internet"
@@ -3815,30 +4808,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"
@@ -3874,7 +4909,7 @@
       mcc="302"
       mnc="270"
       apn="wisp.mobi.eastlink.ca"
-      type="default,supl"
+      type="default,supl,dun"
   />
 
   <apn carrier="Fido Internet"
@@ -3892,6 +4927,7 @@
       mnc="490"
       apn="internet.windmobile.ca"
       type="default,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="MMS"
@@ -3912,14 +4948,44 @@
       type="default,supl,mms"
   />
 
-  <apn carrier="Bell Internet"
+  <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"
-      mmsport="80"
-      type="default,supl,mms"
+      mvno_match_data="3D"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Virgin Mobile"
+      mcc="302"
+      mnc="610"
+      apn="pda.bell.ca"
+      type="default,mms,dun,supl"
+      mmsc="http://mms.bell.ca/mms/wapenc"
+      mvno_match_data="3E"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Solo Mobile"
+      mcc="302"
+      mnc="610"
+      apn="pda.bell.ca"
+      type="default,mms,dun,supl"
+      mmsc="http://mms.bell.ca/mms/wapenc"
+      mvno_match_data="3F"
+      mvno_type="gid"
+  />
+
+  <apn carrier="PC mobile"
+      mcc="302"
+      mnc="610"
+      apn="pda.bell.ca"
+      type="default,mms,dun,supl"
+      mmsc="http://mms.bell.ca/mms/wapenc"
+      mvno_match_data="40"
+      mvno_type="gid"
   />
 
   <apn carrier="MTS"
@@ -3936,10 +5002,52 @@
       mcc="302"
       mnc="370"
       apn="sp.mts"
+      type="default,mms,supl"
       mmsc="http://mmsc2.mts.net/"
       mmsproxy="209.4.229.90"
       mmsport="9401"
-      type="default,supl,mms"
+      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"
+      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"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="2C"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Rogers LTE"
+      mcc="302"
+      mnc="720"
+      apn="ltemobile.apn"
+      type="default,mms,supl"
+      mmsc="http://mms.gprs.rogers.com"
+      mmsproxy="mmsproxy.rogers.com"
+      mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Rogers"
@@ -3956,20 +5064,14 @@
       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"
   />
@@ -3978,10 +5080,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"
@@ -4058,6 +5160,89 @@
       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"
+  />
+
   <apn carrier="My Multi Media"
       mcc="310"
       mnc="130"
@@ -4071,9 +5256,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"
@@ -4098,73 +5306,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"
@@ -4202,9 +5639,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"
@@ -4254,6 +5692,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"
@@ -4295,9 +5750,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"
@@ -4320,6 +5798,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"
@@ -4343,9 +5843,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"
@@ -4358,6 +5881,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"
@@ -4375,36 +5920,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"
@@ -4413,9 +6003,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"
@@ -4577,7 +6190,7 @@
       type="mms"
   />
 
-  <apn carrier="Movistar Internet"
+  <apn carrier="Movistar INTERNET"
       mcc="334"
       mnc="030"
       apn="internet.movistar.mx"
@@ -4606,7 +6219,6 @@
       apn="web.iusacellgsm.mx"
       user="Iusacellgsm"
       password="Iusacellgsm"
-      authtype="0"
       type="default,supl,dun"
   />
 
@@ -4617,9 +6229,6 @@
       user="mmsiusacellgsm"
       password="mmsiusacellgsm"
       mmsc="http://mms.iusacell3g.com/"
-      mmsproxy="192.200.1.40"
-      mmsport="80"
-      authtype="0"
       type="mms"
   />
 
@@ -4737,13 +6346,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"
@@ -5472,6 +7079,7 @@
       apn="internet.beeline.kz"
       user="@internet.beeline"
       password="beeline"
+      authtype="1"
       type="default,supl"
   />
 
@@ -5481,6 +7089,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"
@@ -5542,7 +7151,23 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <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"
@@ -5552,19 +7177,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"
   />
 
@@ -5575,15 +7193,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"
@@ -5622,7 +7231,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="04"
       apn="internet"
@@ -5648,7 +7257,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="05"
       apn="portalnmms"
@@ -5658,14 +7267,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"
@@ -5674,7 +7283,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="07"
       apn="internet"
@@ -5723,6 +7332,7 @@
       apn="smartwap"
       proxy="10.239.221.7"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -5753,7 +7363,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="11"
       apn="portalnmms"
@@ -5763,14 +7373,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"
@@ -5779,7 +7389,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="12"
       apn="internet"
@@ -5805,7 +7415,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="13"
       apn="portalnmms"
@@ -5815,14 +7425,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"
@@ -5831,7 +7441,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA Punjab MMS"
+  <apn carrier="IDEA MMS"
       mcc="404"
       mnc="14"
       apn="mmsc"
@@ -5841,7 +7451,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA Punjab"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="14"
       apn="internet"
@@ -5857,7 +7467,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="15"
       apn="portalnmms"
@@ -5867,14 +7477,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"
@@ -5942,7 +7552,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="17"
       apn="aircelmms"
@@ -5952,7 +7562,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel MMS"
+  <apn carrier="Reliance MMS"
       mcc="404"
       mnc="18"
       apn="mms"
@@ -5975,10 +7585,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"
@@ -6004,7 +7615,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="20"
       apn="portalnmms"
@@ -6014,14 +7625,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"
@@ -6048,7 +7659,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="22"
       apn="internet"
@@ -6074,7 +7685,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="24"
       apn="internet"
@@ -6132,7 +7743,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="25"
       apn="aircelmms"
@@ -6142,7 +7753,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="27"
       apn="portalnmms"
@@ -6152,14 +7763,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"
@@ -6200,7 +7811,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="28"
       apn="aircelmms"
@@ -6242,7 +7853,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="29"
       apn="aircelmms"
@@ -6252,7 +7863,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="30"
       apn="portalnmms"
@@ -6262,14 +7873,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"
@@ -6337,7 +7948,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="33"
       apn="aircelmms"
@@ -6406,7 +8017,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="35"
       apn="aircelmms"
@@ -6416,7 +8027,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel MMS"
+  <apn carrier="Reliance MMS"
       mcc="404"
       mnc="36"
       apn="mms"
@@ -6439,6 +8050,7 @@
       apn="smartwap"
       proxy="10.239.221.7"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -6474,7 +8086,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="37"
       apn="aircelmms"
@@ -6641,7 +8253,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="43"
       apn="portalnmms"
@@ -6651,14 +8263,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"
@@ -6667,7 +8279,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA Karnataka"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="44"
       apn="internet"
@@ -6683,7 +8295,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA Karnataka MMS"
+  <apn carrier="IDEA MMS"
       mcc="404"
       mnc="44"
       apn="mmsc"
@@ -6720,7 +8332,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="46"
       apn="portalnmms"
@@ -6730,14 +8342,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"
@@ -6773,7 +8385,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel MMS"
+  <apn carrier="Reliance MMS"
       mcc="404"
       mnc="50"
       apn="mms"
@@ -6783,7 +8395,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel"
+  <apn carrier="Reliance Net"
       mcc="404"
       mnc="50"
       apn="smartnet"
@@ -6796,6 +8408,7 @@
       apn="smartwap"
       proxy="10.239.221.7"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -6825,7 +8438,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Reliance RTel MMS"
+  <apn carrier="Reliance MMS"
       mcc="404"
       mnc="52"
       apn="mms"
@@ -6835,7 +8448,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel"
+  <apn carrier="Reliance Net"
       mcc="404"
       mnc="52"
       apn="smartnet"
@@ -6848,6 +8461,7 @@
       apn="smartwap"
       proxy="10.239.221.7"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -6929,7 +8543,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="56"
       apn="internet"
@@ -7033,7 +8647,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="60"
       apn="portalnmms"
@@ -7043,14 +8657,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"
@@ -7137,7 +8751,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Reliance RTel MMS"
+  <apn carrier="Reliance MMS"
       mcc="404"
       mnc="67"
       apn="mms"
@@ -7147,7 +8761,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel"
+  <apn carrier="Reliance Net"
       mcc="404"
       mnc="67"
       apn="smartnet"
@@ -7160,6 +8774,7 @@
       apn="smartwap"
       proxy="10.239.221.7"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -7456,7 +9071,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="78"
       apn="internet"
@@ -7560,7 +9175,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="82"
       apn="internet"
@@ -7586,7 +9201,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel MMS"
+  <apn carrier="Reliance MMS"
       mcc="404"
       mnc="83"
       apn="mms"
@@ -7596,7 +9211,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel"
+  <apn carrier="Reliance Net"
       mcc="404"
       mnc="83"
       apn="smartnet"
@@ -7609,10 +9224,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"
@@ -7622,14 +9238,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"
@@ -7638,7 +9254,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Reliance RTel MMS"
+  <apn carrier="Reliance MMS"
       mcc="404"
       mnc="85"
       apn="mms"
@@ -7648,7 +9264,7 @@
       type="mms"
   />
 
-  <apn carrier="Reliance RTel"
+  <apn carrier="Reliance Net"
       mcc="404"
       mnc="85"
       apn="smartnet"
@@ -7661,10 +9277,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"
@@ -7674,14 +9291,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"
@@ -7690,7 +9307,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="87"
       apn="internet"
@@ -7716,7 +9333,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="88"
       apn="portalnmms"
@@ -7726,14 +9343,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"
@@ -7742,7 +9359,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="404"
       mnc="89"
       apn="internet"
@@ -7827,7 +9444,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL NE MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="91"
       apn="aircelmms"
@@ -8572,13 +10189,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"
@@ -8588,6 +10198,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"
@@ -9332,7 +10949,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="66"
       apn="portalnmms"
@@ -9342,14 +10959,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"
@@ -9358,7 +10975,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="67"
       apn="portalnmms"
@@ -9368,14 +10985,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"
@@ -9384,7 +11001,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="70"
       apn="internet"
@@ -9410,7 +11027,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="750"
       apn="portalnmms"
@@ -9420,14 +11037,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"
@@ -9436,7 +11053,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="751"
       apn="portalnmms"
@@ -9446,14 +11063,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"
@@ -9462,7 +11079,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="752"
       apn="portalnmms"
@@ -9472,14 +11089,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"
@@ -9488,7 +11105,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="753"
       apn="portalnmms"
@@ -9498,14 +11115,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"
@@ -9514,7 +11131,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="754"
       apn="portalnmms"
@@ -9524,14 +11141,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"
@@ -9540,7 +11157,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="755"
       apn="portalnmms"
@@ -9550,14 +11167,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"
@@ -9566,7 +11183,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Vodafone MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="756"
       apn="portalnmms"
@@ -9576,14 +11193,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"
@@ -9592,7 +11209,7 @@
       type="default,supl"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="799"
       apn="internet"
@@ -9618,7 +11235,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL ROI"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="800"
       apn="aircelgprs"
@@ -9634,7 +11251,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL ROI MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="800"
       apn="aircelmms"
@@ -9670,7 +11287,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL Central"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="802"
       apn="aircelgprs"
@@ -9686,7 +11303,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL Central MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="802"
       apn="aircelmms"
@@ -9722,7 +11339,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL ROI"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="804"
       apn="aircelgprs"
@@ -9738,7 +11355,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL ROI MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="804"
       apn="aircelmms"
@@ -9748,7 +11365,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL ROI"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="805"
       apn="aircelgprs"
@@ -9764,7 +11381,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL ROI MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="805"
       apn="aircelmms"
@@ -9774,7 +11391,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL Central"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="806"
       apn="aircelgprs"
@@ -9790,7 +11407,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL Central MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="806"
       apn="aircelmms"
@@ -9800,7 +11417,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL Central"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="807"
       apn="aircelgprs"
@@ -9816,7 +11433,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL Central MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="807"
       apn="aircelmms"
@@ -9826,7 +11443,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL Central"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="808"
       apn="aircelgprs"
@@ -9842,7 +11459,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL Central MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="808"
       apn="aircelmms"
@@ -9878,7 +11495,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL ROI"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="810"
       apn="aircelgprs"
@@ -9894,7 +11511,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL ROI MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="810"
       apn="aircelmms"
@@ -9904,7 +11521,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL ROI"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="811"
       apn="aircelgprs"
@@ -9920,7 +11537,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL ROI MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="811"
       apn="aircelmms"
@@ -9930,7 +11547,7 @@
       type="mms"
   />
 
-  <apn carrier="AIRCEL Central"
+  <apn carrier="Aircel-GPRS"
       mcc="405"
       mnc="812"
       apn="aircelgprs"
@@ -9946,7 +11563,7 @@
       type="default,supl"
   />
 
-  <apn carrier="AIRCEL Central MMS"
+  <apn carrier="Aircel-MMS"
       mcc="405"
       mnc="812"
       apn="aircelmms"
@@ -9956,10 +11573,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="813"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -9982,10 +11600,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="814"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10008,10 +11627,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="815"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10034,10 +11654,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="816"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10060,10 +11681,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="817"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10086,10 +11708,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="818"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10112,10 +11735,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="819"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10138,10 +11762,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="820"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10164,10 +11789,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="821"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10190,10 +11816,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="822"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10573,10 +12200,11 @@
       type="default,supl"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="844"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10599,7 +12227,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="845"
       apn="internet"
@@ -10625,7 +12253,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="846"
       apn="internet"
@@ -10651,7 +12279,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="847"
       apn="internet"
@@ -10677,7 +12305,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="848"
       apn="internet"
@@ -10703,7 +12331,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="849"
       apn="internet"
@@ -10729,7 +12357,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="850"
       apn="internet"
@@ -10755,7 +12383,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="851"
       apn="internet"
@@ -10781,7 +12409,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="852"
       apn="internet"
@@ -10807,7 +12435,7 @@
       type="mms"
   />
 
-  <apn carrier="IDEA"
+  <apn carrier="Idea_Internet"
       mcc="405"
       mnc="853"
       apn="internet"
@@ -10833,10 +12461,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="875"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10859,10 +12488,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="876"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10885,10 +12515,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="877"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10911,10 +12542,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="878"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10937,10 +12569,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="879"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -10963,10 +12596,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="880"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -11190,10 +12824,11 @@
       type="default,supl"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="925"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -11216,10 +12851,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="926"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -11242,10 +12878,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="927"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -11268,10 +12905,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="928"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -11294,10 +12932,11 @@
       type="mms"
   />
 
-  <apn carrier="Uninor GPRS"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="929"
       apn="uninor"
+      authtype="1"
       type="default,supl"
   />
 
@@ -11753,13 +13392,23 @@
       type="mms"
   />
 
-  <apn carrier="Asia Cell"
+  <apn carrier="Asiacell GPRS"
       mcc="418"
       mnc="05"
-      apn="default"
+      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"
@@ -11767,13 +13416,29 @@
       type="default,supl"
   />
 
-  <apn carrier="Zain"
+  <apn carrier="ZAIN-GPRS"
       mcc="418"
       mnc="20"
-      apn="default"
+      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"
@@ -11781,13 +13446,42 @@
       type="default,supl"
   />
 
-  <apn carrier="Korek"
+  <apn carrier="Korek 9595"
       mcc="418"
       mnc="40"
-      apn="default"
+      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"
@@ -11815,7 +13509,6 @@
       apn="pps"
       user="pps"
       password="pps"
-      authtype="0"
       type="default,supl"
   />
 
@@ -11880,15 +13573,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"
@@ -11896,7 +13589,6 @@
       type="default,supl"
   />
 
-
   <apn carrier="STC MMS"
       mcc="420"
       mnc="01"
@@ -11907,8 +13599,6 @@
       type="mms"
   />
 
-
-
   <apn carrier="Mobily WEB"
       mcc="420"
       mnc="03"
@@ -12070,6 +13760,7 @@
       mcc="424"
       mnc="02"
       apn="etisalat.ae"
+      authtype="1"
       type="default,supl"
   />
 
@@ -12079,6 +13770,7 @@
       apn="etisalat"
       proxy="10.12.0.32"
       port="8080"
+      authtype="1"
       type="default,supl"
   />
 
@@ -12089,6 +13781,7 @@
       mmsc="http://mms/servlets/mms"
       mmsproxy="10.12.0.32"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -12137,7 +13830,7 @@
   <apn carrier="Cellcom Internet"
       mcc="425"
       mnc="02"
-      apn="Sphone"
+      apn="sphone"
       type="default,supl"
   />
 
@@ -12212,14 +13905,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"
@@ -12229,13 +13922,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"
@@ -12261,6 +13947,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"
@@ -12569,7 +14272,7 @@
       mmsc="http://192.168.193.134:38090/was"
       mmsproxy="192.168.194.73"
       mmsport="8080"
-       type="mms"
+      type="mms"
   />
 
   <apn carrier="MCI-GPRS"
@@ -12588,13 +14291,46 @@
       type="mms"
   />
 
-  <apn carrier="Ucell"
+  <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="default"
+      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"
@@ -12602,13 +14338,26 @@
       type="default,supl"
   />
 
-  <apn carrier="MTS"
+  <apn carrier="MTS-UZB Internet"
       mcc="434"
       mnc="07"
-      apn="default"
+      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"
@@ -12693,8 +14442,6 @@
       type="default,supl"
   />
 
-  <!-- APNs for Japanese phone carriers -->
-
   <apn carrier="mopera U"
       mcc="440"
       mnc="10"
@@ -12714,7 +14461,7 @@
       password="bmobile"
       authtype="3"
       mmsc=""
-   />
+  />
 
   <apn carrier="b-mobile 3G・4G U300"
       mcc="440"
@@ -12760,42 +14507,155 @@
       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 LTE INTERNET"
+      mcc="450"
+      mnc="11"
+      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"
+      server="*"
+  />
+
+  <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="lte.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"
@@ -12915,14 +14775,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"
@@ -12931,7 +14791,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Beeline-gprs-mms"
+  <apn carrier="Gmobile-gprs-mms"
       mcc="452"
       mnc="07"
       apn="mms"
@@ -12941,7 +14801,7 @@
       type="mms"
   />
 
-  <apn carrier="Beeline MMS"
+  <apn carrier="Gmobile MMS"
       mcc="452"
       mnc="07"
       apn="mms"
@@ -12980,45 +14840,254 @@
       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="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"
+      mvno_match_data="01010000"
+      mvno_type="GID"
+  />
+
+  <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 Data"
+  <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"
+      mvno_match_data="01020000"
+      mvno_type="GID"
+  />
+
+  <apn carrier="NWMOBILE"
       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="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"
+      mvno_match_data="01030000"
+      mvno_type="GID"
+  />
+
+<apn carrier="Global Call"
+      mcc="454"
+      mnc="00"
+      apn="globalcall"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      type="default,mms"
+      mvno_match_data="01040000"
+      mvno_type="GID"
+  />
+
+<apn carrier="one2free prepaid"
+      mcc="454"
+      mnc="00"
+      apn="cslp1"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      type="default,mms"
+      mvno_match_data="02020001"
+      mvno_type="GID"
+  />
+
+<apn carrier="CSL prepaid"
+      mcc="454"
+      mnc="00"
+      apn="cslp1"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      type="default,mms"
+      mvno_match_data="02030001"
+      mvno_type="GID"
+  />
+
+<apn carrier="one2free prepaid"
+      mcc="454"
+      mnc="00"
+      apn="cslp3"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      type="default,mms"
+      mvno_match_data="02020002"
+      mvno_type="GID"
+  />
+
+  <apn carrier="1O1O"
+      mcc="454"
+      mnc="02"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,supl,mms"
+  />
+
+  <apn carrier="1O1O"
+      mcc="454"
+      mnc="02"
+      apn="mobile"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      authtype="3"
+      type="default,supl,mms"
+      mvno_match_data="01010000"
+      mvno_type="GID"
+  />
+
+  <apn carrier="one2free"
+      mcc="454"
+      mnc="02"
+      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="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"
+      mvno_match_data="01020000"
+      mvno_type="GID"
+  />
+
+  <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="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"
+      mvno_match_data="01030000"
+      mvno_type="GID"
+  />
+
+<apn carrier="Global Call"
+      mcc="454"
+      mnc="02"
+      apn="globalcall"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      type="default,mms"
+      mvno_match_data="01040000"
+      mvno_type="GID"
+  />
+
+<apn carrier="one2free prepaid"
+      mcc="454"
+      mnc="02"
+      apn="cslp1"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      type="default,mms"
+      mvno_match_data="02020001"
+      mvno_type="GID"
+  />
+
+<apn carrier="CSL prepaid"
+      mcc="454"
+      mnc="02"
+      apn="cslp1"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      type="default,mms"
+      mvno_match_data="02030001"
+      mvno_type="GID"
+  />
+
+<apn carrier="one2free prepaid"
+      mcc="454"
+      mnc="02"
+      apn="cslp3"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      type="default,mms"
+      mvno_match_data="02020002"
+      mvno_type="GID"
+  />
+
+  <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"
   />
 
@@ -13027,8 +15096,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"
   />
 
@@ -13058,6 +15128,7 @@
       mmsc="http://mms.smartone.com/server"
       mmsproxy="10.9.9.9"
       mmsport="8080"
+      authtype="3"
       type="default,supl,mms"
   />
 
@@ -13068,6 +15139,7 @@
       mmsc="http://192.168.58.171:8002"
       mmsproxy="192.168.59.51"
       mmsport="8080"
+      authtype="3"
       type="default,supl,mms"
   />
 
@@ -13086,6 +15158,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"
@@ -13093,26 +15180,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"
@@ -13122,26 +15202,138 @@
       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="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"
+      mvno_match_data="01010000"
+      mvno_type="GID"
+  />
+
+  <apn carrier="one2free"
+      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"
+      mvno_match_data="01020000"
+      mvno_type="GID"
+  />
+
+  <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 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"
+      mvno_match_data="01030000"
+      mvno_type="GID"
+  />
+
+<apn carrier="Global Call"
+      mcc="454"
+      mnc="18"
+      apn="globalcall"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      type="default,mms"
+      mvno_match_data="01040000"
+      mvno_type="GID"
+  />
+
+<apn carrier="one2free prepaid"
+      mcc="454"
+      mnc="18"
+      apn="cslp1"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      type="default,mms"
+      mvno_match_data="02020001"
+      mvno_type="GID"
+  />
+
+<apn carrier="CSL prepaid"
+      mcc="454"
+      mnc="18"
+      apn="cslp1"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      type="default,mms"
+      mvno_match_data="02030001"
+      mvno_type="GID"
+  />
+
+<apn carrier="one2free prepaid"
+      mcc="454"
+      mnc="18"
+      apn="cslp3"
+      mmsproxy="192.168.59.51"
+      mmsport="8080"
+      mmsc="http://192.168.58.171:8002"
+      type="default,mms"
+      mvno_match_data="02020002"
+      mvno_type="GID"
+  />
+
+  <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"
   />
 
@@ -13149,11 +15341,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"
   />
 
@@ -13161,8 +15352,6 @@
       mcc="455"
       mnc="01"
       apn="ctm-mobile"
-      proxy="192.168.99.2"
-      port="8080"
       type="default,supl"
   />
 
@@ -13180,8 +15369,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"
@@ -13195,6 +15382,7 @@
       mmsc="http://mms.three.com.mo:10021/mmsc"
       mmsproxy="mms.three.com.mo"
       mmsport="8080"
+      authtype="1"
       type="default,supl,mms"
   />
 
@@ -13202,8 +15390,6 @@
       mcc="455"
       mnc="04"
       apn="ctm-mobile"
-      proxy="192.168.99.2"
-      port="8080"
       type="default,supl"
   />
 
@@ -13221,8 +15407,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"
@@ -13236,6 +15420,7 @@
       mmsc="http://mms.three.com.mo:10021/mmsc"
       mmsproxy="mms.three.com.mo"
       mmsport="8080"
+      authtype="1"
       type="default,supl,mms"
   />
 
@@ -13463,7 +15648,7 @@
       apn="fetnet01"
       mmsc="http://mms"
       mmsproxy="210.241.199.199"
-      mmsport="8080"
+      mmsport="9201"
       type="mms"
   />
 
@@ -13556,13 +15741,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"
@@ -13627,40 +15805,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"
   />
 
@@ -13680,13 +15861,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"
@@ -13709,25 +15891,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"
@@ -13743,6 +15927,7 @@
       mmsc="http://mms.digi.com.my/servlets/mms"
       mmsproxy="203.92.128.160"
       mmsport="80"
+      authtype="1"
       type="mms"
   />
 
@@ -13753,19 +15938,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"
@@ -13775,26 +15961,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"
@@ -13802,6 +15978,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"
@@ -13809,6 +15995,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"
@@ -13819,6 +16018,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"
@@ -13834,9 +16056,8 @@
       mnc="06"
       apn="3services"
       mmsc="http://mmsc.three.net.au:10021/mmsc"
-      mmsproxy="10.176.57.25"
+      mmsproxy="mmscprox.three.net.au"
       mmsport="8799"
-      type="default,supl,mms"
   />
 
   <apn carrier="VF AU PXT"
@@ -13958,10 +16179,29 @@
       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="Planet 3"
+      mcc="505"
+      mnc="99"
+      apn="3services"
+      mmsc="http://mmsc.three.net.au:10021/mmsc"
+      mmsproxy="mmscprox.three.net.au"
+      mmsport="8799"
+  />
+
   <apn carrier="Indosat-SNS"
       mcc="510"
       mnc="01"
       apn="indosatgprs"
+      authtype="1"
       type="default,supl"
   />
 
@@ -13983,6 +16223,7 @@
       apn="indosatmms"
       user="indosat"
       password="indosat"
+      authtype="1"
       mmsc="http://mmsc.indosat.com"
       mmsproxy="10.19.19.19"
       mmsport="8080"
@@ -13993,6 +16234,7 @@
       mcc="510"
       mnc="08"
       apn="AXIS"
+      authtype="1"
       type="default,supl"
   />
 
@@ -14005,6 +16247,7 @@
       proxy="10.8.3.8"
       port="8080"
       type="default,supl"
+      authtype="1"
   />
 
   <apn carrier="AXISmms"
@@ -14017,6 +16260,7 @@
       mmsproxy="10.8.3.8"
       mmsport="8080"
       type="mms"
+      authtype="1"
   />
 
   <apn carrier="TSEL-SNS"
@@ -14055,6 +16299,7 @@
       mcc="510"
       mnc="11"
       apn="internet"
+      authtype="1"
       type="default,supl"
   />
 
@@ -14108,6 +16353,7 @@
       mcc="510"
       mnc="89"
       apn="3gprs"
+      authtype="1"
       type="default,supl"
   />
 
@@ -14190,6 +16436,13 @@
       type="mms"
   />
 
+  <apn carrier="SMARTLTE"
+      mcc="515"
+      mnc="03"
+      apn="smartlte"
+      type="default,supl"
+  />
+
   <apn carrier="SMART INTERNET"
       mcc="515"
       mnc="03"
@@ -14216,13 +16469,6 @@
       type="mms"
   />
 
-  <apn carrier="Streaming"
-      mcc="515"
-      mnc="03"
-      apn="internet"
-      type="default,supl"
-  />
-
   <apn carrier="Sun Internet"
       mcc="515"
       mnc="05"
@@ -14246,6 +16492,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"
@@ -14256,13 +16509,6 @@
       type="mms"
   />
 
-  <apn carrier="Sun Streaming"
-      mcc="515"
-      mnc="05"
-      apn="minterenet"
-      type="default,supl"
-  />
-
   <apn carrier="Redinternet"
       mcc="515"
       mnc="18"
@@ -14394,21 +16640,17 @@
       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"
@@ -14418,19 +16660,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"
@@ -14455,6 +16695,7 @@
       password="user123"
       proxy="172.16.1.23"
       port="8081"
+      authtype="1"
       type="default,supl"
   />
 
@@ -14467,6 +16708,7 @@
       mmsc="http://mmsgw:8002"
       mmsproxy="172.16.14.10"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
 
@@ -14483,6 +16725,7 @@
       apn="miworld"
       user="65"
       password="user123"
+      authtype="1"
       proxy="172.16.1.23"
       port="8081"
       type="default,supl"
@@ -14494,24 +16737,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"
@@ -14609,13 +16849,32 @@
       type="default,supl"
   />
 
-  <apn carrier="Digicel"
+  <apn carrier="PNG WAP"
       mcc="537"
       mnc="03"
-      apn="default"
+      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"
@@ -14850,27 +17109,94 @@
       type="mms"
   />
 
-  <apn carrier="Mobilis"
+  <apn carrier="mobilis wap"
       mcc="603"
       mnc="01"
-      apn="default"
+      apn="wap"
+      proxy="172.25.49.2"
+      port="8080"
+      user="wap"
+      password="wap"
+      authtype="1"
       type="default,supl"
   />
 
-  <apn carrier="Djezzy"
+  <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="default"
+      apn="djezzy.internet"
       type="default,supl"
   />
 
-  <apn carrier="Nedjma"
+  <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="default"
+      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"
@@ -14965,7 +17291,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Orange MMS"
+  <apn carrier="MMS Orange"
       mcc="605"
       mnc="01"
       apn="mms.otun"
@@ -14988,6 +17314,7 @@
       apn="gprs.tn"
       user="gprs"
       password="gprs"
+      authtype="1"
       type="default,supl"
   />
 
@@ -14997,20 +17324,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"
   />
 
@@ -15020,6 +17345,7 @@
       apn="mms.tunisiana.com"
       user="mms"
       password="mms"
+      authtype="1"
       mmsc="http://mmsc.tunisiana.com"
       mmsproxy="10.3.2.100"
       mmsport="80"
@@ -15788,7 +18114,7 @@
       type="default,supl"
   />
 
-  <apn carrier="Cable & Wireless"
+  <apn carrier="Cable &amp; Wireless"
       mcc="633"
       mnc="01"
       apn="default"
@@ -15942,7 +18268,7 @@
       type="default,supl"
   />
 
-  <apn carrier="safaricom Wap"
+  <apn carrier="safaricom GPRS"
       mcc="639"
       mnc="02"
       apn="safaricom"
@@ -15967,6 +18293,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"
@@ -15974,10 +18319,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"
@@ -15990,7 +18335,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"
@@ -16024,6 +18372,7 @@
       mmsproxy="10.36.17.130"
       mmsport="8080"
       mmsc="http://10.36.16.5/servlets/mms"
+      authtype="1"
       type="mms"
   />
 
@@ -16253,6 +18602,27 @@
       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"
@@ -16333,6 +18703,23 @@
       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"
@@ -16350,14 +18737,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"
@@ -16393,63 +18780,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"
   />
@@ -16955,7 +19285,6 @@
       apn="internet.ideasclaro"
       user=""
       password=""
-      authtype="1"
       type="default,supl,dun"
   />
 
@@ -16968,7 +19297,6 @@
       mmsproxy="216.230.133.66"
       mmsport="8080"
       mmsc="http://mms.ideasclaro.com:8002"
-      authtype="1"
       type="mms"
   />
 
@@ -17247,6 +19575,7 @@
       mmsproxy="200.179.66.242"
       mmsport="8080"
       authtype="1"
+      protocol="IPV4V6"
       type="default,supl,mms"
   />
 
@@ -17260,6 +19589,7 @@
       mmsproxy="200.179.66.242"
       mmsport="8080"
       authtype="1"
+      protocol="IPV4V6"
       type="default,supl,mms"
   />
 
@@ -17273,6 +19603,7 @@
       mmsproxy="200.179.66.242"
       mmsport="8080"
       authtype="1"
+      protocol="IPV4V6"
       type="default,supl,mms"
   />
 
@@ -17282,7 +19613,6 @@
       apn="java.claro.com.br"
       user="claro"
       password="claro"
-      authtype="1"
       type="default,supl"
   />
 
@@ -17309,6 +19639,7 @@
       mmsproxy="200.142.130.104"
       mmsport="80"
       authtype="1"
+      protocol="IPV4V6"
       type="mms"
   />
 
@@ -17319,6 +19650,7 @@
       user="vivo"
       password="vivo"
       authtype="1"
+      protocol="IPV4V6"
       type="default,supl"
   />
 
@@ -17350,6 +19682,8 @@
       apn="zap.vivo.com.br"
       user="vivo"
       password="vivo"
+      authtype="1"
+      protocol="IPV4V6"
       type="default,supl"
   />
 
@@ -17363,6 +19697,7 @@
       mmsproxy="200.142.130.104"
       mmsport="80"
       authtype="1"
+      protocol="IPV4V6"
       type="mms"
   />
 
@@ -17376,6 +19711,7 @@
       mmsproxy="200.142.130.104"
       mmsport="80"
       authtype="1"
+      protocol="IPV4V6"
       type="mms"
   />
 
@@ -17386,29 +19722,27 @@
       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"
+      apn="gprs.oi.com.br"
       type="default,supl"
   />
 
-  <apn carrier="BrT MMS"
+  <apn carrier="MMS GPRS"
       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"
+      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"
       type="mms"
   />
@@ -17441,6 +19775,7 @@
       user="vivo"
       password="vivo"
       authtype="1"
+      protocol="IPV4V6"
       type="default,supl"
   />
 
@@ -17455,6 +19790,7 @@
       mmsproxy="200.142.130.104"
       mmsport="80"
       authtype="1"
+      protocol="IPV4V6"
       type="mms"
   />
 
@@ -17481,20 +19817,19 @@
       type="mms"
   />
 
-  <apn carrier="OI GPRS"
+  <apn carrier="Oi GPRS Internet"
       mcc="724"
       mnc="31"
       apn="gprs.oi.com.br"
-      authtype="1"
       type="default,supl"
   />
 
-  <apn carrier="OI MMS"
+  <apn carrier="MMS GPRS"
       mcc="724"
       mnc="31"
       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"
@@ -17921,7 +20256,7 @@
       type="mms"
   />
 
-   <apn carrier="WAPTIGO"
+  <apn carrier="WAPTIGO"
       mcc="736"
       mnc="03"
       apn="wap.tigo.bo"
@@ -17953,7 +20288,7 @@
       type="default,supl"
   />
 
-  <apn carrier="GT&T Cellink Plus"
+  <apn carrier="GT&amp;T Cellink Plus"
       mcc="738"
       mnc="02"
       apn="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>