Merge "Add APN for carrier Italia Power" into main
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index e810ec1..58a020d 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -98,22 +98,6 @@
       max_conns_time="300"
   />
 
-  <!-- bearer 13, 14 -->
-  <apn carrier="Test IMS"
-      carrier_id = "1911"
-      mcc="001"
-      mnc="01"
-      apn="VZWIMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="13|14"
-      profile_id="2"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-
   <apn carrier="Test Internet"
       carrier_id = "1911"
       mcc="001"
@@ -175,34 +159,6 @@
       max_conns_time="300"
   />
 
-  <apn carrier="Test IMS"
-      mcc="001"
-      mnc="010"
-      apn="VZWIMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="14"
-      profile_id="2"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-
-  <apn carrier="Test IMS"
-      mcc="001"
-      mnc="010"
-      apn="VZWIMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
-      profile_id="2"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-
   <apn carrier="Test Internet"
       mcc="001"
       mnc="010"
@@ -246,14 +202,6 @@
       max_conns_time="300"
   />
 
-  <apn carrier="Cosmote Wireless Internet"
-      carrier_id = "747"
-      mcc="202"
-      mnc="01"
-      apn=""
-      type="ia"
-  />
-
   <apn carrier="Cosmote Internet"
       carrier_id = "747"
       mcc="202"
@@ -272,6 +220,7 @@
       mmsproxy="10.10.10.20"
       mmsport="8080"
       type="mms"
+      network_type_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|17|20"
   />
 
   <apn carrier="IMS"
@@ -299,7 +248,7 @@
       user_visible="false"
   />
 
-  <apn carrier="Vf Mobile Internet"
+  <apn carrier="Vf Mobile LTE"
       carrier_id = "2399"
       mcc="202"
       mnc="05"
@@ -312,7 +261,7 @@
       mcc="202"
       mnc="05"
       apn="internet.vodafone.gr"
-      type="default,ia,supl"
+      type="default,supl"
       user="user"
       password="pass"
   />
@@ -639,9 +588,6 @@
       server="*"
       proxy=""
       port=""
-      mmsc=""
-      mmsproxy=""
-      mmsport=""
       type="default,ia,hipri,supl,fota,cbs"
       mvno_type="spn"
       mvno_match_data="中国电信"
@@ -668,6 +614,8 @@
       type="mms"
       mvno_type="imsi"
       mvno_match_data="2040439909"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="ice.net"
@@ -690,6 +638,8 @@
       type="mms"
       mvno_type="imsi"
       mvno_match_data="2040438005"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="ice.net"
@@ -712,6 +662,8 @@
       type="mms"
       mvno_type="imsi"
       mvno_match_data="2040438006"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="ice.net"
@@ -734,6 +686,8 @@
       type="mms"
       mvno_type="imsi"
       mvno_match_data="2040438007"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="ice.net"
@@ -756,6 +710,8 @@
       type="mms"
       mvno_type="imsi"
       mvno_match_data="2040438008"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="ice.net"
@@ -778,6 +734,8 @@
       type="mms"
       mvno_type="imsi"
       mvno_match_data="2040438009"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="ice.net"
@@ -800,6 +758,8 @@
       type="mms"
       mvno_type="imsi"
       mvno_match_data="2040439904"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="ice.net"
@@ -822,6 +782,8 @@
       type="mms"
       mvno_type="imsi"
       mvno_match_data="2040439905"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="ice.net"
@@ -844,6 +806,8 @@
       type="mms"
       mvno_type="imsi"
       mvno_match_data="2040439505"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="ice.net"
@@ -866,6 +830,8 @@
       type="mms"
       mvno_type="imsi"
       mvno_match_data="2040439506"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="KPN Mobiel Internet"
@@ -972,14 +938,6 @@
       carrier_id = "2386"
       mcc="204"
       mnc="16"
-      apn=""
-      type="ia"
-  />
-
-  <apn carrier="T-Mobile Internet"
-      carrier_id = "2386"
-      mcc="204"
-      mnc="16"
       apn="smartsites.t-mobile"
       authtype="1"
       type="default,ia,supl"
@@ -1079,7 +1037,6 @@
       authtype="1"
       type="xcap"
       protocol="IPV4V6"
-      roaming_protocol="IP"
       mvno_type="gid"
       mvno_match_data="8F"
       user_visible="false"/>
@@ -1094,7 +1051,6 @@
       authtype="1"
       type="xcap"
       protocol="IPV4V6"
-      roaming_protocol="IP"
       mvno_type="gid"
       mvno_match_data="4E4C"
       user_visible="false"
@@ -1143,14 +1099,6 @@
       carrier_id = "2386"
       mcc="204"
       mnc="20"
-      apn=""
-      type="ia"
-  />
-
-  <apn carrier="T-Mobile Internet"
-      carrier_id = "2386"
-      mcc="204"
-      mnc="20"
       apn="smartsites.t-mobile"
       authtype="1"
       type="default,ia,supl"
@@ -1165,10 +1113,7 @@
       user="tmobilemms"
       password="tmobilemms"
       authtype="1"
-      mmsc="http://t-mobilemms"
-      mmsproxy="10.10.10.11"
-      mmsport="8080"
-      type="xcap,mms"
+      type="xcap"
       protocol="IPV4V6"
       user_visible="false"
   />
@@ -1256,6 +1201,16 @@
       type="default,ia,supl"
   />
 
+  <apn carrier="Proximus LTE"
+      carrier_id = "1365"
+      mcc="206"
+      mnc="01"
+      apn=""
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="Proximus MMS"
       carrier_id = "1365"
       mcc="206"
@@ -1275,7 +1230,7 @@
       mcc="206"
       mnc="01"
       apn="internet.proximus.be"
-      type="default,ia,supl"
+      type="default,supl"
       authtype="1"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -1302,16 +1257,6 @@
       roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="Proximus LTE"
-      carrier_id = "1365"
-      mcc="206"
-      mnc="01"
-      apn=""
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
   <apn carrier="Telenet Internet"
       carrier_id = "2270"
       mcc="206"
@@ -1402,36 +1347,6 @@
      mvno_type="gid"
   />
 
-  <apn carrier="IIJmio (TypeI/Roaming)"
-      carrier_id = "2106"
-      mcc="206"
-      mnc="01"
-      apn="iijmio.jp"
-      user="mio@iij"
-      password="iij"
-      authtype="3"
-      protocol="IP"
-      type="default,ia"
-      roaming_protocol="IP"
-      mvno_type="spn"
-      mvno_match_data="IIJ"
-  />
-
-  <apn carrier="vmobile.jp (Roaming)"
-      carrier_id = "2106"
-      mcc="206"
-      mnc="01"
-      apn="vmobile.jp"
-      user="vmobile@jp"
-      password="vmobile"
-      authtype="3"
-      protocol="IP"
-      type="default,ia"
-      roaming_protocol="IP"
-      mvno_type="spn"
-      mvno_match_data="IIJ"
-  />
-
   <apn carrier="Telenet Internet"
       carrier_id = "2150"
       mcc="206"
@@ -1487,6 +1402,7 @@
       mcc="206"
       mnc="10"
       apn="ims"
+      type="ims"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       user_visible="false"
@@ -1520,14 +1436,6 @@
       carrier_id = "1367"
       mcc="206"
       mnc="20"
-      apn=""
-      type="ia"
-  />
-
-  <apn carrier="BASE WAP"
-      carrier_id = "1367"
-      mcc="206"
-      mnc="20"
       apn="gprs.base.be"
       user="base"
       password="base"
@@ -1621,6 +1529,7 @@
       password="orange"
       authtype="3"
       type="default,ia,supl"
+      user_editable="false"
   />
 
   <apn carrier="Orange MCX"
@@ -1767,6 +1676,16 @@
       mvno_match_data="536E617065"
   />
 
+  <apn carrier="SFR LTE"
+      carrier_id = "27"
+      mcc="208"
+      mnc="09"
+      apn=""
+      type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="SFR webphone"
       carrier_id = "27"
       mcc="208"
@@ -1775,8 +1694,9 @@
       mmsc="http://mms1"
       mmsproxy="10.151.0.1"
       mmsport="8080"
-      protocol="IP"
-      type="default,ia,mms,supl,fota"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      type="default,mms,supl,fota,xcap"
   />
 
   <apn carrier="SFR option modem"
@@ -1784,10 +1704,23 @@
       mcc="208"
       mnc="09"
       apn="websfr"
-      protocol="IP"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       type="dun"
   />
 
+  <apn carrier="SFR IMS"
+      carrier_id = "27"
+      mcc="208"
+      mnc="09"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      modem_cognitive="true"
+      user_visible="false"
+  />
+
   <apn carrier="Be Aliv"
       carrier_id = "2130"
       mcc="208"
@@ -1826,6 +1759,7 @@
       mcc="208"
       mnc="09"
       apn="coriolis"
+      authtype="1"
       type="default,ia,supl"
       mvno_match_data="208090036"
       mvno_type="imsi"
@@ -1844,12 +1778,14 @@
       mvno_type="imsi"
   />
 
-  <apn carrier="SFR webphone"
+  <apn carrier="SFR LTE"
       carrier_id = "27"
       mcc="208"
       mnc="10"
       apn=""
       type="ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="SFR webphone"
@@ -1860,7 +1796,9 @@
       mmsc="http://mms1"
       mmsproxy="10.151.0.1"
       mmsport="8080"
-      type="default,ia,mms,supl"
+      type="default,mms,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="SFR option Modem"
@@ -1870,6 +1808,20 @@
       apn="websfr"
       authtype="0"
       type="dun"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="SFR IMS"
+      carrier_id = "27"
+      mcc="208"
+      mnc="10"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      modem_cognitive="true"
+      user_visible="false"
   />
 
   <apn carrier="Auchan WAP"
@@ -1920,11 +1872,12 @@
       mvno_type="spn"
   />
 
-  <apn carrier="Coriolis WAP"
+  <apn carrier="Coriolis"
       carrier_id = "2135"
       mcc="208"
       mnc="10"
-      apn="fnetcoriolis"
+      apn="coriolis"
+      authtype="1"
       type="default,ia,supl"
       mvno_match_data="12"
       mvno_type="gid"
@@ -1934,24 +1887,37 @@
       carrier_id = "2135"
       mcc="208"
       mnc="10"
-      mmsc="http://mmscoriolis"
-      mmsproxy="10.143.156.6"
-      mmsport="8080"
       apn="mmscoriolis"
+      mmsc="http://mms.coriolis.fr"
+      mmsproxy="10.12.0.1"
+      mmsport="9028"
       type="mms"
       mvno_match_data="12"
       mvno_type="gid"
   />
 
-  <apn carrier="Coriolis WEB"
+  <apn carrier="Coriolis"
       carrier_id = "2135"
       mcc="208"
       mnc="10"
-      apn="internetcoriolis"
-      authtype="0"
-      type="default,ia,supl,fota,dun"
-      mvno_type="gid"
-      mvno_match_data="12"
+      apn="coriolis"
+      authtype="1"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="Coriolis"
+  />
+
+  <apn carrier="Coriolis MMS"
+      carrier_id = "2135"
+      mcc="208"
+      mnc="10"
+      apn="mmscoriolis"
+      mmsc="http://mms.coriolis.fr"
+      mmsproxy="10.12.0.1"
+      mmsport="9028"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="Coriolis"
   />
 
   <apn carrier="4G La Poste Mobile"
@@ -1972,7 +1938,7 @@
       mmsc="http://mmsdebitel"
       mmsproxy="10.143.156.3"
       mmsport="8080"
-      type="default,ia,supl,mms"
+      type="default,supl,mms"
       mvno_match_data="4C"
       mvno_type="gid"
   />
@@ -2123,6 +2089,8 @@
       authtype="0"
       mmsc="http://mms.free.fr"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Free Re Int"
@@ -2141,6 +2109,8 @@
       mnc="15"
       apn="jn"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mvno_match_data="f005"
       mvno_type="gid"
   />
@@ -2151,6 +2121,8 @@
       apn="mmsjn"
       type="mms"
       mmsc="http://mms.freepro.fr"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mvno_match_data="f005"
       mvno_type="gid"
   />
@@ -2345,6 +2317,21 @@
       mvno_type="spn"
   />
 
+  <apn carrier="DataPro"
+      mcc="208"
+      mnc="28"
+      apn="datapro"
+      type="default,ia,supl"
+  />
+
+  <apn carrier="MmsPro"
+      mcc="208"
+      mnc="28"
+      apn="mmspro"
+      mmsc="http://100.101.102.103:8080"
+      type="mms"
+  />
+
   <apn carrier="Lebara France"
       mcc="208"
       mnc="38"
@@ -2413,17 +2400,11 @@
       type="dun"
   />
 
-  <apn carrier="MMS VODAFONE"
+  <apn carrier="ut.es"
       mcc="214"
       mnc="01"
-      apn="mms.vodafone.net"
-      user="wap@wap"
-      password="wap125"
-      mmsc="http://mmsc.vodafone.es/servlets/mms"
-      mmsproxy="212.73.32.10"
-      mmsport="80"
-      authtype="1"
-      type="mms"
+      apn="ut.es"
+      type="xcap"
   />
 
   <apn carrier="IMS Vodafone"
@@ -2432,6 +2413,7 @@
       apn="ims"
       type="ims"
       protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="ALTECOM"
@@ -2550,24 +2532,8 @@
       password="EUSKALTEL"
       authtype="1"
       type="default,ia,supl"
-      mvno_type="imsi"
-      mvno_match_data="2140359"
-  />
-
-  <apn carrier="Euskaltel MMS"
-      carrier_id = "1909"
-      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"
+      mvno_type="spn"
+      mvno_match_data="EUSKALTEL"
   />
 
   <apn carrier="Carrefour"
@@ -2590,7 +2556,7 @@
       password="CARREFOUR"
       authtype="1"
       mmsc="http://mms.orange.es"
-      mmsproxy="172.022.188.025"
+      mmsproxy="172.22.188.25"
       mmsport="8080"
       mvno_type="imsi"
       mvno_match_data="2140352xxxxxxxx"
@@ -2850,15 +2816,36 @@
       mvno_type="spn"
   />
 
-  <apn carrier="Yoigo Internet"
-      carrier_id = "679"
+  <apn carrier="Virgin TELCO Internet"
       mcc="214"
-      mnc="04"
-      apn=""
-      type="ia"
+      mnc="03"
+      apn="i.virgintelco.es"
+      type="default,ia,supl"
+      mvno_match_data="Virgin telco"
+      mvno_type="spn"
   />
 
-  <apn carrier="Yoigo Internet"
+  <apn carrier="Internet R"
+      carrier_id = "2113"
+      mcc="214"
+      mnc="03"
+      apn="internet.mundo-r.com"
+      type="default,ia,supl"
+      mvno_match_data="mobilR"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Internet R"
+      carrier_id = "2113"
+      mcc="214"
+      mnc="03"
+      apn="internet.mundo-r.com"
+      type="default,ia,supl"
+      mvno_match_data="Mobil R"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Internet"
       carrier_id = "679"
       mcc="214"
       mnc="04"
@@ -2866,17 +2853,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Yoigo MMS"
-      carrier_id = "679"
-      mcc="214"
-      mnc="04"
-      apn="mms"
-      mmsc="http://mmss/"
-      mmsproxy="193.209.134.141"
-      mmsport="80"
-      type="mms"
-  />
-
   <apn carrier="Tuenti"
       carrier_id = "2357"
       mcc="214"
@@ -2885,10 +2861,7 @@
       authtype="1"
       user="tuenti"
       password="tuenti"
-      mmsc="http://tuenti.com"
-      mmsproxy="10.138.255.43"
-      mmsport="8080"
-      type="default,ia,mms,supl"
+      type="default,ia,supl"
       mvno_type="spn"
       mvno_match_data="Tuenti"
   />
@@ -2959,54 +2932,34 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       type="xcap"
+      user_editable="false"
   />
 
-  <apn carrier="INTERNET GPRS"
-      carrier_id = "1909"
+  <apn carrier="TeleCable Internet"
+      carrier_id = "2112"
       mcc="214"
-      mnc="06"
-      apn="airtelnet.es"
-      user="vodafone"
-      password="vodafone"
+      mnc="05"
+      apn="internet.telecable.es"
+      user="telecable"
+      password="telecable"
       type="default,ia,supl"
+      mvno_match_data="TeleCable"
+      mvno_type="spn"
   />
 
-  <apn carrier="MMS Vodafone"
-      carrier_id = "1909"
+  <apn carrier="TeleCable MMS"
+      carrier_id = "2112"
       mcc="214"
-      mnc="06"
-      apn="mms.vodafone.net"
-      user="wap@wap"
-      password="wap125"
-      mmsc="http://mmsc.vodafone.es/servlets/mms"
-      mmsproxy="212.73.32.10"
-      mmsport="80"
-      type="mms"
-  />
-
-  <apn carrier="Euskaltel MMS"
-      mcc="214"
-      mnc="06"
-      apn="euskaltelmms.euskaltel.mobi"
-      user="MMS"
-      password="EUSKALTEL"
-      mmsc="http://mms.euskaltel.mobi"
-      mmsproxy="172.16.18.74"
+      mnc="05"
+      apn="mms.telecable.es"
+      user="telecable"
+      password="telecable"
+      mmsc="http://mms.telecable.es/mms/"
+      mmsproxy="212.89.0.84"
       mmsport="8080"
-      authtype="1"
       type="mms"
-  />
-
-  <apn carrier="Euskaltel Internet"
-      mcc="214"
-      mnc="06"
-      apn="internet.euskaltel.mobi"
-      user="CLIENTE"
-      password="EUSKALTEL"
-      authtype="1"
-      type="default,ia,supl"
-      mvno_match_data="0008"
-      mvno_type="gid"
+      mvno_match_data="TeleCable"
+      mvno_type="spn"
   />
 
   <apn carrier="Internet R"
@@ -3020,76 +2973,50 @@
       mvno_type="imsi"
   />
 
-  <apn carrier="MMS R"
-      carrier_id = "2278"
+  <apn carrier="LOWI_data"
       mcc="214"
       mnc="06"
-      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"
-  />
-
-  <apn carrier="TeleCable Internet"
-      carrier_id = "2112"
-      mcc="214"
-      mnc="06"
-      apn="internet.telecable.es"
-      user="telecable"
-      password="telecable"
-      authtype="1"
+      apn="lowi.private.omv.es"
       type="default,ia,supl"
-      mvno_match_data="2140613"
-      mvno_type="imsi"
+      mvno_match_data="Eroski Movil"
+      mvno_type="spn"
   />
 
-  <apn carrier="TeleCable MMS"
-      carrier_id = "2112"
+  <apn carrier="LOWI_MMS"
       mcc="214"
       mnc="06"
-      apn="mms.telecable.es"
-      user="telecable"
-      password="telecable"
-      mmsc="http://mms.telecable.es/mms/"
-      mmsproxy="212.89.0.84"
-      mmsport="8080"
-      authtype="1"
-      type="mms"
-      mvno_match_data="2140613"
-      mvno_type="imsi"
-  />
-
-  <apn carrier="Eroski Movil GPRS"
-      carrier_id = "2279"
-      mcc="214"
-      mnc="06"
-      apn="gprs.eroskimovil.es"
+      apn="mms.lowi.omv.es"
       user="wap@wap"
       password="wap125"
-      authtype="1"
-      type="default,ia,supl"
-      mvno_match_data="2140606"
-      mvno_type="imsi"
-  />
-
-  <apn carrier="Eroski Movil MMS"
-      carrier_id = "2279"
-      mcc="214"
-      mnc="06"
-      apn="mms.eroskimovil.es"
-      user="wap@wap"
-      password="wap125"
-      mmsc="http://mms.eroskimovil.es/servlets/mms"
+      mmsc="http://mms.lowi.omv.es/servlets/mms"
       mmsproxy="212.73.32.10"
       mmsport="80"
-      authtype="1"
       type="mms"
-      mvno_match_data="2140606"
-      mvno_type="imsi"
+      mvno_match_data="Eroski Movil"
+      mvno_type="spn"
+  />
+
+  <apn carrier="LOWI_data"
+      mcc="214"
+      mnc="06"
+      apn="lowi.private.omv.es"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="Lowi"
+  />
+
+  <apn carrier="LOWI_MMS"
+      mcc="214"
+      mnc="06"
+      apn="mms.lowi.omv.es"
+      user="wap@wap"
+      password="wap125"
+      mmsc="http://mms.lowi.omv.es/servlets/mms"
+      mmsproxy="212.73.32.10"
+      mmsport="80"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="Lowi"
   />
 
   <apn carrier="DUN"
@@ -3130,6 +3057,52 @@
       mvno_match_data="pepephone"
   />
 
+  <apn carrier="Hits"
+      mcc="214"
+      mnc="06"
+      apn="tel.hitsmobile.es"
+      type="default,ia"
+      mvno_type="spn"
+      mvno_match_data="Hits"
+  />
+
+  <apn carrier="MMS Hits"
+      mcc="214"
+      mnc="06"
+      apn="mms.hitsmobile.es"
+      user="wap@wap"
+      password="wap125"
+      mmsc="http://mms.hitsmobile.es/servlets/mms"
+      mmsproxy="212.73.32.10"
+      mmsport="80"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="Hits"
+  />
+
+  <apn carrier="Lebara Internet"
+      mcc="214"
+      mnc="06"
+      apn="gprsmov.lebaramobile.es"
+      type="default,ia"
+      mvno_type="spn"
+      mvno_match_data="Lebara"
+  />
+
+  <apn carrier="Lebara MMS"
+      mcc="214"
+      mnc="06"
+      apn="mms.lebaramobile.es"
+      user="wap@wap"
+      password="wap125"
+      mmsc="http://mms.lebaramobile.es/servlets/mms"
+      mmsproxy="212.73.32.10"
+      mmsport="80"
+      type="mms"
+      mvno_type="spn"
+      mvno_match_data="Lebara"
+  />
+
   <apn carrier="Movistar"
       carrier_id = "34"
       mcc="214"
@@ -3162,20 +3135,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       type="xcap"
-  />
-
-  <apn carrier="Euskaltel MMS"
-      carrier_id = "1909"
-      mcc="214"
-      mnc="08"
-      apn="euskaltelmms.euskaltel.mobi"
-      user="MMS"
-      password="EUSKALTEL"
-      mmsc="http://mms.euskaltel.mobi"
-      mmsproxy="172.16.18.74"
-      mmsport="8080"
-      authtype="1"
-      type="mms"
+      user_editable="false"
   />
 
   <apn carrier="Euskaltel Internet"
@@ -3247,8 +3207,6 @@
       mcc="214"
       mnc="19"
       apn="orangemms"
-      user="orange"
-      password="orange"
       authtype="1"
       mmsc="http://mms.orange.es"
       mmsproxy="172.22.188.25"
@@ -3262,14 +3220,6 @@
       carrier_id = "1974"
       mcc="214"
       mnc="21"
-      apn=""
-      type="ia"
-  />
-
-  <apn carrier="jazzinternet"
-      carrier_id = "1974"
-      mcc="214"
-      mnc="21"
       apn="jazzinternet"
       type="default,ia,supl,dun"
   />
@@ -3288,7 +3238,7 @@
       type="mms"
   />
 
-  <apn carrier="DIGI Spain"
+  <apn carrier="DIGI Internet"
       carrier_id="2442"
       mcc="214"
       mnc="22"
@@ -3423,14 +3373,6 @@
       user_visible="false"
   />
 
-  <apn carrier="T-Mobile H"
-      carrier_id = "2401"
-      mcc="216"
-      mnc="30"
-      apn=""
-      type="ia"
-  />
-
   <apn carrier="Telekom HU NET"
       carrier_id = "2401"
       mcc="216"
@@ -3442,6 +3384,7 @@
       mmsport="8080"
       authtype="1"
       protocol="IPV4V6"
+      network_type_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|17|20"
   />
 
   <apn carrier="Telekom IMS"
@@ -3460,7 +3403,7 @@
       mnc="30"
       apn="hos"
       mmsc="http://mms.t-mobile.hu/servlets/mms"
-      mmsproxy="212.051.126.010"
+      mmsproxy="212.51.126.10"
       mmsport="8080"
       type="mms"
       network_type_bitmask="18"
@@ -3499,18 +3442,6 @@
       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 HU IMS"
       carrier_id = "1535"
       mcc="216"
@@ -3615,14 +3546,6 @@
       user_visible="false"
   />
 
-  <apn carrier="T-Mobile"
-      carrier_id = "2365"
-      mcc="219"
-      mnc="01"
-      apn=""
-      type="ia"
-  />
-
   <apn carrier="T-Mobile IMS"
       carrier_id = "2365"
       mcc="219"
@@ -3690,14 +3613,6 @@
       type="default,ia,supl,mms"
   />
 
-  <apn carrier="A1 LTE IA"
-      carrier_id = "1530"
-      mcc="219"
-      mnc="10"
-      apn=""
-      type="ia"
-  />
-
   <apn carrier="A1 internet"
       carrier_id = "1530"
       mcc="219"
@@ -3846,6 +3761,22 @@
       type="mms"
   />
 
+  <apn carrier="Vala"
+      mcc="221"
+      mnc="01"
+      apn="vala-int"
+      type="default,ia"
+  />
+
+  <apn carrier="IPKO Telekom"
+      mcc="221"
+      mnc="02"
+      apn="IPKO"
+      proxy="213.229.249.40"
+      port="8080"
+      type="default,ia"
+  />
+
   <apn carrier="TIM WAP"
       carrier_id = "33"
       mcc="222"
@@ -4000,7 +3931,7 @@
       apn="web.kenamobile.it"
       type="default,ia"
       mvno_type="spn"
-      mvno_match_data="Kena Mobile"
+      mvno_match_data="Kena Mobile R"
   />
 
   <apn carrier="Kenamobile MMS"
@@ -4012,7 +3943,7 @@
       mmsport="80"
       type="mms"
       mvno_type="spn"
-      mvno_match_data="Kena Mobile"
+      mvno_match_data="Kena Mobile R"
   />
 
   <apn carrier="FW WEB"
@@ -4053,7 +3984,8 @@
       mmsport="80"
   />
 
-  <apn carrier="Acc. Internet da cell"
+  <apn carrier="Vodafone LTE"
+      carrier_id = "29"
       mcc="222"
       mnc="10"
       apn=""
@@ -4077,7 +4009,7 @@
       mcc="222"
       mnc="10"
       apn="mobile.vodafone.it"
-      type="default,ia,supl"
+      type="default,supl"
   />
 
   <apn carrier="IMS Vodafone"
@@ -4309,14 +4241,6 @@
       carrier_id = "2391"
       mcc="226"
       mnc="01"
-      apn=""
-      type="ia"
-  />
-
-  <apn carrier="Vodafone live!"
-      carrier_id = "2391"
-      mcc="226"
-      mnc="01"
       apn="live.vodafone.com"
       user="live"
       password="vodafone"
@@ -4327,20 +4251,6 @@
       user_editable="false"
   />
 
-  <apn carrier="Vodafone MMS"
-      carrier_id = "2391"
-      mcc="226"
-      mnc="01"
-      apn="mms.vodafone.ro"
-      user="mms"
-      password="vodafone"
-      mmsc="http://multimedia/servlets/mms"
-      mmsproxy="193.230.161.231"
-      mmsport="8080"
-      authtype="1"
-      type="mms"
-  />
-
   <apn carrier="Vodafone IMS"
       carrier_id = "2391"
       mcc="226"
@@ -4365,7 +4275,7 @@
       mcc="226"
       mnc="03"
       apn="broadband"
-      type="default,ia,supl"
+      type="default,supl"
   />
 
   <apn carrier="Telekom Romania MMS"
@@ -4448,7 +4358,7 @@
       mcc="226"
       mnc="06"
       apn="broadband"
-      type="default,ia,supl"
+      type="default,supl"
   />
 
   <apn carrier="Telekom Romania MMS"
@@ -4585,6 +4495,8 @@
       mnc="02"
       apn="xcap"
       type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       user_visible="false"
   />
 
@@ -4686,15 +4598,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="T-Mobile CZ"
-      carrier_id = "2394"
-      mcc="230"
-      mnc="01"
-      apn=""
-      type="ia"
-      protocol="IPV4V6"
-  />
-
   <apn carrier="T-Mobile IMS"
       carrier_id = "2394"
       mcc="230"
@@ -4729,6 +4632,7 @@
       mmsport="80"
       authtype="1"
       type="mms"
+      network_type_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|17|20"
   />
 
   <apn carrier="HOS"
@@ -4803,6 +4707,7 @@
       mnc="03"
       apn="internet"
       type="default,ia,supl,xcap"
+      user_editable="false"
   />
 
   <apn carrier="MMS"
@@ -4829,14 +4734,6 @@
       user_visible="false"
   />
 
-  <apn carrier="Orange Internet"
-      carrier_id = "1713"
-      mcc="231"
-      mnc="01"
-      apn="internet"
-      type="default,ia,supl"
-  />
-
   <apn carrier="Orange LTE"
       carrier_id = "1713"
       mcc="231"
@@ -4845,6 +4742,14 @@
       type="ia"
   />
 
+  <apn carrier="Orange Internet"
+      carrier_id = "1713"
+      mcc="231"
+      mnc="01"
+      apn="internet"
+      type="default,supl"
+  />
+
   <apn carrier="Orange MMS"
       carrier_id = "1713"
       mcc="231"
@@ -4976,11 +4881,14 @@
       user_visible="false"
   />
 
-  <apn carrier="T-Mobile LTE"
+  <apn carrier="A1 HOS"
+      carrier_id = "14"
       mcc="232"
-      mnc="03"
-      apn=""
-      type="ia"
+      mnc="01"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="T-Mobile A Internet"
@@ -5138,7 +5046,7 @@
       apn="mmsaut"
       authtype="1"
       mmsc="http://mmsaut.at/send"
-      mmsproxy="212.095.031.050"
+      mmsproxy="212.95.31.50"
       mmsport="80"
       type="mms"
       mvno_type="imsi"
@@ -5161,7 +5069,7 @@
       apn="mmsaut"
       authtype="1"
       mmsc="http://mmsaut.at/send"
-      mmsproxy="212.095.031.050"
+      mmsproxy="212.95.31.50"
       mmsport="80"
       type="mms"
       mvno_type="imsi"
@@ -5493,7 +5401,7 @@
       authtype="1"
       user="tm"
       password="p"
-      type="default,ia,supl,mms"
+      type="default,ia,supl,mms,xcap"
       protocol="IPV4V6"
       mvno_match_data="0A"
       mvno_type="gid"
@@ -5508,7 +5416,7 @@
       user="gg"
       password="p"
       mmsc="http://mmsc.mediamessaging.co.uk:8002"
-      type="default,ia,supl,mms"
+      type="default,ia,supl,mms,xcap"
       protocol="IPV4V6"
       mvno_type="spn"
       mvno_match_data="giffgaff"
@@ -5570,31 +5478,19 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone UK"
+  <apn carrier="Vodafone UK Data"
+      carrier_id = "28"
       mcc="234"
       mnc="15"
       apn="wap.vodafone.co.uk"
       user="wap"
-      password="wap"
-      mmsc="http://mms.vodafone.co.uk/servlets/mms"
+      password="*wap"
+      type="default,ia,supl,mms"
+      mmsc="http://mms.vodafone.co.uk/servlets/mms*"
       mmsproxy="212.183.137.12"
       mmsport="8799"
       authtype="1"
-      type="default,ia,supl,mms"
-      user_editable="false"
-  />
-
-  <apn carrier="Vodafone UK Prepay"
-      mcc="234"
-      mnc="15"
-      apn="pp.vodafone.co.uk"
-      user="wap"
-      password="wap"
-      mmsc="http://mms.vodafone.co.uk/servlets/mms"
-      mmsproxy="212.183.137.12"
-      mmsport="8799"
-      authtype="1"
-      type="default,ia,supl,mms"
+      protocol="IPV4V6"
       user_editable="false"
   />
 
@@ -5609,6 +5505,16 @@
       user_visible="false"
   />
 
+  <apn carrier="Vodafone UK UT"
+      carrier_id = "28"
+      mcc="234"
+      mnc="15"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="Talkmob PAYG WAP"
       mcc="234"
       mnc="15"
@@ -5886,6 +5792,7 @@
       authtype="1"
       type="emergency"
       protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="EE IMS"
@@ -6005,6 +5912,7 @@
       mvno_match_data="B3"
       type="emergency"
       protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="BT IMS"
@@ -6061,6 +5969,7 @@
       mvno_match_data="C3"
       type="emergency"
       protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="BT IMS"
@@ -6111,6 +6020,7 @@
       authtype="1"
       type="emergency"
       protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="EE IMS"
@@ -6383,6 +6293,7 @@
       mmsproxy="185.110.178.97"
       mmsport="9028"
       type="mms"
+      network_type_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|19|20"
   />
 
   <apn carrier="Sky IMS"
@@ -6490,6 +6401,39 @@
       type="mms"
   />
 
+  <apn carrier="Lebara UK"
+      carrier_id="2564"
+      mcc="234"
+      mnc="87"
+      apn="uk.lebara.mobi"
+      type="default,ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_editable="false"
+  />
+
+  <apn carrier="Lebara UK"
+      carrier_id="2564"
+      mcc="234"
+      mnc="87"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      romaing_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Lebara UK"
+      carrier_id="2564"
+      mcc="234"
+      mnc="87"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="3hotspot"
       carrier_id = "1505"
       mcc="235"
@@ -6510,82 +6454,57 @@
       type="default,ia,supl,mms,xcap"
   />
 
-  <apn carrier="DK TDC"
-      carrier_id = "1463"
-      mcc="238"
-      mnc="01"
-      apn="internet"
-      authtype="0"
-      type="default,ia,supl,fota,dun"
-  />
-
-  <apn carrier="DK TDC mms"
-      carrier_id = "1463"
-      mcc="238"
-      mnc="01"
-      apn="mms"
-      authtype="0"
-      mmsc="http://192.168.241.114:8002"
-      mmsproxy="194.182.251.15"
-      mmsport="8080"
-      type="mms"
-  />
-
   <apn carrier="TDC Internet"
+      carrier_id = "1463"
       mcc="238"
       mnc="01"
       apn="internet"
       type="default,ia,supl"
-      mvno_match_data="2380101xxxxxxxx"
-      mvno_type="imsi"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="TDC MMS"
+      carrier_id = "1463"
       mcc="238"
       mnc="01"
       apn="mms"
       mmsc="http://mmsc.tdc.dk:8002"
-      mmsproxy="194.182.251.15"
+      mmsproxy="inetproxy.tdc.dk"
       mmsport="8080"
       type="mms"
-      mvno_match_data="2380101xxxxxxxx"
-      mvno_type="imsi"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="Telmore Internet"
-      carrier_id = "2284"
+  <apn carrier="TDC Ut"
+      carrier_id = "1463"
       mcc="238"
       mnc="01"
-      apn="internet"
-      type="default,ia,supl"
-      mvno_type="spn"
-      mvno_match_data="TELMORE"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
-  <apn carrier="Telmore MMS"
-      carrier_id = "2284"
+  <apn carrier="TDC IMS"
+      carrier_id = "1463"
       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="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
-  <apn carrier="TELMORE WAP"
-      carrier_id = "2284"
+  <apn carrier="Telenor LTE"
+      carrier_id = "1464"
       mcc="238"
-      mnc="01"
-      apn="wap"
-      proxy="194.182.251.15"
-      port="8080"
-      authtype="0"
-      type="default,ia"
-      mvno_type="spn"
-      mvno_match_data="TELMORE"
+      mnc="02"
+      apn=""
+      type="ia"
   />
 
   <apn carrier="Telenor Internet"
@@ -6593,7 +6512,7 @@
       mcc="238"
       mnc="02"
       apn="Internet"
-      type="default,ia,supl"
+      type="default,supl"
   />
 
   <apn carrier="Telenor MMS"
@@ -6607,17 +6526,83 @@
       type="mms"
   />
 
+  <apn carrier="Telenor IMS"
+      carrier_id = "1464"
+      mcc="238"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Telenor Ut"
+      carrier_id = "1464"
+      mcc="238"
+      mnc="02"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="3"
       carrier_id = "1466"
       mcc="238"
       mnc="06"
       apn="data.tre.dk"
+      type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="3 MMS"
+      carrier_id = "1466"
+      mcc="238"
+      mnc="06"
+      apn="data.tre.dk"
       mmsc="http://mms.3.dk/"
       mmsproxy="mmsproxy.3.dk"
       mmsport="8799"
-      type="default,ia,supl,mms"
+      type="mms"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      network_type_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|17|20"
+  />
+
+  <apn carrier="3 MMS iWLAN"
+      carrier_id = "1466"
+      mcc="238"
+      mnc="06"
+      apn="services"
+      mmsc="http://mms.3.dk/"
+      mmsproxy="mmsproxy.3.dk"
+      mmsport="8799"
+      type="mms"
+      protocol="IPV4V6"
+      network_type_bitmask="18"
+      user_visible="false"
+  />
+
+  <apn carrier="3 DK Ut"
+      carrier_id = "1466"
+      mcc="238"
+      mnc="06"
+      apn="services"
+      type="xcap"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="3 DK IMS"
+      mcc="238"
+      mnc="06"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="Lycamobile"
@@ -6632,15 +6617,17 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Telia SurfPort"
+  <apn carrier="Internet"
       carrier_id = "656"
       mcc="238"
       mnc="20"
       apn="www.internet.mtelia.dk"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="Telia MMS"
+  <apn carrier="MMS"
       carrier_id = "656"
       mcc="238"
       mnc="20"
@@ -6649,68 +6636,82 @@
       mmsproxy="193.209.134.131"
       mmsport="8080"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="Call me Internet"
-      carrier_id = "2285"
+  <apn carrier="Telia IMS"
+      carrier_id = "656"
       mcc="238"
       mnc="20"
-      apn="webSP"
-      type="default,ia,supl"
-      mvno_type="spn"
-      mvno_match_data="Call me"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
-  <apn carrier="Call me MMS"
-      carrier_id = "2285"
+  <apn carrier="Telia Ut"
+      carrier_id = "656"
       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="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
-  <apn carrier="DLG Tele GPRS"
-      carrier_id = "2286"
-      mcc="238"
-      mnc="20"
-      apn="webSP"
-      type="default,ia,supl"
-      mvno_type="spn"
-      mvno_match_data="DLG Tele"
-  />
-
-  <apn carrier="DLG Tele MMS"
-      carrier_id = "2286"
-      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="Orange DE"
+  <apn carrier="Internet"
       carrier_id = "656"
       mcc="238"
       mnc="30"
-      apn="web.orange.dk"
-      user=""
-      password=""
+      apn="www.internet.mtelia.dk"
+      type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="MMS"
+      carrier_id = "656"
+      mcc="238"
+      mnc="30"
+      apn="www.mms.mtelia.dk"
+      mmsc="http://mms.telia.dk"
+      mmsproxy="193.209.134.131"
+      mmsport="8080"
+      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Telia IMS"
+      carrier_id = "656"
+      mcc="238"
+      mnc="30"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Telia Ut"
+      carrier_id = "656"
+      mcc="238"
+      mnc="30"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="Telenor Internet"
       carrier_id = "657"
       mcc="238"
       mnc="77"
-      apn="Internet"
+      apn="internet"
       type="default,ia,supl"
   />
 
@@ -6727,21 +6728,39 @@
 
   <apn carrier="Telia MMS"
       carrier_id = "1690"
-      mcc="240"
-      mnc="01"
       apn="mms.telia.se"
       mmsc="http://mmss"
       mmsproxy="193.209.134.132"
       mmsport="80"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Telia"
       carrier_id = "1690"
-      mcc="240"
-      mnc="01"
       apn="online.telia.se"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Telia IMS"
+      carrier_id = "1690"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Telia Ut"
+      carrier_id = "1690"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="Halebop Internet"
@@ -6750,8 +6769,10 @@
       mnc="01"
       apn="halebop.telia.se"
       type="default,ia,supl"
-      mvno_match_data="240017xxxxxxxxx"
-      mvno_type="imsi"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="halebop"
+      mvno_type="spn"
   />
 
   <apn carrier="Halebop MMS"
@@ -6763,8 +6784,36 @@
       mmsproxy="193.209.134.132"
       mmsport="80"
       type="mms"
-      mvno_match_data="240017xxxxxxxxx"
-      mvno_type="imsi"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="halebop"
+      mvno_type="spn"
+  />
+
+  <apn carrier="Halebop IMS"
+      carrier_id = "2287"
+      mcc="240"
+      mnc="01"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="spn"
+      mvno_match_data="halebop"
+      user_visible="false"
+  />
+
+  <apn carrier="Halebop Ut"
+      carrier_id = "2287"
+      mcc="240"
+      mnc="01"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="spn"
+      mvno_match_data="halebop"
+      user_visible="false"
   />
 
   <apn carrier="3"
@@ -6772,12 +6821,58 @@
       mcc="240"
       mnc="02"
       apn="data.tre.se"
+      type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="3 MMS"
+      carrier_id = "1691"
+      mcc="240"
+      mnc="02"
+      apn="data.tre.se"
       mmsc="http://mms.tre.se"
       mmsproxy="mmsproxy.tre.se"
       mmsport="8799"
-      type="default,ia,supl,mms"
+      type="mms"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      network_type_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|19|20"
+  />
+
+  <apn carrier="3 MMS iWLAN"
+      carrier_id = "1691"
+      mcc="240"
+      mnc="02"
+      apn="services"
+      mmsc="http://mms.tre.se"
+      mmsproxy="mmsproxy.tre.se"
+      mmsport="8799"
+      type="mms"
+      protocol="IPV4V6"
+      network_type_bitmask="18"
+      user_visible="false"
+  />
+
+  <apn carrier="3 Ut"
+      carrier_id = "1691"
+      mcc="240"
+      mnc="02"
+      apn="services"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="3 IMS"
+      carrier_id = "1691"
+      mcc="240"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="3"
@@ -6790,103 +6885,31 @@
       mmsport="8799"
       type="default,ia,supl,mms"
       protocol="IPV4V6"
-      roaming_protocol="IP"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Tele2 Internet"
+      carrier_id = "1694"
       mcc="240"
       mnc="05"
       apn="4g.tele2.se"
-      type="default,ia,supl"
-      mvno_match_data="Tele2"
-      mvno_type="spn"
-  />
-
-  <apn carrier="Tele2 MMS"
-      mcc="240"
-      mnc="05"
-      apn="4g.tele2.se"
+      type="default,ia,supl,mms"
       mmsc="http://mmsc.tele2.se"
-      mmsproxy="130.244.202.30"
+      mmsproxy="mmsproxy.tele2.se"
       mmsport="8080"
-      type="mms"
+      protocol="IPV4V6"
       mvno_match_data="Tele2"
       mvno_type="spn"
   />
 
-  <apn carrier="Tele2 Internet 3G"
-      mcc="240"
-      mnc="05"
-      apn="internet.tele2.se"
-      type="default,ia,supl"
-      mvno_match_data="Tele2"
-      mvno_type="spn"
-  />
-
-  <apn carrier="Tele2 MMS 3G"
-      mcc="240"
-      mnc="05"
-      apn="internet.tele2.se"
-      mmsc="http://mmsc.tele2.se"
-      mmsproxy="130.244.202.30"
-      mmsport="8080"
-      type="mms"
-      mvno_match_data="Tele2"
-      mvno_type="spn"
-  />
-
-  <apn carrier="Telia MMS"
-      carrier_id = "1690"
-      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"
-      carrier_id = "1690"
-      mcc="240"
-      mnc="05"
-      apn="online.telia.se"
-      type="default,ia,supl"
-      mvno_match_data="Telia"
-      mvno_type="spn"
-  />
-
-  <apn carrier="Halebop Internet"
-      carrier_id = "2287"
-      mcc="240"
-      mnc="05"
-      apn="halebop.telia.se"
-      type="default,ia,supl"
-      mvno_match_data="Halebop"
-      mvno_type="spn"
-  />
-
-  <apn carrier="Halebop MMS"
-      carrier_id = "2287"
-      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="Internet"
       carrier_id = "1695"
       mcc="240"
       mnc="06"
       apn="internet"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="MMS"
@@ -6898,54 +6921,61 @@
       type="mms"
   />
 
+  <apn carrier="Vimla IMS"
+      carrier_id = "1695"
+      mcc="240"
+      mnc="06"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Vimla Ut"
+      carrier_id = "1695"
+      mcc="240"
+      mnc="06"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="Tele2 Internet"
       carrier_id = "1696"
       mcc="240"
       mnc="07"
-      apn="4g.tele2.se"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Tele2 MMS"
-      carrier_id = "1696"
-      mcc="240"
-      mnc="07"
-      apn="4g.tele2.se"
-      mmsc="http://mmsc.tele2.se"
-      mmsproxy="130.244.202.30"
-      mmsport="8080"
-      type="mms"
-  />
-
-  <apn carrier="Tele2 Internet 3G"
-      carrier_id = "1696"
-      mcc="240"
-      mnc="07"
       apn="internet.tele2.se"
-      type="default,ia,supl"
+      type="default,ia,supl,mms"
+      mmsc="http://mmsc.tele2.se"
+      mmsproxy="mmsproxy.tele2.se"
+      mmsport="8080"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="Tele2 MMS 3G"
+  <apn carrier="Tele2 IMS"
       carrier_id = "1696"
       mcc="240"
       mnc="07"
-      apn="internet.tele2.se"
-      mmsc="http://mmsc.tele2.se"
-      mmsproxy="130.244.202.30"
-      mmsport="8080"
-      type="mms"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
-  <apn carrier="Tele2 Internet"
+  <apn carrier="Tele2 XCAP"
+      carrier_id = "1696"
       mcc="240"
       mnc="07"
-      apn="internet.tele2.no"
-      user="wap"
-      password="wap"
-      type="default,ia,supl"
-      authtype="1"
-      mvno_match_data="2400768xxxxxxxx"
-      mvno_type="imsi"
+      apn="HOS"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="Tele2 MMS"
@@ -6960,15 +6990,43 @@
       mvno_type="imsi"
   />
 
-  <apn carrier="Tele2 IMS"
-      carrier_id = "1696"
+  <apn carrier="Tele2 Internet"
       mcc="240"
       mnc="07"
-      apn="ims"
-      type="ims"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      user_visible="false"
+      apn="internet.tele2.no"
+      user="wap"
+      password="wap"
+      type="default,ia,supl"
+      authtype="1"
+      mvno_match_data="2400768xxxxxxxx"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Tele2 Web"
+      mcc="240"
+      mnc="07"
+      apn="internet.tele2.at"
+      type="default,ia,supl"
+      mvno_match_data="2400764xxxxxxxx"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Tele2 Web"
+      mcc="240"
+      mnc="07"
+      apn="internet.tele2.at"
+      type="default,ia,supl"
+      mvno_match_data="2400765xxxxxxxx"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Tele2 Internet"
+      mcc="240"
+      mnc="07"
+      apn="internet.tele2.nl"
+      type="default,ia,supl"
+      mvno_match_data="4E4C"
+      mvno_type="gid"
   />
 
   <apn carrier="Jump"
@@ -6999,12 +7057,79 @@
       mvno_match_data="240075610"
   />
 
+ <apn carrier="Sky IMS"
+      mcc="240"
+      mnc="07"
+      apn="IMS"
+      type="ims"
+      mvno_type="gid"
+      mvno_match_data="0C"
+      user_visible="false"
+  />
+
+  <apn carrier="Sky MMS"
+      mcc="240"
+      mnc="07"
+      apn="mms.mobile.sky"
+      mmsproxy="185.110.178.97"
+      mmsport="9028"
+      mmsc="http://185.110.178.96:38090/was"
+      type="mms"
+      network_type_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|19|20"
+      mvno_match_data="0C"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Sky MMS VoWiFi"
+      mcc="240"
+      mnc="07"
+      apn="wifi.mms.mobile.sky"
+      type="mms"
+      mmsc="http://185.110.178.96:38090/was"
+      mmsproxy="185.110.178.97"
+      mmsport="9028"
+      network_type_bitmask="18"
+      mvno_type="gid"
+      mvno_match_data="0C"
+      user_visible="false"
+  />
+
+  <apn carrier="Sky Internet"
+      mcc="240"
+      mnc="07"
+      apn="mobile.sky"
+      type="default,ia,supl"
+      mvno_match_data="0C"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Sky Ut"
+      mcc="240"
+      mnc="07"
+      apn="ut.mobile.sky"
+      type="xcap"
+      mvno_type="gid"
+      mvno_match_data="0C"
+      user_visible="false"
+  />
+
+  <apn carrier="Sberbank-Telecom Internet"
+      mcc="240"
+      mnc="07"
+      apn="internet.sberbank-tele.com"
+      type="default,ia,supl"
+      mvno_match_data="FA3207FF"
+      mvno_type="gid"
+  />
+
   <apn carrier="Telenor Mobilsurf"
       carrier_id = "1695"
       mcc="240"
       mnc="08"
       apn="services.telenor.se"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Telenor MMS"
@@ -7018,6 +7143,28 @@
       type="mms"
   />
 
+  <apn carrier="Telenor IMS"
+      carrier_id = "1695"
+      mcc="240"
+      mnc="08"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Telenor Ut"
+      carrier_id = "1695"
+      mcc="240"
+      mnc="08"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="Com4"
       carrier_id = "1956"
       mcc="240"
@@ -7058,69 +7205,25 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Halebop Internet"
-      mcc="240"
-      mnc="017"
-      apn="halebop.telia.se"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Halebop MMS"
-      mcc="240"
-      mnc="017"
-      apn="mms.telia.se"
-      user="mms"
-      password="telia"
-      mmsc="http://mmss"
-      mmsproxy="193.209.134.132"
-      mmsport="9201"
-      type="mms"
-  />
-
   <apn carrier="Tele2 Internet"
       carrier_id = "1696"
       mcc="240"
       mnc="24"
       apn="4g.tele2.se"
-      type="default,ia,supl"
-      mvno_match_data="Tele2"
-      mvno_type="spn"
-  />
-
-  <apn carrier="Tele2 MMS"
-      carrier_id = "1696"
-      mcc="240"
-      mnc="24"
-      apn="4g.tele2.se"
+      type="default,ia,supl,mms"
       mmsc="http://mmsc.tele2.se"
-      mmsproxy="130.244.202.30"
+      mmsproxy="mmsproxy.tele2.se"
       mmsport="8080"
-      type="mms"
+      protocol="IPV4V6"
       mvno_match_data="Tele2"
       mvno_type="spn"
   />
 
-  <apn carrier="Tele2 Internet 3G"
-      carrier_id = "1696"
+  <apn carrier="netmore"
       mcc="240"
-      mnc="24"
-      apn="internet.tele2.se"
+      mnc="40"
+      apn="data.rewicom.net"
       type="default,ia,supl"
-      mvno_match_data="Tele2"
-      mvno_type="spn"
-  />
-
-  <apn carrier="Tele2 MMS 3G"
-      carrier_id = "1696"
-      mcc="240"
-      mnc="24"
-      apn="internet.tele2.se"
-      mmsc="http://mmsc.tele2.se"
-      mmsproxy="130.244.202.30"
-      mmsport="8080"
-      type="mms"
-      mvno_match_data="Tele2"
-      mvno_type="spn"
   />
 
   <apn carrier="Goodspeed"
@@ -7133,41 +7236,36 @@
       mvno_match_data="C5"
   />
 
-  <apn carrier="Ventelo Internett"
-      carrier_id = "2333"
-      mcc="242"
-      mnc="01"
-      apn="internet.ventelo.no"
-      type="default,ia,supl"
-      mvno_match_data="24201700xxxxxxx"
-      mvno_type="imsi"
-  />
-
-  <apn carrier="Ventelo MMS"
-      carrier_id = "2333"
-      mcc="242"
-      mnc="01"
-      apn="mms.ventelo.no"
-      user="ventelo"
-      password="1111"
-      mmsc="http://mmsc/"
-      mmsproxy="10.10.10.11"
-      mmsport="8080"
-      type="mms"
-      authtype="1"
-      mvno_match_data="24201700xxxxxxx"
-      mvno_type="imsi"
-  />
-
-  <apn carrier="Telenor"
+  <apn carrier="Telenor LTE"
       carrier_id = "958"
       mcc="242"
       mnc="01"
-      apn="telenor"
+      apn=""
+      type="ia"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="Telenor Smart"
+      carrier_id = "958"
+      mcc="242"
+      mnc="01"
+      apn="telenor.smart"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      type="default,supl"
+  />
+
+  <apn carrier="Telenor MMS"
+      carrier_id = "958"
+      mcc="242"
+      mnc="01"
+      apn="telenor.mms"
       mmsc="http://mmsc"
-      mmsproxy="10.10.10.11"
+      mmsproxy="mms-proxy.telenor.no"
       mmsport="8080"
-      type="default,ia,supl,mms"
+      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Telenor IMS"
@@ -7181,41 +7279,60 @@
       user_visible="false"
   />
 
-  <apn carrier="NetCom"
+  <apn carrier="Telenor Ut"
+      carrier_id = "958"
+      mcc="242"
+      mnc="01"
+      apn="hos"
+      type="xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="Telia"
       carrier_id = "959"
       mcc="242"
       mnc="02"
-      apn="netcom"
-      mmsc="http://mm/"
-      mmsproxy="212.169.66.4"
-      mmsport="8080"
-      type="default,ia,supl,mms"
-  />
-
-  <apn carrier="Chess MMS"
-      carrier_id = "2334"
-      mcc="242"
-      mnc="02"
-      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"
-      carrier_id = "2334"
-      mcc="242"
-      mnc="02"
-      apn="netcom"
+      apn="telia"
       type="default,ia,supl"
-      mvno_match_data="2420256xxxxxxxx"
-      mvno_type="imsi"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Telia MMS"
+      carrier_id = "959"
+      mcc="242"
+      mnc="02"
+      apn="mms"
+      mmsc="http://mm/"
+      mmsproxy="212.169.66.4"
+      mmsport="8080"
+      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Telia IMS"
+      carrier_id = "959"
+      mcc="242"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Telia Ut"
+      carrier_id = "959"
+      mcc="242"
+      mnc="02"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="Tele2 Internet"
@@ -7229,23 +7346,51 @@
       type="default,ia,supl,mms"
   />
 
-  <apn carrier="NwN Internet"
+  <apn carrier="OneCall Internet"
       carrier_id = "1900"
       mcc="242"
       mnc="05"
       apn="internet"
+      authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="NwN MMS"
+  <apn carrier="OneCall MMS"
       carrier_id = "1900"
       mcc="242"
       mnc="05"
       apn="mms"
-      mmsc="http://mms.nwn.no"
-      mmsproxy="188.149.250.10"
+      mmsc="http://mmsc/"
+      mmsproxy="10.100.100.100"
       mmsport="80"
+      authtype="1"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="IMS"
+      carrier_id = "1900"
+      mcc="242"
+      mnc="05"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Ut"
+      carrier_id = "1900"
+      mcc="242"
+      mnc="05"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="Com4"
@@ -7272,6 +7417,8 @@
       mmsproxy="185.83.167.222"
       mmsport="8080"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="eRate Internet"
@@ -7296,6 +7443,15 @@
       type="mms"
   />
 
+  <apn carrier="ICE IMS"
+      mcc="242"
+      mnc="14"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      user_visible="false"
+  />
+
   <apn carrier="Lycamobile"
       mcc="242"
       mnc="23"
@@ -7314,6 +7470,7 @@
       mnc="03"
       apn="internet"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="DNA MMS"
@@ -7327,33 +7484,14 @@
       type="mms"
   />
 
-  <apn carrier="DNA Internet"
-      carrier_id = "682"
-      mcc="244"
-      mnc="04"
-      apn="internet"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="DNA MMS"
-      carrier_id = "682"
-      mcc="244"
-      mnc="04"
-      apn="mms"
-      user="dna"
-      password="mms"
-      mmsc="http://mmsc.dnafinland.fi/"
-      mmsproxy="10.1.1.2"
-      mmsport="8080"
-      type="mms"
-  />
-
   <apn carrier="Elisa Internet"
       carrier_id = "1475"
       mcc="244"
       mnc="05"
       apn="internet"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Elisa MMS"
@@ -7365,6 +7503,30 @@
       mmsproxy="213.161.41.57"
       mmsport="80"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Elisa IMS"
+      carrier_id = "1475"
+      mcc="244"
+      mnc="05"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="Elisa Ut"
+      carrier_id = "1475"
+      mcc="244"
+      mnc="05"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
   />
 
   <apn carrier="Saunalahti Internet"
@@ -7417,6 +7579,7 @@
       mnc="12"
       apn="internet"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="DNA MMS"
@@ -7430,46 +7593,26 @@
       type="mms"
   />
 
-  <apn carrier="DNA Pro Internet"
+  <apn carrier="DNA IMS"
       carrier_id = "1904"
       mcc="244"
       mnc="12"
-      apn="dnapro.fi"
-      authtype="1"
-      type="default,ia,supl"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
   />
 
-  <apn carrier="DNA Pro MMS"
+  <apn carrier="DNA ut"
       carrier_id = "1904"
       mcc="244"
       mnc="12"
-      apn="mms.dnapro.fi"
-      mmsc="http://mmsc.dnapro.fi/"
-      mmsproxy="10.1.1.21"
-      mmsport="8080"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="TDC Internet Finland"
-      carrier_id = "1904"
-      mcc="244"
-      mnc="12"
-      apn="inet.tdc.fi"
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="TDC MMS Finland"
-      carrier_id = "1904"
-      mcc="244"
-      mnc="12"
-      apn="mms.tdc.fi"
-      mmsc="http://mmsc.tdc.fi"
-      mmsproxy="10.1.12.2"
-      mmsport="8080"
-      authtype="1"
-      type="mms"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="DNA Internet"
@@ -7478,6 +7621,7 @@
       mnc="13"
       apn="internet"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="DNA MMS"
@@ -7493,12 +7637,46 @@
       type="mms"
   />
 
+  <apn carrier="DNA IMS"
+      carrier_id = "1904"
+      mcc="244"
+      mnc="13"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="DNA Ut"
+      carrier_id = "1904"
+      mcc="244"
+      mnc="13"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Alcom"
+      mcc="244"
+      mnc="14"
+      apn="internet"
+      mmsc="http://mms.amt.aland.fi"
+      mmsproxy="194.110.177.70"
+      mmsport="8080"
+      authtype="1"
+      type="default,ia,mms,supl"
+  />
+
   <apn carrier="Saunalahti Internet"
       carrier_id = "1479"
       mcc="244"
       mnc="21"
       apn="internet.saunalahti"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="Saunalahti MMS"
@@ -7512,23 +7690,49 @@
       type="mms"
   />
 
-  <apn carrier="SONERA Internet"
+  <apn carrier="Telia Internet"
       carrier_id = "1480"
       mcc="244"
       mnc="91"
       apn="internet"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="SONERA MMS"
+  <apn carrier="Telia MMS"
       carrier_id = "1480"
       mcc="244"
       mnc="91"
-      apn="wap.sonera.net"
-      mmsc="http://mms.sonera.fi:8002"
+      apn="mms"
+      mmsc="http://mms/"
       mmsproxy="195.156.25.33"
-      mmsport="80"
+      mmsport="8080"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Telia IMS"
+      carrier_id = "1480"
+      mcc="244"
+      mnc="91"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Telia Ut"
+      carrier_id = "1480"
+      mcc="244"
+      mnc="91"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="Omnitel MMS"
@@ -7543,6 +7747,8 @@
       mmsport="8080"
       authtype="1"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Omnitel Internet"
@@ -7554,13 +7760,35 @@
       password="omni"
       authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Omnitel IMS"
+      mcc="246"
+      mnc="01"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Omnitel Ut"
+      mcc="246"
+      mnc="01"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="Bite Internet"
       carrier_id = "893"
       mcc="246"
       mnc="02"
-      apn="wap"
+      apn="internet"
       type="default,ia,supl"
   />
 
@@ -7569,12 +7797,11 @@
       mcc="246"
       mnc="02"
       apn="mms"
-      user="mms@mms"
-      password="mms"
-      mmsc="http://mmsc/servlets/mms"
+      user=""
+      password=""
+      mmsc="http://mmsc"
       mmsproxy="192.168.150.2"
       mmsport="8080"
-      authtype="1"
       type="mms"
   />
 
@@ -7584,256 +7811,41 @@
       mnc="03"
       apn="internet.tele2.lt"
       mmsc="http://mmsc.tele2.lt/"
-      mmsproxy="193.12.40.29"
+      mmsproxy="mmsproxy.tele2.lt"
       mmsport="8080"
       type="default,ia,supl,mms"
   />
 
-  <apn carrier="Test FOTA"
-      mcc="246"
-      mnc="081"
-      apn="VZWADMIN"
-      type="fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="14"
-  />
-
-  <apn carrier="Test FOTA"
-      mcc="246"
-      mnc="081"
-      apn="VZWADMIN"
-      type="fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
-  />
-
-  <apn carrier="Test CBS"
-      mcc="246"
-      mnc="081"
-      apn="VZWAPP"
-      type="cbs,mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="14"
-  />
-
-  <apn carrier="Test CBS"
-      mcc="246"
-      mnc="081"
-      apn="VZWAPP"
-      type="cbs,mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
-  />
-
-  <apn carrier="Test IMS"
-      mcc="246"
-      mnc="081"
-      apn="VZWIMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="14"
-  />
-
-  <apn carrier="Test IMS"
-      mcc="246"
-      mnc="081"
-      apn="VZWIMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
-  />
-
-  <apn carrier="Test Internet"
-      mcc="246"
-      mnc="081"
-      apn="VZWINTERNET"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,ia,dun"
-      carrier_enabled="false"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      authtype="3"
-      network_type_bitmask="7"
-  />
-
-  <apn carrier="Test Internet"
-      mcc="246"
-      mnc="081"
-      apn="VZWINTERNET"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,ia,dun"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="14"
-      profile_id="0"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-
-  <apn carrier="Test Internet"
-      mcc="246"
-      mnc="081"
-      apn="VZWINTERNET"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,ia,dun"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
-      profile_id="0"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-
-  <apn carrier="Test FOTA"
-      mcc="246"
-      mnc="81"
-      apn="VZWADMIN"
-      type="fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="14"
-      profile_id="3"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-
-  <apn carrier="Test FOTA"
-      mcc="246"
-      mnc="81"
-      apn="VZWADMIN"
-      type="fota"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
-      profile_id="3"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-
-  <apn carrier="Test CBS"
-      mcc="246"
-      mnc="81"
-      apn="VZWAPP"
-      type="cbs,mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="14"
-      profile_id="4"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-
-  <apn carrier="Test CBS"
-      mcc="246"
-      mnc="81"
-      apn="VZWAPP"
-      type="cbs,mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
-      profile_id="4"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-
-  <apn carrier="Test IMS"
-      mcc="246"
-      mnc="81"
-      apn="VZWIMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="14"
-      profile_id="2"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-
-  <apn carrier="Test IMS"
-      mcc="246"
-      mnc="81"
-      apn="VZWIMS"
-      type="ims,ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
-      profile_id="2"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-
-  <apn carrier="Test Internet"
-      mcc="246"
-      mnc="81"
-      apn="VZWINTERNET"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,ia,dun"
-      carrier_enabled="false"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      authtype="3"
-      network_type_bitmask="7"
-  />
-
-  <apn carrier="Test Internet"
-      mcc="246"
-      mnc="81"
-      apn="VZWINTERNET"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,ia,dun"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="14"
-      profile_id="0"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-
-  <apn carrier="Test Internet"
-      mcc="246"
-      mnc="81"
-      apn="VZWINTERNET"
-      mmsc="http://mms.vtext.com/servlets/mms"
-      type="default,ia,dun"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
-      profile_id="0"
-      modem_cognitive="true"
-      max_conns="1023"
-      max_conns_time="300"
-  />
-
   <apn carrier="LMT Internet"
       carrier_id = "898"
       mcc="247"
       mnc="01"
       apn="internet.lmt.lv"
-      type="default,ia,supl"
+      mmsc="http://mmsc.lmt.lv/mmsc"
+      type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="LMT MMS"
+  <apn carrier="LMT IMS"
       carrier_id = "898"
       mcc="247"
       mnc="01"
-      apn="internet.lmt.lv"
-      mmsc="http://mmsc.lmt.lv/mmsc"
-      type="mms"
+      apn="IMS"
+      type="ims"
+      protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="LMT Ut"
+      carrier_id = "898"
+      mcc="247"
+      mnc="01"
+      apn="hos"
+      type="xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="Tele2 LV Internet"
@@ -7852,7 +7864,7 @@
       user="wap"
       password="wap"
       mmsc="http://mmsc.tele2.lv/"
-      mmsproxy="193.12.40.38"
+      mmsproxy="mmsproxy.tele2.lv"
       mmsport="8080"
       authtype="1"
       type="mms"
@@ -7871,23 +7883,41 @@
       mcc="247"
       mnc="05"
       apn="mms"
-      user="mms@mms"
-      password="mms"
-      mmsc="http://mmsc/servlets/mms"
+      user=""
+      password=""
+      mmsc="http://mmsc"
       mmsproxy="192.168.150.2"
       mmsport="8080"
-      authtype="1"
       type="mms"
   />
 
-  <apn carrier="Bite LV WAP"
-      carrier_id = "2037"
+  <apn carrier="LMT Internet"
       mcc="247"
-      mnc="05"
-      apn="wap"
-      proxy="213.226.131.133"
-      port="8080"
-      type="default,ia,supl"
+      mnc="10"
+      apn="internet.lmt.lv"
+      mmsc="http://mmsc.lmt.lv/mmsc"
+      type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="LMT IMS"
+      mcc="247"
+      mnc="10"
+      apn="IMS"
+      type="ims"
+      protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="LMT Ut"
+      mcc="247"
+      mnc="10"
+      apn="hos"
+      type="xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="EMT Internet"
@@ -7896,6 +7926,8 @@
       mnc="01"
       apn="internet.emt.ee"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="EMT MMS"
@@ -7907,19 +7939,33 @@
       mmsproxy="217.71.32.82"
       mmsport="8080"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="EMT WAP"
+  <apn carrier="EMT IMS"
       carrier_id = "667"
       mcc="248"
       mnc="01"
-      apn="wap.emt.ee"
-      proxy="217.71.32.236"
-      port="8080"
-      type="default,ia,supl"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
-  <apn carrier="Send"
+  <apn carrier="EMT Ut"
+      carrier_id = "667"
+      mcc="248"
+      mnc="01"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+ <apn carrier="Send"
       carrier_id = "2332"
       mcc="248"
       mnc="01"
@@ -7928,6 +7974,8 @@
       mmsproxy="217.71.32.82"
       mmsport="8080"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mvno_match_data="248010x2"
       mvno_type="imsi"
   />
@@ -7941,16 +7989,65 @@
       mmsproxy="217.71.32.82"
       mmsport="8080"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mvno_match_data="248010x3"
       mvno_type="imsi"
   />
 
+  <apn carrier="Send"
+      carrier_id = "2332"
+      mcc="248"
+      mnc="01"
+      apn="send.ee"
+      mmsc="http://mms.emt.ee/servlets/mms"
+      mmsproxy="217.71.32.82"
+      mmsport="8080"
+      type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="2480101601"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Send"
+      carrier_id = "2332"
+      mcc="248"
+      mnc="01"
+      apn="send.ee"
+      mmsc="http://mms.emt.ee/servlets/mms"
+      mmsproxy="217.71.32.82"
+      mmsport="8080"
+      type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="248010241"
+      mvno_type="imsi"
+  />
+
+  <apn carrier="Send"
+      carrier_id = "2332"
+      mcc="248"
+      mnc="01"
+      apn="send.ee"
+      mmsc="http://mms.emt.ee/servlets/mms"
+      mmsproxy="217.71.32.82"
+      mmsport="8080"
+      type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="2480104"
+      mvno_type="imsi"
+  />
+
   <apn carrier="Elisa Internet"
       carrier_id = "668"
       mcc="248"
       mnc="02"
       apn="internet"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Elisa MMS"
@@ -7964,14 +8061,25 @@
       type="mms"
   />
 
-  <apn carrier="Elisa WAP"
+  <apn carrier="Elisa IMS"
       carrier_id = "668"
       mcc="248"
       mnc="02"
-      apn="wap"
-      proxy="194.204.2.6"
-      port="8000"
-      type="default,ia,supl"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="Elisa Ut"
+      carrier_id = "668"
+      mcc="248"
+      mnc="02"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
   />
 
   <apn carrier="Tele2 Internet"
@@ -7988,18 +8096,7 @@
       mnc="03"
       apn="mms.tele2.ee"
       mmsc="http://mmsc.tele2.ee"
-      mmsproxy="193.12.40.6"
-      mmsport="8080"
-      type="mms"
-  />
-
-  <apn carrier="Smart/Ultra MMS"
-      carrier_id = "669"
-      mcc="248"
-      mnc="03"
-      apn="internet.tele2.ee"
-      mmsc="http://mmsc.tele2.ee"
-      mmsproxy="193.12.40.6"
+      mmsproxy="mmsproxy.tele2.ee"
       mmsport="8080"
       type="mms"
   />
@@ -8014,7 +8111,6 @@
       authtype="1"
       type="default,ia,supl"
       protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="MTS MMS"
@@ -8031,6 +8127,17 @@
       type="mms"
   />
 
+  <apn carrier="MTS IMS"
+      carrier_id = "1678"
+      mcc="250"
+      mnc="01"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="Megafon Internet"
       carrier_id = "1016"
       mcc="250"
@@ -8055,23 +8162,49 @@
       type="mms"
   />
 
+  <apn carrier="Megafon IMS"
+      carrier_id = "1016"
+      mcc="250"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="YOTA Internet"
       carrier_id = "1022"
       mcc="250"
       mnc="11"
-      apn="yota.ru"
+      apn="internet.yota"
+      authtype="1"
       type="default,ia,supl"
   />
 
-  <apn carrier="TELE2 Internet"
+  <apn carrier="YOTA MMS"
+      carrier_id = "1022"
+      mcc="250"
+      mnc="11"
+      apn="mms.yota"
+      mmsc="http://mmsc:8002"
+      mmsproxy="10.10.10.10"
+      mmsport="8080"
+      authtype="1"
+      type="mms"
+  />
+
+  <apn carrier="Tele2 Internet"
       carrier_id = "1028"
       mcc="250"
       mnc="20"
       apn="internet.tele2.ru"
-      type="default,ia,supl"
+      type="default,ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="TELE2 MMS"
+  <apn carrier="Tele2 MMS"
       carrier_id = "1028"
       mcc="250"
       mnc="20"
@@ -8082,6 +8215,35 @@
       type="mms"
   />
 
+  <apn carrier="Tele2 IMS"
+      carrier_id = "1028"
+      mcc="250"
+      mnc="20"
+      apn="ims.tele2.ru"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="HOS"
+      carrier_id = "1028"
+      mcc="250"
+      mnc="20"
+      apn="hos.tele2.ru"
+      type="xcap"
+      user_visible="false"
+  />
+
+  <apn carrier="Sberbank-Telecom Internet"
+      mcc="250"
+      mnc="20"
+      apn="internet.sberbank-tele.com"
+      type="default,ia,supl"
+      mvno_match_data="FA3207FF"
+      mvno_type="gid"
+  />
+
   <apn carrier="VTB Mobile"
       carrier_id = "2448"
       mcc="250"
@@ -8092,6 +8254,25 @@
       type="default,ia,supl"
   />
 
+  <apn carrier="Letai Internet"
+      mcc="250"
+      mnc="27"
+      apn="internet.letai.ru"
+      authtype="1"
+      type="default,ia,supl"
+  />
+
+  <apn carrier="Letai MMS"
+      mcc="250"
+      mnc="27"
+      apn="mms"
+      mmsc="http://mmsc:8002"
+      mmsproxy="mmsc"
+      mmsport="8080"
+      authtype="1"
+      type="mms"
+  />
+
   <apn carrier="VODA internet"
       carrier_id = "1029"
       mcc="250"
@@ -8115,11 +8296,9 @@
       mcc="250"
       mnc="50"
       apn="internet.sberbank-tele.com"
-      user=""
-      password=""
       type="default,ia,supl"
       mvno_type="gid"
-      mvno_match_data="FA3207"
+      mvno_match_data="FA3207FF"
   />
 
   <apn carrier="Sberbank-Telecom MMS"
@@ -8134,7 +8313,7 @@
       mmsport="8080"
       type="mms"
       mvno_type="gid"
-      mvno_match_data="FA3207"
+      mvno_match_data="FA3207FF"
   />
 
   <apn carrier="Sberbank-Telecom IMS"
@@ -8176,13 +8355,21 @@
       apn="mms.beeline.ru"
       user="beeline"
       password="beeline"
-      mmsc="http://mms/"
+      mmsc="http://mms"
       mmsproxy="192.168.94.23"
       mmsport="8080"
       authtype="1"
       type="mms"
   />
 
+  <apn carrier="Beeline IMS"
+      mcc="250"
+      mnc="99"
+      apn="ims"
+      type="ims"
+      user_visible="false"
+  />
+
   <apn carrier="MTS MMS"
       carrier_id = "1746"
       mcc="255"
@@ -8467,6 +8654,8 @@
       mnc="01"
       apn="plus"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Plus MMS"
@@ -8478,20 +8667,24 @@
       mmsproxy="212.2.96.16"
       mmsport="8080"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Plus IMS"
+      mcc="260"
+      mnc="01"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="T-Mobile Internet"
       carrier_id = "2367"
       mcc="260"
       mnc="02"
-      apn=""
-      type="ia"
-  />
-
-  <apn carrier="T-mobile.pl"
-      carrier_id = "2367"
-      mcc="260"
-      mnc="02"
       apn="internet"
       type="default,ia,supl"
       protocol="IPV4V6"
@@ -8522,25 +8715,6 @@
       user_visible="false"
   />
 
-  <apn carrier="heyahinternet"
-      carrier_id = "2367"
-      mcc="260"
-      mnc="02"
-      apn="heyah.pl"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="heyahmms"
-      carrier_id = "2367"
-      mcc="260"
-      mnc="02"
-      apn="heyahmms"
-      mmsc="http://mms.heyah.pl/servlets/mms"
-      mmsproxy="213.158.194.226"
-      mmsport="8080"
-      type="mms"
-  />
-
   <apn carrier="Orange Internet"
       carrier_id = "1659"
       mcc="260"
@@ -8594,6 +8768,8 @@
       mnc="06"
       apn="internet"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Play MMS"
@@ -8603,6 +8779,28 @@
       apn="mms"
       mmsc="http://mmsc.play.pl/mms/wapenc"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Play UT"
+      mcc="260"
+      mnc="06"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Play IMS"
+      mcc="260"
+      mnc="06"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="Lycamobile"
@@ -8611,11 +8809,9 @@
       mnc="09"
       apn="data.lycamobile.pl"
       authtype="1"
-      user=""
-      password=""
-      mvno_type="spn"
-      mvno_match_data="Lycamobile"
-      type="default,ia,supl"
+      user="lmpl"
+      password="plus"
+      type="default,ia"
   />
 
   <apn carrier="Truphone"
@@ -8751,7 +8947,7 @@
       user_visible="false"
   />
 
-  <apn carrier="Vodafone DE"
+  <apn carrier="Vodafone DE LTE"
       carrier_id = "2397"
       mcc="262"
       mnc="02"
@@ -8760,23 +8956,16 @@
       protocol="IPV4V6"
   />
 
-  <apn carrier="Vodafone DE-MMS"
-      carrier_id = "2397"
-      mcc="262"
-      mnc="02"
-      apn="event.vodafone.de"
-      mmsc="http://139.7.24.1/servlets/mms"
-      mmsproxy="139.7.29.17"
-      mmsport="80"
-      type="mms"
-  />
-
-  <apn carrier="Vodafone DE"
+  <apn carrier="VF DE Web"
       carrier_id = "2397"
       mcc="262"
       mnc="02"
       apn="web.vodafone.de"
-      type="default,ia,supl"
+      type="default,supl,xcap"
+      authtype="3"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_editable="false"
   />
 
   <apn carrier="Vodafone DE-IMS"
@@ -8790,29 +8979,226 @@
       user_visible="false"
   />
 
-  <apn carrier="E-Plus Internet"
-      carrier_id = "1453"
+  <apn carrier="Vodafone Internet"
       mcc="262"
-      mnc="03"
-      apn="internet.eplus.de"
-      user="eplus"
-      password="internet"
+      mnc="02"
+      apn="live.vodafone.com"
+      type="default,supl,ia"
+      user="vodafone"
+      password="vodafone"
       authtype="1"
-      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="VNR mode"
   />
 
-  <apn carrier="E-Plus MMS"
+  <apn carrier="1&amp;1 Internet (Vodafone)"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="1&amp;1"
+  />
+
+  <apn carrier="1&amp;1 MMS (Vodafone)"
+      mcc="262"
+      mnc="02"
+      apn="event.vodafone.de"
+      type="mms"
+      mmsc="http://139.7.24.1/servlets/mms"
+      mmsport="80"
+      mmsproxy="139.7.29.17"
+      mvno_type="spn"
+      mvno_match_data="1&amp;1"
+  />
+
+  <apn carrier="atg Mobile"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="atg Mobile"
+  />
+
+  <apn carrier="ROSSMANN mobil"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="ROSSMANN mobil"
+  />
+
+  <apn carrier="Willkommen"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="Willkommen"
+  />
+
+  <apn carrier="WILLKOMMEN"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="WILLKOMMEN"
+  />
+
+  <apn carrier="ewe.de"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="ewe.de"
+  />
+
+  <apn carrier="TomTom"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="TomTom"
+  />
+
+  <apn carrier="EDEKA mobil"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="EDEKA mobil"
+  />
+
+  <apn carrier="M2M"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="M2M"
+  />
+
+  <apn carrier="otelo"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="otelo"
+  />
+
+  <apn carrier="mobilcom-debitel"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="mobilcom-debitel"
+  />
+
+  <apn carrier="Talkline"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="Talkline"
+  />
+
+  <apn carrier="callmobile.de"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="callmobile.de"
+  />
+
+  <apn carrier="D3 Mobile"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="D3 Mobile"
+  />
+
+  <apn carrier="mobi"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="mobi"
+  />
+
+  <apn carrier="klarmobil"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="klarmobil"
+  />
+
+  <apn carrier="Tele2"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="Tele2"
+  />
+
+  <apn carrier="KabelDeutschland"
+      mcc="262"
+      mnc="02"
+      apn="web.vodafone.de"
+      type="default,ia,supl"
+      mvno_type="spn"
+      mvno_match_data="KabelDeutschland"
+  />
+
+  <apn carrier="o2 ut"
       carrier_id = "1453"
       mcc="262"
       mnc="03"
-      apn="mms.eplus.de"
-      user="mms"
-      password="eplus"
-      mmsc="http://mms/eplus/"
-      mmsproxy="212.23.97.153"
-      mmsport="5080"
-      authtype="1"
-      type="mms"
+      apn="internet"
+      type="xcap"
+      authtype="0"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="o2 Internet"
+      carrier_id = "1453"
+      mcc="262"
+      mnc="03"
+      apn="internet"
+      mmsc="http://10.81.0.7:8002"
+      mmsproxy="82.113.100.5"
+      mmsport="8080"
+      type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="O2 DE IMS"
+      carrier_id = "1453"
+      mcc="262"
+      mnc="03"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="MVNO DE"
@@ -8837,6 +9223,8 @@
       mmsproxy="82.113.100.5"
       mmsport="8080"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mvno_match_data="26203293"
       mvno_type="imsi"
   />
@@ -8863,6 +9251,8 @@
       mmsproxy="82.113.100.5"
       mmsport="8080"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mvno_match_data="26203330"
       mvno_type="imsi"
   />
@@ -8919,7 +9309,20 @@
       user_visible="false"
   />
 
+  <apn carrier="o2 ut"
+      carrier_id = "1454"
+      mcc="262"
+      mnc="07"
+      apn="internet"
+      type="xcap"
+      authtype="0"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="o2 Internet"
+      carrier_id = "1454"
       mcc="262"
       mnc="07"
       apn="internet"
@@ -8927,11 +9330,11 @@
       mmsproxy="82.113.100.5"
       mmsport="8080"
       type="default,ia,supl,mms"
-      mvno_match_data="2620739"
-      mvno_type="imsi"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="O2 DE IMS"
+  <apn carrier="o2 DE IMS"
       carrier_id = "1454"
       mcc="262"
       mnc="07"
@@ -8954,43 +9357,62 @@
       mvno_type="imsi"
   />
 
+  <apn carrier="Drillisch"
+      mcc="262"
+      mnc="07"
+      apn="internet"
+      type="default,ia,supl,mms"
+      mmsc="http://10.81.0.7:8002"
+      mmsproxy="82.113.100.5"
+      mmsport="8080"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="imsi"
+      mvno_match_data="262074030000516"
+  />
+
   <apn carrier="Fonic Prepaid"
       carrier_id = "2328"
       mcc="262"
       mnc="07"
-      apn="pinternet.interkom.de"
+      apn="internet"
       mmsc="http://10.81.0.7:8002"
-      mmsproxy="82.113.100.6"
+      mmsproxy="82.113.100.5"
       mmsport="8080"
       type="default,ia,supl,mms"
-      mvno_match_data="26207515"
-      mvno_type="imsi"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="420602"
+      mvno_type="gid"
   />
 
-  <apn carrier="Lidl Mobile"
-      carrier_id = "2329"
+  <apn carrier="Fonic Mobile"
       mcc="262"
       mnc="07"
-      apn="pinternet.interkom.de"
+      apn="internet"
       mmsc="http://10.81.0.7:8002"
       mmsproxy="82.113.100.6"
       mmsport="8080"
       type="default,ia,supl,mms"
-      mvno_match_data="26207520"
-      mvno_type="imsi"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="450605"
+      mvno_type="gid"
   />
 
   <apn carrier="Tchibo Internet"
       carrier_id = "2330"
       mcc="262"
       mnc="07"
-      apn="webmobil1"
+      apn="internet"
       mmsc="http://10.81.0.7:8002"
-      mmsproxy="82.113.100.8"
+      mmsproxy="82.113.100.7"
       mmsport="8080"
       type="default,ia,supl,mms"
-      mvno_match_data="26207500"
-      mvno_type="imsi"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_match_data="030903"
+      mvno_type="gid"
   />
 
   <apn carrier="1and1 Internet"
@@ -9002,6 +9424,8 @@
       mmsproxy="82.113.100.5"
       mmsport="8080"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mvno_match_data="118004"
       mvno_type="gid"
   />
@@ -9028,6 +9452,8 @@
       mmsproxy="82.113.100.5"
       mmsport="8080"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mvno_match_data="118006"
       mvno_type="gid"
   />
@@ -9054,6 +9480,8 @@
       mmsproxy="82.113.100.5"
       mmsport="8080"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mvno_match_data="250109"
       mvno_type="gid"
   />
@@ -9071,7 +9499,7 @@
       mvno_type="gid"
   />
 
-  <apn carrier="O2 DE IMS"
+  <apn carrier="o2 DE IMS"
       carrier_id = "1454"
       mcc="262"
       mnc="08"
@@ -9079,6 +9507,37 @@
       type="ims"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Vodafone DE LTE"
+      carrier_id = "2147"
+      mcc="262"
+      mnc="09"
+      apn=""
+      type="ia"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="Vodafone DE Web"
+      carrier_id = "2147"
+      mcc="262"
+      mnc="09"
+      apn="web32.testnetz-vd2.de"
+      type="default,supl,xcap"
+      authtype="3"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Vodafone DE IMS"
+      carrier_id = "2147"
+      mcc="262"
+      mnc="09"
+      apn="ims32.testnetz-vd2.de"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Lebara Germany"
@@ -9129,7 +9588,7 @@
       mcc="262"
       mnc="23"
       apn="internet"
-      type="default,supl"
+      type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
@@ -9204,11 +9663,20 @@
       type="default,ia,supl"
   />
 
+  <apn carrier="Gibtel"
+      mcc="266"
+      mnc="01"
+      apn="www.gibtele.com"
+      type="default,ia"
+  />
+
   <apn carrier="Vodafone Net2"
+      carrier_id = "22"
       mcc="268"
       mnc="01"
       apn=""
       type="ia"
+      protocol="IPV4V6"
   />
 
   <apn carrier="Vodafone Net2"
@@ -9254,14 +9722,6 @@
       carrier_id = "1668"
       mcc="268"
       mnc="03"
-      apn=""
-      type="ia"
-  />
-
-  <apn carrier="Internet"
-      carrier_id = "1668"
-      mcc="268"
-      mnc="03"
       apn="umts"
       mmsc="http://mmsc:10021/mmsc"
       mmsproxy="62.169.66.5"
@@ -9294,7 +9754,7 @@
       mcc="268"
       mnc="06"
       apn="internet"
-      type="default,ia,supl"
+      type="default,supl"
   />
 
   <apn carrier="mms"
@@ -9650,11 +10110,30 @@
       mcc="274"
       mnc="11"
       apn="net.nova.is"
-      proxy="10.10.2.60"
-      port="8080"
       type="default,ia,supl"
   />
 
+  <apn carrier="One Telecommunications"
+      mcc="276"
+      mnc="01"
+      apn="internet.t"
+      type="default,ia"
+  />
+
+  <apn carrier="Vodafone"
+      mcc="276"
+      mnc="02"
+      apn="vodafoneweb"
+      type="default,ia,dun"
+  />
+
+  <apn carrier="ALBTelecom"
+      mcc="276"
+      mnc="03"
+      apn="internet"
+      type="default,ia"
+  />
+
   <apn carrier="Vodafone MT"
       carrier_id = "2368"
       mcc="278"
@@ -9676,6 +10155,20 @@
       type="mms"
   />
 
+  <apn carrier="GO postpaid"
+      mcc="278"
+      mnc="21"
+      apn="rtgsurfing"
+      type="default,ia"
+  />
+
+  <apn carrier="GO prepaid"
+      mcc="278"
+      mnc="21"
+      apn="gointernet"
+      type="default,ia"
+  />
+
   <apn carrier="Cyta"
       carrier_id = "1447"
       mcc="280"
@@ -9995,6 +10488,27 @@
       protocol="IPV4V6"
   />
 
+  <apn carrier="FT"
+      mcc="288"
+      mnc="01"
+      apn="internet"
+      type="default,ia"
+  />
+
+  <apn carrier="Hey"
+      mcc="288"
+      mnc="02"
+      apn="gprs.fo"
+      type="default,ia"
+  />
+
+  <apn carrier="Tosa"
+      mcc="288"
+      mnc="03"
+      apn="chili"
+      type="default,ia"
+  />
+
   <apn carrier="Tele Internet"
       carrier_id = "735"
       mcc="290"
@@ -10099,14 +10613,6 @@
       carrier_id = "2396"
       mcc="294"
       mnc="01"
-      apn=""
-      type="ia"
-  />
-
-  <apn carrier="T-Mobile MK Internet"
-      carrier_id = "2396"
-      mcc="294"
-      mnc="01"
       apn="internet"
       user="internet"
       password="t-mobile"
@@ -10163,6 +10669,41 @@
       type="default,ia,supl"
   />
 
+  <apn carrier="Swisscom Services"
+      mcc="295"
+      mnc="01"
+      apn="gprs.swisscom.ch"
+      proxy="192.168.210.1"
+      port="8080"
+      type="default,ia"
+  />
+
+  <apn carrier="Internet"
+      mcc="295"
+      mnc="02"
+      apn="internet-ofl"
+      type="default,ia,supl"
+  />
+
+  <apn carrier="MMS"
+      mcc="295"
+      mnc="02"
+      apn="mms-ofl"
+      mmsc="http://192.168.151.3:8002"
+      mmsproxy="192.168.151.2"
+      mmsport="8080"
+      type="mms"
+  />
+
+ <apn carrier="FL1"
+      mcc="295"
+      mnc="05"
+      apn="fl1"
+      user="gprs@a1plus.at"
+      password="fl1"
+      type="default,ia"
+  />
+
   <apn carrier="EMnify"
       carrier_id = "2326"
       mcc="295"
@@ -11631,22 +12172,6 @@
       roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="itewire"
-      mcc="310"
-      mnc="032"
-      apn="CdmaNai"
-      mvno_type="spn"
-      mvno_match_data="itewire"
-      mmsc=""
-      mmsproxy=""
-      mmsport=""
-      type="mms"
-      carrier_enabled="false"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      network_type_bitmask="7"
-  />
-
   <apn carrier="Itewire IMS"
       mcc="310"
       mnc="032"
@@ -11699,9 +12224,6 @@
       mcc="310"
       mnc="032"
       apn="VZWINTERNET"
-      mmsc=""
-      mmsproxy=""
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="itewire"
       type="default,ia,mms,dun,supl"
@@ -11714,9 +12236,6 @@
       mcc="310"
       mnc="032"
       apn="VZWINTERNET"
-      mmsc=""
-      mmsproxy=""
-      mmsport=""
       mvno_type="spn"
       mvno_match_data="itewire"
       type="default,ia,mms,dun,supl"
@@ -12140,18 +12659,6 @@
       mcc="310"
       mnc="160"
       apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MetroPCS 160"
-      carrier_id = "1949"
-      mcc="310"
-      mnc="160"
-      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,ia,supl,mms"
       protocol="IPV6"
@@ -12189,18 +12696,6 @@
       mcc="310"
       mnc="200"
       apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MetroPCS 200"
-      carrier_id = "1949"
-      mcc="310"
-      mnc="200"
-      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,ia,supl,mms"
       protocol="IPV6"
@@ -12214,18 +12709,6 @@
       mcc="310"
       mnc="210"
       apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MetroPCS 210"
-      carrier_id = "1949"
-      mcc="310"
-      mnc="210"
-      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,ia,supl,mms"
       protocol="IPV6"
@@ -12239,18 +12722,6 @@
       mcc="310"
       mnc="220"
       apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MetroPCS 220"
-      carrier_id = "1949"
-      mcc="310"
-      mnc="220"
-      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,ia,supl,mms"
       protocol="IPV6"
@@ -12264,18 +12735,6 @@
       mcc="310"
       mnc="230"
       apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MetroPCS 230"
-      carrier_id = "1949"
-      mcc="310"
-      mnc="230"
-      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,ia,supl,mms"
       protocol="IPV6"
@@ -12284,16 +12743,37 @@
       mvno_type="gid"
   />
 
-  <apn carrier="MetroPCS 240"
-      carrier_id = "1949"
+  <apn carrier="Qlink"
       mcc="310"
       mnc="240"
-      apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
+      apn="qlink"
+      mmsc="http://wholesale.mmsmvno.com/mms/wapenc"
+      mmsport="80"
+      type="default,ia,mms,supl"
       mvno_type="gid"
+      mvno_match_data="514C"
+  />
+
+  <apn carrier="Tello"
+      mcc="310"
+      mnc="240"
+      apn="tello"
+      mmsc="http://wholesale.mmsmvno.com/mms/wapenc"
+      mmsport="80"
+      type="default,ia,mms,supl"
+      mvno_type="gid"
+      mvno_match_data="6941"
+  />
+
+  <apn carrier="iWireless"
+      mcc="310"
+      mnc="240"
+      apn="iwireless"
+      mmsc="http://wholesale.mmsmvno.com/mms/wapenc"
+      mmsport="80"
+      type="default,ia,mms,supl"
+      mvno_type="gid"
+      mvno_match_data="6957"
   />
 
   <apn carrier="MetroPCS 240"
@@ -12342,16 +12822,16 @@
       user_visible="false"
   />
 
-  <apn carrier="MetroPCS 250"
-      carrier_id = "1949"
+  <apn carrier="Consumer Cellular"
+      carrier_id = "2023"
       mcc="310"
-      mnc="250"
-      apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
+      mnc="240"
+      apn="wholesale"
+      mmsc="http://wholesale.mmsmvno.com/mms/wapenc"
+      mmsport="80"
+      type="default,ia,mms,supl,hipri"
       mvno_type="gid"
+      mvno_match_data="2AC9"
   />
 
   <apn carrier="MetroPCS 250"
@@ -12367,6 +12847,39 @@
       mvno_type="gid"
   />
 
+  <apn carrier="Qlink"
+      mcc="310"
+      mnc="260"
+      apn="qlink"
+      mmsc="http://wholesale.mmsmvno.com/mms/wapenc"
+      mmsport="80"
+      type="default,ia,mms,supl"
+      mvno_type="gid"
+      mvno_match_data="514C"
+  />
+
+  <apn carrier="Tello"
+      mcc="310"
+      mnc="260"
+      apn="tello"
+      mmsc="http://wholesale.mmsmvno.com/mms/wapenc"
+      mmsport="80"
+      type="default,ia,mms,supl"
+      mvno_type="gid"
+      mvno_match_data="6941"
+  />
+
+  <apn carrier="iWireless"
+      mcc="310"
+      mnc="260"
+      apn="iwireless"
+      mmsc="http://wholesale.mmsmvno.com/mms/wapenc"
+      mmsport="80"
+      type="default,ia,mms,supl"
+      mvno_type="gid"
+      mvno_match_data="6957"
+  />
+
   <apn carrier="Google Fi - Tm"
       carrier_id = "1989"
       mcc="310"
@@ -12405,18 +12918,6 @@
       mcc="310"
       mnc="260"
       apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D38"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MetroPCS 260"
-      carrier_id = "1949"
-      mcc="310"
-      mnc="260"
-      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,ia,supl,mms"
       protocol="IPV6"
@@ -12486,18 +12987,6 @@
       mcc="310"
       mnc="270"
       apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MetroPCS 270"
-      carrier_id = "1949"
-      mcc="310"
-      mnc="270"
-      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,ia,supl,mms"
       protocol="IPV6"
@@ -12506,11 +12995,11 @@
       mvno_type="gid"
   />
 
-  <apn carrier="internet"
+  <apn carrier="Reach"
       mcc="310"
       mnc="280"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -12549,7 +13038,7 @@
       mcc="310"
       mnc="280"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -12588,7 +13077,7 @@
       mcc="310"
       mnc="280"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -12627,7 +13116,7 @@
       mcc="310"
       mnc="280"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -12666,7 +13155,7 @@
       mcc="310"
       mnc="280"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -12705,7 +13194,7 @@
       mcc="310"
       mnc="280"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -12744,7 +13233,7 @@
       mcc="310"
       mnc="280"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -12783,7 +13272,7 @@
       mcc="310"
       mnc="280"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -12822,7 +13311,7 @@
       mcc="310"
       mnc="280"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -12861,7 +13350,7 @@
       mcc="310"
       mnc="280"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -12900,7 +13389,7 @@
       mcc="310"
       mnc="280"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -12939,7 +13428,7 @@
       mcc="310"
       mnc="280"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -12978,7 +13467,7 @@
       mcc="310"
       mnc="280"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -13018,18 +13507,6 @@
       mcc="310"
       mnc="300"
       apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MetroPCS 300"
-      carrier_id = "1949"
-      mcc="310"
-      mnc="300"
-      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,ia,supl,mms"
       protocol="IPV6"
@@ -13066,18 +13543,6 @@
       mcc="310"
       mnc="310"
       apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MetroPCS 310"
-      carrier_id = "1949"
-      mcc="310"
-      mnc="310"
-      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,ia,supl,mms"
       protocol="IPV6"
@@ -13323,7 +13788,7 @@
       mcc="310"
       mnc="410"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -13362,7 +13827,7 @@
       mcc="310"
       mnc="410"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -13401,7 +13866,7 @@
       mcc="310"
       mnc="410"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -13440,7 +13905,7 @@
       mcc="310"
       mnc="410"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -13479,7 +13944,7 @@
       mcc="310"
       mnc="410"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -13518,7 +13983,7 @@
       mcc="310"
       mnc="410"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -13557,7 +14022,7 @@
       mcc="310"
       mnc="410"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -13596,7 +14061,7 @@
       mcc="310"
       mnc="410"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -13635,7 +14100,7 @@
       mcc="310"
       mnc="410"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -13674,7 +14139,7 @@
       mcc="310"
       mnc="410"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -13713,7 +14178,7 @@
       mcc="310"
       mnc="410"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -13752,7 +14217,7 @@
       mcc="310"
       mnc="410"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -13791,7 +14256,7 @@
       mcc="310"
       mnc="410"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -13830,7 +14295,7 @@
       mcc="310"
       mnc="410"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -14068,18 +14533,6 @@
       mcc="310"
       mnc="490"
       apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MetroPCS 490"
-      carrier_id = "1949"
-      mcc="310"
-      mnc="490"
-      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,ia,supl,mms"
       protocol="IPV6"
@@ -14093,18 +14546,6 @@
       mcc="310"
       mnc="530"
       apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MetroPCS 530"
-      carrier_id = "1949"
-      mcc="310"
-      mnc="530"
-      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,ia,supl,mms"
       protocol="IPV6"
@@ -14224,18 +14665,6 @@
       mcc="310"
       mnc="590"
       apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MetroPCS 590"
-      carrier_id = "1949"
-      mcc="310"
-      mnc="590"
-      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,ia,supl,mms"
       protocol="IPV6"
@@ -14355,18 +14784,6 @@
       mcc="310"
       mnc="640"
       apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MetroPCS 640"
-      carrier_id = "1949"
-      mcc="310"
-      mnc="640"
-      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,ia,supl,mms"
       protocol="IPV6"
@@ -14380,18 +14797,6 @@
       mcc="310"
       mnc="660"
       apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MetroPCS 660"
-      carrier_id = "1949"
-      mcc="310"
-      mnc="660"
-      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,ia,supl,mms"
       protocol="IPV6"
@@ -14553,18 +14958,6 @@
       mcc="310"
       mnc="800"
       apn="fast.metropcs.com"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-      mvno_match_data="6D"
-      mvno_type="gid"
-  />
-
-  <apn carrier="MetroPCS 800"
-      carrier_id = "1949"
-      mcc="310"
-      mnc="800"
-      apn="fast.metropcs.com"
       mmsc="http://metropcs.mmsmvno.com/mms/wapenc"
       type="default,ia,supl,mms"
       protocol="IPV6"
@@ -14984,11 +15377,11 @@
       network_type_bitmask="13"
   />
 
-  <apn carrier="internet"
+  <apn carrier="Reach"
       mcc="310"
       mnc="950"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -15027,7 +15420,7 @@
       mcc="310"
       mnc="950"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -15066,7 +15459,7 @@
       mcc="310"
       mnc="950"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -15105,7 +15498,7 @@
       mcc="310"
       mnc="950"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -15144,7 +15537,7 @@
       mcc="310"
       mnc="950"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -15183,7 +15576,7 @@
       mcc="310"
       mnc="950"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -15222,7 +15615,7 @@
       mcc="310"
       mnc="950"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -15261,7 +15654,7 @@
       mcc="310"
       mnc="950"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -15300,7 +15693,7 @@
       mcc="310"
       mnc="950"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -15339,7 +15732,7 @@
       mcc="310"
       mnc="950"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -15378,7 +15771,7 @@
       mcc="310"
       mnc="950"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -15420,7 +15813,7 @@
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       mvno_match_data="DEFF"
@@ -16366,7 +16759,7 @@
       mcc="311"
       mnc="180"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -16405,7 +16798,7 @@
       mcc="311"
       mnc="180"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -16444,7 +16837,7 @@
       mcc="311"
       mnc="180"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -16483,7 +16876,7 @@
       mcc="311"
       mnc="180"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -16522,7 +16915,7 @@
       mcc="311"
       mnc="180"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -16561,7 +16954,7 @@
       mcc="311"
       mnc="180"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -16600,7 +16993,7 @@
       mcc="311"
       mnc="180"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -16639,7 +17032,7 @@
       mcc="311"
       mnc="180"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -16678,7 +17071,7 @@
       mcc="311"
       mnc="180"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -16717,7 +17110,7 @@
       mcc="311"
       mnc="180"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -16756,7 +17149,7 @@
       mcc="311"
       mnc="180"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -16795,7 +17188,7 @@
       mcc="311"
       mnc="180"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -16834,7 +17227,7 @@
       mcc="311"
       mnc="180"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -16873,7 +17266,7 @@
       mcc="311"
       mnc="180"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -19905,16 +20298,7 @@
       mcc="330"
       mnc="110"
       apn="lte.claropr.com"
-      type="default,ia"
-      authtype="1"
-  />
-
-  <apn carrier="Puerto Rico:Claro:Banda Ancha"
-      carrier_id = "1955"
-      mcc="330"
-      mnc="110"
-      apn="lte.claropr.com"
-      type="dun"
+      type="default,ia,dun"
       authtype="1"
   />
 
@@ -20997,6 +21381,14 @@
       type="dun"
   />
 
+  <apn carrier="SFR LTE"
+      carrier_id = "743"
+      mcc="340"
+      mnc="02"
+      apn=""
+      type="ia"
+  />
+
   <apn carrier="SFR Internet"
       carrier_id = "743"
       mcc="340"
@@ -21005,7 +21397,7 @@
       mmsc="http://mmsc.only.fr:9091"
       mmsproxy="mmsc.only.fr"
       mmsport="9091"
-      type="default,ia,hipri,mms,supl"
+      type="default,hipri,mms,supl"
   />
 
   <apn carrier="Modem"
@@ -21325,31 +21717,6 @@
       type="mms"
   />
 
-  <apn carrier="INTERNET Aruba"
-      carrier_id = "2163"
-      mcc="363"
-      mnc="020"
-      apn="web.digicelaruba.com"
-      user=""
-      password=""
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="MMS Digicel"
-      carrier_id = "2163"
-      mcc="363"
-      mnc="020"
-      apn="wap"
-      user=""
-      password=""
-      mmsproxy="172.16.7.12"
-      mmsport="8080"
-      mmsc="http://mms.digicelgroup.com"
-      authtype="1"
-      type="mms"
-  />
-
   <apn carrier="Be Aliv"
       carrier_id = "2130"
       mcc="364"
@@ -28952,7 +29319,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29393,7 +29759,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29414,7 +29779,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29435,7 +29799,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29456,7 +29819,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29477,7 +29839,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29498,7 +29859,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29519,7 +29879,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29540,7 +29899,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29561,7 +29919,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29582,7 +29939,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29603,7 +29959,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29624,7 +29979,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29645,7 +29999,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29666,7 +30019,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29687,7 +30039,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29708,7 +30059,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29729,7 +30079,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29750,7 +30099,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29771,7 +30119,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29792,7 +30139,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -29813,7 +30159,6 @@
       type="default,ia,supl"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
-      network_type_bitmask="13"
   />
 
   <apn carrier="Reliance Jio IMS"
@@ -30722,8 +31067,8 @@
       carrier_id = "1611"
       mcc="414"
       mnc="01"
-      apn="default"
-      type="default,ia,supl"
+      apn="mptnet"
+      type="default,ia"
   />
 
   <apn carrier="Ooredoo Internet"
@@ -30734,6 +31079,13 @@
       type="default,ia,supl"
   />
 
+  <apn carrier="Telenor INTERNET"
+      mcc="414"
+      mnc="06"
+      apn="internet"
+      type="default,ia,supl"
+  />
+
   <apn carrier="Alfa Internet"
       carrier_id = "1920"
       mcc="415"
@@ -30886,44 +31238,6 @@
   <apn carrier="Orange MMS"
       carrier_id = "849"
       mcc="416"
-      mnc="770"
-      apn="mms.orange.jo"
-      user="mmc"
-      password="mmc"
-      authtype="1"
-      mmsc="http://172.16.1.96/servlets/mms"
-      mmsproxy="172.16.1.2"
-      mmsport="8080"
-      type="mms"
-  />
-
-  <apn carrier="Orange Internet"
-      carrier_id = "849"
-      mcc="416"
-      mnc="770"
-      apn="net.orange.jo"
-      user="net"
-      password="net"
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Orange WAP"
-      carrier_id = "849"
-      mcc="416"
-      mnc="770"
-      apn="wap.orange.jo"
-      user="wap"
-      password="wap"
-      authtype="1"
-      proxy="172.16.1.2"
-      port="8080"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Orange MMS"
-      carrier_id = "849"
-      mcc="416"
       mnc="77"
       apn="mms.orange.jo"
       user="mmc"
@@ -31209,12 +31523,30 @@
       type="default,ia,supl,mms"
   />
 
-  <apn carrier="STC - GPRS"
+  <apn carrier="STC LTE"
+      carrier_id = "1683"
+      mcc="420"
+      mnc="01"
+      apn=""
+      type="ia"
+  />
+
+  <apn carrier="STC Internet"
       carrier_id = "1683"
       mcc="420"
       mnc="01"
       apn="jawalnet.com.sa"
-      type="default,ia,supl"
+      type="default,supl,xcap"
+  />
+
+  <apn carrier="STC"
+      carrier_id = "1683"
+      mcc="420"
+      mnc="01"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="STC MMS"
@@ -31236,26 +31568,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Mobily prepaid - GPRS"
-      carrier_id = "1684"
-      mcc="420"
-      mnc="03"
-      apn="wap2"
-      proxy="10.3.2.133"
-      port="8080"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Mobily postpaid - GPRS"
-      carrier_id = "1684"
-      mcc="420"
-      mnc="03"
-      apn="wap1"
-      proxy="10.3.2.133"
-      port="8080"
-      type="default,ia,supl"
-  />
-
   <apn carrier="Mobily WEB 2"
       carrier_id = "1684"
       mcc="420"
@@ -31286,7 +31598,7 @@
       type="mms"
   />
 
-  <apn carrier="zain-Internet Wap"
+  <apn carrier="Zain Internet"
       carrier_id = "1972"
       mcc="420"
       mnc="04"
@@ -31430,7 +31742,6 @@
       type="mms"
   />
 
-
   <apn carrier="Nawras Internet"
       carrier_id = "971"
       mcc="422"
@@ -31442,37 +31753,43 @@
       type="default,ia,supl"
   />
 
-
   <apn carrier="Etisalat Data Package"
       carrier_id = "451"
       mcc="424"
       mnc="02"
       apn="etisalat.ae"
       authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Weyak Wap"
-      carrier_id = "451"
-      mcc="424"
-      mnc="02"
-      apn="etisalat"
-      proxy="10.12.0.32"
-      port="8080"
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Etisalat MMS"
-      carrier_id = "451"
-      mcc="424"
-      mnc="02"
-      apn="etisalat"
       mmsc="http://mms/servlets/mms"
       mmsproxy="10.12.0.32"
       mmsport="8080"
-      authtype="1"
-      type="mms"
+      type="default,ia,supl,mms"
+  />
+
+  <apn carrier="Etisalat IMS"
+      carrier_id = "451"
+      mcc="424"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="Etisalat Ut"
+      carrier_id = "451"
+      mcc="424"
+      mnc="02"
+      apn="ut"
+      type="xcap"
+      protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="du LTE"
+      carrier_id = "1970"
+      mcc="424"
+      mnc="03"
+      apn=""
+      type="ia"
   />
 
   <apn carrier="du Internet"
@@ -31480,17 +31797,16 @@
       mcc="424"
       mnc="03"
       apn="du"
-      type="default,ia,supl"
+      type="default,supl"
   />
 
-  <apn carrier="du WAP"
+  <apn carrier="du IMS"
       carrier_id = "1970"
       mcc="424"
       mnc="03"
-      apn="du"
-      proxy="10.19.18.4"
-      port="8080"
-      type="default,ia,supl"
+      apn="ims"
+      type="ims,xcap"
+      protocol="IPV4V6"
   />
 
   <apn carrier="du MMS"
@@ -31499,8 +31815,8 @@
       mnc="03"
       apn="du"
       mmsc="http://mms.du.ae:8002"
-      mmsproxy="10.19.18.4"
-      mmsport="8080"
+      mmsproxy="10.164.208.4"
+      mmsport="8002"
       type="mms"
   />
 
@@ -31897,7 +32213,8 @@
       carrier_id = "1612"
       mcc="428"
       mnc="99"
-      apn="default"
+      apn="internet"
+      authtype="0"
       type="default,ia,supl"
   />
 
@@ -32012,8 +32329,6 @@
       mcc="432"
       mnc="35"
       apn="mtnirancell"
-      proxy="10.131.26.138"
-      port="8080"
       type="default,ia,supl"
   />
 
@@ -32388,54 +32703,17 @@
       authtype="2"
   />
 
-  <apn carrier="RATEL"
-      carrier_id = "1894"
-      mcc="440"
-      mnc="20"
-      apn="ratel.com"
-      user="ratel@ratel.com"
-      server=""
-      password="ratel"
-      authtype="3"
-      protocol="IPV4V6"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="RATEL"
-      carrier_id = "1581"
-      mcc="440"
-      mnc="51"
-      apn="ratel.com"
-      user="ratel@ratel.com"
-      server=""
-      password="ratel"
-      authtype="3"
-      protocol="IPV4V6"
-      type="default,ia,supl"
-  />
-
   <apn carrier="Rakuten"
       carrier_id = "2109"
       mcc="440"
       mnc="51"
       apn="a.rmobile.jp"
       user="rakuten@vdm"
-      server=""
       password="0000"
       authtype="3"
       type="default,ia,supl"
   />
 
-  <apn carrier="SKT IA"
-      carrier_id = "1891"
-      mcc="450"
-      mnc="05"
-      apn=""
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IP"
-  />
-
   <apn carrier="SKT IMS"
       carrier_id = "1891"
       mcc="450"
@@ -32443,6 +32721,7 @@
       apn="IMS"
       type="ims"
       protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="SKT LTE INTERNET"
@@ -32456,15 +32735,6 @@
       mmsport="9093"
       server="*"
       protocol="IPV4V6"
-  />
-
-  <apn carrier="LG uplus IA"
-      carrier_id = "1892"
-      mcc="450"
-      mnc="06"
-      apn=""
-      type="ia"
-      protocol="IPV4V6"
       roaming_protocol="IP"
   />
 
@@ -32473,7 +32743,7 @@
       mcc="450"
       mnc="06"
       apn="IMS"
-      type="ims"
+      type="ia,ims"
       mmsc="http://omammsc.uplus.co.kr:9084"
       protocol="IPV4V6"
   />
@@ -32483,21 +32753,11 @@
       mcc="450"
       mnc="06"
       apn="internet.lguplus.co.kr"
-      type="default,ia,mms,supl,fota,cbs"
+      type="default,mms,supl,fota,cbs"
       mmsc="http://omammsc.uplus.co.kr:9084"
       protocol="IPV4V6"
   />
 
-  <apn carrier="KT IA"
-      carrier_id = "1890"
-      mcc="450"
-      mnc="08"
-      apn=""
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IP"
-  />
-
   <apn carrier="KT IMS"
       carrier_id = "1890"
       mcc="450"
@@ -32505,6 +32765,7 @@
       apn="IMS"
       type="ims"
       protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="KT"
@@ -32514,7 +32775,7 @@
       apn="lte.ktfwing.com"
       type="default,ia,mms,supl,fota,cbs"
       mmsc="http://mmsc.ktfwing.com:9082"
-      port="80"
+      protocol="IPV4V6"
       server="*"
   />
 
@@ -32581,7 +32842,7 @@
       type="mms"
   />
 
-  <apn carrier="Viettel-wap-gprs 1"
+  <apn carrier="Viettel"
       carrier_id = "1899"
       mcc="452"
       mnc="04"
@@ -32589,17 +32850,7 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Viettel-wap-gprs 2"
-      carrier_id = "1899"
-      mcc="452"
-      mnc="04"
-      apn="v-wap"
-      proxy="192.168.233.10"
-      port="8080"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Viettel-gprs-mms"
+  <apn carrier="Viettel MMS"
       carrier_id = "1899"
       mcc="452"
       mnc="04"
@@ -32610,6 +32861,26 @@
       type="mms"
   />
 
+  <apn carrier="Viettel IMS"
+      carrier_id = "1899"
+      mcc="452"
+      mnc="04"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Viettel Ut"
+      carrier_id = "1899"
+      mcc="452"
+      mnc="04"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="Vietnamobile_GPRS3"
       carrier_id = "1994"
       mcc="452"
@@ -33052,6 +33323,8 @@
       mmsport="8080"
       authtype="3"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="CTM Data"
@@ -33060,6 +33333,9 @@
       mnc="01"
       apn="ctm-mobile"
       type="default,ia,supl"
+      authtype="0"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="CTM MMS"
@@ -33070,7 +33346,10 @@
       mmsc="http://mms.wap.ctm.net:8002"
       mmsproxy="192.168.99.3"
       mmsport="8080"
+      authtype="0"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="CTM (Prepaid)"
@@ -33081,7 +33360,62 @@
       mmsc="http://mms.wap.ctm.net:8002"
       mmsproxy="192.168.99.3"
       mmsport="8080"
+      authtype="0"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="CTM IMS"
+      carrier_id = "1614"
+      mcc="455"
+      mnc="01"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="CTM XCAP"
+      carrier_id = "1614"
+      mcc="455"
+      mnc="01"
+      apn="XCAP"
+      type="xcap"
+      user_visible="false"
+  />
+
+  <apn carrier="CTNET"
+      mcc="455"
+      mnc="02"
+      apn="ctnet"
+      authtype="3"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="ims"
+      mcc="455"
+      mnc="02"
+      apn="ims"
+      authtype="0"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+
+  <apn carrier="CTWAP"
+      mcc="455"
+      mnc="02"
+      apn="ctwap"
+      mmsc="http://mmsc.vnet.mobi"
+      mmsproxy="10.0.0.200"
+      mmsport="80"
+      authtype="3"
+      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="3 Macau"
@@ -33094,6 +33428,8 @@
       mmsport="8080"
       authtype="1"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="CTM Data"
@@ -33102,6 +33438,8 @@
       mnc="04"
       apn="ctm-mobile"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="CTM MMS"
@@ -33113,6 +33451,8 @@
       mmsproxy="192.168.99.3"
       mmsport="8080"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="CTM (Prepaid)"
@@ -33124,6 +33464,27 @@
       mmsproxy="192.168.99.3"
       mmsport="8080"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="CTM IMS"
+      carrier_id = "1614"
+      mcc="455"
+      mnc="04"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="CTM XCAP"
+      carrier_id = "1614"
+      mcc="455"
+      mnc="04"
+      apn="XCAP"
+      type="xcap"
+      user_visible="false"
   />
 
   <apn carrier="3 Macau"
@@ -33135,6 +33496,51 @@
       mmsport="8080"
       authtype="1"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="3 Macau IMS"
+      mcc="455"
+      mnc="05"
+      apn="mobile.three.com.mo"
+      type="ims"
+      authtype="0"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="CTNET"
+      mcc="455"
+      mnc="07"
+      apn="ctnet"
+      authtype="3"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="ims"
+      mcc="455"
+      mnc="07"
+      apn="ims"
+      authtype="0"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+
+  <apn carrier="CTWAP"
+      mcc="455"
+      mnc="07"
+      apn="ctwap"
+      mmsc="http://mmsc.vnet.mobi"
+      mmsproxy="10.0.0.200"
+      mmsport="80"
+      authtype="3"
+      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Cellcard"
@@ -33240,25 +33646,17 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="中国移动 (China Mobile) GPRS"
+  <apn carrier="中国移动 (China Mobile) NET"
       carrier_id = "1435"
       mcc="460"
       mnc="00"
       apn="cmnet"
-      type="default,ia,supl"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="中国移动 (China Mobile) WAP"
-      carrier_id = "1435"
-      mcc="460"
-      mnc="00"
-      apn="cmwap"
-      proxy="10.0.0.172"
-      port="80"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="中国移动彩信 (China Mobile)"
+  <apn carrier="中国移动 (China Mobile) WAP&amp;MMS"
       carrier_id = "1435"
       mcc="460"
       mnc="00"
@@ -33269,75 +33667,76 @@
       mmsproxy="10.0.0.172"
       mmsport="80"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="沃3G连接互联网 (China Unicom)"
+  <apn carrier="中国移动 (China Mobile) NET IMS"
+      carrier_id = "1435"
+      mcc="460"
+      mnc="00"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国联通 (China Unicom) NET"
       carrier_id = "1436"
       mcc="460"
       mnc="01"
       apn="3gnet"
-      type="default,ia,supl"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="沃3G手机上网 (China Unicom)"
+  <apn carrier="中国联通 (China Unicom) WAP&amp;MMS"
       carrier_id = "1436"
       mcc="460"
       mnc="01"
       apn="3gwap"
       proxy="10.0.0.172"
       port="80"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="联通2GNET上网 (China Unicom)"
-      carrier_id = "1436"
-      mcc="460"
-      mnc="01"
-      apn="uninet"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="联通彩信 (China Unicom)"
-      carrier_id = "1436"
-      mcc="460"
-      mnc="01"
-      apn="3gwap"
       mmsc="http://mmsc.myuni.com.cn"
       mmsproxy="10.0.0.172"
       mmsport="80"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="联通2g彩信 (China Unicom)"
+  <apn carrier="中国联通 (China Unicom) NET IMS"
       carrier_id = "1436"
       mcc="460"
       mnc="01"
-      apn="uniwap"
-      mmsc="http://mmsc.myuni.com.cn"
-      mmsproxy="10.0.0.172"
-      mmsport="80"
-      type="mms"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="中国移动 (China Mobile) GPRS"
+  <apn carrier="中国电信 (China Telecom) SOS"
+      carrier_id = "2237"
+      mcc="460"
+      mnc="03"
+      apn="sos"
+      type="emergency"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国移动 (China Mobile) NET"
       carrier_id = "1435"
       mcc="460"
       mnc="02"
       apn="cmnet"
-      type="default,ia,supl"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="中国移动 (China Mobile) WAP"
-      carrier_id = "1435"
-      mcc="460"
-      mnc="02"
-      apn="cmwap"
-      proxy="10.0.0.172"
-      port="80"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="中国移动彩信 (China Mobile)"
+  <apn carrier="中国移动 (China Mobile) WAP&amp;MMS"
       carrier_id = "1435"
       mcc="460"
       mnc="02"
@@ -33348,71 +33747,101 @@
       mmsproxy="10.0.0.172"
       mmsport="80"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="CTNET"
+  <apn carrier="中国移动 (China Mobile) NET IMS"
+      carrier_id = "1435"
+      mcc="460"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国电信 (China Telecom) NET"
       carrier_id = "2237"
       mcc="460"
       mnc="03"
       apn="ctnet"
-      user="ctnet@mycdma.cn"
-      password="vnet.mobi"
-      authtype="3"
-      server="*"
-      proxy=""
-      port="80"
-      mmsc=""
-      mmsproxy=""
-      mmsport=""
-      type="default,ia,hipri,fota,cbs"
-      protocol="IP"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="CTWAP"
+  <apn carrier="中国电信 (China Telecom) WAP&amp;MMS"
       carrier_id = "2237"
       mcc="460"
       mnc="03"
       apn="ctwap"
-      user="ctwap@mycdma.cn"
-      password="vnet.mobi"
-      authtype="3"
-      server="*"
-      proxy=""
+      proxy="10.0.0.200"
       port="80"
       mmsc="http://mmsc.vnet.mobi"
       mmsproxy="10.0.0.200"
       mmsport="80"
-      type="default,ia,mms,hipri,supl,fota,cbs"
-      protocol="IP"
+      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="中国移动 (China Mobile) GPRS"
+  <apn carrier="中国电信 (China Telecom) NET IMS"
+      carrier_id = "2237"
+      mcc="460"
+      mnc="03"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国移动 (China Mobile) NET"
       carrier_id = "1435"
       mcc="460"
-      mnc="07"
+      mnc="04"
       apn="cmnet"
-      type="default,ia,supl"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="中国移动 (China Mobile) GPRS"
+  <apn carrier="中国移动 (China Mobile) WAP&amp;MMS"
       carrier_id = "1435"
       mcc="460"
-      mnc="08"
-      apn="cmnet"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="中国移动 (China Mobile) WAP"
-      carrier_id = "1435"
-      mcc="460"
-      mnc="07"
+      mnc="04"
       apn="cmwap"
       proxy="10.0.0.172"
       port="80"
-      type="default,ia,supl"
+      mmsc="http://mmsc.monternet.com"
+      mmsproxy="10.0.0.172"
+      mmsport="80"
+      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="中国移动彩信 (China Mobile)"
+  <apn carrier="中国移动 (China Mobile) NET IMS"
+      carrier_id = "1435"
+      mcc="460"
+      mnc="04"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国移动 (China Mobile) NET"
+      carrier_id = "1435"
+      mcc="460"
+      mnc="07"
+      apn="cmnet"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国移动 (China Mobile) WAP&amp;MMS"
       carrier_id = "1435"
       mcc="460"
       mnc="07"
@@ -33423,19 +33852,31 @@
       mmsproxy="10.0.0.172"
       mmsport="80"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="中国移动 (China Mobile) WAP"
+  <apn carrier="中国移动 (China Mobile) NET IMS"
+      carrier_id = "1435"
+      mcc="460"
+      mnc="07"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国移动 (China Mobile) NET"
       carrier_id = "1435"
       mcc="460"
       mnc="08"
-      apn="cmwap"
-      proxy="10.0.0.172"
-      port="80"
-      type="default,ia,supl"
+      apn="cmnet"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="中国移动彩信 (China Mobile)"
+  <apn carrier="中国移动 (China Mobile) WAP&amp;MMS"
       carrier_id = "1435"
       mcc="460"
       mnc="08"
@@ -33446,62 +33887,194 @@
       mmsproxy="10.0.0.172"
       mmsport="80"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="China Unicom 3G"
+  <apn carrier="中国移动 (China Mobile) NET IMS"
+      carrier_id = "1435"
+      mcc="460"
+      mnc="08"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国联通 (China Unicom) NET"
+      carrier_id = "1436"
+      mcc="460"
+      mnc="09"
       apn="3gnet"
-      carrier_id = "1436"
-      mcc="460"
-      mnc="09"
-      port="80"
-      type="default,ia, supl"/>
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
 
-  <apn carrier="China Unicom wap"
-      apn="3gwap"
+  <apn carrier="中国联通 (China Unicom) WAP&amp;MMS"
       carrier_id = "1436"
       mcc="460"
       mnc="09"
+      apn="3gwap"
       proxy="10.0.0.172"
       port="80"
       mmsproxy="10.0.0.172"
       mmsport="80"
       mmsc="http://mmsc.myuni.com.cn"
-      type="default,ia, mms"/>
+      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
 
-  <apn carrier="ctlte"
+  <apn carrier="中国联通 (China Unicom) NET IMS"
+      carrier_id = "1436"
+      mcc="460"
+      mnc="09"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国电信 (China Telecom) NET"
       carrier_id = "2237"
       mcc="460"
       mnc="11"
-      apn="ctlte"
-      user=""
-      password=""
-      authtype="0"
-      server="*"
-      proxy=""
-      port="80"
-      mmsc=""
-      mmsproxy=""
-      mmsport=""
-      type="default,ia,hipri,supl,fota,cbs"
+      apn="ctnet"
+      type="default,ia,supl,xcap"
       protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="CTWAP"
+  <apn carrier="中国电信 (China Telecom) WAP&amp;MMS"
       carrier_id = "2237"
       mcc="460"
       mnc="11"
       apn="ctwap"
-      user=""
-      password=""
-      authtype="0"
-      server="*"
-      proxy=""
+      proxy="10.0.0.200"
       port="80"
       mmsc="http://mmsc.vnet.mobi"
       mmsproxy="10.0.0.200"
       mmsport="80"
       type="mms"
       protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国电信 (China Telecom) NET IMS"
+      carrier_id = "2237"
+      mcc="460"
+      mnc="11"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国电信 (China Telecom) SOS"
+      carrier_id = "2237"
+      mcc="460"
+      mnc="11"
+      apn="sos"
+      type="emergency"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国移动 (China Mobile) NET"
+      mcc="460"
+      mnc="13"
+      apn="cmnet"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国移动 (China Mobile) MMS"
+      mcc="460"
+      mnc="13"
+      apn="cmwap"
+      proxy="10.0.0.172"
+      port="80"
+      mmsc="http://mmsc.monternet.com"
+      mmsproxy="10.0.0.172"
+      mmsport="80"
+      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国移动 (China Mobile) IMS"
+      mcc="460"
+      mnc="13"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国广电 (CBN) NET"
+      mcc="460"
+      mnc="15"
+      apn="cbnet"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国广电 (CBN) NET MMS"
+      mcc="460"
+      mnc="15"
+      apn="cmwap"
+      proxy="10.0.0.172"
+      port="80"
+      mmsc="http://mmsc.monternet.com"
+      mmsproxy="10.0.0.172"
+      mmsport="80"
+      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国广电 (CBN) NET IMS"
+      mcc="460"
+      mnc="15"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国广电 (CBN) NET"
+      mcc="460"
+      mnc="60"
+      apn="cmnet"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国广电 (CBN) NET MMS"
+      mcc="460"
+      mnc="60"
+      apn="cmwap"
+      proxy="10.0.0.172"
+      port="80"
+      mmsc="http://mmsc.monternet.com"
+      mmsproxy="10.0.0.172"
+      mmsport="80"
+      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="中国广电 (CBN) NET IMS"
+      mcc="460"
+      mnc="60"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="遠傳電信(Far EasTone) (MMS)"
@@ -33513,6 +34086,8 @@
       mmsproxy="210.241.199.199"
       mmsport="9201"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="遠傳電信(Far EasTone) (Internet)"
@@ -33521,52 +34096,118 @@
       mnc="01"
       apn="internet"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="和信電訊(KGT-Online) (Internet)"
+  <apn carrier="遠傳電信(Far EasTone) (IMS)"
       carrier_id = "1881"
       mcc="466"
-      mnc="88"
-      apn="internet"
-      type="default,ia,supl"
+      mnc="01"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
-  <apn carrier="和信電訊(KGT-Online) (MMS)"
+  <apn carrier="遠傳電信(Far EasTone) (XCAP)"
       carrier_id = "1881"
       mcc="466"
-      mnc="88"
-      apn="kgtmms"
-      mmsc="http://mms.kgtmms.net.tw/mms/wapenc"
-      mmsproxy="172.28.33.5"
-      mmsport="8080"
+      mnc="01"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="遠傳電信(Far EasTone) (MMS)"
+      carrier_id = "1881"
+      mcc="466"
+      mnc="02"
+      apn="fetnet01"
+      mmsc="http://mms"
+      mmsproxy="210.241.199.199"
+      mmsport="9201"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="VIBO-vibo"
-      carrier_id = "1886"
+  <apn carrier="遠傳電信(Far EasTone) (Internet)"
+      carrier_id = "1881"
       mcc="466"
-      mnc="89"
-      apn="vibo"
+      mnc="02"
+      apn="internet"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="T Star-internet"
+  <apn carrier="遠傳電信(Far EasTone) (IMS)"
+      carrier_id = "1881"
+      mcc="466"
+      mnc="02"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="遠傳電信(Far EasTone) (XCAP)"
+      carrier_id = "1881"
+      mcc="466"
+      mnc="02"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="亞太電信(APT) (UT)"
+      carrier_id = "1882"
+      mcc="466"
+      mnc="05"
+      apn="gtnet"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="亞太電信(APT) (Internet)"
+      carrier_id = "1882"
+      mcc="466"
+      mnc="05"
+      apn="gtnet"
+      type="default,ia,supl"
+      protocol="IPV4V6"
+   />
+
+  <apn carrier="亞太電信(APT) (IMS)"
+      carrier_id = "1882"
+      mcc="466"
+      mnc="05"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="台灣之星(T Star) (Internet )"
       carrier_id = "1886"
       mcc="466"
       mnc="89"
       apn="internet"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
-  <apn carrier="VIBOONE"
-      carrier_id = "1886"
-      mcc="466"
-      mnc="89"
-      apn="viboone"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="T Star-MMS"
+  <apn carrier="台灣之星(T Star) (MMS)"
       carrier_id = "1886"
       mcc="466"
       mnc="89"
@@ -33575,6 +34216,16 @@
       mmsproxy="172.24.128.36"
       mmsport="8080"
       type="mms"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="台灣之星(T Star) (IMS)"
+      carrier_id = "1886"
+      mcc="466"
+      mnc="89"
+      apn="ims"
+      type="ims"
+      user_visible="false"
   />
 
   <apn carrier="中華電信(Chunghwa) (Internet)"
@@ -33583,6 +34234,7 @@
       mnc="92"
       apn="internet"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="中華電信(Chunghwa) (MMS)"
@@ -33596,23 +34248,26 @@
       type="mms"
   />
 
-  <apn carrier="台灣大哥大(TW Mobile) (Internet)"
-      carrier_id = "1887"
+  <apn carrier="中華電信(Chunghwa) (IMS)"
+      carrier_id = "1884"
       mcc="466"
-      mnc="93"
-      apn="Internet"
-      type="default,ia,supl"
+      mnc="92"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
-  <apn carrier="台灣大哥大(TW Mobile) (MMS)"
-      carrier_id = "1887"
+  <apn carrier="中華電信(Chunghwa) (UT)"
+      carrier_id = "1884"
       mcc="466"
-      mnc="93"
-      apn="MMS"
-      mmsc="http://mms.catch.net.tw"
-      mmsproxy="10.1.1.2"
-      mmsport="80"
-      type="mms"
+      mnc="92"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="台灣大哥大(TW Mobile) (Internet)"
@@ -33621,6 +34276,7 @@
       mnc="97"
       apn="Internet"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="台灣大哥大(TW Mobile) (MMS)"
@@ -33632,6 +34288,27 @@
       mmsproxy="10.1.1.2"
       mmsport="80"
       type="mms"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="台灣大哥大(TW Mobile) (IMS)"
+      carrier_id = "1888"
+      mcc="466"
+      mnc="97"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="台灣大哥大(TW Mobile) (UT)"
+      carrier_id = "1888"
+      mcc="466"
+      mnc="97"
+      apn="hos"
+      type="xcap"
+      user_visible="false"
   />
 
   <apn carrier="台灣大哥大(TW Mobile) (Internet)"
@@ -33640,17 +34317,39 @@
       mnc="99"
       apn="Internet"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="台灣大哥大(TW Mobile) (MMS)"
       carrier_id = "1889"
       mcc="466"
       mnc="99"
-      apn="mms"
+      apn="MMS"
       mmsc="http://mms.catch.net.tw"
       mmsproxy="10.1.1.2"
       mmsport="80"
       type="mms"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="台灣大哥大(TW Mobile) (IMS)"
+      carrier_id = "1889"
+      mcc="466"
+      mnc="99"
+      apn="ims"
+      type="ims"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
+  <apn carrier="台灣大哥大(TW Mobile) (UT)"
+      carrier_id = "1889"
+      mcc="466"
+      mnc="99"
+      apn="hos"
+      type="xcap"
+      user_visible="false"
   />
 
   <apn carrier="GP-INTERNET"
@@ -33723,134 +34422,191 @@
       type="mms"
   />
 
-  <apn carrier="Maxis Internet"
+  <apn carrier="Unifi"
+      carrier_id = "2038"
+      mcc="502"
+      mnc="11"
+      apn="unifi"
+      type="default,ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Maxis Internet &amp; MMS"
       carrier_id = "1628"
       mcc="502"
       mnc="12"
-      apn="max4g"
-      user="maxis"
-      password="wap"
+      apn="unet"
       mmsproxy="202.75.133.49"
       mmsport="80"
       mmsc="http://172.16.74.100:10021/mmsc"
       authtype="1"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="Celcom Internet"
+  <apn carrier="Maxis ims"
+      carrier_id = "1628"
+      mcc="502"
+      mnc="12"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Maxis UT"
+      carrier_id = "1628"
+      mcc="502"
+      mnc="12"
+      apn="hos"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Celcom Internet &amp; MMS"
       carrier_id = "1633"
       mcc="502"
       mnc="13"
-      apn="celcom4g"
+      apn="celcom3g"
       mmsproxy="10.128.1.242"
       mmsport="8080"
       mmsc="http://mms.celcom.net.my"
       type="default,ia,supl,mms"
   />
 
-  <apn carrier="DiGi Internet"
-      carrier_id = "1630"
+  <apn carrier="Maxis Internet &amp; MMS"
       mcc="502"
-      mnc="143"
-      apn="diginet"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="DiGi MMS"
-      carrier_id = "1630"
-      mcc="502"
-      mnc="143"
-      apn="digimms"
-      user="mms"
-      password="mms"
-      mmsc="http://mms.digi.com.my/servlets/mms"
-      mmsproxy="203.92.128.160"
-      mmsport="80"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="Celcom Internet"
-      carrier_id = "1633"
-      mcc="502"
-      mnc="145"
-      apn="celcom4g"
-      mmsproxy="10.128.1.242"
-      mmsport="8080"
-      mmsc="http://mms.celcom.net.my"
-      type="default,ia,supl,mms"
-  />
-
-  <apn carrier="DiGi Internet"
-      carrier_id = "1630"
-      mcc="502"
-      mnc="146"
-      apn="diginet"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="DiGi MMS"
-      carrier_id = "1630"
-      mcc="502"
-      mnc="146"
-      apn="digimms"
-      user="mms"
-      password="mms"
-      mmsc="http://mms.digi.com.my/servlets/mms"
-      mmsproxy="203.92.128.160"
-      mmsport="80"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="Celcom Internet"
-      carrier_id = "1633"
-      mcc="502"
-      mnc="148"
-      apn="celcom4g"
-      mmsproxy="10.128.1.242"
-      mmsport="8080"
-      mmsc="http://mms.celcom.net.my"
-      type="default,ia,supl,mms"
-  />
-
-  <apn carrier="DiGi MMS"
-      carrier_id = "1630"
-      mcc="502"
-      mnc="16"
-      apn="digimms"
-      user="mms"
-      password="mms"
-      mmsc="http://mms.digi.com.my/servlets/mms"
-      mmsproxy="203.92.128.160"
-      mmsport="80"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="DiGi Internet"
-      carrier_id = "1630"
-      mcc="502"
-      mnc="16"
-      apn="diginet"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Maxis Internet"
-      carrier_id = "1631"
-      mcc="502"
-      mnc="17"
-      apn="max4g"
-      user="maxis"
-      password="wap"
+      mnc="142"
+      apn="unet"
       mmsproxy="202.75.133.49"
       mmsport="80"
       mmsc="http://172.16.74.100:10021/mmsc"
       authtype="1"
       type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="U Mobile Internet"
+  <apn carrier="DiGi Internet"
+      carrier_id = "1630"
+      mcc="502"
+      mnc="143"
+      apn="diginet"
+      type="default,ia,supl"
+  />
+
+  <apn carrier="DiGi MMS"
+      carrier_id = "1630"
+      mcc="502"
+      mnc="143"
+      apn="digimms"
+      user="mms"
+      password="mms"
+      mmsc="http://mms.digi.com.my/servlets/mms"
+      mmsproxy="203.92.128.160"
+      mmsport="80"
+      authtype="1"
+      type="mms"
+  />
+
+  <apn carrier="Celcom Internet &amp; MMS"
+      mcc="502"
+      mnc="145"
+      apn="celcom3g"
+      mmsproxy="10.128.1.242"
+      mmsport="8080"
+      mmsc="http://mms.celcom.net.my"
+      type="default,ia,supl,mms"
+  />
+
+  <apn carrier="DiGi Internet"
+      carrier_id = "1630"
+      mcc="502"
+      mnc="146"
+      apn="diginet"
+      type="default,ia,supl"
+  />
+
+  <apn carrier="DiGi MMS"
+      carrier_id = "1630"
+      mcc="502"
+      mnc="146"
+      apn="digimms"
+      user="mms"
+      password="mms"
+      mmsc="http://mms.digi.com.my/servlets/mms"
+      mmsproxy="203.92.128.160"
+      mmsport="80"
+      authtype="1"
+      type="mms"
+  />
+
+  <apn carrier="Maxis Internet &amp; MMS"
+      mcc="502"
+      mnc="147"
+      apn="unet"
+      mmsproxy="202.75.133.49"
+      mmsport="80"
+      mmsc="http://172.16.74.100:10021/mmsc"
+      authtype="1"
+      type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Celcom Internet &amp; MMS"
+      mcc="502"
+      mnc="148"
+      apn="celcom3g"
+      mmsproxy="10.128.1.242"
+      mmsport="8080"
+      mmsc="http://mms.celcom.net.my"
+      type="default,ia,supl,mms"
+  />
+
+  <apn carrier="DiGi MMS"
+      carrier_id = "1630"
+      mcc="502"
+      mnc="16"
+      apn="digimms"
+      user="mms"
+      password="mms"
+      mmsc="http://mms.digi.com.my/servlets/mms"
+      mmsproxy="203.92.128.160"
+      mmsport="80"
+      authtype="1"
+      type="mms"
+  />
+
+  <apn carrier="DiGi Internet"
+      carrier_id = "1630"
+      mcc="502"
+      mnc="16"
+      apn="diginet"
+      authtype="1"
+      type="default,ia,supl"
+  />
+
+  <apn carrier="Maxis Internet &amp; MMS"
+      carrier_id = "1631"
+      mcc="502"
+      mnc="17"
+      apn="unet"
+      mmsproxy="202.75.133.49"
+      mmsport="80"
+      mmsc="http://172.16.74.100:10021/mmsc"
+      authtype="1"
+      type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="U Mobile Internet &amp; MMS"
       carrier_id = "1632"
       mcc="502"
       mnc="18"
@@ -33858,20 +34614,48 @@
       mmsproxy="10.30.5.11"
       mmsport="8080"
       mmsc="http://10.30.3.11/servlets/mms"
+      authtype="1"
       type="default,ia,supl,mms"
   />
 
-  <apn carrier="Celcom Internet"
+  <apn carrier="Celcom Internet &amp; MMS"
       carrier_id = "1633"
       mcc="502"
       mnc="19"
-      apn="celcom4g"
+      apn="celcom3g"
       mmsproxy="10.128.1.242"
       mmsport="8080"
       mmsc="http://mms.celcom.net.my"
+      authtype="0"
       type="default,ia,supl,mms"
   />
 
+  <apn carrier="Yes Internet"
+      carrier_id = "2017"
+      mcc="502"
+      mnc="152"
+      apn="yesnet"
+      type="default,ia,supl"
+  />
+
+  <apn carrier="Yes IMS"
+      carrier_id = "2017"
+      mcc="502"
+      mnc="152"
+      apn="ims"
+      type="ims"
+  />
+
+  <apn carrier="Unifi"
+      carrier_id = "2038"
+      mcc="502"
+      mnc="153"
+      apn="unifi"
+      type="default,ia"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="Telstra IMS"
       carrier_id = "1345"
       mcc="505"
@@ -33888,8 +34672,6 @@
       mnc="01"
       apn="telstra.wap"
       type="default,ia,supl"
-      protocol="IP"
-      roaming_protocol="IP"
   />
 
   <apn carrier="Telstra MMS"
@@ -33901,8 +34683,6 @@
       mmsc="http://mmsc.telstra.com:8002/"
       mmsproxy="10.1.1.180"
       mmsport="80"
-      protocol="IP"
-      roaming_protocol="IP"
   />
 
   <apn carrier="Telstra Tethering"
@@ -33912,7 +34692,6 @@
       apn="telstra.internet"
       type="dun"
       protocol="IPV4V6"
-      roaming_protocol="IP"
   />
 
   <apn carrier="Telstra HOS"
@@ -33920,8 +34699,7 @@
       mcc="505"
       mnc="01"
       apn="hos"
-      protocol="IP"
-      roaming_protocol="IP"
+      type="xcap"
   />
 
   <apn carrier="Optus Yes Internet"
@@ -33977,16 +34755,35 @@
       type="default,ia,supl,mms"
   />
 
-  <apn carrier="Planet 3"
-      carrier_id = "1348"
+  <apn carrier="Vodafone IMS"
+      carrier_id = "15"
       mcc="505"
-      mnc="06"
-      apn="3services"
-      authtype="0"
-      mmsc="http://mmsc.three.net.au:10021/mmsc"
-      mmsproxy="10.176.57.25"
-      mmsport="8799"
-      protocol="IP"
+      mnc="03"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Lebara Internet"
+      mcc="505"
+      mnc="03"
+      apn="purtona.net"
+      type="default,ia,supl"
+      mvno_match_data="01"
+      mvno_type="gid"
+  />
+
+  <apn carrier="Lebara MMS"
+      mcc="505"
+      mnc="03"
+      apn="purtona.wap"
+      mmsc="http://purtona.mms/mmssend"
+      mmsproxy="10.202.2.20"
+      mmsport="8080"
+      type="mms"
+      mvno_match_data="01"
+      mvno_type="gid"
   />
 
   <apn carrier="VF AU PXT"
@@ -34241,17 +35038,7 @@
       type="mms"
   />
 
-  <apn carrier="Vodafone Live!"
-      carrier_id = "1349"
-      mcc="505"
-      mnc="99"
-      apn="live.vodafone.com"
-      mmsc="http://pxt.vodafone.net.au/pxtsend"
-      mmsproxy="10.202.2.60"
-      mmsport="8080"
-  />
-
-  <apn carrier="indosatgprs"
+  <apn carrier="Internet"
       carrier_id = "1537"
       mcc="510"
       mnc="01"
@@ -34274,16 +35061,7 @@
       type="mms"
   />
 
-  <apn carrier="AXIS-SNS"
-      carrier_id = "788"
-      mcc="510"
-      mnc="08"
-      apn="AXIS"
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="AXISwap"
+  <apn carrier="AXIS"
       carrier_id = "788"
       mcc="510"
       mnc="08"
@@ -34310,7 +35088,18 @@
       authtype="1"
   />
 
-  <apn carrier="internet"
+  <apn carrier="Smartfren4G"
+      carrier_id = "1978"
+      mcc="510"
+      mnc="09"
+      apn="Smartfren4G"
+      user="smartfren"
+      password="smartfren"
+      type="default,ia"
+      authtype="3"
+  />
+
+  <apn carrier="Internet"
       carrier_id = "787"
       mcc="510"
       mnc="10"
@@ -34318,19 +35107,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="TSEL-WAP"
-      carrier_id = "787"
-      mcc="510"
-      mnc="10"
-      apn="telkomsel"
-      user="wap"
-      password="wap123"
-      authtype="1"
-      proxy="10.1.89.130"
-      port="8000"
-      type="default,ia,supl"
-  />
-
   <apn carrier="TSEL-MMS"
       carrier_id = "787"
       mcc="510"
@@ -34368,7 +35144,7 @@
       type="mms"
   />
 
-  <apn carrier="Indosat-SNS"
+  <apn carrier="Internet"
       carrier_id = "789"
       mcc="510"
       mnc="21"
@@ -34377,19 +35153,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Indosat GPRS"
-      carrier_id = "789"
-      mcc="510"
-      mnc="21"
-      apn="indosatgprs"
-      user="indosat"
-      password="indosat"
-      authtype="1"
-      proxy="10.19.19.19"
-      port="8080"
-      type="default,ia,supl"
-  />
-
   <apn carrier="Indosat MMS"
       carrier_id = "789"
       mcc="510"
@@ -34404,13 +35167,15 @@
       type="mms"
   />
 
-  <apn carrier="3-SNS"
-      carrier_id = "1966"
+  <apn carrier="Smartfren4G"
+      carrier_id = "1978"
       mcc="510"
-      mnc="89"
-      apn="3gprs"
-      authtype="1"
-      type="default,ia,supl"
+      mnc="28"
+      apn="Smartfren4G"
+      user="smartfren"
+      password="smartfren"
+      type="default,ia"
+      authtype="3"
   />
 
   <apn carrier="3GPRS"
@@ -34478,16 +35243,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="myGlobe Connect"
-      carrier_id = "1653"
-      mcc="515"
-      mnc="02"
-      apn="www.globe.com.ph"
-      proxy="203.177.42.214"
-      port="8080"
-      type="default,ia,supl"
-  />
-
   <apn carrier="myGlobe MMS"
       carrier_id = "1653"
       mcc="515"
@@ -34499,14 +35254,6 @@
       type="mms"
   />
 
-  <apn carrier="SMARTLTE"
-      carrier_id = "1654"
-      mcc="515"
-      mnc="03"
-      apn="smartlte"
-      type="default,ia,supl"
-  />
-
   <apn carrier="SMART INTERNET"
       carrier_id = "1654"
       mcc="515"
@@ -34515,16 +35262,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Smart GPRS"
-      carrier_id = "1654"
-      mcc="515"
-      mnc="03"
-      apn="Smart1"
-      proxy="10.102.61.46"
-      port="8080"
-      type="default,ia,supl"
-  />
-
   <apn carrier="Smart MMS"
       carrier_id = "1654"
       mcc="515"
@@ -34544,32 +35281,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="SUN WAP GPRS"
-      carrier_id = "1655"
-      mcc="515"
-      mnc="05"
-      apn="wap"
-      proxy="202.138.159.78"
-      port="8080"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Sun SBW"
-      carrier_id = "1655"
-      mcc="515"
-      mnc="05"
-      apn="fbband"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Sun Streaming"
-      carrier_id = "1655"
-      mcc="515"
-      mnc="05"
-      apn="minternet"
-      type="default,ia,supl"
-  />
-
   <apn carrier="SUN MMS"
       carrier_id = "1655"
       mcc="515"
@@ -34600,27 +35311,8 @@
       type="mms"
   />
 
-  <apn carrier="CAT3G INTERNET"
-      carrier_id = "1096"
-      mcc="520"
-      mnc="00"
-      apn="internet"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="CAT3G MMS"
-      carrier_id = "1096"
-      mcc="520"
-      mnc="00"
-      apn="catmms"
-      mmsc="http://mms.cat3g.com:8002/"
-      mmsproxy="10.4.7.39"
-      mmsport="8080"
-      type="mms"
-  />
-
   <apn carrier="TRUE-H INTERNET"
-      carrier_id = "2336"
+      carrier_id = "1997"
       mcc="520"
       mnc="00"
       apn="internet"
@@ -34628,12 +35320,10 @@
       password="true"
       authtype="1"
       type="default,ia,supl"
-      mvno_match_data="01"
-      mvno_type="gid"
   />
 
   <apn carrier="TRUE-H MMS"
-      carrier_id = "2336"
+      carrier_id = "1997"
       mcc="520"
       mnc="00"
       apn="hmms"
@@ -34644,8 +35334,28 @@
       mmsproxy="10.4.7.39"
       mmsport="8080"
       type="mms"
-      mvno_match_data="01"
-      mvno_type="gid"
+  />
+
+  <apn carrier="TRUE IMS"
+      carrier_id = "1997"
+      mcc="520"
+      mnc="00"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="TRUE UT"
+      carrier_id = "1997"
+      mcc="520"
+      mnc="00"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
   />
 
   <apn carrier="AIS Internet"
@@ -34668,6 +35378,28 @@
       type="mms"
   />
 
+  <apn carrier="AIS IMS"
+      carrier_id = "1097"
+      mcc="520"
+      mnc="01"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="AIS UT"
+      carrier_id = "1097"
+      mcc="520"
+      mnc="01"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
   <apn carrier="AIS Internet"
       carrier_id = "1098"
       mcc="520"
@@ -34675,6 +35407,7 @@
       apn="internet"
       authtype="0"
       type="default,ia,supl"
+      protocol="IPV4V6"
   />
 
   <apn carrier="AIS MMS"
@@ -34688,6 +35421,28 @@
       type="mms"
   />
 
+  <apn carrier="AIS IMS"
+      carrier_id = "1098"
+      mcc="520"
+      mnc="03"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="AIS UT"
+      carrier_id = "1098"
+      mcc="520"
+      mnc="03"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
   <apn carrier="TRUE-H INTERNET"
       carrier_id = "1997"
       mcc="520"
@@ -34713,6 +35468,28 @@
       type="mms"
   />
 
+  <apn carrier="TRUE IMS"
+      carrier_id = "1997"
+      mcc="520"
+      mnc="04"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="TRUE UT"
+      carrier_id = "1997"
+      mcc="520"
+      mnc="04"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="dtac Internet"
       carrier_id = "1897"
       mcc="520"
@@ -34732,6 +35509,28 @@
       type="mms"
   />
 
+  <apn carrier="dtac IMS"
+      carrier_id = "1897"
+      mcc="520"
+      mnc="05"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="dtac UT"
+      carrier_id = "1897"
+      mcc="520"
+      mnc="05"
+      apn="XCAP"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="TOT 3G Internet"
       carrier_id = "1723"
       mcc="520"
@@ -34751,6 +35550,28 @@
       type="mms"
   />
 
+  <apn carrier="TOT IMS"
+      carrier_id = "1723"
+      mcc="520"
+      mnc="15"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="TOT UT"
+      carrier_id = "1723"
+      mcc="520"
+      mnc="15"
+      apn="xcap"
+      type="xcap"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+      user_visible="false"
+  />
+
   <apn carrier="dtac MMS"
       carrier_id = "1896"
       mcc="520"
@@ -34770,6 +35591,69 @@
       type="default,ia,supl"
   />
 
+  <apn carrier="dtac IMS"
+      carrier_id = "1896"
+      mcc="520"
+      mnc="18"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="dtac UT"
+      carrier_id = "1896"
+      mcc="520"
+      mnc="18"
+      apn="XCAP"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="dtac Internet"
+      carrier_id = "2413"
+      mcc="520"
+      mnc="47"
+      apn="www.dtac.co.th"
+      type="default,ia,supl"
+  />
+
+  <apn carrier="dtac MMS"
+      carrier_id = "2413"
+      mcc="520"
+      mnc="47"
+      apn="mms"
+      mmsc="http://mms2.dtac.co.th:8002/"
+      mmsproxy="10.10.10.10"
+      mmsport="8080"
+      type="mms"
+  />
+
+  <apn carrier="dtac IMS"
+      carrier_id = "2413"
+      mcc="520"
+      mnc="47"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="dtac UT"
+      carrier_id = "2413"
+      mcc="520"
+      mnc="47"
+      apn="XCAP"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
   <apn carrier="TRUE INTERNET"
       carrier_id = "1898"
       mcc="520"
@@ -35101,14 +35985,12 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="PNG WAP"
+  <apn carrier="Digicel PNG LTE"
       carrier_id = "1651"
       mcc="537"
       mnc="03"
-      apn="wap.digicelpng.com"
-      proxy="10.149.83.116"
-      port="8080"
-      type="default,ia,supl"
+      apn="lte"
+      type="default,ia"
   />
 
   <apn carrier="PNG WEB"
@@ -35116,19 +35998,7 @@
       mcc="537"
       mnc="03"
       apn="internet.digicelpng.com"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Papua New Guinea:Digicel:Modem"
-      carrier_id = "1651"
-      mcc="537"
-      mnc="03"
-      apn="wap.digicel.com.pg"
-      type="dun"
-      authtype="1"
-      mmsc="http://wapdigicel.com"
-      proxy="10.149.122.12"
-      port="8080"
+      type="default,ia"
   />
 
   <apn carrier="PNG MMS"
@@ -35172,20 +36042,8 @@
       carrier_id = "2220"
       mcc="539"
       mnc="88"
-      apn="default"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Tonga:Digicel:Modem"
-      carrier_id = "2220"
-      mcc="539"
-      mnc="88"
-      apn="wap"
-      type="dun"
-      authtype="1"
-      mmsc="http://wapdigicel.com"
-      proxy="172.16.7.12"
-      port="8080"
+      apn="web.digicelpacific.com"
+      type="default,ia"
   />
 
   <apn carrier="Tonga:Digicel:Mms"
@@ -35236,20 +36094,8 @@
       carrier_id = "2219"
       mcc="541"
       mnc="05"
-      apn="default"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Vanatu:Digicel:Modem"
-      carrier_id = "2219"
-      mcc="541"
-      mnc="05"
-      apn="wap"
-      type="dun"
-      authtype="1"
-      mmsc="http://wapdigicel.com"
-      proxy="172.16.7.12"
-      port="8080"
+      apn="web.digicelpacific.com"
+      type="default,ia"
   />
 
   <apn carrier="Vanatu:Digicel:Mms"
@@ -35276,20 +36122,8 @@
       carrier_id = "2186"
       mcc="542"
       mnc="02"
-      apn="default"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Fiji:Digicel:Modem"
-      carrier_id = "2186"
-      mcc="542"
-      mnc="02"
-      apn="wap"
-      type="dun"
-      authtype="1"
-      mmsc="http://wapdigicel.com"
-      proxy="172.16.7.12"
-      port="8080"
+      apn="web.digicelpacific.com"
+      type="default,ia"
   />
 
   <apn carrier="Fiji:Digicel:Mms"
@@ -35407,16 +36241,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Mobinil WAP"
-      carrier_id = "675"
-      mcc="602"
-      mnc="01"
-      apn="mobinilwap"
-      proxy="62.241.155.45"
-      port="8080"
-      type="default,ia,supl"
-  />
-
   <apn carrier="Mobinil MMS"
       carrier_id = "675"
       mcc="602"
@@ -35439,19 +36263,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Vodafone WAP"
-      carrier_id = "2380"
-      mcc="602"
-      mnc="02"
-      apn="wap.vodafone.com.eg"
-      user="wap"
-      password="wap"
-      authtype="3"
-      proxy="163.121.178.2"
-      port="8080"
-      type="default,ia,supl"
-  />
-
   <apn carrier="Vodafone MMS"
       carrier_id = "2380"
       mcc="602"
@@ -35466,14 +36277,13 @@
       type="mms"
   />
 
-  <apn carrier="Etisalat WAP"
+  <apn carrier="Etisalat Internet"
       carrier_id = "1968"
       mcc="602"
       mnc="03"
       apn="etisalat"
-      proxy="10.71.130.29"
-      port="8080"
-      type="default,ia,supl"
+      type="default,ia"
+      protocol="IPV4V6"
   />
 
   <apn carrier="Etisalat MMS"
@@ -36225,25 +37035,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Glo"
-      mcc="620"
-      mnc="0"
-      apn="glowap"
-      authtype="0"
-      type="default,ia,supl,fota,dun"
-  />
-
-  <apn carrier="Glo mms"
-      mcc="620"
-      mnc="0"
-      apn="glo mms"
-      authtype="0"
-      mmsc="http://mms.gloworld.com/mms"
-      mmsproxy="10.161.85.4"
-      mmsport="8799"
-      type="mms"
-  />
-
   <apn carrier="MTN Internet GH"
       apn="internet"
       carrier_id = "1515"
@@ -37284,6 +38075,14 @@
       mvno_type="gid"
   />
 
+  <apn carrier="SFR LTE"
+      carrier_id = "1008"
+      mcc="647"
+      mnc="10"
+      apn=""
+      type="ia"
+  />
+
   <apn carrier="SFR webphone"
       carrier_id = "1008"
       mcc="647"
@@ -37292,7 +38091,7 @@
       mmsport="8080"
       mmsproxy="10.0.224.145"
       mmsc="http://mms"
-      type="default,ia,supl,hipri,mms"
+      type="default,supl,hipri,mms"
   />
 
   <apn carrier="MMS"
@@ -37476,15 +38275,22 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="MMS.Vodacom"
+  <apn carrier="Vodacom"
       carrier_id = "24"
       mcc="655"
       mnc="01"
-      apn="mms.vodacom.net"
-      mmsc="http://mmsc.vodacom4me.co.za"
-      mmsproxy="196.6.128.13"
-      mmsport="8080"
-      type="mms"
+      apn="IMS"
+      type="ims"
+      protocol="IPV4V6"
+  />
+
+  <apn carrier="Vodacom"
+      carrier_id = "24"
+      mcc="655"
+      mnc="01"
+      apn="xcap"
+      type="xcap"
+      user_visible="false"
   />
 
   <apn carrier="Telkom Mobile Internet"
@@ -37511,8 +38317,6 @@
       mcc="655"
       mnc="07"
       apn="internet"
-      proxy="196.31.116.250"
-      port="8080"
       type="default,ia,supl"
   />
 
@@ -37577,14 +38381,11 @@
       mvno_type="imsi"
   />
 
-  <apn carrier="MTN GPRS"
+  <apn carrier="myMTN"
       carrier_id = "1309"
       mcc="655"
       mnc="10"
       apn="myMTN"
-      user="mtnwap"
-      password="mtnwap"
-      authtype="1"
       type="default,ia,supl"
   />
 
@@ -37602,6 +38403,24 @@
       type="mms"
   />
 
+  <apn carrier="MTN IMS"
+      carrier_id = "1309"
+      mcc="655"
+      mnc="10"
+      apn="IMS"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="MTN XCAP"
+      carrier_id = "1309"
+      mcc="655"
+      mnc="10"
+      apn="hos"
+      type="xcap"
+  />
+
   <apn carrier="Lycamobile"
       mcc="655"
       mnc="53"
@@ -37642,7 +38461,7 @@
       carrier_id = "1520"
       mcc="704"
       mnc="01"
-      apn="internet.ideasclaro"
+      apn="ba.amx"
       type="default,ia,supl"
   />
 
@@ -37651,9 +38470,10 @@
       mcc="704"
       mnc="01"
       apn="mms.ideasclaro"
-      mmsproxy="216.230.133.66"
+      authtype="1"
+      mmsproxy="10.6.32.2"
       mmsport="8080"
-      mmsc="http://mms.ideasclaro.com:8002"
+      mmsc="http://10.6.32.27/servlets/mms"
       type="mms"
   />
 
@@ -37663,6 +38483,8 @@
       mnc="02"
       apn="broadband.tigo.gt"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="MMS TIGO"
@@ -37674,6 +38496,8 @@
       mmsport="8888"
       mmsc="http://mms"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Movistar INTERNET"
@@ -37685,45 +38509,8 @@
       password="movistargt"
       authtype="1"
       type="default,ia,supl"
-  />
-
-  <apn carrier="Movistar MMS"
-      carrier_id = "1522"
-      mcc="704"
-      mnc="03"
-      apn="mms.movistar.gt"
-      user="movistargt"
-      password="movistargt"
-      mmsproxy="10.12.22.1"
-      mmsport="80"
-      mmsc="http://mms.movistar.gt"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="Movistar INTERNET"
-      carrier_id = "1522"
-      mcc="704"
-      mnc="030"
-      apn="internet.movistar.gt"
-      user="movistargt"
-      password="movistargt"
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Movistar MMS"
-      carrier_id = "1522"
-      mcc="704"
-      mnc="030"
-      apn="mms.movistar.gt"
-      user="movistargt"
-      password="movistargt"
-      mmsproxy="10.12.22.1"
-      mmsport="80"
-      mmsc="http://mms.movistar.gt"
-      authtype="1"
-      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Internet CLARO"
@@ -37739,9 +38526,9 @@
       mcc="706"
       mnc="01"
       apn="mms.ideasclaro"
-      mmsproxy="216.230.133.66"
+      mmsproxy="10.6.32.2"
       mmsport="8080"
-      mmsc="http://mms.ideasclaro.com:8002"
+      mmsc="http://10.6.32.27/servlets/mms"
       type="mms"
   />
 
@@ -37760,7 +38547,7 @@
       apn="wap.digicelsv.com"
       mmsproxy="172.26.5.12"
       mmsport="8080"
-      mmsc="http://mmc.digiceljamaica.com/servlets/mms"
+      mmsc="http://172.26.5.132/servlets/mms"
       type="mms"
   />
 
@@ -37790,47 +38577,10 @@
       apn="internet.movistar.sv"
       user="movistarsv"
       password="movistarsv"
-      authtype="1"
+      authtype="0"
       type="default,ia,supl"
-  />
-
-  <apn carrier="Movistar MMS"
-      carrier_id = "2009"
-      mcc="706"
-      mnc="04"
-      apn="mms.movistar.sv"
-      user="movistarsv"
-      password="movistarsv"
-      mmsproxy="10.12.20.1"
-      mmsport="80"
-      mmsc="http://mms.movistar.sv"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="Movistar INTERNET"
-      carrier_id = "2009"
-      mcc="706"
-      mnc="040"
-      apn="internet.movistar.sv"
-      user="movistarsv"
-      password="movistarsv"
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Movistar MMS"
-      carrier_id = "2009"
-      mcc="706"
-      mnc="040"
-      apn="mms.movistar.sv"
-      user="movistarsv"
-      password="movistarsv"
-      mmsproxy="10.12.20.1"
-      mmsport="80"
-      mmsc="http://mms.movistar.sv"
-      authtype="1"
-      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Internet Claro"
@@ -37880,28 +38630,16 @@
       type='default,ia'
   />
 
-  <apn carrier='Honduras:Digicel:Mms'
+  <apn carrier="Honduras:Digicel:Mms"
       carrier_id = "2248"
-      mcc='708'
-      mnc='04'
-      apn='wap.digicelhn.com'
-      authtype='1'
-      mmsc='http://mms.digicelsv.com/servlets/mms'
-      mmsproxy='172.26.5.12'
-      mmsport='9201'
-      type='mms'
-  />
-
-  <apn carrier='Honduras:Digicel:Modem'
-      carrier_id = "2248"
-      mcc='708'
-      mnc='04'
-      apn='wap.digicelhn.com'
-      port='8080'
-      authtype='1'
-      proxy='172.26.5.12'
-      mmsc='http://www.digicelive.com'
-      type='dun'
+      mcc="708"
+      mnc="04"
+      apn="wap.digicelhn.com"
+      authtype="1"
+      mmsc="http://172.026.005.132/servlets/mms"
+      mmsproxy="172.26.5.12"
+      mmsport="8080"
+      type="mms"
   />
 
   <apn carrier="INTERNET TIGO"
@@ -37932,41 +38670,34 @@
       type='default,ia'
   />
 
-  <apn carrier='Honduras:Digicel:Mms:2'
+  <apn carrier="Honduras:Digicel:Mms:2"
       carrier_id = "2248"
-      mcc='708'
-      mnc='040'
-      apn='wap.digicelhn.com'
-      authtype='1'
-      mmsc='http://mms.digicelsv.com/servlets/mms'
-      mmsproxy='172.26.5.12'
-      mmsport='9201'
-      type='mms'
+      mcc="708"
+      mnc="040"
+      apn="wap.digicelhn.com"
+      authtype="1"
+      mmsc="http://172.026.005.132/servlets/mms"
+      mmsproxy="172.26.5.12"
+      mmsport="8080"
+      type="mms"
   />
 
-  <apn carrier="Enitel WEB"
+  <apn carrier="Internet CLARO"
       carrier_id = "1641"
       mcc="710"
       mnc="21"
-      apn="internet.ideasalo.ni"
-      user="internet"
-      password="internet"
-      authtype="1"
+      apn="internet.ideasclaro"
       type="default,ia,supl"
   />
 
-
-  <apn carrier="Enitel MMS"
+  <apn carrier="Claro MMS"
       carrier_id = "1641"
       mcc="710"
       mnc="21"
-      apn="mms.indeasalo.ni"
-      user="mms"
-      password="mms"
+      apn="mms.ideasclaro"
       mmsproxy="10.6.32.2"
       mmsport="8080"
       mmsc="http://10.6.32.27/servlets/mms"
-      authtype="1"
       type="mms"
   />
 
@@ -37977,22 +38708,10 @@
       apn="internet.movistar.ni"
       user="movistarni"
       password="movistarni"
-      authtype="1"
+      authtype="0"
       type="default,ia,supl"
-  />
-
-  <apn carrier="Movistar MMS"
-      carrier_id = "2010"
-      mcc="710"
-      mnc="30"
-      apn="mms.movistar.ni"
-      user="movistarni"
-      password="movistarni"
-      mmsproxy="10.12.23.1"
-      mmsport="80"
-      mmsc="http://mms.movistar.ni"
-      authtype="1"
-      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Yota Nicaragua Internet"
@@ -38003,80 +38722,22 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Movistar INTERNET"
-      carrier_id = "2010"
-      mcc="710"
-      mnc="300"
-      apn="internet.movistar.ni"
-      user="movistarni"
-      password="movistarni"
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Movistar MMS"
-      carrier_id = "2010"
-      mcc="710"
-      mnc="300"
-      apn="mms.movistar.ni"
-      user="movistarni"
-      password="movistarni"
-      mmsproxy="10.12.23.1"
-      mmsport="80"
-      mmsc="http://mms.movistar.ni"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="Enitel WEB"
+  <apn carrier="Internet CLARO"
       carrier_id = "1642"
       mcc="710"
       mnc="73"
-      apn="internet.ideasalo.ni"
-      user="internet"
-      password="internet"
-      authtype="1"
+      apn="internet.ideasclaro"
       type="default,ia,supl"
   />
 
-
-  <apn carrier="Enitel MMS"
+  <apn carrier="Claro MMS"
       carrier_id = "1642"
       mcc="710"
       mnc="73"
-      apn="mms.indeasalo.ni"
-      user="mms"
-      password="mms"
+      apn="mms.ideasclaro"
       mmsproxy="10.6.32.2"
       mmsport="8080"
       mmsc="http://10.6.32.27/servlets/mms"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="Enitel WEB"
-      carrier_id = "1642"
-      mcc="710"
-      mnc="730"
-      apn="internet.ideasalo.ni"
-      user="internet"
-      password="internet"
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-
-  <apn carrier="Enitel MMS"
-      carrier_id = "1642"
-      mcc="710"
-      mnc="730"
-      apn="mms.indeasalo.ni"
-      user="mms"
-      password="mms"
-      mmsproxy="10.6.32.2"
-      mmsport="8080"
-      mmsc="http://10.6.32.27/servlets/mms"
-      authtype="1"
       type="mms"
   />
 
@@ -38088,18 +38749,7 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Costar Rica:Kolbi:Modem"
-      carrier_id = "627"
-      mcc="712"
-      mnc="01"
-      apn="kolbi"
-      type="dun"
-      authtype="1"
-      mmsc="http://mimundokolbi.ice.cr"
-      mmsport="8080"
-  />
-
-  <apn carrier="Kolbi_Multimedia"
+  <apn carrier="Kolbi MMS"
       carrier_id = "627"
       mcc="712"
       mnc="01"
@@ -38110,7 +38760,7 @@
       type="mms"
   />
 
-  <apn carrier="KOLBI 3G"
+  <apn carrier="Kolbi Internet"
       carrier_id = "627"
       mcc="712"
       mnc="02"
@@ -38118,7 +38768,7 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Kolbi_Multimedia"
+  <apn carrier="Kolbi MMS"
       carrier_id = "627"
       mcc="712"
       mnc="02"
@@ -38129,26 +38779,24 @@
       type="mms"
   />
 
-  <apn carrier="Internet CLARO CR"
+  <apn carrier="Internet CLARO"
       carrier_id = "1953"
       mcc="712"
       mnc="03"
       apn="internet.ideasclaro"
-      user=""
-      password=""
+      authtype="0"
       type="default,ia,supl"
   />
 
-  <apn carrier="MMS CLARO CR"
+  <apn carrier="MMS CLARO"
       carrier_id = "1953"
       mcc="712"
       mnc="03"
       apn="mms.ideasclaro"
-      user=""
-      password=""
       mmsproxy="216.230.133.66"
       mmsport="8080"
       mmsc="http://mms.ideasclaro.com:8002"
+      authtype="0"
       type="mms"
   />
 
@@ -38159,67 +38807,10 @@
       apn="internet.movistar.cr"
       user="movistarcr"
       password="movistarcr"
-      authtype="1"
+      authtype="0"
       type="default,ia,supl"
-  />
-
-  <apn carrier="Movistar MMS"
-      carrier_id = "2003"
-      mcc="712"
-      mnc="04"
-      apn="mms.movistar.cr"
-      user="movistarcr"
-      password="movistarcr"
-      mmsproxy="10.221.79.83"
-      mmsport="80"
-      mmsc="http://mms.movistar.cr"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="Internet Tuyo"
-      carrier_id = "2267"
-      mcc="712"
-      mnc="019"
-      apn="tm7datos"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="MMS Tuyo"
-      carrier_id = "2267"
-      mcc="712"
-      mnc="019"
-      apn="tm7mms"
-      mmsproxy="10.186.181.5"
-      mmsport="3128"
-      mmsc="http://mmsc.tuyomovil.com:1981"
-      type="mms"
-  />
-
-  <apn carrier="Internet Tuyo"
-      carrier_id = "2267"
-      mcc="712"
-      mnc="190"
-      apn="tm7datos"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="MMS Tuyo"
-      carrier_id = "2267"
-      mcc="712"
-      mnc="190"
-      apn="tm7mms"
-      mmsproxy="10.186.181.5"
-      mmsport="3128"
-      mmsc="http://mmsc.tuyomovil.com:1981"
-      type="mms"
-  />
-
-  <apn carrier="Internet Fullmovil"
-      mcc="712"
-      mnc="20"
-      apn="datos.fullmovil.cr"
-      type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Internet"
@@ -38248,47 +38839,10 @@
       apn="internet.movistar.pa"
       user="movistarpa"
       password="movistarpa"
-      authtype="1"
+      authtype="0"
       type="default,ia,supl"
-  />
-
-  <apn carrier="Movistar MMS"
-      carrier_id = "974"
-      mcc="714"
-      mnc="02"
-      apn="mms.movistar.pa"
-      user="movistarpamms"
-      password="movistarpa"
-      mmsproxy="10.12.21.1"
-      mmsport="80"
-      mmsc="http://mms.movistar.pa"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="Movistar INTERNET"
-      carrier_id = "974"
-      mcc="714"
-      mnc="020"
-      apn="internet.movistar.pa"
-      user="movistarpa"
-      password="movistarpa"
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Movistar MMS"
-      carrier_id = "974"
-      mcc="714"
-      mnc="020"
-      apn="mms.movistar.pa"
-      user="movistarpamms"
-      password="movistarpa"
-      mmsproxy="10.12.21.1"
-      mmsport="80"
-      mmsc="http://mms.movistar.pa"
-      authtype="1"
-      type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="WEB Claro"
@@ -38298,24 +38852,10 @@
       apn="web.claro.com.pa"
       user="CLAROWEB"
       password="CLAROWEB"
-      authtype="1"
+      authtype="0"
       type="default,ia,supl"
   />
 
-  <apn carrier="MMS Claro"
-      carrier_id = "1925"
-      mcc="714"
-      mnc="03"
-      apn="mms.claro.com.pa"
-      user="CLAROMMS"
-      password="CLAROMMS"
-      mmsproxy="10.240.3.129"
-      mmsport="8799"
-      mmsc="http://www.claro.com.pa/mms/"
-      authtype="1"
-      type="mms"
-  />
-
   <apn carrier="Digicel Internet"
       carrier_id = "1926"
       mcc="714"
@@ -38335,27 +38875,6 @@
       type="mms"
   />
 
-  <apn carrier='Panama:Digicel:Internet:2'
-      carrier_id = "1926"
-      mcc='714'
-      mnc='040'
-      apn='web.digicelpanama.com'
-      authtype='1'
-      type='default,ia'
-  />
-
-  <apn carrier='Panama:Digicel:Mms:2'
-      carrier_id = "1926"
-      mcc='714'
-      mnc='040'
-      apn='wap.digicelpanama.com'
-      authtype='1'
-      mmsc='http://mmc.digicelpanama.com/servlets/mms'
-      mmsproxy='172.27.99.99'
-      mmsport='9201'
-      type='mms'
-  />
-
   <apn carrier="Movistar INTERNET"
       carrier_id = "1929"
       mcc="716"
@@ -38364,21 +38883,19 @@
       user="movistar@datos"
       password="movistar"
       authtype="1"
-      type="default,ia,supl"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="Movistar MMS"
+  <apn carrier="IMS"
       carrier_id = "1929"
       mcc="716"
       mnc="06"
-      apn="mms.movistar.pe"
-      user="movistar@mms"
-      password="movistar"
-      mmsproxy="200.4.196.118"
-      mmsport="8080"
-      mmsc="http://mmsc.telefonicamovistar.com.pe:8088/mms/"
-      authtype="1"
-      type="mms"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="CLARO DATOS"
@@ -38389,7 +38906,9 @@
       user="claro"
       password="claro"
       authtype="1"
-      type="default,ia,supl"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="CLARO MMS"
@@ -38404,6 +38923,18 @@
       mmsc="http://claro/servlets/mms"
       authtype="1"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Claro PE IMS"
+      carrier_id = "1647"
+      mcc="716"
+      mnc="10"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Bitel - Internet"
@@ -38437,33 +38968,18 @@
       mnc="17"
       apn="entel.pe"
       authtype="0"
-      type="default,ia,dun"
+      type="default,ia,supl,xcap"
       protocol="IP"
   />
 
-  <apn carrier="Entel MMS"
+  <apn carrier="Entel PE IMS"
       carrier_id = "1930"
       mcc="716"
       mnc="17"
-      apn="mms.entel.pe"
-      mmsc="http://mms.entel.pe"
-      mmsproxy="10.0.215.74"
-      mmsport="8080"
-      authtype="0"
-      type="mms"
-      protocol="IP"
-  />
-
-  <apn carrier="Entel Location"
-      carrier_id = "1930"
-      mcc="716"
-      mnc="17"
-      apn="location.entel.pe"
-      port="7275"
-      server="http://location.entel.pe"
-      authtype="0"
-      type="supl"
-      protocol="IP"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Servicio_WEB"
@@ -38506,6 +39022,17 @@
       authtype="1"
       type="default,ia,supl"
       protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Movistar AR IMS"
+      carrier_id = "1337"
+      mcc="722"
+      mnc="07"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Movistar MMS"
@@ -38520,15 +39047,8 @@
       mmsc="http://mms.movistar.com.ar"
       authtype="1"
       type="mms"
-  />
-
-  <apn carrier="Claro AR"
-      carrier_id = "1338"
-      mcc="722"
-      mnc="31"
-      apn="igprs.claro.com.ar"
-      mmsc="http://mms.claro.com.ar"
-      type="default,ia,supl,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Claro AR"
@@ -38537,7 +39057,20 @@
       mnc="310"
       apn="igprs.claro.com.ar"
       mmsc="http://mms.claro.com.ar"
-      type="default,ia,supl,mms"
+      type="default,ia,supl,mms,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Claro AR IMS"
+      carrier_id = "1338"
+      mcc="722"
+      mnc="310"
+      apn="ims"
+      type="ims"
+      authtype="0"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
   />
 
   <apn carrier="Personal Datos"
@@ -38547,19 +39080,8 @@
       apn="datos.personal.com"
       user="datos"
       password="datos"
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Argentina:Personal:DUN"
-      carrier_id = "1341"
-      mcc="722"
-      mnc="34"
-      apn="internet.personal.com"
-      type="dun"
-      user="internet"
-      password="internet"
       authtype="0"
+      type="default,ia,supl,xcap"
   />
 
   <apn carrier="Personal MMS"
@@ -38572,67 +39094,18 @@
       mmsproxy="172.25.7.31"
       mmsport="8080"
       mmsc="http://mms.personal.com"
-      authtype="1"
+      authtype="0"
       type="mms"
   />
 
-  <apn carrier='Argentina:Nuestro:MMS'
-      carrier_id = "2250"
-      mcc='722'
-      mnc='36'
-      apn='mms.nuestro.com.ar'
-      authtype='0'
-      mmsc='http://mms.nuestro.com.ar'
-      mmsproxy='172.16.0.20'
-      mmsport='8080'
-      type='mms'
-      user='mms'
-  />
-
-  <apn carrier='Argentina:Nuestro:Internet'
-      carrier_id = "2250"
-      mcc='722'
-      mnc='36'
-      apn='gprs.nuestro.com.ar'
-      authtype='0'
-      type='default,ia'
-      user='gprs'
-  />
-
-  <apn carrier='Argentina:Personal :Datos'
+  <apn carrier="Personal IMS"
       carrier_id = "1341"
-      mcc='722'
-      mnc='340'
-      apn='datos.personal.com'
-      authtype='0'
-      type='default,ia'
-      user='gprs'
-      password='adgj'
-  />
-
-  <apn carrier='Argentina:Personal :DUN'
-      carrier_id = "1341"
-      mcc='722'
-      mnc='340'
-      apn='internet.personal.com'
-      authtype='0'
-      type='dun'
-      user='internet'
-      password='internet'
-  />
-
-  <apn carrier='Argentina:Personal :MMS'
-      carrier_id = "1341"
-      mcc='722'
-      mnc='340'
-      apn='mms'
-      authtype='0'
-      mmsc='http://mms.personal.com'
-      mmsproxy='172.25.7.31'
-      mmsport='8080'
-      type='mms'
-      user='mms'
-      password='mms'
+      mcc="722"
+      mnc="34"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Personal Datos"
@@ -38642,19 +39115,8 @@
       apn="datos.personal.com"
       user="datos"
       password="datos"
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="Argentina:Personal: DUN"
-      carrier_id = "1341"
-      mcc="722"
-      mnc="341"
-      apn="internet.personal.com"
-      type="dun"
-      user="internet"
-      password="internet"
       authtype="0"
+      type="default,ia,supl,xcap"
   />
 
   <apn carrier="Personal MMS"
@@ -38667,10 +39129,20 @@
       mmsproxy="172.25.7.31"
       mmsport="8080"
       mmsc="http://mms.personal.com"
-      authtype="1"
+      authtype="0"
       type="mms"
   />
 
+  <apn carrier="Personal IMS"
+      carrier_id = "1341"
+      mcc="722"
+      mnc="341"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="TIM Connect"
       carrier_id = "1385"
       mcc="724"
@@ -38750,6 +39222,7 @@
       apn="java.claro.com.br"
       user="claro"
       password="claro"
+      authtype="0"
       type="default,ia,supl"
   />
 
@@ -38763,7 +39236,7 @@
       mmsc="http://mms.claro.com.br"
       mmsproxy="200.169.126.10"
       mmsport="8799"
-      authtype="1"
+      authtype="0"
       type="mms"
   />
 
@@ -38943,7 +39416,7 @@
       mnc='15'
       apn='sercomtel.com.br'
       authtype='1'
-      type='default,ia'
+      type='default,ia,dun'
       user='sercomtel'
       password='sercomtel'
   />
@@ -38962,27 +39435,18 @@
       password='sercomtel'
   />
 
-  <apn carrier='Sercomtel:Modem'
-      carrier_id = "539"
-      mcc='724'
-      mnc='15'
-      apn='sercomtel.com.br'
-      authtype='1'
-      type='dun'
-      user='sercomtel'
-      password='sercomtel'
-  />
-
-  <apn carrier="Oi GPRS Internet"
+  <apn carrier="Oi Internet"
       carrier_id = "540"
       mcc="724"
       mnc="16"
       apn="gprs.oi.com.br"
       protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      authtype="0"
       type="default,ia,supl"
   />
 
-  <apn carrier="MMS GPRS"
+  <apn carrier="Oi MMS"
       carrier_id = "540"
       mcc="724"
       mnc="16"
@@ -38992,8 +39456,9 @@
       mmsc="http://200.222.42.204:8002"
       mmsproxy="192.168.10.50"
       mmsport="3128"
-      authtype="1"
+      authtype="0"
       protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       type="mms"
   />
 
@@ -39121,45 +39586,45 @@
       type="xcap"
   />
 
-  <apn carrier="OI:INTERNET:2"
+  <apn carrier="Oi Internet"
       carrier_id = "1389"
       mcc="724"
       mnc="24"
       apn="gprs.oi.com.br"
-      authtype="1"
-      type="default,ia,dun"
-      user="oi"
-      password="oi"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
-  <apn carrier="Oi:MMS:2"
-      carrier_id = "1389"
-      mcc="724"
-      mnc="24"
-      apn="mmsgprs.oi.com.br"
-      authtype="1"
-      mmsc="http://200.222.42.204:8002"
-      mmsproxy="192.168.10.50"
-      mmsport="3128"
-      type="mms"
-      user="oimms"
-      password="oioioi"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
-  />
-
-  <apn carrier="Oi GPRS Internet"
-      carrier_id = "1389"
-      mcc="724"
-      mnc="31"
-      apn="gprs.oi.com.br"
-      protocol="IPV4V6"
+      authtype="0"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="MMS GPRS"
+  <apn carrier="Oi MMS"
+      carrier_id = "1389"
+      mcc="724"
+      mnc="24"
+      apn="mmsgprs.oi.com.br"
+      authtype="0"
+      mmsc="http://200.222.42.204:8002"
+      mmsproxy="192.168.10.50"
+      mmsport="3128"
+      type="mms"
+      user="oimms"
+      password="oioioi"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Oi Internet"
+      carrier_id = "1389"
+      mcc="724"
+      mnc="31"
+      apn="gprs.oi.com.br"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      type="default,ia,supl"
+      authtype="0"
+  />
+
+  <apn carrier="Oi MMS"
       carrier_id = "1389"
       mcc="724"
       mnc="31"
@@ -39169,142 +39634,79 @@
       mmsc="http://200.222.42.204:8002"
       mmsproxy="192.168.10.50"
       mmsport="3128"
-      authtype="1"
+      authtype="0"
       protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       type="mms"
   />
 
-  <apn carrier='CTBC:Dados:1'
+  <apn carrier="Algar Telecom Internet"
       carrier_id = "1390"
-      mcc='724'
-      mnc='32'
-      apn='ctbc.br'
-      authtype='1'
-      type='default,ia'
-      user='CTBC'
-      password='1212'
+      mcc="724"
+      mnc="32"
+      apn="algar.br"
+      type="default,ia"
+      user="algar"
+      password="1212"
   />
 
-  <apn carrier='CTBC:Modem:1'
+  <apn carrier="Algar MMS"
       carrier_id = "1390"
-      mcc='724'
-      mnc='32'
-      apn='ctbc.br'
-      authtype='1'
-      type='dun'
-      user='CTBC'
-      password='1212'
+      mcc="724"
+      mnc="32"
+      apn="mms.algar.br"
+      mmsc="http://mms.ctbccelular.com.br/was"
+      mmsproxy="172.29.7.70"
+      mmsport="8080"
+      type="mms"
+      user="algar"
+      password="1212"
   />
 
-  <apn carrier='CTBC:MMS:1'
+  <apn carrier="Algar Telecom Internet"
       carrier_id = "1390"
-      mcc='724'
-      mnc='32'
-      apn='mms.ctbc.br'
-      authtype='1'
-      mmsc='http://mms.ctbccelular.com.br/was'
-      mmsproxy='172.29.7.70'
-      mmsport='8080'
-      type='mms'
-      user='CTBC'
-      password='1212'
+      mcc="724"
+      mnc="33"
+      apn="algar.br"
+      type="default,ia"
+      user="algar"
+      password="1212"
   />
 
-  <apn carrier='CTBC:Dados:2'
+  <apn carrier="Algar MMS"
       carrier_id = "1390"
-      mcc='724'
-      mnc='33'
-      apn='ctbc.br'
-      authtype='1'
-      type='default,ia'
-      user='CTBC'
-      password='1212'
+      mcc="724"
+      mnc="33"
+      apn="mms.algar.br"
+      mmsc="http://mms.ctbccelular.com.br/was"
+      mmsproxy="172.29.7.70"
+      mmsport="8080"
+      type="mms"
+      user="algar"
+      password="1212"
   />
 
-  <apn carrier='CTBC:Modem:2'
+  <apn carrier="Algar Telecom Internet"
       carrier_id = "1390"
-      mcc='724'
-      mnc='33'
-      apn='ctbc.br'
-      authtype='1'
-      type='dun'
-      user='CTBC'
-      password='1212'
+      mcc="724"
+      mnc="34"
+      apn="algar.br"
+      type="default,ia"
+      user="algar"
+      password="1212"
   />
 
-  <apn carrier='CTBC:MMS:2'
+  <apn carrier="Algar MMS"
       carrier_id = "1390"
-      mcc='724'
-      mnc='33'
-      apn='mms.ctbc.br'
-      authtype='1'
-      mmsc='http://mms.ctbccelular.com.br/was'
-      mmsproxy='172.29.7.70'
-      mmsport='8080'
-      type='mms'
-      user='CTBC'
-      password='1212'
-  />
-
-  <apn carrier='CTBC:Dados:3'
-      carrier_id = "1390"
-      mcc='724'
-      mnc='34'
-      apn='ctbc.br'
-      authtype='1'
-      type='default,ia'
-      user='CTBC'
-      password='1212'
-  />
-
-  <apn carrier='CTBC:Modem:3'
-      carrier_id = "1390"
-      mcc='724'
-      mnc='34'
-      apn='ctbc.br'
-      authtype='1'
-      type='dun'
-      user='CTBC'
-      password='1212'
-  />
-
-  <apn carrier='CTBC:MMS:3'
-      carrier_id = "1390"
-      mcc='724'
-      mnc='34'
-      apn='mms.ctbc.br'
-      authtype='1'
-      mmsc='http://mms.ctbccelular.com.br/was'
-      mmsproxy='172.29.7.70'
-      mmsport='8080'
-      type='mms'
-      user='CTBC'
-      password='1212'
-  />
-
-  <apn carrier='Nextel MMS'
-      carrier_id = "1383"
-      mcc='724'
-      mnc='39'
-      apn='mms.nextel3g.net.br'
-      authtype='0'
-      mmsc='http://3gmms.nextel3g.net.br'
-      mmsproxy='129.192.129.104'
-      mmsport='8080'
-      type='mms'
-      protocol='IPV4V6'
-      roaming_protocol='IPV4V6'
-  />
-
-  <apn carrier='Nextel WAP'
-      carrier_id = "1383"
-      mcc='724'
-      mnc='39'
-      apn='wap.nextel3g.net.br'
-      authtype='0'
-      type='default,ia,dun'
-      protocol='IPV4V6'
-      roaming_protocol='IPV4V6'
+      mcc="724"
+      mnc="34"
+      apn="mms.algar.br"
+      mmsc="http://mms.ctbccelular.com.br/was"
+      mmsproxy="172.29.7.70"
+      mmsport="8080"
+      type="mms"
+      user="algar"
+      password="1212"
   />
 
   <apn carrier='Porto Seguro Conecta'
@@ -39357,45 +39759,10 @@
       apn="bam.entelpcs.cl"
       user="entelpcs"
       password="entelpcs"
-      authtype="1"
+      authtype="0"
       type="default,ia,supl"
   />
 
-  <apn carrier="MMS Entel"
-      carrier_id = "1427"
-      mcc="730"
-      mnc="01"
-      apn="mms.entelpcs.cl"
-      user="entelpcs"
-      password="entelpcs"
-      mmsproxy="10.99.0.10"
-      mmsport="8080"
-      mmsc="http://mmsc.entelpcs.cl"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier='Internet Nextel'
-      carrier_id = "1430"
-      mcc='730'
-      mnc='09'
-      apn='wap.nextelmovil.cl'
-      authtype='0'
-      type='default,ia'
-  />
-
-  <apn carrier='MMS Nextel'
-      carrier_id = "1430"
-      mcc='730'
-      mnc='09'
-      apn='mms.nextelmovil.cl'
-      authtype='0'
-      mmsc='http://3gmms.nextelmovil.cl'
-      mmsproxy='129.192.129.104'
-      mmsport='8080'
-      type='mms'
-  />
-
   <apn carrier="Internet WOM"
       carrier_id="1430"
       mcc="730"
@@ -39423,57 +39790,30 @@
       user_visible="false"
   />
 
-  <apn carrier="Internet Movil"
-      carrier_id = "1427"
-      mcc="730"
-      mnc="10"
-      apn="bam.entelpcs.cl"
-      user="entelpcs"
-      password="entelpcs"
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="MMS Entel"
-      carrier_id = "1427"
-      mcc="730"
-      mnc="10"
-      apn="mms.entelpcs.cl"
-      user="entelpcs"
-      password="entelpcs"
-      mmsproxy="10.99.0.10"
-      mmsport="8080"
-      mmsc="http://mmsc.entelpcs.cl"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="Movistar APLICACIONES"
+  <apn carrier="Movistar INTERNET"
       carrier_id = "1428"
       mcc="730"
       mnc="02"
       apn="wap.tmovil.cl"
       user="wap"
       password="wap"
-      authtype="1"
-      type="default,ia,supl"
+      authtype="0"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="Movistar MMS"
+  <apn carrier="Movistar CL IMS"
       carrier_id = "1428"
       mcc="730"
       mnc="02"
-      apn="mms.tmovil.cl"
-      user="mms"
-      password="mms"
-      mmsproxy="172.17.8.10"
-      mmsport="8080"
-      mmsc="http://mms.movistar.cl"
-      authtype="1"
-      type="mms"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="Banda Ancha Movil"
+  <apn carrier="Claro Chile"
       carrier_id = "1429"
       mcc="730"
       mnc="03"
@@ -39481,7 +39821,7 @@
       user="clarochile"
       password="clarochile"
       authtype="1"
-      type="default,ia,supl"
+      type="default,ia,supl,xcap"
   />
 
   <apn carrier="MMS Claro"
@@ -39498,14 +39838,18 @@
       type="mms"
   />
 
-  <apn carrier="web"
-      carrier_id = "1428"
+  <apn carrier="IMS"
+      carrier_id = "1429"
+      mcc="730"
+      mnc="03"
+      apn="ims"
+      type="ims"
+  />
+
+  <apn carrier="Virgin Internet Movil"
       mcc="730"
       mnc="07"
-      apn="web.gtdmovil.cl"
-      user="webgtd"
-      password="webgtd"
-      authtype="1"
+      apn="imovil.virginmobile.cl"
       type="default,ia,supl"
   />
 
@@ -39520,19 +39864,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Wap"
-      carrier_id = "2216"
-      mcc="730"
-      mnc="08"
-      apn="wap.vtr.com"
-      proxy="192.168.94.210"
-      port="9028"
-      user=""
-      password=""
-      authtype="0"
-      type="default,ia,supl"
-  />
-
   <apn carrier="MMS"
       carrier_id = "2216"
       mcc="730"
@@ -39558,44 +39889,34 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="MMS Entel PCS"
-      carrier_id = "1427"
-      mcc="730"
-      mnc="10"
-      apn="mms.entelpcs.cl"
-      user="entelpcs"
-      password="entelpcs"
-      mmsc="http://mmsc.entelpcs.cl"
-      mmsproxy="10.99.0.10"
-      mmsport="8080"
+  <apn carrier="Movistar INTERNET"
+      mcc="732"
+      mnc="12"
+      apn="internet.movistar.com.co"
       authtype="1"
+      type="default,ia"
+      user="movistar"
+      password="movistar"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Movistar MMS"
+      mcc="732"
+      mnc="12"
+      apn="mms.movistar.com.co"
+      authtype="1"
+      mmsc="http://mms.movistar.com.co"
+      mmsproxy="192.168.222.7"
+      mmsport="9001"
       type="mms"
+      user="movistar"
+      password="movistar"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier='Movistar INTERNET'
-      mcc='732'
-      mnc='12'
-      apn='internet.movistar.com.co'
-      authtype='1'
-      type='default,ia, dun'
-      user='movistar'
-      password='movistar'
-  />
-
-  <apn carrier='Movistar MMS'
-      mcc='732'
-      mnc='12'
-      apn='mms.movistar.com.co'
-      authtype='1'
-      mmsc='http://mms.movistar.com.co'
-      mmsproxy='192.168.222.7'
-      mmsport='9001'
-      type='mms'
-      user='movistar'
-      password='movistar'
-  />
-
-  <apn carrier="COMCEL"
+  <apn carrier="Web Claro CO"
       carrier_id = "1442"
       mcc="732"
       mnc="101"
@@ -39603,10 +39924,12 @@
       user="COMCELWEB"
       password="COMCELWEB"
       authtype="1"
-      type="default,ia,supl"
+      type="default,ia,supl,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="MMS Comcel 3GSM"
+  <apn carrier="MMS Claro CO"
       carrier_id = "1442"
       mcc="732"
       mnc="101"
@@ -39618,6 +39941,18 @@
       mmsc="http://www.comcel.com.co/mms/"
       authtype="1"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="IMS Claro CO"
+      carrier_id = "1442"
+      mcc="732"
+      mnc="101"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Webbing"
@@ -39630,15 +39965,14 @@
       mvno_match_data="536E617065"
   />
 
-  <apn carrier="TIGO WEB"
+  <apn carrier="Tigo Web"
       carrier_id = "624"
       mcc="732"
       mnc="103"
       apn="web.colombiamovil.com.co"
-      user=""
-      password=""
-      authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="TIGO Multimedia"
@@ -39668,19 +40002,6 @@
       mvno_type="spn"
   />
 
-  <apn carrier="Internet ETB"
-      carrier_id = "2218"
-      mcc="732"
-      mnc="103"
-      apn="moviletb.net.co"
-      type="default,ia,dun"
-      user="etb"
-      password="etb"
-      authtype="0"
-      mvno_match_data="ETB MOVI"
-      mvno_type="spn"
-  />
-
   <apn carrier="Internet Éxito"
       carrier_id = "2337"
       mcc="732"
@@ -39705,15 +40026,14 @@
       mvno_type="spn"
   />
 
-  <apn carrier="TIGO WEB"
+  <apn carrier="Tigo Web"
       carrier_id = "624"
       mcc="732"
       mnc="111"
       apn="web.colombiamovil.com.co"
-      user=""
-      password=""
-      authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="TIGO Multimedia"
@@ -39776,6 +40096,8 @@
       password="movistar"
       authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Movistar MMS"
@@ -39790,6 +40112,29 @@
       mmsc="http://mms.movistar.com.co"
       authtype="1"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Movistar CO IMS"
+      carrier_id = "625"
+      mcc="732"
+      mnc="123"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Movistar CO Ut"
+      carrier_id = "625"
+      mcc="732"
+      mnc="123"
+      apn="hos"
+      type="xcap"
+      protocol="IP"
+      roaming_protocol="IP"
+      user_visible="false"
   />
 
   <apn carrier="Virgin Mobile"
@@ -39863,15 +40208,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Venezuela:Digitel:MODEM:1"
-      carrier_id = "1870"
-      mcc="734"
-      mnc="01"
-      apn="gprsweb.digitel.ve"
-      type="dun"
-      authtype="1"
-  />
-
   <apn carrier="MMS"
       carrier_id = "1870"
       mcc="734"
@@ -39891,15 +40227,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Venezuela:Digitel:MODEM:2"
-      carrier_id = "1871"
-      mcc="734"
-      mnc="02"
-      apn="gprsweb.digitel.ve"
-      type="dun"
-      authtype="1"
-  />
-
   <apn carrier="MMS"
       carrier_id = "1871"
       mcc="734"
@@ -39919,15 +40246,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Venezuela:Digitel:MODEM:3"
-      carrier_id = "1872"
-      mcc="734"
-      mnc="03"
-      apn="gprsweb.digitel.ve"
-      type="dun"
-      authtype="1"
-  />
-
   <apn carrier="MMS"
       carrier_id = "1872"
       mcc="734"
@@ -39945,27 +40263,8 @@
       mnc="04"
       apn="internet.movistar.ve"
       type="default,ia,supl"
-  />
-
-  <apn carrier="Movistar MMS"
-      carrier_id = "1873"
-      mcc="734"
-      mnc="04"
-      apn="mms.movistar.ve"
-      mmsproxy="200.35.64.73"
-      mmsport="9001"
-      mmsc="http://mms.movistar.com.ve:8088/mms"
-      type="mms"
-  />
-
-  <apn carrier="Movistar WAP"
-      carrier_id = "1873"
-      mcc="734"
-      mnc="04"
-      apn="wap.movistar.ve"
-      mmsproxy="200.35.64.73"
-      mmsport="9001"
-      type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="MODEM"
@@ -39994,8 +40293,6 @@
       apn="internet.nuevatel.com"
       user=""
       password=""
-      proxy="192.168.101.4"
-      port="3128"
       authtype="1"
       type="default,ia,supl"
   />
@@ -40014,20 +40311,18 @@
       type="mms"
   />
 
-  <apn carrier="ENTEL WAP GPRS"
+  <apn carrier="Entel Bolivia 4G"
       carrier_id = "1381"
       mcc="736"
       mnc="02"
-      apn="wap.movil.com.bo"
+      apn="4g.entel"
       user=""
       password=""
-      proxy="172.27.7.10"
-      port="8080"
-      authtype="1"
+      authtype="0"
       type="default,ia,supl"
   />
 
-  <apn carrier="ENTEL MMS GPRS"
+  <apn carrier="ENTEL MMS"
       carrier_id = "1381"
       mcc="736"
       mnc="02"
@@ -40041,16 +40336,14 @@
       type="mms"
   />
 
-  <apn carrier="WAPTIGO"
+  <apn carrier="Tigo Internet"
       carrier_id = "1382"
       mcc="736"
       mnc="03"
-      apn="wap.tigo.bo"
+      apn="internet.tigo.bo"
       user=""
       password=""
-      proxy="172.25.100.8"
-      port="8080"
-      authtype="1"
+      authtype="0"
       type="default,ia,supl"
   />
 
@@ -40062,7 +40355,7 @@
       user=""
       password=""
       mmsproxy="172.25.100.8"
-      mmsport="8080"
+      mmsport="8888"
       mmsc="http://mms"
       authtype="1"
       type="mms"
@@ -40072,24 +40365,10 @@
       carrier_id = "1525"
       mcc="738"
       mnc="01"
-      apn="default"
+      apn="web.digicelgy.com"
       type="default,ia,supl"
   />
 
-  <apn carrier="Guyana:Digicel:Modem"
-      carrier_id = "1525"
-      mcc="738"
-      mnc="01"
-      apn="wap.digicelgy.com"
-      type="dun"
-      user="wap"
-      password="wap"
-      authtype="1"
-      mmsc="http://www.digicelive.com"
-      proxy="172.20.6.12"
-      port="8080"
-  />
-
   <apn carrier="Guyana:Digicel:Mms"
       carrier_id = "1525"
       mcc="738"
@@ -40119,8 +40398,10 @@
       apn="internet.movistar.com.ec"
       user="movistar"
       password="movistar"
-      authtype="1"
+      authtype="0"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Movistar MMS"
@@ -40133,8 +40414,23 @@
       mmsproxy="10.3.5.50"
       mmsport="9001"
       mmsc="http://mms.movistar.com.ec:8088/mms/"
-      authtype="1"
+      authtype="0"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
+  <apn carrier="Movistar EC IMS"
+      carrier_id = "1472"
+      mcc="740"
+      mnc="00"
+      apn="ims"
+      user="movistar"
+      password="movistar"
+      authtype="0"
+      type="ims,xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Internet Claro"
@@ -40159,47 +40455,15 @@
       type="mms"
   />
 
-  <apn carrier="Internet Claro"
-      carrier_id = "1473"
-      mcc="740"
-      mnc="010"
-      apn="internet.claro.com.ec"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="MMS Claro"
-      carrier_id = "1473"
-      mcc="740"
-      mnc="010"
-      apn="mms.claro.com.ec"
-      user="portamms"
-      password="portamms2003"
-      mmsproxy="216.250.208.94"
-      mmsport="8799"
-      mmsc="http://iesmms.porta.com.ec/"
-      authtype="1"
-      type="mms"
-  />
-
-  <apn carrier="CNT 3G"
+  <apn carrier="CNT Internet"
       carrier_id = "1474"
       mcc="740"
       mnc="02"
-      apn="internet3gsp.alegro.net.ec"
+      apn="internet.cnt.net.ec"
+      authtype="3"
       type="default,ia,supl"
   />
 
-  <apn carrier="CNT MMS"
-      carrier_id = "1474"
-      mcc="740"
-      mnc="02"
-      apn="mms.alegro.net.ec"
-      mmsproxy="10.4.85.3"
-      mmsport="8080"
-      mmsc="http://mms.alegro.net.ec/mms/"
-      type="mms"
-  />
-
   <apn carrier="VOX INTERNET"
       carrier_id = "1672"
       mcc="744"
@@ -40209,18 +40473,6 @@
       type="default,ia,supl"
   />
 
-  <apn carrier="Paraguay:Voxx:Modem"
-      carrier_id = "1672"
-      mcc="744"
-      mnc="01"
-      apn="vox.wap"
-      type="dun"
-      authtype="1"
-      mmsproxy="172.24.97.29"
-      mmsc="http://www.vox.com.py/"
-      port="8080"
-  />
-
   <apn carrier="VOX MMS"
       carrier_id = "1672"
       mcc="744"
@@ -40240,24 +40492,9 @@
       mcc="744"
       mnc="02"
       apn="igprs.claro.com.py"
-      user="ctigprs"
-      password="ctigprs999"
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="MMS GPRS PY"
-      carrier_id = "1673"
-      mcc="744"
-      mnc="02"
-      apn="mms.ctimovil.com.py"
-      user="ctimms"
-      password="ctimms999"
-      mmsproxy="170.51.255.240"
-      mmsport="8080"
-      mmsc="http://mms.ctimovil.com.py"
-      authtype="1"
-      type="mms"
+      mmsc="http://mms.claro.com.py"
+      authtype="0"
+      type="default,ia,supl,mms"
   />
 
   <apn carrier="TIGO PY"
@@ -40339,54 +40576,29 @@
       password='wap'
   />
 
-  <apn carrier='Suriname:Digicel:Modem'
-      carrier_id = "1084"
-      mcc='746'
-      mnc='03'
-      apn='wap.digicelsr.com'
-      port='8080'
-      authtype='1'
-      proxy='172.20.6.12'
-      mmsc='http://wapdigicel.com'
-      type='dun'
-      user='wap'
-      password='wap'
-  />
-
-  <apn carrier="wapANCEL"
-      carrier_id = "1862"
-      mcc="748"
-      mnc="01"
-      apn="wap"
-      proxy="200.40.246.2"
-      port="3128"
-      user=""
-      password=""
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="mmsANCEL"
+  <apn carrier="Antel mms"
       carrier_id = "1862"
       mcc="748"
       mnc="01"
       apn="mms"
-      user=""
-      password=""
       mmsproxy="200.40.246.2"
       mmsport="3128"
       mmsc="http://mmsc.mms.ancelutil.com.uy"
       authtype="1"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
-  <apn carrier="gprsANCEL"
+  <apn carrier="Vera 1"
       carrier_id = "1862"
       mcc="748"
       mnc="01"
-      apn="gprs.ancel"
+      apn="antel.lte"
       authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Movistar INTERNET"
@@ -40398,6 +40610,8 @@
       password="movistar"
       authtype="1"
       type="default,ia,supl"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Movistar MMS"
@@ -40412,6 +40626,8 @@
       mmsc="http://mmsc.movistar.com.uy"
       authtype="1"
       type="mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
 
   <apn carrier="Claro UY"
@@ -40419,24 +40635,9 @@
       mcc="748"
       mnc="10"
       apn="igprs.claro.com.uy"
-      user="ctigprs"
-      password="ctigprs999"
-      authtype="1"
-      type="default,ia,supl"
-  />
-
-  <apn carrier="MMS GPRS UY"
-      carrier_id = "1864"
-      mcc="748"
-      mnc="10"
-      apn="mms.ctimovil.com.uy"
-      user="ctimms"
-      password="ctimms999"
-      mmsproxy="170.51.255.240"
-      mmsport="8080"
-      mmsc="http://mms.ctimovil.com.uy"
-      authtype="1"
-      type="mms"
+      mmsc="http://mms.claro.com.uy"
+      authtype="0"
+      type="default,ia,supl,mms"
   />
 
   <apn carrier="Webbing"
@@ -40515,7 +40716,7 @@
   <apn carrier="ATT Nxtgenphone"
       carrier_id = "1187"
       apn="nxtgenphone"
-      type="default,ia,mms,supl,fota"
+      type="default,mms,supl,fota"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -40545,7 +40746,7 @@
   <apn carrier="Cricket internet"
       carrier_id = "1779"
       apn="endo"
-      type="default,ia,mms,supl,fota"
+      type="default,mms,supl,fota"
       mmsc="http://mmsc.aiowireless.net"
       mmsproxy="proxy.aiowireless.net"
       mmsport="80"
@@ -40584,7 +40785,7 @@
   <apn carrier="Pure Talk internet"
       carrier_id = "2025"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -40614,7 +40815,7 @@
   <apn carrier="Airvoice internet"
       carrier_id = "2027"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -40644,7 +40845,7 @@
   <apn carrier="Ztar internet"
       carrier_id = "2028"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -40674,7 +40875,7 @@
   <apn carrier="Kore internet"
       carrier_id = "2031"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -40704,7 +40905,7 @@
   <apn carrier="ATT FirstNet-Phone"
       carrier_id = "2119"
       apn="firstnet-phone"
-      type="default,ia,mms,supl,fota"
+      type="default,mms,supl,fota"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -40733,7 +40934,7 @@
 
   <apn carrier="XCAP"
       carrier_id = "2119"
-      apn="ereseller"
+      apn="firstnet-phone"
       type="xcap"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
@@ -40782,7 +40983,7 @@
   <apn carrier="Dish-ATT internet"
       carrier_id = "2525"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -40812,7 +41013,7 @@
   <apn carrier="Dish-ATT internet"
       carrier_id = "2526"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -40842,7 +41043,7 @@
   <apn carrier="Dish-ATT internet"
       carrier_id = "2527"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -40872,7 +41073,7 @@
   <apn carrier="Dish-ATT internet"
       carrier_id = "2534"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -40902,7 +41103,7 @@
   <apn carrier="Dish-ATT internet"
       carrier_id = "2538"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -40932,7 +41133,7 @@
   <apn carrier="Dish-ATT internet"
       carrier_id = "2539"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -40959,13 +41160,43 @@
       user_visible="false"
   />
 
+  <apn carrier="SSi Mobile"
+      carrier_id = "2567"
+      apn="ssi992.ssimicro.com"
+      type="default,supl,ia,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mmsc="http://mms.ssimicro.com"
+      mmsproxy="mms.ssimicro.com"
+      mmsport="80"
+  />
+
+  <apn carrier="Eeyou Mobility"
+      carrier_id = "2568"
+      apn="apn.em.com"
+      type="default,supl,ia,mms"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mmsc="http://mms.eeyoumobility.com"
+      mmsproxy="mms.eeyoumobility.com"
+      mmsport="80"
+  />
+
+  <apn carrier="DENT"
+      carrier_id="2583"
+      apn="global.telcoequity"
+      type="default"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+  />
+
   <apn carrier="Tracfone AT&amp;T"
       carrier_id = "10000"
       apn="ereseller"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       user_editable="false"
@@ -40992,7 +41223,7 @@
   <apn carrier="Red Pocket-ATT internet"
       carrier_id = "10012"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -41022,7 +41253,7 @@
   <apn carrier="ATT 5G NSA default"
       carrier_id = "10021"
       apn="enhancedphone"
-      type="default,ia,mms,supl,fota"
+      type="default,mms,supl,fota"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -41062,7 +41293,7 @@
   <apn carrier="Consumer Cellular internet"
       carrier_id = "10022"
       apn="ereseller"
-      type="default,ia,mms,supl,fota,xcap"
+      type="default,mms,supl,fota,xcap"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -41092,7 +41323,7 @@
   <apn carrier="ATT 5G SA Default"
       carrier_id = "10028"
       apn="nrphone"
-      type="default,ia,mms,supl,fota"
+      type="default,mms,supl,fota"
       mmsc="http://mmsc.mobile.att.net"
       mmsproxy="proxy.mobile.att.net"
       mmsport="80"
@@ -41129,4 +41360,42 @@
       user_visible="false"
   />
 
+  <apn carrier="Cricket internet"
+      carrier_id = "10029"
+      apn="endo"
+      type="default,mms,supl,fota"
+      mmsc="http://mmsc.aiowireless.net"
+      mmsproxy="proxy.aiowireless.net"
+      mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_editable="false"
+  />
+
+  <apn carrier="IMS"
+      carrier_id = "10029"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="Cricket Hotspot"
+      carrier_id = "10029"
+      apn="mht"
+      type="dun"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
+
+  <apn carrier="XCAP"
+      carrier_id = "10029"
+      apn="endo"
+      type="xcap"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_visible="false"
+  />
 </apns>