Merge remote-tracking branch 'upstream/master' into 'cros/master'.

Conflicts:
	serviceproviders.2.dtd
	serviceproviders.xml

Change-Id: Id3d34b8118e1f46c86d0d6771bf0bd17bc917c72
diff --git a/autogen.sh b/autogen.sh
index 9bedfb8..75a225e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,6 +17,6 @@
 (cd $srcdir;
     autoreconf --install --symlink &&
     autoreconf &&
-    ./configure --enable-maintainer-mode $@
+    ./configure $@
 )
 
diff --git a/configure.ac b/configure.ac
index 7f630c6..b280854 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 AC_INIT([mobile-broadband-provider-info], [20110511],
         [dcbw@redhat.com], [mobile-broadband-provider-info])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign no-dist-gzip dist-bzip2])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
 
 AC_PROG_CC
 AC_PROG_LIBTOOL
diff --git a/mobile-broadband-provider-info.doap b/mobile-broadband-provider-info.doap
new file mode 100644
index 0000000..9f03226
--- /dev/null
+++ b/mobile-broadband-provider-info.doap
@@ -0,0 +1,18 @@
+<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+         xmlns:foaf="http://xmlns.com/foaf/0.1/"
+         xmlns:gnome="http://api.gnome.org/doap-extensions#"
+         xmlns="http://usefulinc.com/ns/doap#">
+
+  <name xml:lang="en"></name>
+  <shortdesc xml:lang="en">Mobile broadband settings for various service providers</shortdesc>
+  <bug-database rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=NetworkManager" />
+
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Antti Kaijanmäki</foaf:name>
+      <gnome:userid>kaijanma</gnome:userid>
+      <foaf:mbox rdf:resource="mailto:antti.kaijanmaki.net"/>
+    </foaf:Person>
+  </maintainer>
+</Project>
diff --git a/serviceproviders.2.dtd b/serviceproviders.2.dtd
index 00cb856..ee08440 100644
--- a/serviceproviders.2.dtd
+++ b/serviceproviders.2.dtd
@@ -16,14 +16,19 @@
 <!-- some MVNOs. -->
 <!ATTLIST provider roaming-required (true|false) "false">
 
-<!ELEMENT gsm (network-id*, voicemail*, balance-check*, balance-top-up*, apn*)>
-<!ELEMENT apn (name*,
+<!ELEMENT gsm (network-id*, msisdn-query*, voicemail*, balance-check*, balance-top-up*, apn*)>
+<!ELEMENT apn (plan*,
+               usage*,
+               name*,
                gateway?,
                username?,
                password?,
                dns*)>
 <!ATTLIST apn value CDATA #REQUIRED>
 
+<!ELEMENT msisdn-query (ussd*, sms*)>
+<!-- query the network for the telephone number assigned to the SIM card -->
+
 <!ELEMENT voicemail (#PCDATA)>
 <!-- contains dial string used to access voicemail services for this provider -->
 <!-- for historical/legacy reasons network providers may support various alternative -->
@@ -91,6 +96,12 @@
      PDP context negotiation and this value is not used.
 -->
 
+<!ELEMENT plan EMPTY>
+<!ATTLIST plan type (prepaid|postpaid) #REQUIRED>
+
+<!ELEMENT usage EMPTY>
+<!ATTLIST usage type (internet|mms|wap) #REQUIRED>
+
 <!ELEMENT cdma (name*,
                 username?,
                 password?,
diff --git a/serviceproviders.xml b/serviceproviders.xml
index b5f91c9..d080846 100644
--- a/serviceproviders.xml
+++ b/serviceproviders.xml
@@ -5,6 +5,7 @@
 <!-- Authors:
      2008 Antti Kaijanmäki <antti@kaijanmaki.net>
      2009 Dan Williams <dcbw@redhat.com>
+     2011 Antti Kaijanmäki <antti@canonical.com>
 -->
 
 <!-- THIS WORK IS IN PUBLIC DOMAIN:
@@ -45,6 +46,8 @@
 		<gsm>
 			<network-id mcc="424" mnc="02"/>
 			<apn value="mnet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Etisalat</name>
 				<username>mnet</username>
 				<password>mnet</password>
@@ -52,6 +55,8 @@
 				<dns>194.170.1.7</dns>
 			</apn>
 			<apn value="etisalat.ae">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Etisalat 3G</name>
 				<username>etisalat.ae</username>
 				<password>etisalat.ae</password>
@@ -62,7 +67,13 @@
 		<name>du</name>
 		<gsm>
 			<network-id mcc="424" mnc="03"/>
-			<apn value="du"/>
+			<msisdn-query>
+				<ussd>*#100#</ussd>
+			</msisdn-query>
+			<apn value="du">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -74,6 +85,8 @@
 		<gsm>
 			<network-id mcc="412" mnc="01"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>awcc</username>
 				<password>1111</password>
 			</apn>
@@ -87,7 +100,14 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="276" mnc="02"/>
+			<apn value="Twa">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>TWA</name>
+			</apn>
 			<apn value="vodafoneweb">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Vodafone Web</name>
 			</apn>
 		</gsm>
@@ -101,6 +121,8 @@
 		<gsm>
 			<network-id mcc="283" mnc="01"/>
 			<apn value="internet.beeline.am">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>internet</username>
 				<password>internet</password>
 			</apn>
@@ -111,9 +133,13 @@
 		<gsm>
 			<network-id mcc="283" mnc="10"/>
 			<apn value="internet.orange">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet Hima (USB)</name>
 			</apn>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Broadband</name>
 			</apn>
 		</gsm>
@@ -123,9 +149,13 @@
 		<gsm>
 			<network-id mcc="283" mnc="05"/>
 			<apn value="connect.vivacell.am">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>MTS connect</name>
 			</apn>
 			<apn value="inet.vivacell.am">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Broadband</name>
 			</apn>
 		</gsm>
@@ -145,7 +175,10 @@
 		<name>Unitel</name>
 		<gsm>
 			<network-id mcc="631" mnc="02"/>
-			<apn value="internet.unitel.co.ao" />
+			<apn value="internet.unitel.co.ao" >
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -155,8 +188,10 @@
 	<provider>
 		<name>Personal</name>
 		<gsm>
-			<network-id mcc="722" mnc="340"/>
+			<network-id mcc="722" mnc="341"/>
 			<apn value="gprs.personal.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>gprs</username>
 				<password>adgj</password>
 				<dns>172.25.7.6</dns>
@@ -169,6 +204,8 @@
 		<gsm>
 			<network-id mcc="722" mnc="340"/>
 			<apn value="arnet.personal.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>172.25.7.6</dns>
 				<dns>172.25.7.7</dns>
 			</apn>
@@ -181,6 +218,8 @@
 			<network-id mcc="722" mnc="320"/>
 			<network-id mcc="722" mnc="330"/>
 			<apn value="gprs.claro.com.ar">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>3G Internet</name>
 				<username>clarogprs</username>
 				<password>clarogprs999</password>
@@ -188,6 +227,8 @@
 				<dns>170.51.242.18</dns>
 			</apn>
 			<apn value="internet.ctimovil.com.ar">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>GPRS</name>
 				<username>clarogprs</username>
 				<password>clarogprs999</password>
@@ -200,6 +241,8 @@
 			<network-id mcc="722" mnc="010"/>
 			<network-id mcc="722" mnc="070"/>
 			<apn value="internet.gprs.unifon.com.ar">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
@@ -214,19 +257,27 @@
 		<gsm>
 			<!-- Vodafone Broadband Connect version 10.1.0.23908 2010-06-07T17:47:01 -->
 			<network-id mcc="232" mnc="01"/>
-			<apn value="A1.net">
+			<apn value="a1.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>A1 Breitband</name>
 				<username>ppp@A1plus.at</username>
 				<password>ppp</password>
+				<dns>194.48.124.202</dns>
+				<dns>194.48.124.200</dns>
 			</apn>
 			<!-- https://www.aon.at/export/sites/default/residential/pdf/produktfolder/aonFlex_Mobiltelefon.pdf-->
 			<apn value="aon.data">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>aon (Flex, Breitband-Duo, BusinessFlex)</name>
 				<username>mobile@aon.at</username>
 				<password>ppp</password>
 			</apn>
 			<!-- http://konfigurator.aon.at/otauseraon/templates/user/aon/manuals/AON_Installation.pdf -->
 			<apn value="aon.at">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>aonMobile</name>
 				<username>mobile@aon.at</username>
 				<password>ppp</password>
@@ -234,10 +285,39 @@
 		</gsm>
 	</provider>
 	<provider>
+		<name>ABroadband</name>
+		<gsm>
+			<network-id mcc="232" mnc="01"/>
+			<apn value="mdata.com">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>International Roaming</name>
+				<username>mdata@mdata.com</username>
+				<password>ppp</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Bob</name>
 		<gsm>
 			<network-id mcc="232" mnc="11"/>
 			<apn value="bob.at">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<username>data@bob.at</username>
+				<password>ppp</password>
+			</apn>
+			<apn value="bob.at">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<username>ppp@bob.at</username>
+				<password>ppp</password>
+				<dns>194.48.139.254</dns>
+				<dns>194.48.124.200</dns>
+			</apn>
+			<apn value="mms.bob.at">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>data@bob.at</username>
 				<password>ppp</password>
 			</apn>
@@ -248,16 +328,24 @@
 		<gsm>
 			<network-id mcc="232" mnc="03"/>
 			<apn value="gprswap">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>WAP</name>
 				<username>t-mobile</username>
 				<password>tm</password>
 			</apn>
 			<apn value="gprsinternet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 				<username>t-mobile</username>
 				<password>tm</password>
+				<dns>213.162.69.169</dns>
+				<dns>213.162.65.1</dns>
 			</apn>
 			<apn value="business.gprsinternet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Business Internet</name>
 				<username>t-mobile</username>
 				<password>tm</password>
@@ -269,10 +357,13 @@
 		<gsm>
 			<network-id mcc="232" mnc="07"/>
 			<apn value="web">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Ge org:)</name>
 				<username>web@telering.at</username>
 				<password>web</password>
-				<dns>212.95.31.11</dns>
-				<dns>212.95.31.35</dns>
+				<dns>213.162.69.170</dns>
+				<dns>213.162.65.2</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -281,21 +372,50 @@
 		<gsm>
 			<network-id mcc="232" mnc="05"/>
 			<apn value="web.one.at">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>OneNet Web</name>
 				<username>web</username>
 				<password>web</password>
 				<dns>194.24.128.100</dns>
 				<dns>194.24.128.102</dns>
 			</apn>
+			<apn value="wap.one.at">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
+				<name>Orange WAP</name>
+				<username>wap</username>
+				<password>wap</password>
+			</apn>
+			<apn value="mms.one.at">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
+				<name>Orange MMS</name>
+				<username>mms</username>
+				<password>mms</password>
+			</apn>
 			<apn value="fullspeed">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Web (no filtering)</name>
 				<username>web</username>
 				<password>web</password>
 			</apn>
 			<apn value="orange.web">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Orange Web</name>
 				<username>Orange</username>
 				<password>Orange</password>
+				<dns>81.3.216.100</dns>
+				<dns>194.24.128.100</dns>
+			</apn>
+			<apn value="orange.mms">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
+				<name>Orange Web</name>
+				<username>mms</username>
+				<password>mms</password>
 			</apn>
 		</gsm>
 	</provider>
@@ -304,58 +424,277 @@
 		<name xml:lang="de">Drei</name>
 		<gsm>
 			<network-id mcc="232" mnc="10"/>
-			<apn value="drei.at"/>
+			<apn value="drei.at">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<dns>213.94.78.17</dns>
+				<dns>213.94.78.16</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Yesss</name>
 		<gsm>
 			<network-id mcc="232" mnc="12"/>
-			<apn value="web.yesss.at"/>
+			<apn value="web.yesss.at">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
 
 <!-- Australia -->
+<!-- http://whirlpool.net.au/wiki/mobiles_apn
+     http://ausdroid.net/apns/ -->
 <country code="au">
 	<provider>
-		<name>Exetel</name>
+		<name>Amaysim</name>
+		<!-- http://www.amaysim.com.au/help-support/amaysim-mobile-broadband.html/ -->
 		<gsm>
 			<network-id mcc="505" mnc="02"/>
-			<apn value="exetel1"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Apex Telecom</name>
+		<gsm>
+			<network-id mcc="505" mnc="02"/>
+			<apn value="splns357"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Beagle</name>
+		<!-- http://www.beagle.com.au/support/faq/wireless.html -->
+		<gsm>
+			<network-id mcc="505" mnc="02"/>
+			<apn value="splns357"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>BLiNK</name>
+		<gsm>
+			<network-id mcc="505" mnc="02"/>
+			<apn value="splns888a1">
+				<name>BLiNK (services after 04/08/09)</name>
+			</apn>
+			<apn value="connect">
+				<name>BLiNK (services prior to 04/08/09)</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Crazy John's</name>
+		<gsm>
+			<network-id mcc="505" mnc="03"/>
+			<network-id mcc="505" mnc="38"/>
+			<apn value="purtona.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Crazy NET</name>
+				<dns>203.21.112.40</dns>
+				<dns>203.21.113.40</dns>
+			</apn>
+			<apn value="purtona.wap">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
+				<name>Crazy WAP/MMS</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Dodo</name>
+		<!-- http://www.dodo.com/top-right-navigation/support/technical-support/wireless-broadband/wireless-broadband-settings/ -->
+		<gsm>
+			<network-id mcc="505" mnc="02"/>
+			<apn value="WirelessBroadband">
+				<name>Postpaid</name>
+			</apn>
+			<apn value="DODOLNS1">
+				<name>Prepaid</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Escape Net</name>
+		<gsm>
+			<network-id mcc="505" mnc="02"/>
+			<apn value="splns357"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Exetel</name>
+		<!-- http://www.exetel.com.au/mobile_faq.php -->
+		<gsm>
+			<network-id mcc="505" mnc="02"/>
+			<apn value="exetel1">
+				<name>Exetel (Optus Based HSPA plans)</name>
+			</apn>
+			<apn value="INTERNET">
+				<name>Exetel (Optus Based CAP Plans) not iPhone</name>
+			</apn>
+			<apn value="OPTUSWAP">
+				<name>Exetel (Optus Based CAP Plans) not iPhone</name>
+			</apn>
+			<apn value="YesINTERNET">
+				<name>Exetel (Optus Based CAP Plans) iPhone</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Exetel (Vodafone based)</name>
+		<gsm>
+			<network-id mcc="505" mnc="03"/>
+			<apn value="vfinternet.au">
+				<name>Exetel (Vodafone Based)</name>
+			</apn>
+		</gsm>
+	</provider>
+<!-- Not validated yet
+	<provider>
+		<name>GRL / Red Bull Mobile</name>
+		<gsm>
+			<network-id mcc="505" mnc="03"/>
+			<apn value="purtona.net"/>
+		</gsm>
+	</provider>
+-->
+	<provider>
+		<name>Highway1</name>
+		<gsm>
+			<network-id mcc="505" mnc="02"/>
+			<apn value="splns357"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>iiNet</name>
+		<!-- https://iihelp.iinet.net.au/BoB_MBB -->
+		<gsm>
+			<network-id mcc="505" mnc="02"/>
+			<apn value="iinet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Internode</name>
 		<gsm>
 			<!-- http://www.internode.on.net/residential/broadband/3g_wireless/nodemobile_data/faq/#What_is_the_APN -->
+			<network-id mcc="505" mnc="02"/>
 			<apn value="internode">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>NodeMobile Data</name>
 			</apn>
 			<apn value="splns333a1">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Old NodeMobile Data (before 2009-08-26)</name>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
+		<name>iPrimus</name>
+		<!-- http://support.iprimus.com.au/index.php?option=com_content&task=view&id=559&Itemid=203 -->
+		<gsm>
+			<network-id mcc="505" mnc="02"/>
+			<apn value="primuslns1"/>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Optus</name>
 		<gsm>
 			<network-id mcc="505" mnc="02"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Internet (handsets)</name>
 				<dns>211.29.132.12</dns>
 				<dns>198.142.0.51</dns>
 			</apn>
+			<apn value="yesinternet">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Optus Yes Internet</name>
+				<dns>211.29.132.12</dns>
+				<dns>198.142.0.51</dns>
+			</apn>
 			<apn value="connect">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Wireless Broadband</name>
 				<dns>211.29.132.12</dns>
 				<dns>198.142.0.51</dns>
 			</apn>
+			<apn value="connectcap">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Post-Paid Mobile Broadband</name>
+				<dns>211.29.132.12</dns>
+				<dns>198.142.0.51</dns>
+			</apn>
 			<apn value="preconnect">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Pre-Paid Mobile Broadband</name>
 				<dns>211.29.132.12</dns>
 				<dns>198.142.0.51</dns>
 			</apn>
+			<apn value="mms">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
+				<name>Optus MMS</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>TPG Mobile</name>
+		<gsm>
+			<network-id mcc="505" mnc="02"/>
+			<apn value="yesinternet">
+				<name>TPG (iPhone)</name>
+			</apn>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>TPG (all except iPhone)</name>
+			</apn>
+			<apn value="mms">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
+				<name>MMS</name>
+			</apn>
+		</gsm>
+	</provider>
+<!-- not yet validated
+	<provider>
+		<name>Pacnet – Optus</name>
+		<gsm>
+			<network-id mcc="505" mnc="02"/>
+			<apn value="pacnet"/>
+			<apn value="internet"/>
+		</gsm>
+	</provider>
+-->
+	<provider>
+		<name>Pennytel</name>
+		<!-- https://www.pennytel.com.au/faqs?f-answer-search=apn&x=0&y=0 -->
+		<gsm>
+			<network-id mcc="505" mnc="03"/>
+			<apn value="live.vodafone.com">
+				<name>Pennytel (Vodafone) live.vodafone.com</name>
+			</apn>
+			<apn value="vfinternet.au">
+				<name>Pennytel (Vodafone) vfinternet.au</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Smelly Black Dog</name>
+		<gsm>
+			<network-id mcc="505" mnc="02"/>
+			<apn value="splns357"/>
 		</gsm>
 	</provider>
 	<provider>
@@ -368,26 +707,50 @@
 				<ussd-response>*100#</ussd-response>
 			</balance-check>
 			<apn value="telstra.wap">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>139.130.4.4</dns>
 				<dns>203.50.2.71</dns>
 			</apn>
 			<apn value="telstra.datapack">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Telstra (3G data pack)</name>
 				<password>Telstra</password>
 				<dns>139.130.4.4</dns>
 				<dns>203.50.2.71</dns>
 			</apn>
 			<apn value="telstra.internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Telstra (Next G)</name>
-				<dns>139.130.4.4</dns>
-				<dns>203.50.2.71</dns>
+				<dns>10.4.85.138</dns>
+				<dns>10.4.176.234</dns>
 			</apn>
 			<apn value="telstra.pcpack">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Telstra (3G PC pack - pay by time)</name>
 				<password>Telstra</password>
 				<dns>139.130.4.4</dns>
 				<dns>203.50.2.71</dns>
 			</apn>
+			<apn value="telstra.iph">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
+				<name>Telstra Internet/Wap</name>
+			</apn>
+			<apn value="telstra.mms">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
+				<name>Telstra MMS</name>
+			</apn>
+			<apn value="telstra.bigpond">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Telstra BigPond</name>
+				<!-- username/password per-user -->
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -395,12 +758,16 @@
 		<gsm>
 			<network-id mcc="505" mnc="06"/>
 			<apn value="3netaccess">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>a</username>
 				<password>a</password>
 				<dns>202.124.68.130</dns>
 				<dns>202.124.76.66</dns>
 			</apn>
 			<apn value="3services">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Three Prepaid</name>
 				<username>a</username>
 				<password>a</password>
@@ -414,12 +781,16 @@
 		<gsm>
 			<network-id mcc="505" mnc="02"/>
 			<apn value="VirginInternet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Internet</name>
 				<username>guest</username>
 				<password>guest</password>
 				<dns>61.88.88.88</dns>
 			</apn>
 			<apn value="VirginBroadband">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Broadband</name>
 			</apn>
 		</gsm>
@@ -430,20 +801,37 @@
 			<!-- http://www.vodafone.com.au/personal/mobile-broadband/modem-setup/index.htm -->
 			<network-id mcc="505" mnc="03"/>
 			<apn value="vfinternet.au">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Postpaid and some prepaid phone plans</name>
 			</apn>
 			<apn value="vfprepaymbb">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Prepaid</name>
-				<username>web</username>
-				<password>web</password>
+				<!-- username>web</username -->
+				<!-- password>web</password -->
+				<dns>203.21.112.40</dns>
+				<dns>203.21.113.40</dns>
+			</apn>
+			<apn value="live.vodafone.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Vodafone Internet</name>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Crazy John's</name>
+		<name>Westnet</name>
+		<!-- http://myhelp.westnet.com.au/pages/releaseview.action;jsessionid=2C8E8DAB3826667BAA24105E467B31DF?pageId=17073209#FAQs-WestnetMobilePhone-link31 -->
 		<gsm>
-			<network-id mcc="505" mnc="38"/>
-			<apn value="purtona.net"/>
+			<network-id mcc="505" mnc="02"/>
+			<apn value="yesinternet">
+				<name>Westnet (iPhone)</name>
+			</apn>
+			<apn value="internet">
+				<name>Westnet (all except iPhone)</name>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -454,21 +842,33 @@
 		<name>Azercell</name>
 		<gsm>
 			<network-id mcc="400" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Bakcell</name>
 		<gsm>
 			<network-id mcc="400" mnc="02"/>
-			<apn value="mms"/>
+			<apn value="mms">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Azerfon</name>
 		<gsm>
 			<network-id mcc="400" mnc="04"/>
-			<apn value="Azerfon"/>
+			<msisdn-query>
+				<ussd>*100#3#</ussd>
+			</msisdn-query>
+			<apn value="azerfon">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -479,7 +879,67 @@
 		<name>BH GSM</name>
 		<gsm>
 			<network-id mcc="218" mnc="90"/>
-			<apn value="mms.bhmobile.ba"/>
+			<apn value="mms.bhmobile.ba">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>m:tel</name>
+		<gsm>
+			<network-id mcc="218" mnc="05"/>
+			<balance-check>
+				<ussd>*101#</ussd>
+			</balance-check>
+			<apn value="mtelgprs1">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Package 1</name>
+				<dns>81.93.67.2</dns>
+				<dns>81.93.67.3</dns>
+			</apn>
+			<apn value="mtelgprs2">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Package 2</name>
+				<dns>81.93.67.2</dns>
+				<dns>81.93.67.3</dns>
+			</apn>
+			<apn value="mtelgprs3">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Package 3</name>
+				<dns>81.93.67.2</dns>
+				<dns>81.93.67.3</dns>
+			</apn>
+			<apn value="mtelgprs4">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Package 4</name>
+				<dns>81.93.67.2</dns>
+				<dns>81.93.67.3</dns>
+			</apn>
+			<apn value="mtelfun">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Prepaid</name>
+				<dns>81.93.67.2</dns>
+				<dns>81.93.67.3</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>HT-ERONET</name>
+		<gsm>
+			<network-id mcc="218" mnc="03"/>
+			<balance-check>
+				<ussd>*101#</ussd>
+			</balance-check>
+			<apn value="gprs.eronet.ba">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -490,7 +950,10 @@
 		<name>Digicel</name>
 		<gsm>
 			<network-id mcc="342" mnc="750"/>
-			<apn value="isp.digicelbarbados.com"/>
+			<apn value="isp.digicelbarbados.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -502,6 +965,8 @@
 		<gsm>
 			<network-id mcc="470" mnc="02"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 				<dns>192.168.23.7</dns>
 			</apn>
@@ -512,6 +977,8 @@
 		<gsm>
 			<network-id mcc="470" mnc="03"/>
 			<apn value="blweb">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Web</name>
 				<dns>10.10.55.34</dns>
 			</apn>
@@ -522,6 +989,8 @@
 		<gsm>
 			<network-id mcc="470" mnc="01"/>
 			<apn value="gpinternet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>202.56.4.120</dns>
 				<dns>202.56.4.121</dns>
 			</apn>
@@ -532,6 +1001,8 @@
 		<gsm>
 			<network-id mcc="470" mnc="07"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 				<dns>10.6.0.2</dns>
 			</apn>
@@ -555,7 +1026,13 @@
 		<name>Mobistar</name>
 		<gsm>
 			<network-id mcc="206" mnc="10"/>
+			<voicemail>5555</voicemail>
+			<balance-check>
+				<ussd>#123#</ussd>
+			</balance-check>
 			<apn value="web.pro.be">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Business</name>
 				<username>mobistar</username>
 				<password>mobistar</password>
@@ -563,6 +1040,8 @@
 				<dns>212.65.63.145</dns>
 			</apn>
 			<apn value="internet.be">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Personal</name>
 				<username>mobistar</username>
 				<password>mobistar</password>
@@ -570,22 +1049,41 @@
 				<dns>212.65.63.145</dns>
 			</apn>
 			<apn value="iew.be">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet Everywhere</name>
 				<username>mobistar</username>
 				<password>mobistar</password>
 				<dns>212.224.255.252</dns>
 				<dns>212.65.63.217</dns>
 			</apn>
+			<apn value="mworld.be">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<username>mobistar</username>
+				<password>mobistar</password>
+				<dns>212.65.63.10</dns>
+				<dns>212.65.63.145</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Telenet Mobile</name>
 		<gsm>
 			<network-id mcc="206" mnc="10"/>
+			<apn value="mobile.internet.be">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Old Walk &amp; Surf</name>
+			</apn>
 			<apn value="telenetwap.be">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Walk &amp; Talk</name>
 			</apn>
 			<apn value="telenetwap.be">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Walk &amp; Surf</name>
 			</apn>
 		</gsm>
@@ -594,15 +1092,31 @@
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="206" mnc="10"/>
-			<apn value="orangeinternet"/>
+			<apn value="orangeinternet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Proximus</name>
 		<gsm>
 			<network-id mcc="206" mnc="01"/>
+			<voicemail>1230</voicemail>
+			<!-- no balancecheck method ('auto-recharge') -->
 			<apn value="internet.proximus.be">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Inter</name>
+				<dns>195.238.2.21</dns>
+				<dns>81.169.60.107</dns>
+			</apn>
+			<apn value="intraprox.be">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Intra</name>
+				<dns>195.238.2.21</dns>
+				<dns>195.238.2.22</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -610,7 +1124,11 @@
 		<name>Base</name>
 		<gsm>
 			<network-id mcc="206" mnc="20"/>
+			<voicemail>1933</voicemail>
+			<!-- no balancecheck method ('auto-recharge') -->
 			<apn value="gprs.base.be">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>base</username>
 				<password>base</password>
 				<dns>195.130.131.139</dns>
@@ -626,7 +1144,13 @@
 		<name>GloBul</name>
 		<gsm>
 			<network-id mcc="284" mnc="05"/>
+			<voicemail>120</voicemail>
+			<balance-check>
+				<ussd>*125#</ussd>
+			</balance-check>
 			<apn value="internet.globul.bg">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>globul</username>
 				<dns>192.168.88.11</dns>
 			</apn>
@@ -636,20 +1160,38 @@
 		<name>M-Tel</name>
 		<gsm>
 			<network-id mcc="284" mnc="01"/>
-			<apn value="inet-gprs.mtel.bg" />
+			<voicemail>131</voicemail>
+			<balance-check>
+				<ussd>*101#</ussd>
+			</balance-check>
+			<!-- username/password not included in Vodafone Broadband Connect version 10.1.0.23908 2010-06-07T17:47:01 -->
+			<apn value="inet-gprs.mtel.bg">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<dns>213.226.7.34</dns>
+				<dns>213.226.7.35</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Vivacom</name>
 		<gsm>
 			<network-id mcc="284" mnc="03"/>
+			<voicemail>110</voicemail>
+			<balance-check>
+				<ussd>*102#</ussd>
+			</balance-check>
 			<apn value="internet.vivacom.bg">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<!-- http://www.vivacom.bg/en/residential/help_and_advice/common_questions/mobile_postpaid/8/ -->
 				<name>Vivacom Internet (Postpaid)</name>
 				<username>vivacom</username>
 				<password>vivacom</password>
 			</apn>
 			<apn value="internet.vivatel.bg">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Vivatel (old)</name>
 				<username>vivatel</username>
 				<password>vivatel</password>
@@ -666,6 +1208,8 @@
 		<gsm>
 			<network-id mcc="426" mnc="01"/>
 			<apn value="internet.batelco.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>oNet</name>
 				<username>wap</username>
 				<password>wap</password>
@@ -677,10 +1221,19 @@
 		<gsm>
 			<network-id mcc="426" mnc="02"/>
 			<apn value="internet">
-				<name>internet</name>
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Internet</name>
 				<username>internet</username>
 				<password>internet</password>
 			</apn>
+			<apn value="hsdpa">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>eGO</name>
+				<username>hsdpa</username>
+				<password>hsdpa</password>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -688,6 +1241,8 @@
 		<gsm>
 			<network-id mcc="426" mnc="04"/>
 			<apn value="viva.bh">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Viva</name>
 			</apn>
 		</gsm>
@@ -704,6 +1259,8 @@
 		<gsm>
 			<network-id mcc="724" mnc="16"/>
 			<apn value="brt.br">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>BrT</username>
 				<password>BrT</password>
 			</apn>
@@ -713,11 +1270,21 @@
 		<name>Claro</name>
 		<gsm>
 			<network-id mcc="724" mnc="05"/>
+			<voicemail>*100</voicemail>
+			<balance-check>
+				<ussd>*544#</ussd>
+				<ussd>*545#</ussd>
+				<ussd>*546#</ussd>
+			</balance-check>
 			<apn value="claro.com.br">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>claro</username>
 				<password>claro</password>
 			</apn>
 			<apn value="bandalarga.claro.com.br">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>3G</name>
 				<username>claro</username>
 				<password>claro</password>
@@ -731,7 +1298,12 @@
 			<network-id mcc="724" mnc="32"/>
 			<network-id mcc="724" mnc="33"/>
 			<network-id mcc="724" mnc="34"/>
+			<balance-check>
+				<dtmf>*22</dtmf>
+			</balance-check>
 			<apn value="ctbc.br">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>ctbc</username>
 				<password>1212</password>
 			</apn>
@@ -743,11 +1315,19 @@
 			<network-id mcc="724" mnc="16"/>
 			<network-id mcc="724" mnc="31"/>
 			<network-id mcc="724" mnc="24"/>
-
+			<voicemail>*100</voicemail>
+			<balance-check>
+				<dtmf>*804</dtmf>
+				<dtmf>*805</dtmf>
+			</balance-check>
 			<apn value="gprs.oi.com.br">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<password>oioioi</password>
 			</apn>
 			<apn value="wapgprs.oi.com.br">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>WAP</name>
 				<username>oiwap</username>
 				<password>oioioi</password>
@@ -761,8 +1341,14 @@
 			<network-id mcc="724" mnc="03"/>
 			<network-id mcc="724" mnc="04"/>
 			<network-id mcc="724" mnc="08"/>
-
+			<voicemail>*100</voicemail>
+			<balance-check>
+				<ussd>*222#</ussd>
+				<dtmf>*222</dtmf>
+			</balance-check>
 			<apn value="tim.br">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>tim</username>
 				<password>tim</password>
 				<dns>10.223.246.102</dns>
@@ -774,6 +1360,8 @@
 		<name>Velox</name>
 		<gsm>
 			<apn value="wap.telcel.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>iesgprs</username>
 				<password>iesgprs2002</password>
 				<dns>66.36.250.14</dns>
@@ -787,8 +1375,14 @@
 			<network-id mcc="724" mnc="10"/>
 			<network-id mcc="724" mnc="11"/>
 			<network-id mcc="724" mnc="23"/>
-
+			<voicemail>*555</voicemail>
+			<balance-check>
+				<dtmf>*8000</dtmf>
+				<dtmf>*5005</dtmf>
+			</balance-check>
 			<apn value="zap.vivo.com.br">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>vivo</username>
 				<password>vivo</password>
 			</apn>
@@ -802,7 +1396,10 @@
 		<name>Batelco</name>
 		<gsm>
 			<network-id mcc="364" mnc="390"/>
-			<apn value="internet.btcbahamas.com"/>
+			<apn value="internet.btcbahamas.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -813,7 +1410,10 @@
 		<name>B-Mobile</name>
 		<gsm>
 			<network-id mcc="528" mnc="02"/>
-			<apn value="bmobilewap"/>
+			<apn value="bmobilewap">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -821,6 +1421,8 @@
 		<gsm>
 			<network-id mcc="528" mnc="11"/>
 			<apn value="dst.wap">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
@@ -836,41 +1438,57 @@
 		<gsm>
 			<network-id mcc="257" mnc="01"/>
 			<apn value="wap.velcom.by">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>GPRS WAP</name>
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
 			<apn value="web.velcom.by">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>GPRS WEB</name>
 				<username>web</username>
 				<password>web</password>
 			</apn>
 			<apn value="plus.velcom.by">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>GPRS WEB PLUS</name>
 				<username>plus</username>
 				<password>plus</password>
 			</apn>
 			<apn value="privet.velcom.by">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>GPRS PRIVET</name>
 				<username>privet</username>
 				<password>privet</password>
 			</apn>
 			<apn value="web1.velcom.by">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>WEB BASIC</name>
 				<username>web1</username>
 				<password>web1</password>
 			</apn>
 			<apn value="web2.velcom.by">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>WEB 25</name>
 				<username>web2</username>
 				<password>web2</password>
 			</apn>
 			<apn value="web3.velcom.by">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>WEB 150</name>
 				<username>web3</username>
 				<password>web3</password>
 			</apn>
 			<apn value="vmi.velcom.by">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>WEB 500</name>
 				<username>vmi</username>
 				<password>vmi</password>
@@ -882,6 +1500,8 @@
 		<gsm>
 			<network-id mcc="257" mnc="02"/>
 			<apn value="internet.mts.by">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>mts</username>
 				<password>mts</password>
 			</apn>
@@ -892,7 +1512,10 @@
 		<name>life:)</name>
 		<gsm>
 			<network-id mcc="257" mnc="03"/>
-			<apn value="internet.life.com.by"/>
+			<apn value="internet.life.com.by">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -903,7 +1526,10 @@
 		<name>Mascom Wireless</name>
 		<gsm>
 			<network-id mcc="652" mnc="01"/>
-			<apn value="internet.mascom"/>
+			<apn value="internet.mascom">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -914,14 +1540,20 @@
 		<name>Leo/UCom</name>
 		<gsm>
 			<network-id mcc="642" mnc="03"/>
-			<apn value="ucnet"/>
+			<apn value="ucnet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Tempo/Africell</name>
 		<gsm>
 			<network-id mcc="642" mnc="02"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -933,6 +1565,8 @@
 		<gsm>
 			<network-id mcc="302" mnc="370"/>
 			<apn value="internet.fido.ca">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>fido</username>
 				<password>fido</password>
 				<dns>204.92.15.211</dns>
@@ -945,6 +1579,8 @@
 		<gsm>
 			<network-id mcc="302" mnc="720"/>
 			<apn value="internet.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>wapuser1</username>
 				<password>wap</password>
 				<dns>207.181.101.4</dns>
@@ -960,11 +1596,20 @@
 			<network-id mcc="302" mnc="651"/>
 			<network-id mcc="302" mnc="880"/>
 			<apn value="inet.bell.ca">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 			</apn>
 			<apn value="pda.bell.ca">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Web</name>
 			</apn>
+			<apn value="pda2.bell.ca">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Mobile Fast Web</name>
+			</apn>
 		</gsm>
 		<cdma>
 			<sid value="16420"/>
@@ -1001,15 +1646,23 @@
 			<network-id mcc="302" mnc="860"/>
 			<network-id mcc="302" mnc="880"/>
 			<apn value="isp.telus.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 			</apn>
 			<apn value="vpn.telus.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet (with VPN)</name>
 			</apn>
 			<apn value="bb.telus.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Blackberry</name>
 			</apn>
 			<apn value="sp.telus.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Web/Smartphone</name>
 			</apn>
 		</gsm>
@@ -1040,6 +1693,8 @@
 			<network-id mcc="302" mnc="500"/>
 			<network-id mcc="302" mnc="510"/>
 			<apn value="ihvm.videotron">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>IHVM</name>
 			</apn>
 		</gsm>
@@ -1049,9 +1704,13 @@
 		<gsm>
 			<network-id mcc="302" mnc="490"/>
 			<apn value="broadband.windmobile.ca">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Laptop (data stick)</name>
 			</apn>
 			<apn value="internet.windmobile.ca">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile (add-on for phone)</name>
 			</apn>
 		</gsm>
@@ -1061,9 +1720,13 @@
 		<gsm>
 			<network-id mcc="302" mnc="320"/>
 			<apn value="wap.davewireless.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Web</name>
 			</apn>
 			<apn value="internet.davewireless.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Broadband</name>
 			</apn>
 		</gsm>
@@ -1077,7 +1740,10 @@
 		<gsm>
 			<network-id mcc="630" mnc="01"/>
 			<apn value="vodanet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>vodalive</username>
+				<dns>172.24.97.1</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -1094,16 +1760,27 @@
 		<gsm>
 			<network-id mcc="228" mnc="03"/>
 			<apn value="mobileoffice3g">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet Everywhere - Standard</name>
 				<dns>213.55.128.1</dns>
 				<dns>213.55.128.2</dns>
 			</apn>
 			<apn value="click">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Internet Everywhere - Prepaid</name>
+				<dns>213.55.128.1</dns>
+				<dns>213.55.128.2</dns>
 			</apn>
 			<apn value="intranetaccess">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet Everywhere - Intranet Access</name>
 			</apn>
+			<apn value="internet">
+				<name>Internet Everywhere - Postpaid</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -1111,8 +1788,20 @@
 		<gsm>
 			<network-id mcc="228" mnc="02"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>internet</username>
 				<password>internet</password>
+				<dns>194.230.1.103</dns>
+				<dns>194.230.1.71</dns>
+			</apn>
+			<apn value="wap.sunrise.ch">
+				<username>wap</username>
+				<password>wap</password>
+			</apn>
+			<apn value="mms.sunrise.ch">
+				<username>mms</username>
+				<password>mms</password>
 			</apn>
 		</gsm>
 	</provider>
@@ -1126,9 +1815,41 @@
 				<ussd>*130#</ussd>
 			</balance-check>
 			<balance-top-up>
-				<ussd replacement="CODE">*130*CODE#</ussd>
+				<ussd replacement="CODE">*123*CODE#</ussd>
 			</balance-top-up>
-			<apn value="gprs.swisscom.ch"/>
+			<apn value="gprs.swisscom.ch">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Swisscom GPRS</name>
+				<dns>138.188.101.189</dns>
+				<dns>138.188.101.186</dns>
+			</apn>
+			<apn value="corporate.swisscom.ch">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Swisscom CAA</name>
+				<username>testprofil</username>
+				<password>temporary</password>
+			</apn>
+			<apn value="event.swisscom.ch">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Swisscom MMS</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>M-Budget</name>
+		<gsm>
+			<network-id mcc="228" mnc="01"/>
+			<msisdn-query>
+				<ussd>*#100#</ussd>
+			</msisdn-query>
+			<apn value="gprs.swisscom.ch">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Migros Data</name>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -1140,6 +1861,8 @@
 		<gsm>
 			<network-id mcc="612" mnc="05"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>172.16.100.5</dns>
 			</apn>
 		</gsm>
@@ -1153,15 +1876,21 @@
 		<gsm>
 			<network-id mcc="730" mnc="03"/>
 			<apn value="bam.clarochile.cl">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>clarochile</username>
 				<password>clarochile</password>
 			</apn>
 			<apn value="bap.clarochile.cl">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Prepago</name>
 				<username>clarochile</username>
 				<password>clarochile</password>
 			</apn>
 			<apn value="wap.clarochile.cl">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>WAP</name>
 				<username>clarochile</username>
 				<password>clarochile</password>
@@ -1173,10 +1902,19 @@
 		<gsm>
 			<network-id mcc="730" mnc="01"/>
 			<apn value="imovil.entelpcs.cl">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract / Prepaid / WebSession</name>
 				<username>entelpcs</username>
 				<password>entelpcs</password>
 			</apn>
+			<apn value="bam.entelpcs.cl">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>WAP</name>
+				<username>entelpcs</username>
+				<password>entelpcs</password>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -1184,11 +1922,15 @@
 		<gsm>
 			<network-id mcc="730" mnc="10"/>
 			<apn value="web.tmovil.cl">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Web</name>
 				<username>web</username>
 				<password>web</password>
 			</apn>
 			<apn value="wap.tmovil.cl">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>WAP</name>
 				<username>wap</username>
 				<password>wap</password>
@@ -1204,6 +1946,8 @@
 		<gsm>
 			<network-id mcc="624" mnc="02"/>
 			<apn value="orangecmgprs">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>orange</username>
 				<password>orange</password>
 			</apn>
@@ -1214,6 +1958,8 @@
 		<gsm>
 			<network-id mcc="624" mnc="01"/>
 			<apn value="INTERNET">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>guest</username>
 				<password>guest</password>
 			</apn>
@@ -1229,11 +1975,15 @@
 			<network-id mcc="460" mnc="00"/>
 			<network-id mcc="460" mnc="02"/>
 			<apn value="cmwap">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>WAP</name>
 				<username>guest</username>
 				<password>guest</password>
 			</apn>
 			<apn value="cmnet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 				<username>guest</username>
 				<password>guest</password>
@@ -1245,7 +1995,9 @@
 		<name>China Unicom</name>
 		<gsm>
 			<network-id mcc="460" mnc="01"/>
-			<apn value="uninet">
+			<apn value="3gnet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>uninet</username>
 			</apn>
 		</gsm>
@@ -1269,12 +2021,29 @@
 			<network-id mcc="712" mnc="01"/>
 			<network-id mcc="712" mnc="02"/>
 			<apn value="icecelular">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>guest</username>
 				<password>guest</password>
 				<dns>208.133.206.44</dns>
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Kolbi</name>
+		<gsm>
+			<network-id mcc="712" mnc="03"/>
+			<voicemail>190</voicemail>
+			<balance-check>
+				<sms text="">1150</sms>
+			</balance-check>
+			<apn value="kolbi3g">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Kolbi 3g</name>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Colombia -->
@@ -1284,17 +2053,22 @@
 		<gsm>
 			<network-id mcc="732" mnc="101"/>
 			<apn value="internet.comcel.com.co">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>COMCELWEB</username>
 				<password>COMCELWEB</password>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Tigo</name>
+		<name>eTb</name>
 		<gsm>
-			<network-id mcc="732" mnc="103"/>
-			<network-id mcc="732" mnc="111"/>
-			<apn value="web.colombiamovil.com.co"/>
+			<apn value="moviletb.net.co">
+			     <plan type="postpaid"/>
+			     <usage type="internet"/>
+			     <username>etb</username>
+			     <password>etb</password>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -1303,11 +2077,44 @@
 			<network-id mcc="732" mnc="102"/>
 			<network-id mcc="732" mnc="123"/>
 			<apn value="internet.movistar.com.co">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>movistar</username>
 				<password>movistar</password>
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Tigo</name>
+		<gsm>
+			<network-id mcc="732" mnc="103"/>
+			<network-id mcc="732" mnc="111"/>
+			<apn value="web.colombiamovil.com.co">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Uff</name>
+		<gsm>
+			<apn value="web.uffmovil.com.co">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>UNE</name>
+		<gsm>
+			<apn value="www.une.net.co">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<username>une</username>
+				<password>une</password>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Cyprus -->
@@ -1316,10 +2123,17 @@
 		<name>Cytamobile-Vodafone</name>
 		<gsm>
 			<network-id mcc="280" mnc="01"/>
+			<msisdn-query>
+				<ussd>*#109#</ussd>
+			</msisdn-query>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract</name>
 			</apn>
 			<apn value="pp.internet">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Prepaid</name>
 			</apn>
 		</gsm>
@@ -1329,6 +2143,8 @@
 		<gsm>
 			<network-id mcc="280" mnc="10"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
@@ -1342,7 +2158,12 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="230" mnc="03"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<dns>217.77.161.130</dns>
+				<dns>217.77.161.131</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -1350,10 +2171,14 @@
 		<gsm>
 			<network-id mcc="230" mnc="02"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>160.218.10.200</dns>
 				<dns>160.218.43.200</dns>
 			</apn>
 			<apn value="internet.open">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>160.218.10.200</dns>
 				<dns>160.218.43.200</dns>
 			</apn>
@@ -1364,6 +2189,8 @@
 		<gsm>
 			<network-id mcc="230" mnc="01"/>
 			<apn value="internet.t-mobile.cz">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>62.141.0.1</dns>
 				<dns>213.162.65.1</dns>
 			</apn>
@@ -1379,6 +2206,7 @@
 			<network-id mcc="262" mnc="03"/>
 			<network-id mcc="262" mnc="05"/>
 			<network-id mcc="262" mnc="77"/>
+			<voicemail>9911</voicemail>
 			<balance-check>
 				<ussd>*100#</ussd>
 			</balance-check>
@@ -1386,6 +2214,8 @@
 				<ussd replacement="CODE">*104*CODE#</ussd>
 			</balance-top-up>
 			<apn value="internet.eplus.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Volume rate/30 Day Flatrate</name>
 				<username>eplus</username>
 				<password>gprs</password>
@@ -1393,6 +2223,8 @@
 				<dns>212.23.97.3</dns>
 			</apn>
 			<apn value="tagesflat.eplus.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>24 Hour Flatrate</name>
 				<name xml:lang="de">Tages-Flatrate</name>
 				<username>eplus</username>
@@ -1414,10 +2246,14 @@
 				<ussd replacement="CODE">*104*CODE#</ussd>
 			</balance-top-up>
 			<apn value="internet.eplus.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>blau</username>
 				<password>blau</password>
 			</apn>
 			<apn value="tagesflat.eplus.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>24 Hour Flatrate</name>
 				<name xml:lang="de">Tages-Flatrate</name>
 				<username>blau</username>
@@ -1431,13 +2267,23 @@
 			<!-- http://www.bildmobil.de/info_handyeinstellungen.html -->
 			<network-id mcc="262" mnc="02"/>
 			<apn value="access.vodafone.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>BILD Mobilportal</name>
 			</apn>
 			<apn value="web.vodafone.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract</name>
 				<dns>139.7.30.125</dns>
 				<dns>139.7.30.126</dns>
 			</apn>
+			<!-- http://www.prepaid-wiki.de/index.php5/BILDmobil_Daten-SIM -->
+			<apn value="event.vodafone.de">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>BILDmobil Speedstick (Surfpakete)</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider primary="true">
@@ -1454,6 +2300,8 @@
 				<ussd replacement="CODE">*104*CODE#</ussd>
 			</balance-top-up>
 			<apn value="internet.eplus.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>eplus</username>
 				<password>gprs</password>
 				<dns>212.23.97.2</dns>
@@ -1468,23 +2316,31 @@
 			<network-id mcc="262" mnc="08"/>
 			<network-id mcc="262" mnc="11"/>
 
+			<voicemail>333</voicemail>
 			<balance-check>
 				<ussd>*101#</ussd>
 			</balance-check>
 			<balance-top-up>
 				<ussd replacement="CODE">*103*CODE#</ussd>
 			</balance-top-up>
+
 			<apn value="pinternet.interkom.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>LOOP</name>
 				<dns>193.189.244.225</dns>
 				<dns>193.189.244.206</dns>
 			</apn>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Pay-by-MB</name>
 				<dns>195.182.110.132</dns>
 				<dns>62.134.11.4</dns>
 			</apn>
 			<apn value="surfo2">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Pay-by-time</name>
 				<dns>195.182.110.132</dns>
 				<dns>62.134.11.4</dns>
@@ -1505,12 +2361,14 @@
 				<ussd replacement="CODE">*103*CODE#</ussd>
 			</balance-top-up>
 			<apn value="webmobil1">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Tagesflat / Monats-Flatrate L / Monats-Flatrate XL</name>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>T-mobile (D1)</name>
+		<name>T-Mobile(Telekom)</name>
 		<gsm>
 			<network-id mcc="262" mnc="01"/>
 			<network-id mcc="262" mnc="06"/>
@@ -1522,11 +2380,15 @@
 				<ussd replacement="CODE">*101*CODE#</ussd>
 			</balance-top-up>
 			<apn value="internet.t-d1.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<password>t-d1</password>
 				<dns>193.254.160.1</dns>
 				<dns>193.254.160.130</dns>
 			</apn>
 			<apn value="internet.t-mobile">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>t-mobile</username>
 				<password>tm</password>
 				<dns>10.74.83.22</dns>
@@ -1535,11 +2397,14 @@
 		</gsm>
 	</provider>
 	<provider>
-		<name>CongStar</name>
+		<name>Congstar</name>
 		<gsm>
 			<network-id mcc="262" mnc="01"/>
 
 			<apn value="internet.t-mobile">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Prepaid Contracts</name>
 				<username>t-mobile</username>
 				<password>tm</password>
 				<dns>193.254.160.1</dns>
@@ -1554,17 +2419,23 @@
 			<network-id mcc="262" mnc="04"/>
 			<network-id mcc="262" mnc="09"/>
 
+			<voicemail>5500</voicemail>
 			<balance-check>
 				<ussd>*100#</ussd>
 			</balance-check>
 			<balance-top-up>
 				<ussd replacement="CODE">*100*CODE#</ussd>
 			</balance-top-up>
+
 			<apn value="web.vodafone.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>139.7.30.125</dns>
 				<dns>139.7.30.126</dns>
 			</apn>
 			<apn value="event.vodafone.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>WebSessions</name>
 			</apn>
 		</gsm>
@@ -1581,7 +2452,12 @@
 			<balance-top-up>
 				<ussd replacement="CODE">*103*CODE#</ussd>
 			</balance-top-up>
-			<apn value="pinternet.interkom.de"/>
+			<apn value="pinternet.interkom.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<username>fonic</username>
+				<password>fonic</password>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -1597,6 +2473,8 @@
 				<ussd replacement="CODE">*104*CODE#</ussd>
 			</balance-top-up>
 			<apn value="internet.eplus.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>simyo</username>
 				<password>simyo</password>
 				<dns>212.23.97.2</dns>
@@ -1614,6 +2492,8 @@
 				<ussd>*100#</ussd>
 			</balance-check>
 			<apn value="internet.vistream.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1627,6 +2507,8 @@
 				<ussd>*100#</ussd>
 			</balance-check>
 			<apn value="internet.vistream.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1637,6 +2519,8 @@
 		<gsm>
 			<network-id mcc="262" mnc="16"/>
 			<apn value="internet.vistream.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1647,6 +2531,8 @@
 		<gsm>
 			<network-id mcc="262" mnc="16"/>
 			<apn value="internet.vistream.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1657,6 +2543,8 @@
 		<gsm>
 			<network-id mcc="262" mnc="16"/>
 			<apn value="internet.vistream.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1667,6 +2555,8 @@
 		<gsm>
 			<network-id mcc="262" mnc="16"/>
 			<apn value="internet.vistream.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1677,6 +2567,8 @@
 		<gsm>
 			<network-id mcc="262" mnc="16"/>
 			<apn value="internet.vistream.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1690,6 +2582,8 @@
 				<ussd>*100#</ussd>
 			</balance-check>
 			<apn value="internet.vistream.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
@@ -1700,16 +2594,32 @@
 		<gsm>
 			<network-id mcc="262" mnc="16"/>
 			<apn value="internet.vistream.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 				<password>vistream</password>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
+		<name>NetCologne</name>
+		<gsm>
+			<network-id mcc="262" mnc="03"/>
+			<apn value="internet.netcologne.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<username>web</username>
+				<password>password</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Alice</name>
 		<gsm>
 			<network-id mcc="262" mnc="07"/>
 			<apn value="internet.partner1">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Option Mobile</name>
 				<dns>193.189.244.225</dns>
 				<dns>193.189.244.206</dns>
@@ -1723,10 +2633,20 @@
 			<network-id mcc="262" mnc="02"/>
 			<network-id mcc="262" mnc="04"/>
 			<network-id mcc="262" mnc="09"/>
+
+			<voicemail>5500</voicemail>
+			<balance-check>
+				<ussd>*100#</ussd>
+			</balance-check>
+
 			<apn value="web.vodafone.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Broadband</name>
 			</apn>
 			<apn value="mail.partner.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Web</name>
 				<username>D2</username>
 				<password>Web</password>
@@ -1741,6 +2661,8 @@
 			<network-id mcc="262" mnc="08"/>
 			<network-id mcc="262" mnc="11"/>
 			<apn value="pinternet.interkom.de">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<!-- Information taken from https://www.netzclub.net/downloads/default/Manuelle_Handyeinstellungen.pdf -->
 				<name>Internet</name>
 			</apn>
@@ -1755,15 +2677,23 @@
 		<gsm>
 			<network-id mcc="238" mnc="06"/>
 			<apn value="bredband.tre.dk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Bredbånd (standard)</name>
  			</apn>
 			<apn value="net.tre.dk">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Bredbånd Premium Kontant</name>
 			</apn>
 			<apn value="data.tre.dk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>3 (standard for mobilkunder; spærret for indgående trafik)</name>
 			</apn>
 			<apn value="static.tre.dk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>3 (statisk IP)</name>
 			</apn>
 		</gsm>
@@ -1773,7 +2703,10 @@
 		<name>OiSTER</name>
 		<gsm>
 			<network-id mcc="238" mnc="06"/>
-			<apn value="bredband.oister.dk"/>
+			<apn value="bredband.oister.dk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 
@@ -1790,7 +2723,16 @@
 		<gsm>
 			<network-id mcc="238" mnc="02"/>
 			<network-id mcc="238" mnc="77"/>
+
+			<voicemail>20171717</voicemail>
+			<balance-check>
+				<ussd>*101#</ussd>
+				<dtmf>40454545</dtmf>
+			</balance-check>
+
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>212.88.64.199</dns>
 				<dns>212.88.64.14</dns>
 			</apn>
@@ -1803,24 +2745,48 @@
 		<gsm>
 			<network-id mcc="238" mnc="02"/>
 			<network-id mcc="238" mnc="77"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider primary="true">
 		<name>TDC</name>
 		<gsm>
 			<network-id mcc="238" mnc="01"/>
-			<apn value="internet"/>
+
+			<voicemail>20171717</voicemail>
+			<balance-check>
+				<ussd>*101#</ussd>
+				<dtmf>40454545</dtmf>
+			</balance-check>
+
+			<!-- http://kundeservice.tdc.dk/privat/faq.php?id=20063 -->
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<dns>194.239.134.83</dns>
+				<dns>193.162.153.164</dns>
+			</apn>
 			<!-- mnc="0171" in Vodafone XML -->
-			<apn value="internet.no"/>
+			<apn value="internet.no">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 			<!-- mnc="0172" in Vodafone XML -->
-			<apn value="internet.se"/>
+			<apn value="internet.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Fullrate</name>
 		<gsm>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>Fullrate</username>
 				<password>Fullrate</password>
 			</apn>
@@ -1830,14 +2796,26 @@
 		<name>Telia</name>
 		<gsm>
 			<network-id mcc="238" mnc="30"/>
-			<apn value="www.internet.mtelia.dk"/>
+
+			<voicemail>28184000</voicemail>
+			<balance-check>
+				<ussd>*101#</ussd>
+			</balance-check>
+
+			<apn value="www.internet.mtelia.dk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>BiBoB</name>
 		<gsm>
 			<network-id mcc="238" mnc="02"/>
-			<apn value="internet.bibob.dk"/>
+			<apn value="internet.bibob.dk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<!-- Telmore - Same network as TDC -->
@@ -1846,6 +2824,8 @@
 		<gsm>
 			<network-id mcc="238" mnc="01"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>194.239.134.83</dns>
 				<dns>193.162.153.164</dns>
 			</apn>
@@ -1855,14 +2835,31 @@
 		<name>Unotel</name>
 		<gsm>
 			<network-id mcc="238" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>happiimobil</name>
 		<gsm>
 			<network-id mcc="238" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<!-- Onfone: https://www.onfone.dk/Kundeservice/mobil/saet_din_mobil_op/internet-gprs-3g/ --> 
+	<provider>
+		<name>Onfone Internet DK</name>
+		<gsm>
+			<network-id mcc="238" mnc="01"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -1877,7 +2874,10 @@
 			<balance-check>
 				<ussd>#131#</ussd>
 			</balance-check>
-			<apn value="orangenet.com.do"/>
+			<apn value="orangenet.com.do">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -1890,6 +2890,8 @@
 				<dtmf>*22</dtmf>
 			</balance-check>
 			<apn value="internet.ideasclaro.com.do">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>196.3.81.5</dns>
 				<dns>196.3.81.132</dns>
 			</apn>
@@ -1904,6 +2906,8 @@
 				<dtmf>*74</dtmf>
 			</balance-check>
 			<apn value="edge.viva.net.do">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>viva</username>
 				<password>viva</password>
 			</apn>
@@ -1917,7 +2921,10 @@
 		<name>Djezzy</name>
 		<gsm>
 			<network-id mcc="603" mnc="02"/>
-			<apn value="djezzy.internet"/>
+			<apn value="djezzy.internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -1925,6 +2932,8 @@
 		<gsm>
 			<network-id mcc="603" mnc="01"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>internet</username>
 				<password>internet</password>
 			</apn>
@@ -1935,6 +2944,8 @@
 		<gsm>
 			<network-id mcc="603" mnc="03"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>WEB</name>
 				<username>nedjma</username>
 				<password>nedjma</password>
@@ -1950,6 +2961,8 @@
 		<gsm>
 			<network-id mcc="740" mnc="00"/>
 			<apn value="navega.movistar.ec">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>movistar</username>
 				<password>movistar</password>
 			</apn>
@@ -1959,7 +2972,10 @@
 		<name>Porta 3G</name>
 		<gsm>
 			<network-id mcc="740" mnc="01"/>
-			<apn value="internet.porta.com.ec"/>
+			<apn value="internet.porta.com.ec">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -1971,6 +2987,8 @@
 		<gsm>
 			<network-id mcc="248" mnc="01"/>
 			<apn value="internet.emt.ee">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>217.71.32.116</dns>
 				<dns>217.71.32.115</dns>
 			</apn>
@@ -1980,7 +2998,10 @@
 		<name>Nordea</name>
 		<gsm>
 			<network-id mcc="248" mnc="01"/>
-			<apn value="internet.emt.ee"/>
+			<apn value="internet.emt.ee">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -1988,6 +3009,8 @@
 		<gsm>
 			<network-id mcc="248" mnc="02"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>194.204.0.1</dns>
 			</apn>
 		</gsm>
@@ -1997,6 +3020,8 @@
 		<gsm>
 			<network-id mcc="248" mnc="03"/>
 			<apn value="internet.tele2.ee">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
@@ -2010,7 +3035,12 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="602" mnc="02"/>
+			<msisdn-query>
+				<ussd>*878#</ussd>
+			</msisdn-query>
 			<apn value="internet.vodafone.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>internet</username>
 				<password>internet</password>
 				<dns>163.121.128.134</dns>
@@ -2022,7 +3052,10 @@
 		<name>Etisalat</name>
 		<gsm>
 			<network-id mcc="602" mnc="03"/>
-			<apn value="etisalat"/>
+			<apn value="etisalat">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2030,6 +3063,8 @@
 		<gsm>
 			<network-id mcc="602" mnc="01"/>
 			<apn value="mobinilweb">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>80.75.166.250</dns>
 				<dns>163.121.163.201</dns>
 			</apn>
@@ -2044,6 +3079,8 @@
 		<gsm>
 			<network-id mcc="214" mnc="08"/>
 			<apn value="internet.euskaltel.mobi">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>CLIENTE</username>
 				<password>EUSKALTEL</password>
 			</apn>
@@ -2053,14 +3090,20 @@
 		<name>Másmovil</name>
 		<gsm>
 			<network-id mcc="214" mnc="03"/>
-			<apn value="internetmas" />
+			<apn value="internetmas" >
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>móbil R (Mundo-R)</name>
 		<gsm>
 			<network-id mcc="214" mnc="17"/>
-			<apn value="internet.mundo-r.com" />
+			<apn value="internet.mundo-r.com" >
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2068,6 +3111,8 @@
 		<gsm>
 			<network-id mcc="214" mnc="03"/>
 			<apn value="INTERNETTPH">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>213.143.33.8</dns>
 				<dns>62.36.225.150</dns>
 			</apn>
@@ -2078,6 +3123,8 @@
 		<gsm>
 			<network-id mcc="214" mnc="18"/>
 			<apn value="internet.ono.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>62.42.230.24</dns>
 				<dns>62.42.63.52</dns>
 			</apn>
@@ -2087,7 +3134,10 @@
 		<name>Pepephone</name>
 		<gsm>
 			<network-id mcc="214" mnc="06"/>
-			<apn value="gprs.pepephone.com" />
+			<apn value="gprs.pepephone.com" >
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2095,7 +3145,16 @@
 		<gsm>
 			<network-id mcc="214" mnc="03"/>
 			<network-id mcc="214" mnc="09"/>
+
+			<voicemail>242</voicemail>
+			<balance-check>
+				<ussd>*111#</ussd>
+				<ussd>*113#</ussd>
+			</balance-check>
+
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Orange</name>
 				<username>ORANGE</username>
 				<password>ORANGE</password>
@@ -2109,6 +3168,8 @@
 		<gsm>
 			<network-id mcc="214" mnc="19"/>
 			<apn value="gprs-service.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>195.230.105.134</dns>
 				<dns>195.230.105.135</dns>
 			</apn>
@@ -2119,6 +3180,8 @@
 		<gsm>
 			<network-id mcc="214" mnc="16"/>
 			<apn value="internet.telecable.es">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>telecable</username>
 				<password>telecable</password>
 			</apn>
@@ -2129,7 +3192,15 @@
 		<gsm>
 			<network-id mcc="214" mnc="05"/>
 			<network-id mcc="214" mnc="07"/>
+
+			<voicemail>123</voicemail>
+			<balance-check>
+				<dtmf>2266</dtmf>
+			</balance-check>
+
 			<apn value="movistar.es">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>movistar</username>
 				<password>movistar</password>
 				<dns>194.179.1.100</dns>
@@ -2141,10 +3212,27 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="214" mnc="01"/>
+			<network-id mcc="214" mnc="06"/>
+			<msisdn-query>
+				<ussd>*138#</ussd>
+			</msisdn-query>
 			<apn value="ac.vodafone.es">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Vodafone</name>
 				<username>vodafone</username>
 				<password>vodafone</password>
+				<dns>212.73.32.96</dns>
+				<dns>212.73.32.67</dns>
+			</apn>
+			<apn value="airtelnet.es">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Airtel (old)</name>
+				<username>vodafone</username>
+				<password>vodafone</password>
+				<dns>212.73.32.3</dns>
+				<dns>212.73.32.67</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -2152,7 +3240,15 @@
 		<name>Yoigo</name>
 		<gsm>
 			<network-id mcc="214" mnc="04"/>
+
+			<voicemail>633</voicemail>
+			<balance-check>
+				<ussd>*111#</ussd>
+			</balance-check>
+
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>213.248.76.210</dns>
 				<dns>213.248.100.54</dns>
 			</apn>
@@ -2163,6 +3259,8 @@
 		<gsm>
 			<network-id mcc="214" mnc="21"/>
 			<apn value="jazzinternet">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<dns>87.216.1.65</dns>
 				<dns>87.216.1.66</dns>
 			</apn>
@@ -2171,9 +3269,48 @@
 	<provider>
 		<name>Carrefour Móvil</name>
 		<gsm>
-			<apn value="CARREFOURINTERNET"/>
+			<apn value="CARREFOURINTERNET">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<!-- from http://www.eroskimovil.es/geomv/c/pub/en/servicios/datos -->
+		<name>Eroski Móvil</name>
+		<gsm>
+			<network-id mcc="214" mnc="24"/>
+			<apn value="gprs.eroskimovil.es">
+				<name>Eroski Móvil GPRS</name>
+				<username>wap@wap</username>
+				<password>wap125</password>
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
+<!-- Ethiopia -->
+<country code="et">
+	<provider>
+		<name>Ethio Telecom</name>
+		<gsm>
+			<network-id mcc="636" mnc="01"/>
+			<balance-check>
+				<ussd>*804#</ussd>
+			</balance-check>
+
+			<apn value="etc.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<dns>213.55.96.148</dns>
+				<dns>213.55.96.166</dns>
+			</apn>
+		</gsm>
+		<cdma>
+			<username>etc</username>
+			<password>etc</password>
+		</cdma>
+	</provider>
 </country>
 
 <!-- Faroe Islands -->
@@ -2182,7 +3319,13 @@
 		<name>Vodafone FO</name>
 		<gsm>
 			<network-id mcc="288" mnc="02"/>
-			<apn value="vmc.vodafone.fo"/>
+			<msisdn-query>
+				<ussd>*#100#</ussd>
+			</msisdn-query>
+			<apn value="vmc.vodafone.fo">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -2193,7 +3336,22 @@
 		<name>Dna</name>
 		<gsm>
 			<network-id mcc="244" mnc="03"/>
+			<!-- Phone number dependent:
+			 - Numbers beginning with 044 XXXXXXX turn in to 044 6 XXXXXXX
+			 - Numbers beginning with 041 XXXXXXX turn in to 041 6 XXXXXXX
+			 - Others case by case
+			 http://www.dna.fi/Yrityksille/Matkaviestinpalvelut/LiittymienLisapalvelut/dnafaksivastaaja/Documents/dna_vastaaja_kayttohje_120310.pdf
+			<voicemail/> -->
+			<balance-check>
+				<ussd>*100#</ussd>
+				<dtmf>0800412582</dtmf>
+				<sms text="SALDO">14000</sms>
+			</balance-check>
+
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>dna internet</name>
 				<dns>217.78.192.22</dns>
 				<dns>217.78.192.78</dns>
 			</apn>
@@ -2203,22 +3361,58 @@
 		<name>Elisa</name>
 		<gsm>
 			<network-id mcc="244" mnc="05"/>
-			<apn value="internet"/>
+			<voicemail>777</voicemail>
+			<balance-check>
+				<dtmf>080090598</dtmf>
+				<sms text="SALDO">18258</sms>
+				<sms text="PAKETTI">18258</sms>
+			</balance-check>
+
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Saunalahti</name>
 		<gsm>
 			<network-id mcc="244" mnc="21"/>
+
+			<!-- Phone number dependent:
+				 - Numbers beginning with 045 67 XXXXX turn in to 045 66 XXXXX
+				 - Numbers beginning with 045 63 XXXXX turn in to 045 62 XXXXX
+				 - Others case by case
+				 http://saunalahti.fi/tuki/gsm/vo/ohjevastaaja.php
+			<voicemail/> -->
+			<balance-check>
+					<sms text="SALDO">16304</sms>
+					<sms text="SALDO">15045</sms>
+					<sms text="KOKOSALDO">16304</sms>
+					<sms text="GSALDO">16304</sms>
+					<sms text="PAKETTI">16304</sms>
+			</balance-check>
+
 			<apn value="internet.saunalahti">
-				<name>Postpaid (contract)</name>
-				<dns>192.89.123.230</dns>
-				<dns>192.89.123.231</dns>
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Postpaid (contract) NAT (available for all subscribers)</name>
+				<dns>195.74.0.47</dns>
+				<dns>195.197.54.100</dns>
+			</apn>
+			<apn value="internet4">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Postpaid (contract) public IP address (needs to be ordered)</name>
+				<dns>195.74.0.47</dns>
+				<dns>195.197.54.100</dns>
 			</apn>
 			<apn value="internet">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Prepaid (no contract)</name>
-				<dns>192.89.123.230</dns>
-				<dns>192.89.123.231</dns>
+				<dns>195.74.0.47</dns>
+				<dns>195.197.54.100</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -2226,11 +3420,24 @@
 		<name>Sonera</name>
 		<gsm>
 			<network-id mcc="244" mnc="91"/>
+
+			<!-- Phone number dependent:
+				 - Numbers beginning with 040 XXXXXXX turns in to 042 XXXXXXX
+				 - Others case by case
+			<voicemail/> -->
+			<balance-check>
+					<sms text="EASY SALDO">15400</sms>
+			</balance-check>
+
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>192.89.123.230</dns>
 				<dns>192.89.123.231</dns>
 			</apn>
 			<apn value="prointernet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Prointernet (public IP)</name>
 				<dns>192.89.123.230</dns>
 				<dns>192.89.123.231</dns>
@@ -2241,6 +3448,8 @@
 		<name>Welho</name>
 		<gsm>
 			<apn value="internet.welho.fi">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Wekkula</name>
 			</apn>
 		</gsm>
@@ -2253,15 +3462,22 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="542" mnc="01"/>
-			<apn value="vfinternet.fj"/>
-			<apn value="prepay.vfinternet.fj"/>
-		</gsm>
-	</provider>
-	<provider>
-		<name>Kidanet</name>
-		<gsm>
-			<network-id mcc="542" mnc="01"/>
-			<apn value="kidanet.fj"/>
+			<msisdn-query>
+				<ussd>*999#</ussd>
+			</msisdn-query>
+			<apn value="vfinternet.fj">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+			<apn value="kidanet.fj">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+			<!-- http://www.vodafone.com.fj/pages.cfm/personal/services/prepay-flashnet/installation-guide.html -->
+			<apn value="prepay.vfinternet.fj">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -2271,7 +3487,10 @@
 	<provider>
 		<name>A Mobile (Auchan Telecom)</name>
 		<gsm>
-			<apn value="wap65"/>
+			<apn value="wap65">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2279,48 +3498,91 @@
 		<gsm>
 			<network-id mcc="208" mnc="20"/>
 			<network-id mcc="208" mnc="21"/>
+
+			<voicemail>660</voicemail>
+			<balance-check>
+				<dtmf>630</dtmf>
+			</balance-check>
+
 			<apn value="a2bouygtel.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contrat Pro Data Illimité</name>
 				<dns>62.201.129.99</dns>
 			</apn>
 			<apn value="b2bouygtel.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>B2Bouygtel</name>
 				<dns>62.201.129.99</dns>
 			</apn>
 			<apn value="ebouygtel.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Forfait Data</name>
 				<dns>62.201.129.99</dns>
 			</apn>
 			<apn value="mmsbouygtel.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Forfait Data</name>
 				<dns>62.201.129.99</dns>
 			</apn>
 			<apn value="pcebouygtel.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contrat Pro Data</name>
 				<dns>62.201.129.99</dns>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
+		<name>Free Mobile</name>
+		<gsm>
+			<!-- http://mobile.free.fr/faq-config-apn-autres.html -->
+			<network-id mcc="208" mnc="15"/>
+			<apn value="free">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Free-Mobile</name>
+				<username>free</username>
+				<password>free</password>
+			</apn>
+			<apn value="mmsfree">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
+				<name>Free-Mobile</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="208" mnc="01"/>
 			<network-id mcc="208" mnc="00"/>
+
+			<voicemail>888</voicemail>
+			<balance-check>
+				<ussd>#123#</ussd>
+			</balance-check>
+
 			<apn value="orange.fr">
-				<name>Contract</name>
-				<username>orange</username>
-				<password>orange</password>
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Orange Internet</name>
 				<dns>194.51.3.56</dns>
 				<dns>194.51.3.76</dns>
 			</apn>
 			<apn value="internet-entreprise">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Business Contract</name>
-				<username>orange</username>
-				<password>orange</password>
 				<dns>194.51.3.56</dns>
 				<dns>194.51.3.76</dns>
 			</apn>
 			<apn value="orange">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>No Contract / Mobicarte</name>
 				<username>orange</username>
 				<password>orange</password>
@@ -2328,13 +3590,24 @@
 				<dns>194.51.3.76</dns>
 			</apn>
 			<apn value="orange-mib">
-				<name>Orange MIB</name>
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Orange Entreprises</name>
 				<username>mportail</username>
 				<password>mib</password>
 				<dns>172.17.0.2</dns>
 				<dns>172.17.0.4</dns>
 			</apn>
+			<apn value="orange-acte">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
+				<name>Orange MMS</name>
+				<username>orange</username>
+				<password>orange</password>
+			</apn>
 			<apn value="orange.ie">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet Everywhere 3G</name>
 			</apn>
 		</gsm>
@@ -2345,25 +3618,58 @@
 			<!-- http://assistance.sfr.fr/internet-partout/Mobile/difference-wap-web/fc-2302-62196 -->
 			<network-id mcc="208" mnc="10"/>
 			<network-id mcc="208" mnc="11"/>
+			<msisdn-query>
+				<sms text="ABCd84367">9445</sms>
+			</msisdn-query>
+			<voicemail>123</voicemail>
+			<balance-check>
+				<dtmf>950</dtmf>
+			</balance-check>
+
 			<apn value="websfr">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Web / Prepaid</name>
+				<dns>172.20.2.10</dns>
+				<dns>172.20.2.39</dns>
 			</apn>
-			<apn value="slsfr">
-				<name>Mobile Broadband</name>
-			</apn>
-			<apn value="ipnet">
-				<name>SFR ipnet</name>
+			<apn value="wapsfr">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
+				<name>WAP</name>
 			</apn>
 			<apn value="internetpro">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>SFR internetpro</name>
 			</apn>
+			<apn value="ipnet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>SFR ipnet</name>
+			</apn>
+			<apn value="slsfr">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Mobile Broadband</name>
+				<dns>172.20.2.10</dns>
+				<dns>172.20.2.39</dns>
+			</apn>
+			<apn value="sl2sfr">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Full Internet (Webphone)</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Transatel Telecom</name>
 		<gsm>
 			<network-id mcc="208" mnc="22"/>
-			<apn value="netgprs.com"/>
+			<apn value="netgprs.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2371,10 +3677,14 @@
 		<gsm>
 			<network-id mcc="208" mnc="01"/>
 			<apn value="ao.fr">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>orange</username>
 				<password>orange</password>
 			</apn>
 			<apn value="ofnew.fr">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Pay-by-MB</name>
 				<username>orange</username>
 				<password>orange</password>
@@ -2386,10 +3696,15 @@
 <!-- Britain -->
 <country code="gb">
 	<provider>
-		<name>airtel vodaphone</name>
+		<name>Asda Mobile</name>
 		<gsm>
-			<network-id mcc="234" mnc="03"/>
-			<apn value="airtel-ci-gprs.com"/>
+			<network-id mcc="234" mnc="15"/>
+			<apn value="asdamobiles.co.uk">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<username>web</username>
+				<password>web</password>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2397,12 +3712,28 @@
 		<gsm>
 			<network-id mcc="234" mnc="00"/>
 			<apn value="btmobile.bt.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>bt</username>
 				<password>bt</password>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
+		<name>GiffGaff</name>
+		<gsm>
+			<network-id mcc="234" mnc="02"/>
+			<network-id mcc="234" mnc="10"/>
+			<network-id mcc="234" mnc="11"/>
+			<apn value="giffgaff.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<username>giffgaff</username>
+				<password>password</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>O2</name>
 		<gsm>
 			<network-id mcc="234" mnc="02"/>
@@ -2414,6 +3745,8 @@
 				<dtmf>4444</dtmf>
 			</balance-check>
 			<apn value="mobile.o2.co.uk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract</name>
 				<username>o2web</username>
 				<password>password</password>
@@ -2421,6 +3754,8 @@
 				<dns>193.113.200.201</dns>
 			</apn>
 			<apn value="mobile.o2.co.uk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract (faster)</name>
 				<username>faster</username>
 				<password>password</password>
@@ -2428,16 +3763,22 @@
 				<dns>193.113.200.201</dns>
 			</apn>
 			<apn value="payandgo.o2.co.uk">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Pay and Go (Prepaid)</name>
 				<username>payandgo</username>
 				<password>payandgo</password>
 			</apn>
 			<apn value="idata.o2.co.uk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>iPhone (Contract)</name>
 				<username>vertigo</username>
 				<password>password</password>
 			</apn>
 			<apn value="m-bb.o2.co.uk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Broadband</name>
 				<username>o2bb</username>
 				<password>password</password>
@@ -2445,6 +3786,8 @@
 				<dns>82.132.254.3</dns>
 			</apn>
 			<apn value="wap.o2.co.uk">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>WAP</name>
 				<username>o2wap</username>
 				<password>password</password>
@@ -2462,50 +3805,95 @@
 				<sms text="AL">150</sms>
 			</balance-check>
 			<apn value="general.t-mobile.uk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>User</username>
 				<password>mms</password>
 				<dns>149.254.201.126</dns>
 				<dns>149.254.192.126</dns>
 			</apn>
 			<apn value="general.t-mobile.uk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>149.254.230.7</dns>
 				<dns>149.254.199.126</dns>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
+		<name>Tesco Mobile</name>
+		<gsm>
+			<network-id mcc="234" mnc="02"/>
+			<network-id mcc="234" mnc="10"/>
+			<network-id mcc="234" mnc="11"/>
+			<apn value="prepay.tesco-mobile.com">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<username>tescowap</username>
+				<password>password</password>
+				<dns>193.113.200.195</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Virgin Mobile</name>
 		<gsm>
 			<network-id mcc="234" mnc="31"/>
 			<network-id mcc="234" mnc="32"/>
 			<apn value="vdata">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>196.7.0.138</dns>
 				<dns>196.7.142.132</dns>
 			</apn>
+			<apn value="goto.virginmobile.uk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<username>user</username>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="234" mnc="15"/>
+			<msisdn-query>
+				<ussd>*#100#</ussd>
+			</msisdn-query>
 			<voicemail>121</voicemail>
 			<balance-check>
 				<ussd>*#1345#</ussd>
 				<dtmf>2345</dtmf>
 			</balance-check>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract</name>
 				<username>web</username>
 				<password>web</password>
 			</apn>
-			<apn value="smart">
+			<apn value="pp.vodafone.co.uk">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Prepaid</name>
 				<username>web</username>
 				<password>web</password>
+				<dns>172.29.1.11</dns>
+				<dns>172.29.1.11</dns>
 			</apn>
 			<apn value="ppbundle.internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>TopUp and Go</name>
 				<username>web</username>
 				<password>web</password>
+				<dns>10.203.129.68</dns>
+				<dns>10.203.129.68</dns>
+			</apn>
+			<apn value="pp.internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>TopUp and Go (older 1GB SIMs)</name>
 			</apn>
 			<apn value="pp.internet">
 				<name>TopUp and Go (older SIMs)</name>
@@ -2519,9 +3907,13 @@
 		<gsm>
 			<network-id mcc="234" mnc="20"/>
 			<apn value="3internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 			</apn>
 			<apn value="three.co.uk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Handsets</name>
 				<dns>172.30.139.17</dns>
 				<dns>172.30.140.69</dns>
@@ -2538,6 +3930,8 @@
 				<dtmf>453</dtmf>
 			</balance-check>
 			<apn value="orangeinternet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract</name>
 				<username>orange</username>
 				<password>orange</password>
@@ -2545,6 +3939,8 @@
 				<dns>193.35.134.10</dns>
 			</apn>
 			<apn value="internetvpn">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract (with VPN)</name>
 				<username>orange</username>
 				<password>orange</password>
@@ -2552,6 +3948,8 @@
 				<dns>193.35.134.10</dns>
 			</apn>
 			<apn value="orangewap">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>Orange WAP</name>
 				<username>orange</username>
 				<password>multimedia</password>
@@ -2569,6 +3967,8 @@
 		<gsm>
 			<network-id mcc="282" mnc="01"/>
 			<apn value="Internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>212.72.130.20</dns>
 				<dns>212.72.152.001</dns>
 			</apn>
@@ -2579,17 +3979,43 @@
 <!-- Guernsey -->
 <country code="gg">
 	<provider>
+		<name>Airtel-Vodaphone</name>
+		<gsm>
+			<network-id mcc="234" mnc="03"/>
+			<apn value="airtel-ci-gprs.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Sure (Cable &amp; Wireless)</name>
 		<gsm>
 			<network-id mcc="234" mnc="55"/>
 			<apn value="wap">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>WAP</name>
 			</apn>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Wave Telecom</name>
+		<gsm>
+			<network-id mcc="234" mnc="50"/>
+			<apn value="pepper">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<dns>212.9.0.135</dns>
+				<dns>212.9.0.136</dns>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Ghana -->
@@ -2598,14 +4024,23 @@
 		<name>MTN</name>
 		<gsm>
 			<network-id mcc="620" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Vodafone (ONEtouch)</name>
 		<gsm>
 			<network-id mcc="620" mnc="02"/>
-			<apn value="browse"/>
+			<msisdn-query>
+				<ussd>*127#</ussd>
+			</msisdn-query>
+			<apn value="browse">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2613,6 +4048,8 @@
 		<gsm>
 			<network-id mcc="620" mnc="03"/>
 			<apn value="web.tigo.com.gh">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 			</apn>
 		</gsm>
@@ -2621,7 +4058,10 @@
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="620" mnc="06"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2636,18 +4076,40 @@
 		<name>Cosmote</name>
 		<gsm>
 			<network-id mcc="202" mnc="01"/>
-			<apn value="internet"/>
+
+			<voicemail>123</voicemail>
+			<balance-check>
+				<dtmf>1314</dtmf>
+				<sms text="YP">1314</sms>
+			</balance-check>
+
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="202" mnc="05"/>
+			<voicemail>121</voicemail>
+			<balance-check>
+				<dtmf>1252</dtmf>
+				<sms text="Y">1252</sms>
+			</balance-check>
+
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract</name>
 			</apn>
 			<apn value="web.session">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Broadband On Demand</name>
+				<dns>213.249.17.10</dns>
+				<dns>213.249.17.11</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -2656,7 +4118,19 @@
 		<gsm>
 			<network-id mcc="202" mnc="09"/>
 			<network-id mcc="202" mnc="10"/>
+
+			<voicemail>122</voicemail>
+			<voicemail>1333</voicemail>
+			<balance-check>
+				<dtmf>1269</dtmf>
+				<dtmf>1225</dtmf>
+				<sms text="">1269</sms>
+				<sms text="">1225</sms>
+			</balance-check>
+
 			<apn value="gint.b-online.gr">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 				<password>web</password>
 			</apn>
@@ -2670,7 +4144,10 @@
 		<name>Claro</name>
 		<gsm>
 			<network-id mcc="704" mnc="01"/>
-			<apn value="internet.ideasclaro"/>
+			<apn value="internet.ideasclaro">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2678,6 +4155,8 @@
 		<gsm>
 			<network-id mcc="704" mnc="02"/>
 			<apn value="Wap.tigo.gt">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>Wap</username>
 				<password>Wap</password>
 			</apn>
@@ -2692,6 +4171,8 @@
 		<gsm>
 			<network-id mcc="738" mnc="02"/>
 			<apn value="wap.cellinkgy.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>test</username>
 				<password>test</password>
 			</apn>
@@ -2702,6 +4183,8 @@
 		<gsm>
 			<network-id mcc="738" mnc="01"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 				<password>web</password>
 			</apn>
@@ -2717,6 +4200,8 @@
 			<network-id mcc="454" mnc="00"/>
 			<network-id mcc="454" mnc="02"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>202.84.255.1</dns>
 				<dns>203.116.254.150</dns>
 			</apn>
@@ -2726,21 +4211,30 @@
 		<name>New World</name>
 		<gsm>
 			<network-id mcc="454" mnc="10"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>China Mobile</name>
 		<gsm>
 			<network-id mcc="454" mnc="12"/>
-			<apn value="peoples.net"/>
+			<apn value="peoples.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>SmarTone-Vodafone</name>
 		<gsm>
 			<network-id mcc="454" mnc="06"/>
-			<apn value="Internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2749,22 +4243,51 @@
 			<network-id mcc="454" mnc="16"/>
 			<network-id mcc="454" mnc="19"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Sunday (Old)</name>
 			</apn>
 			<apn value="pccwdata">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>PCCW 2G/GPRS</name>
 			</apn>
 			<apn value="pccw">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>PCCW 3G</name>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
+		<name>Sunday</name>
+		<gsm>
+			<network-id mcc="454" mnc="16"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Orange</name>
+		<gsm>
+			<network-id mcc="454" mnc="04"/>
+			<apn value="web.orangehk.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Three</name>
 		<gsm>
 			<network-id mcc="454" mnc="03"/>
 			<network-id mcc="454" mnc="04"/>
-			<apn value="mobile.three.com.hk"/>
+			<apn value="mobile.three.com.hk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -2775,7 +4298,10 @@
 		<name>Tigo</name>
 		<gsm>
 			<network-id mcc="708" mnc="02"/>
-			<apn value="internet.tigo.hn"/>
+			<apn value="internet.tigo.hn">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -2787,6 +4313,8 @@
 		<gsm>
 			<network-id mcc="219" mnc="01"/>
 			<apn value="web.htgprs">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>10.12.0.1</dns>
 			</apn>
 		</gsm>
@@ -2796,8 +4324,35 @@
 		<gsm>
 			<network-id mcc="219" mnc="10"/>
 			<apn value="data.vip.hr">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract and Prepaid</name>
 			</apn>
+			<apn value="gprs5.vipnet.hr">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>GPRS 5</name>
+				<username>38591</username>
+				<password>38591</password>
+				<dns>195.29.159.15</dns>
+			</apn>
+			<apn value="gprs0.vipnet.hr">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>GPRS 0</name>
+				<username>38591</username>
+				<password>38591</password>
+				<dns>195.29.159.15</dns>
+			</apn>
+			<apn value="3g.vip.hr">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>3G</name>
+				<username>38591</username>
+				<password>38591</password>
+				<dns>212.91.97.3</dns>
+				<dns>212.91.97.4</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -2805,6 +4360,8 @@
 		<gsm>
 			<network-id mcc="219" mnc="10"/>
 			<apn value="carnet.vip.hr">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>AAIEDU</username>
 				<password></password>
 			</apn>
@@ -2815,6 +4372,8 @@
 		<gsm>
 			<network-id mcc="219" mnc="02"/>
 			<apn value="carnet.tele2.hr">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>AAIEDU</username>
 				<password></password>
 			</apn>
@@ -2825,6 +4384,8 @@
 		<gsm>
 			<network-id mcc="219" mnc="02"/>
 			<apn value="mobileinternet.tele2.hr">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>212.247.156.66</dns>
 			</apn>
 		</gsm>
@@ -2838,6 +4399,8 @@
 		<gsm>
 			<network-id mcc="216" mnc="01"/>
 			<apn value="net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>mobilinternet</name>
 				<dns>217.79.128.40</dns>
 				<dns>217.79.128.45</dns>
@@ -2845,14 +4408,30 @@
 		</gsm>
 	</provider>
 	<provider>
+		<name>DIGI</name>
+		<gsm>
+			<!-- Using Telenor's network -->
+			<network-id mcc="216" mnc="01"/>
+			<apn value="digi">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>DIGI Move</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="216" mnc="30"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>212.51.115.1</dns>
 				<dns>194.176.224.6</dns>
 			</apn>
 			<apn value="mms-westel">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
 				<name>MMS</name>
 				<username>mms</username>
 				<dns>212.51.115.1</dns>
@@ -2864,12 +4443,36 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="216" mnc="70"/>
+			<apn value="standardnet.vodafone.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Előf. Normál</name>
+				<username>vodawap</username>
+				<password>vodawap</password>
+				<dns>80.244.97.30</dns>
+				<dns>80.244.96.1</dns>
+			</apn>
 			<!-- http://www.vodafone.hu/en/support/questions-answers/pay-monthly/internet -->
 			<apn value="internet.vodafone.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Előf. töm.</name>
+				<dns>80.244.97.30</dns>
+				<dns>80.244.96.1</dns>
+			</apn>
+			<apn value="vitamax.snet.vodafone.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Felt. norm.</name>
+				<dns>80.244.97.30</dns>
+				<dns>80.244.96.1</dns>
 			</apn>
 			<apn value="vitamax.internet.vodafone.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Vodafone (felt. töm.)</name>
+				<dns>80.244.97.30</dns>
+				<dns>80.244.96.1</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -2878,6 +4481,8 @@
                 <!-- MVNO operating on Telenor's network -->
 		<gsm>
 			<apn value="invitel.mobilnet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>net.and.go</name>
 			</apn>
 		</gsm>
@@ -2891,11 +4496,15 @@
 		<gsm>
 			<network-id mcc="510" mnc="89"/>
 			<apn value="3gprs">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>GPRS</name>
 				<username>3gprs</username>
 				<password>3gprs</password>
 			</apn>
 			<apn value="3data">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Monthly Internet Service</name>
 				<name xml:lang="id">Layanan Internet Bulanan</name>
 				<username>3data</username>
@@ -2908,6 +4517,8 @@
 		<gsm>
 			<network-id mcc="510" mnc="08"/>
 			<apn value="AXIS">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>axis</username>
 				<password>123456</password>
 			</apn>
@@ -2925,16 +4536,22 @@
 			<!-- It seems that the APN is pretty much the same for plans -->
 
 			<apn value="indosatgprs">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>IM3/Mentari Time-based</name>
 				<username>indosat@durasi</username>
 				<password>indosat@durasi</password>
 			</apn>
 			<apn value="indosatgprs">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>IM3/Mentari Volume-based</name>
 				<username>indosat</username>
 				<password>indosat</password>
 			</apn>
 			<apn value="indosatgprs">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Matrix 3G/3.5G</name>
 				<username>indosat</username>
 				<password>indosat</password>
@@ -2956,6 +4573,8 @@
 
 			<!-- http://www.telkomsel.com/customer-service/manual-setting/ -->
 			<apn value="telkomsel">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>wap</username>
 				<password>wap123</password>
 				<dns>202.152.0.2</dns>
@@ -2964,11 +4583,15 @@
 
 			<!-- http://www.telkomsel.com/telkomselflash/telkomsel-flash -->
 			<apn value="flash">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Flash Time-based</name>
 				<username>foo</username>
 				<password>bar</password>
 			</apn>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Flash Volume-based</name>
 				<username>foo</username>
 				<password>bar</password>
@@ -2980,6 +4603,8 @@
 		<gsm>
 			<network-id mcc="510" mnc="11"/>
 			<apn value="www.xlgprs.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>xlgprs</username>
 				<password>proxl</password>
 				<dns>202.152.254.245</dns>
@@ -3036,6 +4661,8 @@
 				<ussd>*#100#</ussd>
 			</balance-check>
 			<apn value="open.internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract</name>
 				<username>gprs</username>
 				<password>gprs</password>
@@ -3043,21 +4670,64 @@
 				<dns>62.40.32.34</dns>
 			</apn>
 			<apn value="pp.internet">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Prepaid</name>
 				<username>faster</username>
 				<password>web</password>
 				<dns>62.40.32.33</dns>
 				<dns>62.40.32.34</dns>
 			</apn>
+			<apn value="internet">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Old Config Internet and MMS</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="272" mnc="01"/>
+			<msisdn-query>
+				<sms text="MYMSISDN:">50189</sms>
+			</msisdn-query>
 			<apn value="hs.vodafone.ie">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>vodafone</username>
 				<password>vodafone</password>
+				<dns>89.19.64.36</dns>
+				<dns>89.19.64.164</dns>
+			</apn>
+			<apn value="isp.vodafone.ie">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Old</name>
+				<username>vodafone</username>
+				<password>vodafone</password>
+			</apn>
+			<apn value="live.vodafone.com">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Prepaid</name>
+				<username>vodafone</username>
+				<password>vodafone</password>
+				<dns>10.24.59.100</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>E-Mobile</name>
+		<gsm>
+			<network-id mcc="272" mnc="03"/>
+			<!-- Information not found on the web but with the Windows connection software -->
+			<apn value="broadband.eircommbb.ie">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Broadband To Go</name>
+				<dns>212.129.64.220</dns>
+				<dns>212.129.64.221</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -3066,12 +4736,25 @@
 		<gsm>
 			<network-id mcc="272" mnc="03"/>
 			<apn value="data.mymeteor.ie">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Meteor Data</name>
 				<username>my</username>
 				<password>meteor</password>
 			</apn>
 			<apn value="broadband.mymeteor.ie">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Broadband To Go</name>
+				<dns>212.129.64.220</dns>
+				<dns>212.129.64.221</dns>
+			</apn>
+			<apn value="isp.mymeteor.ie">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>GPRS</name>
+				<username>my</username>
+				<password>isp</password>
 			</apn>
 		</gsm>
 	</provider>
@@ -3080,6 +4763,8 @@
 		<gsm>
 			<network-id mcc="272" mnc="05"/>
 			<apn value="3ireland.ie">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>172.31.140.69</dns>
 				<dns>172.30.140.69</dns>
 			</apn>
@@ -3103,7 +4788,10 @@
 		<name>CellCom</name>
 		<gsm>
 			<network-id mcc="425" mnc="02"/>
-			<apn value="internetg"/>
+			<apn value="internetg">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3111,6 +4799,8 @@
 		<gsm>
 			<network-id mcc="425" mnc="01"/>
 			<apn value="uinternet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>3G Internet</name>
 				<dns>158.43.192.1</dns>
 				<dns>158.43.128.1</dns>
@@ -3122,6 +4812,8 @@
 		<gsm>
 			<network-id mcc="425" mnc="03"/>
 			<apn value="internet.pelephone.net.il">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>3G</name>
 				<username>pcl@3g</username>
 				<password>pcl</password>
@@ -3133,13 +4825,28 @@
 <!-- Isle of Man -->
 <country code="im">
 	<provider>
+		<name>Manx Telecom</name>
+		<gsm>
+			<network-id mcc="234" mnc="58"/>
+			<apn value="3gpronto">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Sure (Cable &amp; Wireless)</name>
 		<gsm>
+			<network-id mcc="234" mnc="36"/>
 			<network-id mcc="234" mnc="55"/>
 			<apn value="wap">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>WAP</name>
 			</apn>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -3173,12 +4880,23 @@
 			<network-id mcc="405" mnc="812"/>
 
 			<apn value="aircelweb">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Web</name>
 			</apn>
+			<apn value="aircelgprs">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>GPRS</name>
+			</apn>
 			<apn value="aircelgprs.po">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>GPRS (Postpaid)</name>
 			</apn>
 			<apn value="aircelgprs.pr">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>GPRS (Prepaid)</name>
 			</apn>
 		</gsm>
@@ -3211,6 +4929,8 @@
 			<network-id mcc="405" mnc="56"/>
 
 			<apn value="airtelgprs.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>202.56.230.5</dns>
 				<dns>202.56.240.5</dns>
 			</apn>
@@ -3242,8 +4962,15 @@
 			<network-id mcc="405" mnc="755"/>
 			<network-id mcc="405" mnc="756"/>
 			<apn value="www">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Vodafone Connect</name>
 			</apn>
+			<apn value="portalnmms">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
+				<name>Vodafone Live</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3273,31 +5000,47 @@
 
 			<!-- http://cellone.in/cellone_msp.htm -->
 			<apn value="bsnlnet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>New GPRS/3G</name>
 			</apn>
 
 			<apn value="bsnlwap">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>New WAP</name>
 			</apn>
 
 			<apn value="bsnlsouth">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Old South Zone A (Karnatka, Andhra Pradesh, Chennai, Tamil Nadu, Kerala)</name>
 			</apn>
 			<apn value="gprssouth.cellone.in">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Old South Zone B (Karnatka, Andhra Pradesh, Chennai, Tamil Nadu, Kerala)</name>
 			</apn>
 			<apn value="gprsnorth.cellone.in">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Old North Zone (Haryana, Punjab, UP(East), UP(West), Himachal Pradesh, Rajasthan, Jammu &amp; Kashmir)</name>
 			</apn>
 			<apn value="gprswest.cellone.in">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Old West Zone (Maharashtra, Gujrat, Madhya Pradesh, Chattishgarh)</name>
 			</apn>
 			<apn value="www.e.pr">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Old East Zone Prepaid (Jharkhand, Bihar, Kolkata, West Bengal, Orissa, Assam, North East, Adman Nicobar)</name>
 				<dns>218.248.240.208</dns>
 				<dns>218.248.240.135</dns>
 			</apn>
 			<apn value="www.e.po">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Old East Zone Postpaid (Jharkhand, Bihar, Kolkata, West Bengal, Orissa, Assam, North East, Adman Nicobar)</name>
 				<dns>218.248.240.208</dns>
 				<dns>218.248.240.135</dns>
@@ -3323,7 +5066,8 @@
 			<network-id mcc="405" mnc="848"/>
 			<network-id mcc="405" mnc="850"/>
 			<apn value="internet">
-				<dns>10.4.42.15</dns>
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 			</apn>
 		</gsm>
 	</provider>
@@ -3333,16 +5077,22 @@
 			<network-id mcc="404" mnc="68"/>
 			<network-id mcc="404" mnc="69"/>
 			<apn value="gprsmtnldel">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Delhi</name>
 				<username>mtnl</username>
 				<password>mtnl123</password>
 			</apn>
 			<apn value="gprsppsmum">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Mumbai (Prepaid)</name>
 				<username>mtnl</username>
 				<password>mtnl123</password>
 			</apn>
 			<apn value="gprsmtnlmum">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mumbai (Postpaid / Plan 2)</name>
 				<username>mtnl</username>
 				<password>mtnl123</password>
@@ -3361,11 +5111,20 @@
 			<network-id mcc="405" mnc="10"/>
 			<network-id mcc="405" mnc="13"/>
 			<apn value="smartnet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Smart Net</name>
 			</apn>
 			<apn value="smartwap">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>Smart WAP</name>
 			</apn>
+			<apn value="rcomnet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Netconnect (RCOMNET)</name>
+			</apn>
 		</gsm>
 		<cdma>
 			<name>Reliance Netconnect</name>
@@ -3399,10 +5158,14 @@
 			<network-id mcc="404" mnc="44"/>
 
 			<apn value="Simplyenjoy">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>spice</username>
 				<password>spice</password>
 			</apn>
 			<apn value="simplydownload">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>kar</name>
 			</apn>
 		</gsm>
@@ -3432,6 +5195,13 @@
 			<network-id mcc="405" mnc="047"/>
 
 			<apn value="TATA.DOCOMO.INTERNET">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Internet</name>
+			</apn>
+			<apn value="TATADOCOMO3G">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -3448,6 +5218,7 @@
 		<cdma>
 			<username>internet</username>
 			<password>internet</password>
+			<sid value="14836"/>
 		</cdma>
 	</provider>
 	<provider>
@@ -3456,6 +5227,7 @@
 			<username>internet@internet.mtsindia.in</username>
 			<password>mts</password>
 			<sid value="14554"/>
+			<sid value="14555"/>
 		</cdma>
 	</provider>
 </country>
@@ -3488,6 +5260,8 @@
 		<gsm>
 			<network-id mcc="418" mnc="40"/>
 			<apn value="net.korek.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>korek</username>
 				<password>korek</password>
 			</apn>
@@ -3498,6 +5272,8 @@
 		<gsm>
 			<network-id mcc="418" mnc="50"/>
 			<apn value="net.asiacell.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 			</apn>
 		</gsm>
 	</provider>
@@ -3510,6 +5286,8 @@
 		<gsm>
 			<network-id mcc="432" mnc="11"/>
 			<apn value="mcinet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 			</apn>
 		</gsm>
 	</provider>
@@ -3518,6 +5296,8 @@
 		<gsm>
 			<network-id mcc="432" mnc="35"/>
 			<apn value="mtnirancell">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 			</apn>
 		</gsm>
 	</provider>
@@ -3530,7 +5310,12 @@
 		<gsm>
 			<network-id mcc="274" mnc="02"/>
 			<network-id mcc="274" mnc="03"/>
-			<apn value="vmc.gprs.is"/>
+			<apn value="vmc.gprs.is">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<dns>213.176.128.51</dns>
+				<dns>213.176.128.50</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3538,6 +5323,8 @@
 		<gsm>
 			<network-id mcc="274" mnc="11"/>
 			<apn value="internet.nova.is">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>192.168.190.54</dns>
 				<dns>192.168.190.55</dns>
 			</apn>
@@ -3548,6 +5335,8 @@
 		<gsm>
 			<network-id mcc="274" mnc="01"/>
 			<apn value="wap.simi.is">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>194.105.224.1</dns>
 				<dns>212.30.200.200</dns>
 			</apn>
@@ -3561,9 +5350,18 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="222" mnc="10"/>
-			<apn value="web.omnitel.it">
+			<apn value="mobile.vodafone.it">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Internet</name>
 			</apn>
+			<apn value="web.omnitel.it">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Internet Facile (old)</name>
+				<dns>83.224.70.62</dns>
+				<dns>83.224.70.78</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3571,11 +5369,15 @@
 		<gsm>
 			<network-id mcc="222" mnc="01"/>
 			<apn value="ibox.tim.it">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Maxxi Alice/Internet</name>
 				<dns>217.200.200.42</dns>
 				<dns>213.230.129.10</dns>
 			</apn>
 			<apn value="wap.tim.it">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>WAP</name>
 				<username>WAPTIM</username>
 				<dns>213.230.155.94</dns>
@@ -3588,6 +5390,8 @@
 		<gsm>
 			<network-id mcc="222" mnc="88"/>
 			<apn value="internet.wind">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Non-business</name>
 				<username>Wind</username>
 				<password>Wind</password>
@@ -3595,6 +5399,8 @@
 				<dns>193.70.192.25</dns>
 			</apn>
 			<apn value="internet.wind.biz">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Business</name>
 				<username>Wind</username>
 				<password>Wind</password>
@@ -3608,11 +5414,15 @@
 		<gsm>
 			<network-id mcc="222" mnc="99"/>
 			<apn value="tre.it">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Ricaricabile</name>
 				<dns>62.13.169.92</dns>
 				<dns>62.13.169.93</dns>
 			</apn>
 			<apn value="datacard.tre.it">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Abbonamento</name>
 			</apn>
 		</gsm>
@@ -3622,9 +5432,13 @@
 		<gsm>
 			<network-id mcc="222" mnc="99"/>
 			<apn value="apn.fastweb.it">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Voce/dati</name>
 			</apn>
 			<apn value="datacard.fastweb.it">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Solo dati</name>
 				<dns>213.140.2.43</dns>
 				<dns>213.140.2.49</dns>
@@ -3635,7 +5449,10 @@
 		<name>PosteMobile</name>
 		<gsm>
 			<network-id mcc="222" mnc="10"/>
-			<apn value="internet.postemobile.it"/>
+			<apn value="internet.postemobile.it">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3643,6 +5460,8 @@
 		<gsm>
 			<network-id mcc="222" mnc="01"/>
 			<apn value="web.coopvoce.it">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet Mobile</name>
 			</apn>
 		</gsm>
@@ -3652,10 +5471,13 @@
 <!-- Jersey -->
 <country code="je">
 	<provider>
-		<name>Airtel-Vodafone</name>
+		<name>Airtel-Vodaphone</name>
 		<gsm>
-			<network-id mcc="234" mnc="02"/>
-			<apn value="airtel-ci-gprs.com"/>
+			<network-id mcc="234" mnc="03"/>
+			<apn value="airtel-ci-gprs.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3663,9 +5485,13 @@
 		<gsm>
 			<network-id mcc="234" mnc="55"/>
 			<apn value="wap">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>WAP</name>
 			</apn>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -3675,6 +5501,8 @@
 		<gsm>
 			<network-id mcc="234" mnc="50"/>
 			<apn value="pepper">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>abc</username>
 				<password>abc</password>
 				<dns>212.9.0.135</dns>
@@ -3690,7 +5518,10 @@
 		<name>Cable &amp; Wireless</name>
 		<gsm>
 			<network-id mcc="338" mnc="020"/>
-			<apn value="wap"/>
+			<apn value="wap">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -3698,6 +5529,8 @@
 		<gsm>
 			<network-id mcc="338" mnc="050"/>
 			<apn value="web.digiceljamaica.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>wapuser</username>
 				<password>wap03jam</password>
 				<dns>208.131.176.126</dns>
@@ -3714,6 +5547,8 @@
 		<gsm>
 			<network-id mcc="416" mnc="77"/>
 			<apn value="net.orange.jo">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Broadband</name>
 				<username>net</username>
 				<password>net</password>
@@ -3725,6 +5560,8 @@
 		<gsm>
 			<network-id mcc="416" mnc="01"/>
 			<apn value="zain">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Broadband</name>
 				<username>Zain</username>
 				<password>Zain</password>
@@ -3759,6 +5596,8 @@
 			<network-id mcc="440" mnc="97"/>
 			<network-id mcc="440" mnc="98"/>
 			<apn value="softbank">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>ai@softbank</username>
 				<password>softbank</password>
 			</apn>
@@ -3769,6 +5608,8 @@
 		<gsm>
 			<network-id mcc="440" mnc="10"/>
 			<apn value="dm.jplat.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>u300</name>
 				<username>bmobile@u300</username>
 				<password>bmobile</password>
@@ -3780,6 +5621,8 @@
 		<gsm>
 			<network-id mcc="440" mnc="00"/>
 			<apn value="emb.ne.jp">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>em</username>
 				<password>em</password>
 			</apn>
@@ -3837,9 +5680,13 @@
 			<network-id mcc="440" mnc="99"/>
 
 			<apn value="mopera.ne.jp">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>mopera</name>
 			</apn>
 			<apn value="mopera.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>mopera U</name>
 			</apn>
 		</gsm>
@@ -3858,17 +5705,22 @@
 <!-- Kenya -->
 <country code="ke">
 	<provider>
-		<name>Zain / Celtel</name>
+		<name>Airtel</name>
 		<gsm>
 			<network-id mcc="639" mnc="03"/>
-			<apn value="ke.celtel.com"/>
+			<apn value="ke.celtel.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Safaricom</name>
 		<gsm>
 			<network-id mcc="639" mnc="02"/>
-			<apn value="web.safaricom.com">
+			<apn value="safaricom">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 				<password>web</password>
 			</apn>
@@ -3886,14 +5738,20 @@
 		<name>yu (Econet)</name>
 		<gsm>
 			<network-id mcc="639" mnc="05"/>
-			<apn value="internet.econet.co.ke"/>
+			<apn value="internet.econet.co.ke">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="639" mnc="07"/>
-			<apn value="bew.orange.co.ke"/>
+			<apn value="bew.orange.co.ke">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 		<cdma>
 			<name>Orange Fixed Plus</name>
@@ -3901,28 +5759,95 @@
 	</provider>
 </country>
 
-<!-- Cambodia -->
-<country code="kh">
+<!-- Kyrgyzstan -->
+<country code="kg">
 	<provider>
-		<name>hello</name>
+		<name>Beeline</name>
 		<gsm>
-			<network-id mcc="456" mnc="02"/>
-			<apn value="hellowww"/>
+			<network-id mcc="437" mnc="01"/>
+			<apn value="internet.beeline.kg">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Mobitel</name>
+		<name>MegaCom</name>
+		<gsm>
+			<network-id mcc="437" mnc="05"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>O!</name>
+		<gsm>
+			<network-id mcc="437" mnc="09"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>FONEX</name>
+		<cdma>
+			<username>cdma</username>
+			<password>cdma</password>
+		</cdma>
+	</provider>
+	<provider>
+		<name>nexi (mir+kg)</name>
+		<name xml:lang="ru">Зона Мир+КГ</name>
+		<cdma>
+			<username>555@mir</username>
+			<password>555</password>
+		</cdma>
+	</provider>
+	<provider>
+		<name>nexi (kg)</name>
+		<name xml:lang="ru">Зона КГ</name>
+		<cdma>
+			<username>999@kg</username>
+			<password>999</password>
+		</cdma>
+	</provider>
+</country>
+
+<!-- Cambodia -->
+<country code="kh">
+	<provider>
+		<name>Cellcard</name>
 		<gsm>
 			<network-id mcc="456" mnc="01"/>
-			<apn value="3g">
-				<name>CellCard Corporate</name>
+
+			<balance-check>
+				<ussd>#124#</ussd>
+			</balance-check>
+
+			<!-- http://www.cellcard.com.kh/en/service/data_3.5G_internet.php -->
+			<apn value="cellcard">
+				<usage type="internet"/>
 				<username>mobitel</username>
 				<password>mobitel</password>
 			</apn>
-			<apn value="3gtv">
-				<name>CellCard Unlimited</name>
-				<username>mobitel</username>
-				<password>mobitel</password>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Hello</name>
+		<gsm>
+			<network-id mcc="456" mnc="02"/>
+
+			<balance-check>
+				<ussd>*100#</ussd>
+			</balance-check>
+
+			<!-- http://www.tmic.com.kh/public/mobile_broadband/mobile_broadband.aspx?page=broadband_faq -->
+			<!-- in reality any APN value works -->
+			<apn value="hellowww">
+				<usage type="internet"/>
 			</apn>
 		</gsm>
 	</provider>
@@ -3930,22 +5855,82 @@
 		<name>qb</name>
 		<gsm>
 			<network-id mcc="456" mnc="04"/>
+
+			<balance-check>
+				<ussd>#132#</ussd>
+			</balance-check>
+
+			<!-- http://www.qbmore.com/download/handsetconfiguration.html -->
 			<apn value="WAP">
-				<name>QBmore</name>
+				<usage type="internet"/>
 			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Star-Cell</name>
+		<name>Smart Mobile</name>
 		<gsm>
-			<network-id mcc="456" mnc="05"/>
-			<apn value="internet"/>
+			<network-id mcc="456" mnc="06"/>
+
+			<balance-check>
+				<ussd>*888#</ussd>
+			</balance-check>
+
+			<!-- http://www.smart.com.kh/en/services/internet -->
+			<apn value="smart">
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Metfone</name>
+		<gsm>
+			<network-id mcc="456" mnc="08"/>
+
+			<balance-check>
+				<ussd>*097#</ussd>
+			</balance-check>
+
+			<!-- http://metfone.com.kh/home/metfone.mf?id=20&task=detailpac -->
+			<apn value="metfone">
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Beeline</name>
+		<gsm>
+			<network-id mcc="456" mnc="09"/>
+
+			<balance-check>
+				<ussd>*102#</ussd>
+			</balance-check>
+
+			<!-- in reality any APN value works -->
+			<apn value="gprs.beeline.com.kh">
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Excell</name>
+			<!-- mcc="456" mnc="11" -->
 		<cdma/>
 	</provider>
+	<provider>
+		<name>Mfone</name>
+		<gsm>
+			<network-id mcc="456" mnc="18"/>
+
+			<balance-check>
+				<ussd>*222#</ussd>
+			</balance-check>
+
+			<!-- http://www.mfone.com.kh/images/3g/mfone_3g.pdf -->
+			<apn value="Mfone">
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Korea, Republic of -->
@@ -3954,7 +5939,10 @@
 		<name>KTF</name>
 		<gsm>
 			<network-id mcc="450" mnc="08"/>
-			<apn value="hsdpa-internet.ktfwing.com"/>
+			<apn value="hsdpa-internet.ktfwing.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 		<cdma>
 			<!-- cid: "016" -->
@@ -3978,7 +5966,10 @@
 		<name>SKTelecom</name>
 		<gsm>
 			<network-id mcc="450" mnc="05"/>
-			<apn value="nate.sktelecom.com"/>
+			<apn value="nate.sktelecom.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 		<cdma>
 			<!-- cid: 1501 -->
@@ -3994,11 +5985,15 @@
 		<gsm>
 			<network-id mcc="419" mnc="02"/>
 			<apn value="pps">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Personal</name>
 				<username>pps</username>
 				<password>pps</password>
 			</apn>
 			<apn value="apn01">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Corporate</name>
 			</apn>
 		</gsm>
@@ -4007,14 +6002,20 @@
 		<name>Wataniya</name>
 		<gsm>
 			<network-id mcc="419" mnc="03"/>
-			<apn value="action.wataniya.com"/>
+			<apn value="action.wataniya.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Viva</name>
 		<gsm>
 			<network-id mcc="419" mnc="04"/>
-			<apn value="viva"/>
+			<apn value="viva">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -4026,6 +6027,8 @@
 		<gsm>
 			<network-id mcc="401" mnc="01"/>
 			<apn value="internet.beeline.kz">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>@internet.beeline</username>
 				<dns>212.19.149.53</dns>
 				<dns>194.226.128.1</dns>
@@ -4036,7 +6039,10 @@
 		<name>K'CELL</name>
 		<gsm>
 			<network-id mcc="401" mnc="02"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -4044,14 +6050,20 @@
 		<name>Activ</name>
 		<gsm>
 			<network-id mcc="401" mnc="02"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Neo</name>
 		<gsm>
 			<network-id mcc="401" mnc="77"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -4077,10 +6089,51 @@
 		<gsm>
 			<network-id mcc="457" mnc="02"/>
 			<apn value="etlnet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>192.168.4.130</dns>
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Lao Telecom</name>
+		<gsm>
+			<network-id mcc="457" mnc="01"/>
+			<balance-check>
+				<ussd>*122#</ussd>
+			</balance-check>			
+			<apn value="ltcnet">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Unitel</name>
+		<gsm>
+			<network-id mcc="457" mnc="03"/>
+			<apn value="startelecom">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Unitel (2G)</name>
+			</apn>
+			<apn value="unitel3g">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Unitel (3G)</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Beeline (Tigo)</name>
+		<gsm>
+			<network-id mcc="457" mnc="08"/>
+			<apn value="beelinenet">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Lebanon -->
@@ -4089,7 +6142,10 @@
 		<name>MTC Touch</name>
 		<gsm>
 			<network-id mcc="415" mnc="03"/>
-			<apn value="gprs.mtctouch.com.lb"/>
+			<apn value="gprs.mtctouch.com.lb">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -4100,7 +6156,10 @@
 		<name>Cable &amp; Wireless</name>
 		<gsm>
 			<network-id mcc="358" mnc="110"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -4111,17 +6170,34 @@
 		<name>Airtel</name>
 		<gsm>
 			<network-id mcc="413" mnc="05"/>
-			<apn value="www.wap.airtel.lk"/>
+			<apn value="www.wap.airtel.lk">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>DIALOG</name>
 		<gsm>
 			<network-id mcc="413" mnc="02"/>
-			<apn value="Dialogbb">
+			<apn value="www.dialogsl.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Postpaid</name>
+			</apn>
+			<apn value="ppinternet">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Prepaid</name>
+			</apn>
+			<apn value="dialogbb">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Unlimited Broadband</name>
 			</apn>
 			<apn value="kitbb.com">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Prepaid (Kitbb)</name>
 			</apn>
 		</gsm>
@@ -4130,21 +6206,44 @@
 		<name>Hutch</name>
 		<gsm>
 			<network-id mcc="413" mnc="08"/>
-			<apn value="htwap"/>
+			<apn value="htwap">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Mobitel</name>
 		<gsm>
 			<network-id mcc="413" mnc="01"/>
-			<apn value="isp"/>
+			<apn value="isp">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Tigo</name>
 		<gsm>
 			<network-id mcc="413" mnc="03"/>
-			<apn value="wap"/>
+			<apn value="wap">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+</country>
+
+<!-- Lesotho -->
+<country code="ls">
+	<provider>
+		<name>Vodacom Lesotho</name>
+		<gsm>
+			<network-id mcc="651" mnc="01"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -4166,14 +6265,22 @@
 		<name>Bité Lietuva</name>
 		<gsm>
 			<network-id mcc="246" mnc="02"/>
-			<apn value="banga"/>
+			<apn value="banga">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<dns>213.226.131.131</dns>
+				<dns>193.219.88.36</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>TELE2 GPRS</name>
 		<gsm>
 			<network-id mcc="246" mnc="03"/>
-			<apn value="internet.tele2.lt"/>
+			<apn value="internet.tele2.lt">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -4181,11 +6288,15 @@
 		<gsm>
 			<network-id mcc="246" mnc="01"/>
 			<apn value="gprs.omnitel.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract</name>
 				<dns>194.176.32.129</dns>
 				<dns>195.22.175.1</dns>
 			</apn>
 			<apn value="gprs.startas.lt">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>No contract</name>
 				<username>omni</username>
 				<password>omni</password>
@@ -4203,6 +6314,8 @@
 		<gsm>
 			<network-id mcc="270" mnc="01"/>
 			<apn value="web.pt.lu">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>194.154.192.101</dns>
 				<dns>194.154.192.102</dns>
 			</apn>
@@ -4213,10 +6326,21 @@
 		<gsm>
 			<network-id mcc="270" mnc="77"/>
 			<apn value="hspa">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>hspa</name>
 				<username>tango</username>
 				<password>tango</password>
 			</apn>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>internet</name>
+				<username>tango</username>
+				<password>tango</password>
+				<dns>212.66.70.3</dns>
+				<dns>212.66.75.7</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -4224,6 +6348,8 @@
 		<gsm>
 			<network-id mcc="270" mnc="99"/>
 			<apn value="orange.lu">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>85.94.224.1</dns>
 				<dns>85.94.224.2</dns>
 			</apn>
@@ -4233,7 +6359,10 @@
 		<name>VOXmobile</name>
 		<gsm>
 			<network-id mcc="270" mnc="99"/>
-			<apn value="vox.lu"/>
+			<apn value="vox.lu">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -4245,13 +6374,19 @@
 		<gsm>
 			<network-id mcc="247" mnc="01"/>
 			<apn value="internet.lmt.lv">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>212.93.96.2</dns>
 				<dns>212.93.96.4</dns>
 			</apn>
 			<apn value="open.lmt.lv">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>O!Karte internet</name>
 			</apn>
 			<apn value="okarte.lmt.lv">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>O!Karte</name>
 			</apn>
 		</gsm>
@@ -4261,16 +6396,22 @@
 		<gsm>
 			<network-id mcc="247" mnc="02"/>
 			<apn value="internet.tele2.lv">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Regular</name>
 				<username>gprs</username>
 				<password>internet</password>
 			</apn>
 			<apn value="mobileinternet.tele2.lv">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Internet</name>
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
 			<apn value="data.tele2.lv">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Zelta Zivtina</name>
 				<username>wap</username>
 				<password>wap</password>
@@ -4281,7 +6422,14 @@
 		<name>Bite Latvija</name>
 		<gsm>
 			<network-id mcc="247" mnc="05"/>
+			<apn value="wap">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Bite plus</name>
+			</apn>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Prepaid/Contract</name>
 			</apn>
 		</gsm>
@@ -4291,12 +6439,18 @@
 <!-- Morocco -->
 <country code="ma">
 	<provider>
-		<name>Ittissalat Al Maghrib</name>
+		<name>Ittissalat Al Maghrib (IAM)</name>
 		<gsm>
 			<network-id mcc="604" mnc="01"/>
-			<apn value="iam">
-				<username>wac</username>
-				<password>1987</password>
+			<apn value="www.iamgprs1.ma">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Abonnement</name>
+			</apn>
+			<apn value="www.iamgprs2.ma">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Pre-payé</name>
 			</apn>
 		</gsm>
 	</provider>
@@ -4304,9 +6458,30 @@
 		<name>Medi Telecom</name>
 		<gsm>
 			<network-id mcc="604" mnc="00"/>
-			<apn value="wap.meditel.ma">
-				<username>MEDIWAP</username>
-				<password>MEDIWAP</password>
+			<apn value="internet1.meditel.ma">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Abonnement</name>
+				<username>MEDINET</username>
+				<password>MEDINET</password>
+			</apn>
+			<apn value="internet2.meditel.ma">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Pre-payé</name>
+				<username>MEDINET</username>
+				<password>MEDINET</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>WANA</name>
+		<gsm>
+			<network-id mcc="604" mnc="02"/>
+			<apn value="www.wana.ma">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>INWI</name>
 			</apn>
 		</gsm>
 	</provider>
@@ -4319,6 +6494,8 @@
 		<gsm>
 			<network-id mcc="259" mnc="02"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 				<username>gprs</username>
 				<password>gprs</password>
@@ -4330,6 +6507,8 @@
 		<gsm>
 			<network-id mcc="259" mnc="04"/>
 			<apn value="internet.md">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -4339,6 +6518,8 @@
 		<gsm>
 			<network-id mcc="259" mnc="01"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -4351,27 +6532,38 @@
 		<name>ProMonte GSM</name>
 		<gsm>
 			<network-id mcc="297" mnc="01"/>
-			<apn value="gprs.promonte.com"/>
+			<apn value="gprs.promonte.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>T-Mobile</name>
 		<gsm>
 			<network-id mcc="297" mnc="02"/>
-			<apn value="tcmg-data">
+			<apn value="tmcg-data">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Broadband</name>
 				<username>38267</username>
 				<password>38267</password>
 			</apn>
-			<apn value="tcmg-nw">
+			<apn value="tmcg-nw">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>GPRS</name>
 				<username>38267</username>
 				<password>38267</password>
 			</apn>
 			<apn value="internet-postpaid">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Postpaid (old)</name>
 			</apn>
 			<apn value="internet-prepaid">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Prepaid (old)</name>
 			</apn>
 		</gsm>
@@ -4380,7 +6572,10 @@
 		<name>m:tel</name>
 		<gsm>
 			<network-id mcc="297" mnc="03"/>
-			<apn value="gprsinternet"/>
+			<apn value="gprsinternet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -4392,11 +6587,26 @@
 		<gsm>
 			<network-id mcc="610" mnc="02"/>
 			<apn value="iew">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<username>iew</username>
 				<password>iew</password>
 			</apn>
+			<apn value="internet">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<username>internet</username>
+				<password>internet</password>
+			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Malitel</name>
+		<cdma>
+			<username>card</username>
+			<password>card</password>
+		</cdma>
+	</provider>
 </country>
 
 <!-- Mongolia -->
@@ -4405,7 +6615,10 @@
 		<name>MobiCom</name>
 		<gsm>
 			<network-id mcc="428" mnc="99"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -4418,6 +6631,8 @@
 			<network-id mcc="455" mnc="03"/>
 			<network-id mcc="455" mnc="05"/>
 			<apn value="web.hutchisonmacau.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>hutchison</username>
 				<password>1234</password>
 			</apn>
@@ -4428,7 +6643,10 @@
 		<gsm>
 			<network-id mcc="455" mnc="01"/>
 			<network-id mcc="455" mnc="04"/>
-			<apn value="ctm-mobile"/>
+			<apn value="ctm-mobile">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -4440,10 +6658,35 @@
 <!-- Macedonia -->
 <country code="mk">
 	<provider>
+		<name>T-Mobile</name>
+		<gsm>
+			<network-id mcc="294" mnc="01"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<username>internet</username>
+				<password>internet</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>One</name>
+		<gsm>
+			<network-id mcc="294" mnc="02"/>
+			<apn value="datacard">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Internet</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="294" mnc="03"/>
 			<apn value="vipoperator">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>vipoperator</username>
 				<password>vipoperator</password>
 			</apn>
@@ -4458,9 +6701,13 @@
 		<gsm>
 			<network-id mcc="278" mnc="21"/>
 			<apn value="gosurfing">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Postpaid</name>
 			</apn>
 			<apn value="rtgsurfing">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Prepaid</name>
 			</apn>
 		</gsm>
@@ -4469,7 +6716,9 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="278" mnc="01"/>
-			<apn value="internet">
+			<apn value="Internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>internet</username>
 				<password>internet</password>
 				<dns>80.85.96.131</dns>
@@ -4485,7 +6734,10 @@
 		<name>Emtel</name>
 		<gsm>
 			<network-id mcc="617" mnc="10"/>
-			<apn value="WEB"/>
+			<apn value="WEB">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -4496,14 +6748,20 @@
 		<name>Dhiraagu</name>
 		<gsm>
 			<network-id mcc="472" mnc="01"/>
-			<apn value="internet.dhimobile"/>
+			<apn value="internet.dhimobile">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Wataniya</name>
 		<gsm>
 			<network-id mcc="472" mnc="02"/>
-			<apn value="WataniyaNet"/>
+			<apn value="WataniyaNet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -4514,7 +6772,10 @@
 		<name>TNM</name>
 		<gsm>
 			<network-id mcc="650" mnc="01"/>
-			<apn value="Internet"/>
+			<apn value="Internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -4525,7 +6786,15 @@
 		<name>Telcel</name>
 		<gsm>
 			<network-id mcc="334" mnc="02"/>
+
+			<voicemail>*86</voicemail>
+			<balance-check>
+				<dtmf>*333</dtmf>
+			</balance-check>
+
 			<apn value="internet.itelcel.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>webgprs</username>
 				<password>webgprs2002</password>
 			</apn>
@@ -4535,7 +6804,15 @@
 		<name>Movistar</name>
 		<gsm>
 			<network-id mcc="334" mnc="03"/>
+
+			<voicemail>*86</voicemail>
+			<balance-check>
+				<dtmf>*133#</dtmf>
+			</balance-check>
+
 			<apn value="internet.movistar.mx">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>movistar</username>
 				<password>movistar</password>
 			</apn>
@@ -4554,11 +6831,15 @@
 		<gsm>
 			<network-id mcc="502" mnc="16"/>
 			<apn value="diginet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Internet</name>
 				<dns>203.92.128.131</dns>
 				<dns>203.92.128.132</dns>
 			</apn>
 			<apn value="3gdgnet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Broadband</name>
 			</apn>
 		</gsm>
@@ -4569,16 +6850,22 @@
 			<network-id mcc="502" mnc="12"/>
 			<network-id mcc="502" mnc="17"/>
 			<apn value="maxisbb">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Broadband</name>
 				<username>maxis</username>
 				<password>wap</password>
 			</apn>
 			<apn value="net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>GPRS</name>
 				<username>maxis</username>
 				<password>net</password>
 			</apn>
 			<apn value="unet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>3G (handsets)</name>
 				<username>maxis</username>
 				<password>wap</password>
@@ -4592,8 +6879,16 @@
 		<gsm>
 			<network-id mcc="502" mnc="13"/>
 			<network-id mcc="502" mnc="19"/>
+			<!-- http://www.channelx.com.my/mdp/gprs/internet_config.jsp?model_name=motorola_e398 -->
+			<apn value="celcom.net.my">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>GPRS</name>
+			</apn>
 			<!-- http://www.channelx.com.my/mdp/3g/wap_config_3g.jsp?model_name=huwei_u600_3g -->
 			<apn value="celcom3g">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Celcom 3G</name>
 			</apn>
 		</gsm>
@@ -4607,6 +6902,8 @@
 		<gsm>
 			<network-id mcc="643" mnc="01"/>
 			<apn value="isp.mcel.mz">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>guest</username>
 				<password>guest</password>
 				<dns>212.96.24.2</dns>
@@ -4619,6 +6916,8 @@
 		<gsm>
 			<network-id mcc="643" mnc="04"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract / Prepaid</name>
 			</apn>
 		</gsm>
@@ -4632,11 +6931,15 @@
 		<gsm>
 			<network-id mcc="649" mnc="01"/>
 			<apn value="ppsinternet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Tango</name>
 				<username>ppsuser</username>
 				<password>ppsuser</password>
 			</apn>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract</name>
 			</apn>
 		</gsm>
@@ -4653,6 +6956,8 @@
 		<gsm>
 			<network-id mcc="649" mnc="03"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Leo</name>
 			</apn>
 		</gsm>
@@ -4667,6 +6972,8 @@
 			<network-id mcc="621" mnc="20"/>
 			<network-id mcc="621" mnc="80"/>
 			<apn value="wap">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 				<password>web</password>
 			</apn>
@@ -4678,6 +6985,8 @@
 			<network-id mcc="621" mnc="30"/>
 			<network-id mcc="621" mnc="60"/>
 			<apn value="web.gprs.mtnnigeria.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 				<password>web</password>
 			</apn>
@@ -4689,11 +6998,15 @@
 			<network-id mcc="621" mnc="50"/>
 			<network-id mcc="621" mnc="70"/>
 			<apn value="glosecure">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Pay as You Go</name>
 				<username>gprs</username>
 				<password>gprs</password>
 			</apn>
 			<apn value="gloflat">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Glo 3G Packs</name>
 				<username>flat</username>
 				<password>flat</password>
@@ -4705,10 +7018,20 @@
 		<gsm>
 			<network-id mcc="621" mnc="90"/>
 			<apn value="etisalat">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Etisalat Internet</name>
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Starcomms</name>
+		<cdma>
+			<username>your_phone_number@starcomms.com</username>
+			<password>your_phone_number</password>
+			<sid value="2"/>
+		</cdma>
+	</provider>
 </country>
 
 <!-- Nicaragua -->
@@ -4719,21 +7042,29 @@
 			<network-id mcc="710" mnc="21"/>
 			<network-id mcc="710" mnc="73"/>
 			<apn value="wap.emovil">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>WAP</name>
 				<username>wapemovil</username>
 				<password>wapemovil</password>
 			</apn>
 			<apn value="web.emovil">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Web</name>
 				<username>webemovil</username>
 				<password>webemovil</password>
 			</apn>
 			<apn value="internet.ideasalo.ni">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Web (Alo pcs)</name>
 				<username>internet</username>
 				<password>internet</password>
 			</apn>
 			<apn value="wap.ideasalo.ni">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>WAP (Alo pcs)</name>
 				<username>wap</username>
 				<password>wap</password>
@@ -4745,6 +7076,8 @@
 		<gsm>
 			<network-id mcc="710" mnc="30"/>
 			<apn value="internet.movistar.ni">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>internet</username>
 				<password>internet</password>
 			</apn>
@@ -4758,15 +7091,50 @@
 		<name>Hi</name>
 		<gsm>
 			<network-id mcc="204" mnc="08"/>
-			<apn value="portalmmm.nl"/>
+			<apn value="portalmmm.nl">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider primary="true">
 		<name>KPN NL</name>
 		<gsm>
 			<network-id mcc="204" mnc="08"/>
-			<apn value="prepaidinternet" />
-			<apn value="fastinternet" />
+			<apn value="prepaidinternet" >
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+			<apn value="fastinternet" >
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<username>KPN</username>
+				<password>gprs</password>
+				<dns>62.133.126.28</dns>
+				<dns>62.133.126.29</dns>
+			</apn>
+			<apn value="noapn">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<dns>62.133.126.28</dns>
+				<dns>62.133.126.29</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>MEDIONmobile</name>
+		<gsm>
+			<network-id mcc="204" mnc="08"/>
+			<network-id mcc="204" mnc="10"/>
+			<apn value="portalmmm.nl">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Aldi Talk Mobiel Prepaid Internet</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -4774,6 +7142,8 @@
 		<gsm>
 			<network-id mcc="204" mnc="12"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>telfortnl</username>
 			</apn>
 		</gsm>
@@ -4783,6 +7153,8 @@
 		<gsm>
 			<network-id mcc="204" mnc="16"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>193.78.240.12</dns>
 				<dns>193.79.242.39</dns>
 			</apn>
@@ -4793,6 +7165,8 @@
 		<gsm>
 			<network-id mcc="204" mnc="16"/>
 			<apn value="internet.ben">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>193.78.240.12</dns>
 				<dns>193.79.242.39</dns>
 			</apn>
@@ -4803,6 +7177,8 @@
 		<gsm>
 			<network-id mcc="204" mnc="20"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>orange</username>
 				<password>orange</password>
 			</apn>
@@ -4812,13 +7188,18 @@
 		<name>Tele2</name>
 		<gsm>
 			<network-id mcc="204" mnc="02"/>
-			<apn value="data.tele2.nl"/>
+			<apn value="data.tele2.nl">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>XS4ALL Mobiel Internet</name>
 		<gsm>
 			<apn value="umts.xs4all.nl">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>xs4all</username>
 				<password>xs4all</password>
 			</apn>
@@ -4828,7 +7209,21 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="204" mnc="04"/>
+			<msisdn-query>
+				<ussd>*#100#</ussd>
+			</msisdn-query>
+			<apn value="live.vodafone.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Non-business</name>
+				<username>vodafone</username>
+				<password>vodafone</password>
+				<dns>62.140.138.237</dns>
+				<dns>62.140.140.250</dns>
+			</apn>
 			<apn value="office.vodafone.nl">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Business</name>
 				<username>vodafone</username>
 				<password>vodafone</password>
@@ -4843,7 +7238,14 @@
 		<name>Netcom</name>
 		<gsm>
 			<network-id mcc="242" mnc="02"/>
+
+			<balance-check>
+				<ussd>*150#</ussd>
+			</balance-check>
+
 			<apn value="internet.netcom.no">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>netcom</username>
 				<password>netcom</password>
 				<dns>212.169.123.67</dns>
@@ -4863,11 +7265,15 @@
 		<name>Telenor</name>
 		<gsm>
 			<network-id mcc="242" mnc="01"/>
+
+			<voicemail>91500002</voicemail>
 			<balance-check>
-				<dtmf>220</dtmf>
-				<sms text="saldo">222</sms>
+				<sms text="saldo">2525</sms>
 			</balance-check>
+
 			<apn value="telenor">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>212.17.131.3</dns>
 				<dns>148.122.161.2</dns>
 			</apn>
@@ -4878,6 +7284,8 @@
 		<gsm>
 			<network-id mcc="242" mnc="08"/>
 			<apn value="internet.no">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>80.232.41.10</dns>
 				<dns>80.232.41.20</dns>
 			</apn>
@@ -4887,53 +7295,102 @@
 		<name>NetworkNorway</name>
 		<gsm>
 			<network-id mcc="242" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>OneCall</name>
 		<gsm>
 			<network-id mcc="242" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Lebara</name>
 		<gsm>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Altibox</name>
 		<gsm>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>SheTalks</name>
 		<gsm>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Telipol</name>
 		<gsm>
 			<network-id mcc="242" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Ventelo</name>
 		<gsm>
 			<network-id mcc="242" mnc="07"/>
-			<apn value="internet.ventelo.no"/>
+			<apn value="internet.ventelo.no">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Ludo Mobil</name>
 		<gsm>
 			<network-id mcc="242" mnc="07"/>
-			<apn value="internet.ventelo.no"/>
+			<apn value="internet.ventelo.no">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Tele2</name>
+		<gsm>
+			<network-id mcc="242" mnc="02"/>
+			<network-id mcc="242" mnc="04"/>
+
+			<voicemail>47230000</voicemail>
+			<balance-check>
+				<ussd>*111#</ussd>
+				<dtmf>47300000</dtmf>
+			</balance-check>
+
+			<apn value="internet.tele2.no">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
+				<name>Mobilt internet</name>
+			</apn>
+			<!-- http://www.tele2.no/mobilt-bredbaand.html -->
+			<apn value="mobileinternet.tele2.no">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Mobilt bredbånd</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -4962,14 +7419,20 @@
 		<name>Nepal Telecom</name>
 		<gsm>
 			<network-id mcc="429" mnc="01"/>
-			<apn value="ntnet"/>
+			<apn value="ntnet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Mero Mobile</name>
 		<gsm>
 			<network-id mcc="429" mnc="02"/>
-			<apn value="mero"/>
+			<apn value="mero">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -4982,15 +7445,27 @@
 			<network-id mcc="530" mnc="00"/>
 			<network-id mcc="530" mnc="05"/>
 			<apn value="wap.telecom.co.nz">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>XT mobile (WAP)</name>
 			</apn>
 			<apn value="internet.telecom.co.nz">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>XT mobile (Internet with Firewall)</name>
+				<dns>202.27.156.72</dns>
+				<dns>202.27.158.40</dns>
 			</apn>
 			<apn value="direct.telecom.co.nz">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>XT mobile (Direct Internet)</name>
+				<dns>202.27.156.72</dns>
+				<dns>202.27.158.40</dns>
 			</apn>
 			<apn value="oa.telecom.co.nz">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>XT mobile (One Office/Remote Office)</name>
 			</apn>
 		</gsm>
@@ -4999,9 +7474,63 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="530" mnc="01"/>
+			<apn value="live.vodafone.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>WAP</name>
+				<dns>202.73.206.16</dns>
+				<dns>202.73.198.16</dns>
+			</apn>
 			<apn value="www.vodafone.net.nz">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract / Prepaid (Restricted)</name>
 			</apn>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Unrestricted (public)</name>
+				<dns>202.73.206.16</dns>
+				<dns>202.73.198.16</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>2-Degrees</name>
+		<gsm>
+			<network-id mcc="530" mnc="24"/>
+			<apn value="mms">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
+				<name>MMS</name>
+			</apn>
+			<apn value="internet">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Broadband</name>
+				<dns>118.148.1.10</dns>
+				<dns>118.148.1.20</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>TelstraClear</name>
+		<gsm>
+			<apn value="www.telstraclear.net.nz">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Broadband</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Orcon</name>
+		<gsm>
+			<apn value="www.orcon.net.nz">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Broadband</name>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -5012,14 +7541,28 @@
 		<name>Oman Mobile</name>
 		<gsm>
 			<network-id mcc="422" mnc="02"/>
-			<apn value="internet"/>
+			<apn value="taif">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Mobile Broadband</name>
+				<username>taif</username>
+				<password>taif</password>
+			</apn>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Internet (old)</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Nawras</name>
 		<gsm>
 			<network-id mcc="422" mnc="03"/>
-			<apn value="isp.nawras.com.om"/>
+			<apn value="isp.nawras.com.om">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -5031,6 +7574,8 @@
 		<gsm>
 			<network-id mcc="714" mnc="01"/>
 			<apn value="apn01.cwpanama.com.pa">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 			</apn>
 		</gsm>
 	</provider>
@@ -5039,6 +7584,8 @@
 		<gsm>
 			<network-id mcc="714" mnc="02"/>
 			<apn value="internet.movistar.pa">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>movistarpa</username>
 				<password>movistarpa</password>
 				<dns>200.39.10.1</dns>
@@ -5055,6 +7602,8 @@
 		<gsm>
 			<network-id mcc="716" mnc="10"/>
 			<apn value="tim.pe">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>tim</username>
 				<password>tulibertad</password>
 			</apn>
@@ -5065,11 +7614,23 @@
 		<gsm>
 			<network-id mcc="716" mnc="06"/>
 			<apn value="movistar.pe">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>movistar@datos</username>
 				<password>movistar</password>
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Nextel</name>
+		<gsm>
+			<network-id mcc="716" mnc="07"/>
+			<apn value="datacard.nextel.com.pe">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- French Polynesia -->
@@ -5078,7 +7639,10 @@
 		<name>Vini</name>
 		<gsm>
 			<network-id mcc="547" mnc="20"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -5090,6 +7654,8 @@
 		<gsm>
 			<network-id mcc="515" mnc="02"/>
 			<apn value="internet.globe.com.ph">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Postpaid</name>
 				<username>globe</username>
 				<password>globe</password>
@@ -5097,6 +7663,8 @@
 				<dns>203.127.225.11</dns>
 			</apn>
 			<apn value="http.globe.com.ph">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Prepaid</name>
 				<username>globe</username>
 				<password>globe</password>
@@ -5104,6 +7672,8 @@
 				<dns>203.127.225.11</dns>
 			</apn>
 			<apn value="www.globe.com.ph">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>WAP</name>
 				<username>globe</username>
 				<password>globe</password>
@@ -5117,6 +7687,8 @@
 		<gsm>
 			<network-id mcc="515" mnc="03"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>witsductoor</username>
 				<password>banonoy</password>
 				<dns>202.57.96.3</dns>
@@ -5128,7 +7700,10 @@
 		<name>Digitel (Sun Cellular)</name>
 		<gsm>
 			<network-id mcc="515" mnc="05"/>
-			<apn value="minternet"/>
+			<apn value="minternet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -5140,6 +7715,8 @@
 		<gsm>
 			<network-id mcc="515" mnc="06"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>telenor</username>
 				<password>telenor</password>
 			</apn>
@@ -5150,9 +7727,13 @@
 		<gsm>
 			<network-id mcc="515" mnc="01"/>
 			<apn value="connect.mobilinkworld.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 			</apn>
 			<apn value="jazzconnect.mobilinkworld.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Jazz</name>
 			</apn>
 		</gsm>
@@ -5162,6 +7743,8 @@
 		<gsm>
 			<network-id mcc="515" mnc="06"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>telenor</username>
 				<password>telenor</password>
 			</apn>
@@ -5172,6 +7755,8 @@
 		<gsm>
 			<network-id mcc="410" mnc="03"/>
 			<apn value="ufone.internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>ufone</username>
 				<password>ufone</password>
 			</apn>
@@ -5181,80 +7766,354 @@
 		<name>Warid</name>
 		<gsm>
 			<network-id mcc="515" mnc="07"/>
-			<apn value="warid"/>
+			<apn value="warid">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>ZONG</name>
 		<gsm>
 			<network-id mcc="515" mnc="04"/>
-			<apn value="zonginternet"/>
+			<apn value="zonginternet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Ptcl EVO</name>
+		<cdma>
+			<username>vwireless@ptcl.com</username>
+			<password>ptcl</password>
+		</cdma>
+	</provider>
+	<provider>
+		<name>WorldCall Wireless</name>
+		<cdma/>
+	</provider>
 </country>
 
 <!-- Poland -->
 <country code="pl">
-	<provider>
-		<name>ERA</name>
+	<!-- Polish physical operators -->
+	<provider primary="true">
+		<name>T-mobile</name><!-- rebranded from Era in 2011 -->
 		<gsm>
 			<network-id mcc="260" mnc="02"/>
-			<apn value="erainternet">
-				<username>erainternet</username>
-				<password>erainternet</password>
+			<voicemail>602950</voicemail>
+			<balance-check>
+				<ussd>*101#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*111*CODE#</ussd>
+			</balance-top-up>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<dns>213.158.194.1</dns>
 				<dns>213.158.193.38</dns>
 			</apn>
 		</gsm>
 	</provider>
-	<provider>
+	<provider primary="true">
 		<name>Play Online</name>
 		<gsm>
 			<network-id mcc="260" mnc="06"/>
-			<apn value="Internet"/>
-		</gsm>
-	</provider>
-	<provider>
-		<name>Heyah</name>
-		<gsm>
-			<network-id mcc="260" mnc="02"/>
-			<apn value="heyah.pl">
-				<username>heyah</username>
-				<password>heyah</password>
-				<dns>213.158.194.1</dns>
-				<dns>213.158.193.38</dns>
+			<balance-check>
+				<ussd>*101#</ussd>
+				<ussd>*155#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*100*CODE#</ussd>
+			</balance-top-up>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 			</apn>
 		</gsm>
 	</provider>
-	<provider>
+	<provider primary="true">
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="260" mnc="03"/>
+			<voicemail>*501</voicemail>
+			<balance-check>
+				<ussd>*124*#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*125*CODE#</ussd>
+			</balance-top-up>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Standard access - with image compression</name>
+				<name xml:lang="pl">Dostęp standardowy - z kompresją grafiki</name>
+				<username>internet</username>
+				<password>internet</password>
+				<dns>194.9.223.79</dns>
+				<dns>194.204.159.1</dns>
+			</apn>
+			<apn value="vpn">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>VPN mode access without compression (requires activation)</name>
+				<name xml:lang="pl">Dostęp VPN bez kompresji (wymaga aktywacji)</name>
 				<username>internet</username>
 				<password>internet</password>
 				<dns>194.9.223.79</dns>
 				<dns>194.204.159.1</dns>
 			</apn>
 		</gsm>
+		<cdma>
+			<username>cdma@orange</username>
+			<password>orange</password>
+		</cdma>
 	</provider>
-	<provider>
-		<name>iPlus</name>
+	<provider primary="true">
+		<name>Plus</name>
 		<gsm>
 			<network-id mcc="260" mnc="01"/>
+			<voicemail>2222</voicemail>
+			<balance-check>
+				<ussd>*100#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*123*CODE#</ussd>
+			</balance-top-up>
 			<apn value="www.plusgsm.pl">
+				<plan type="postpaid"/>
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Standard access</name>
+				<name xml:lang="pl">Dostęp standardowy</name>
+				<username>plusgsm</username>
+				<password>plusgsm</password>
+				<dns>212.2.96.51</dns>
+				<dns>212.2.96.52</dns>
+			</apn>
+			<apn value="pro.plusgsm.pl">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>External dynamic IP address (requires activation)</name>
+				<name xml:lang="pl">Zewnętrzny dynamiczny adres IP (wymaga aktywacji)</name>
+				<username>plusgsm</username>
+				<password>plusgsm</password>
+				<dns>212.2.96.51</dns>
+				<dns>212.2.96.52</dns>
+			</apn>
+			<apn value="m2m.plusgsm.pl">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>External static IP address (requires activation)</name>
+				<name xml:lang="pl">Zewnętrzny statyczny adres IP (wymaga aktywacji)</name>
+				<username>plusgsm</username>
+				<password>plusgsm</password>
+				<dns>212.2.96.51</dns>
+				<dns>212.2.96.52</dns>
+			</apn>
+			<apn value="optimizer">
+				<plan type="postpaid"/>
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>iPlus optimizer with data compression</name>
+				<name xml:lang="pl">iPlus optimizer z kompresją danych</name>
 				<dns>212.2.96.51</dns>
 				<dns>212.2.96.52</dns>
 			</apn>
 		</gsm>
 	</provider>
-	<provider>
+	<provider primary="true">
+		<name>Cyfrowy Polsat</name>
+		<gsm>
+			<network-id mcc="260" mnc="12"/>
+			<apn value="multi.internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider primary="true">
+		<name>aero2</name>
+		<gsm>
+			<network-id mcc="260" mnc="17"/>
+			<apn value="darmowy">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<!-- Polish MVNO operators -->
+	<provider primary="false">
+		<name>Multimo</name>
+		<gsm>
+			<network-id mcc="260" mnc="03"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Default APN</name>
+				<username>internet</username>
+				<password>internet</password>
+			</apn>
+			<apn value="mni.internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>APN: mni.internet</name>
+				<username>mni.internet</username>
+			</apn>
+			<apn value="telogic.internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>APN: telogic.internet</name>
+				<username>telogic.internet</username>
+			</apn>
+		</gsm>
+		<cdma>
+			<username>cdma@orange</username>
+			<password>orange</password>
+		</cdma>
+	</provider>
+	<provider primary="false">
+		<name>FreeM</name>
+		<gsm>
+			<network-id mcc="260" mnc="01"/>
+			<apn value="freedata.pl">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+			</apn>
+ 		</gsm>
+ 	</provider>
+ 	<provider primary="false">
+ 		<name>Heyah</name>
+ 		<gsm>
+ 			<network-id mcc="260" mnc="02"/>
+			<balance-check>
+				<ussd>*108#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*109*CODE#</ussd>
+			</balance-top-up>
+ 			<apn value="heyah.pl">
+ 				<plan type="prepaid"/>
+				<usage type="internet"/>
+ 				<username>heyah</username>
+ 				<password>heyah</password>
+				<dns>213.158.194.1</dns>
+				<dns>213.158.193.38</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider primary="false">
 		<name>GaduAIR</name>
 		<gsm>
 			<network-id mcc="260" mnc="01"/>
-			<apn value="internet.gadu-gadu.pl"/>
+			<balance-check>
+				<ussd>*101#</ussd>
+			</balance-check>
+			<apn value="internet.gadu-gadu.pl">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
+	<provider primary="false">
+		<name>Aster</name>
+ 		<gsm>
+ 			<network-id mcc="260" mnc="03"/>
+			<apn value="aster.internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+ 				<username>internet</username>
+ 				<password>internet</password>
+ 			</apn>
+ 		</gsm>
+ 	</provider>
+ 	<provider primary="false">
+		<name>Netia</name>
+		<gsm>
+			<network-id mcc="260" mnc="06"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider primary="false">
+		<name>Vectra</name>
+		<gsm>
+			<network-id mcc="260" mnc="06"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider primary="false">
+		<name>mBank mobile</name>
+ 		<gsm>
+ 			<network-id mcc="260" mnc="01"/>
+			<balance-check>
+				<ussd>*100#</ussd>
+			</balance-check>
+			<apn value="www.mobile.pl">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider primary="false">
+		<name>INEA</name>
+		<gsm>
+			<network-id mcc="260" mnc="03"/>
+			<apn value="telogic.internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<username>internet</username>
+ 			</apn>
+ 		</gsm>
+ 	</provider>
+ 	<provider primary="false">
+		<name>Mobilking</name>
+		<gsm>
+			<network-id mcc="260" mnc="02"/>
+			<apn value="wapMOBILKING">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<username>mobilking</username>
+				<password>mobilking</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider primary="false">
+		<name>SamiSwoi</name>
+ 		<gsm>
+ 			<network-id mcc="260" mnc="01"/>
+			<apn value="www.plusgsm.pl">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<username>internet</username>
+				<password>internet</password>
+			</apn>
+ 		</gsm>
+ 	</provider>
+	<provider primary="false">
+		<name>Sferia</name>
+		<cdma>
+			<username>sferia</username>
+			<password>sferia</password>
+		</cdma>
+	</provider>
+	<provider primary="false">
+		<name>Nordisk Polska</name>
+		<cdma>
+			<username>CDMA</username>
+			<password>CDMA</password>
+		</cdma>
+	</provider>
 </country>
 
 <!-- Portugal -->
@@ -5264,21 +8123,32 @@
 		<gsm>
 			<network-id mcc="268" mnc="03"/>
 			<apn value="kanguru-portatil">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Portable</name>
 				<name xml:lang="pt">Portátil</name>
 				<dns>62.169.67.172</dns>
 				<dns>62.169.67.171</dns>
 			</apn>
 			<apn value="kanguru-tempo">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Tempo (Prepaid)</name>
 				<dns>62.169.67.172</dns>
 				<dns>62.169.67.171</dns>
 			</apn>
 			<apn value="kangurufixo">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Fixo</name>
 				<dns>62.169.67.172</dns>
 				<dns>62.169.67.171</dns>
 			</apn>
+			<apn value="noapn">
+				<name>Apn dinâmico (no apn)</name>
+				<dns>62.169.67.172</dns>
+				<dns>62.169.67.171</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -5286,7 +8156,10 @@
 		<name>Clix</name>
 		<gsm>
 			<network-id mcc="268" mnc="03"/>
-			<apn value="clixinternetmovel"/>
+			<apn value="clixinternetmovel">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -5294,9 +8167,13 @@
 		<gsm>
 			<network-id mcc="268" mnc="03"/>
 			<apn value="umts">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>3G</name>
 			</apn>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>GPRS</name>
 				<dns>194.79.69.129</dns>
 			</apn>
@@ -5307,8 +8184,20 @@
 		<gsm>
 			<network-id mcc="268" mnc="06"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Tmn Internet</name>
 				<username>tmn</username>
 				<password>tmn</password>
+				<dns>88.214.178.1</dns>
+				<dns>88.214.182.2</dns>
+			</apn>
+			<apn value="mmsc.tmn.pt">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
+				<name>Tmn Mms</name>
+				<username>tmn</username>
+				<password>tmnnet</password>
 				<dns>194.65.3.20</dns>
 				<dns>194.65.3.21</dns>
 			</apn>
@@ -5319,8 +8208,24 @@
 		<gsm>
 			<network-id mcc="268" mnc="01"/>
 			<apn value="internet.vodafone.pt">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>vodafone</username>
 				<password>vodafone</password>
+				<dns>212.18.160.133</dns>
+				<dns>212.18.160.134</dns>
+			</apn>
+			<apn value="net2.vodafone.pt">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Vodafone Internet</name>
+			</apn>
+			<apn value="vas.vodafone.pt">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
+				<name>Vodafone MMS</name>
+				<username>vas</username>
+				<password>vas</password>
 			</apn>
 		</gsm>
 	</provider>
@@ -5329,6 +8234,16 @@
 		<gsm>
 			<network-id mcc="268" mnc="01"/>
 			<apn value="internet.zon.pt">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Dados Móveis</name>
+			</apn>
+			<apn value="vas.zon.pt">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
+				<name>MMS</name>
+				<username>vas</username>
+				<password>vas</password>
 			</apn>
 		</gsm>
 	</provider>
@@ -5340,14 +8255,18 @@
 		<name>VOX</name>
 		<gsm>
 			<network-id mcc="744" mnc="01"/>
-			<apn value="vox.wap"></apn>
+			<apn value="vox.wap">
+				<plan type="postpaid"/>
+				<usage type="internet"/></apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Personal</name>
 		<gsm>
 			<network-id mcc="744" mnc="05"/>
-			<apn value="internet"></apn>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/></apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -5355,9 +8274,13 @@
 		<gsm>
 			<network-id mcc="744" mnc="04"/>
 			<apn value="internet.tigo.py">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 			</apn>
 			<apn value="broadband.tigo.py">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Broadband</name>
 				<name xml:lang="es">Banda Ancha Móvil</name>
 				<username>tigo</username>
@@ -5370,6 +8293,8 @@
 		<gsm>
 			<network-id mcc="744" mnc="02"/>
 			<apn value="gprs.claro.com.py">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -5382,9 +8307,19 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="427" mnc="02"/>
+			<msisdn-query>
+				<ussd>*#100#</ussd>
+			</msisdn-query>
 			<apn value="web.vodafone.com.qa">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Web</name>
 			</apn>
+			<apn value="vodafone.com.qa">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Web (old)</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -5392,6 +8327,8 @@
 		<gsm>
 			<network-id mcc="427" mnc="01"/>
 			<apn value="gprs.qtel">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Qatarnet</name>
 				<username>gprs</username>
 				<password>gprs</password>
@@ -5406,16 +8343,27 @@
 		<name>SFR Réunion</name>
 		<gsm>
 			<network-id mcc="647" mnc="10"/>
+			<msisdn-query>
+				<sms text="ABCd84367">+33621012555</sms>
+			</msisdn-query>
 			<apn value="websfr">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract / Prepaid</name>
 			</apn>
 			<apn value="slsfr">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>SFR slsfr</name>
 			</apn>
 			<apn value="internetpro">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>SFR internetpro</name>
 			</apn>
 			<apn value="ipnet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>SFR ipnet</name>
 			</apn>
 		</gsm>
@@ -5429,6 +8377,8 @@
 		<gsm>
 			<network-id mcc="226" mnc="10"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>172.22.7.21</dns>
 				<dns>172.22.7.20</dns>
 			</apn>
@@ -5438,14 +8388,39 @@
 		<name>Vodafone</name>
 		<gsm>
 			<network-id mcc="226" mnc="01"/>
+			<apn value="tobe.vodafone.ro">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Mobile Internet (Prepaid)</name>
+				<username>tobe.vodafone.ro</username>
+				<password>vodafone</password>
+			</apn>
 			<apn value="internet.vodafone.ro">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Internet (Postpaid)</name>
 				<username>internet.vodafone.ro</username>
 				<password>vodafone</password>
 			</apn>
-			<apn value="tobe.vodafone.ro">
+			<apn value="internet.pre.vodafone.ro">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Mobile Internet (Prepaid)</name>
-				<username>tobe.vodafone.ro</username>
+				<username>internet.pre.vodafone.ro</username>
+				<password>vodafone</password>
+			</apn>
+			<apn value="live.vodafone.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Live! (Postpaid)</name>
+				<username>live</username>
+				<password>vodafone</password>
+			</apn>
+			<apn value="live.pre.vodafone.ro">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Live! (Prepaid)</name>
+				<username>live.pre.vodafone.com</username>
 				<password>vodafone</password>
 			</apn>
 		</gsm>
@@ -5462,9 +8437,13 @@
 		<gsm>
 			<network-id mcc="226" mnc="05"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Home</name>
 			</apn>
 			<apn value="static">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Business (static)</name>
 			</apn>
 		</gsm>
@@ -5478,6 +8457,8 @@
 		<gsm>
 			<network-id mcc="220" mnc="01"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>telenor</username>
 				<password>gprs</password>
 			</apn>
@@ -5488,6 +8469,8 @@
 		<gsm>
 			<network-id mcc="220" mnc="03"/>
 			<apn value="gprsinternet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>mts</username>
 				<password>064</password>
 				<dns>195.178.38.3</dns>
@@ -5498,7 +8481,12 @@
 		<name>VIP Mobile</name>
 		<gsm>
 			<network-id mcc="220" mnc="05"/>
-			<apn value="browse"/>
+			<apn value="vipmobile">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<username>vipmobile</username>
+				<password>vipmobile</password>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -5510,6 +8498,18 @@
 		<gsm>
 			<network-id mcc="635" mnc="10"/>
 			<apn value="internet.mtn">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Tigo</name>
+		<gsm>
+			<network-id mcc="635" mnc="13"/>
+			<apn value="web.tigo.rw">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 			</apn>
 		</gsm>
 	</provider>
@@ -5523,6 +8523,8 @@
 		<gsm>
 			<network-id mcc="250" mnc="12"/>
 			<apn value="inet.bwc.ru">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>bwc</username>
 				<password>bwc</password>
 				<dns>81.18.113.2</dns>
@@ -5536,7 +8538,21 @@
 		<gsm>
 			<network-id mcc="250" mnc="28"/>
 			<network-id mcc="250" mnc="99"/>
+			<apn value="home.beeline.ru">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>3G modem</name>
+				<name xml:lang="ru">USB-модем</name>
+				<username>beeline</username>
+				<password>beeline</password>
+				<dns>212.44.130.6</dns>
+				<dns>217.118.83.6</dns>
+			</apn>
 			<apn value="internet.beeline.ru">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Mobile phone</name>
+				<name xml:lang="ru">Мобильный телефон</name>
 				<username>beeline</username>
 				<password>beeline</password>
 				<dns>217.118.66.243</dns>
@@ -5548,7 +8564,10 @@
 		<name>ETK</name>
 		<gsm>
 			<network-id mcc="250" mnc="05"/>
-			<apn value="wap.etk.ru"/>
+			<apn value="wap.etk.ru">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -5556,6 +8575,8 @@
 		<gsm>
 			<network-id mcc="250" mnc="01"/>
 			<apn value="internet.mts.ru">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>mts</username>
 				<password>mts</password>
 				<dns>213.87.0.1</dns>
@@ -5569,62 +8590,11 @@
 
 		<gsm>
 			<network-id mcc="250" mnc="02"/>
-
-			<apn value="internet.nw">
-				<name>NW</name>
-				<name xml:lang="ru">Северо-Запад</name>
-				<dns>10.140.142.42</dns>
-				<dns>10.140.142.45</dns>
-			</apn>
-			<apn value="internet.ugsm">
-				<name>UGSM</name>
-				<name xml:lang="ru">Урал</name>
-				<dns>83.149.32.2</dns>
-				<dns>83.149.33.2</dns>
-			</apn>
-			<apn value="internet.usi.ru">
-				<name>usi</name>
-				<dns>212.120.160.130</dns>
-				<dns>212.120.160.130</dns>
-			</apn>
-			<apn value="internet.dv">
-				<name>DV</name>
-				<name xml:lang="ru">Дальний Восток</name>
-				<dns>83.149.52.77</dns>
-				<dns>194.186.112.18</dns>
-			</apn>
-			<apn value="internet.kvk">
-				<name>kvk</name>
-				<name xml:lang="ru">Кавказ</name>
-				<dns>83.149.24.244</dns>
-				<dns>62.183.50.230</dns>
-			</apn>
-			<apn value="internet.ltmsk">
-				<name>ltmsk</name>
-				<dns>10.22.10.20</dns>
-				<dns>10.22.10.21</dns>
-			</apn>
-			<apn value="internet.sib">
-				<name>sib</name>
-				<name xml:lang="ru">Сибирь</name>
-				<dns>83.149.51.65</dns>
-				<dns>83.149.50.65</dns>
-			</apn>
-			<apn value="internet.volga">
-				<name>volga</name>
-				<name xml:lang="ru">Поволжье</name>
-				<dns>83.149.16.7</dns>
-				<dns>195.128.128.1</dns>
-			</apn>
-			<apn value="internet.mc">
-				<name>mc</name>
-				<name xml:lang="ru">Центр</name>
-				<dns>81.18.129.252</dns>
-				<dns>217.150.34.1</dns>
-			</apn>
 			<apn value="internet">
-				<name>Moscow</name>
-				<name xml:lang="ru">Москва</name>
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>RUS</name>
+				<name xml:lang="ru">Россия</name>
 				<username>gdata</username>
 				<password>gdata</password>
 			</apn>
@@ -5635,6 +8605,8 @@
 		<gsm>
 			<network-id mcc="250" mnc="03"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>ncc</username>
 				<dns>10.0.3.5</dns>
 				<dns>10.0.3.2</dns>
@@ -5646,6 +8618,8 @@
 		<gsm>
 			<network-id mcc="250" mnc="16"/>
 			<apn value="internet.ntc">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>80.243.64.67</dns>
 				<dns>80.243.68.34</dns>
 			</apn>
@@ -5657,6 +8631,8 @@
 		<gsm>
 			<network-id mcc="250" mnc="05"/>
 			<apn value="internet.etk.ru">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>etk</username>
 				<dns>10.10.30.3</dns>
 				<dns>10.10.30.4</dns>
@@ -5669,6 +8645,8 @@
 		<gsm>
 			<network-id mcc="250" mnc="35"/>
 			<apn value="inet.ycc.ru">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>motiv</username>
 				<dns>217.148.52.34</dns>
 				<dns>217.148.52.3</dns>
@@ -5680,6 +8658,8 @@
 		<name xml:lang="ru">Татинком</name>
 		<gsm>
 			<apn value="internet.tatincom.ru">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>tatincom</username>
 				<password>tatincom</password>
 				<dns>89.207.96.2</dns>
@@ -5693,6 +8673,8 @@
 		<gsm>
 			<network-id mcc="250" mnc="20"/>
 			<apn value="internet.tele2.ru">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>130.244.127.161</dns>
 				<dns>130.244.127.169</dns>
 			</apn>
@@ -5803,7 +8785,10 @@
 		<name>U-tel</name>
 		<gsm>
 			<network-id mcc="250" mnc="39"/>
-			<apn value="internet.usi.ru"/>
+			<apn value="internet.usi.ru">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -5815,9 +8800,13 @@
 		<gsm>
 			<network-id mcc="420" mnc="03"/>
 			<apn value="web1">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Postpaid</name>
 			</apn>
 			<apn value="web2">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Prepaid</name>
 			</apn>
 		</gsm>
@@ -5827,6 +8816,8 @@
 		<gsm>
 			<network-id mcc="420" mnc="01"/>
 			<apn value="jawalnet.com.sa">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>212.118.133.101</dns>
 				<dns>212.118.133.102</dns>
 			</apn>
@@ -5836,7 +8827,10 @@
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="420" mnc="04"/>
-			<apn value="zain"/>
+			<apn value="zain">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -5851,13 +8845,19 @@
 			<network-id mcc="240" mnc="04"/>
 			<!-- http://www.tre.se/templates/Sporg3_02.aspx?id=4231 -->
 			<apn value="data.tre.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobiltelefon</name>
 			</apn>
 			<!-- http://www.tre.se/templates/Sporg3_02.aspx?id=4231 -->
 			<apn value="bredband.tre.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Bredband</name>
 			</apn>
 			<apn value="net.tre.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Bredband Kontantkort</name>
 			</apn>
 		</gsm>
@@ -5868,10 +8868,14 @@
 			<network-id mcc="240" mnc="08"/>
 			<!-- http://glocalnet.se/mobiltbredband -->
 			<apn value="bredband.glocalnet.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobilt Bredband</name>
 			</apn>
 			<!-- http://kundservice.glocalnet.se/Kundservice/Mobiltelefoni/Installningar/ -->
 			<apn value="internet.glocalnet.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Glocalnet Internet</name>
 			</apn>
 		</gsm>
@@ -5882,7 +8886,10 @@
 			<network-id mcc="240" mnc="01"/>
 
 			<!-- http://www.halebop.se/halebop_kundtjanst/vanliga_fragor_kontantkort/ -->
-			<apn value="halebop.telia.se"/>
+			<apn value="halebop.telia.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -5898,16 +8905,23 @@
 		<gsm>
 			<network-id mcc="240" mnc="07"/>
 			<network-id mcc="240" mnc="05"/>
+
+			<voicemail>222</voicemail>
 			<balance-check>
 				<ussd>*111#</ussd>
 				<dtmf>211</dtmf>
 			</balance-check>
+
 			<!-- http://www.tele2.se/internet-via-gprs.html -->
 			<apn value="internet.tele2.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobilt Internet</name>
 			</apn>
 			<!-- http://www.tele2.se/alien-modem.html -->
 			<apn value="mobileinternet.tele2.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobilt Bredband</name>
 			</apn>
 		</gsm>
@@ -5917,9 +8931,32 @@
 		<gsm>
 			<network-id mcc="240" mnc="07"/>
 			<network-id mcc="240" mnc="05"/>
+
+			<voicemail>222</voicemail>
+			<balance-check>
+				<ussd>*111#</ussd>
+				<dtmf>211</dtmf>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*110*CODE#</ussd>
+			</balance-top-up>
+
 			<apn value="data.comviq.se">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Surf</name>
 			</apn>
+
+			<apn value="internet.tele2.se">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Tele2 Comviq 3G</name>
+			</apn>
+			<apn value="mobileinternet.tele2.se">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Tele2 Comviq 3G (7,2 Mbit/s)</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -5930,6 +8967,8 @@
 			
 			<!-- http://multicomsecurity.se/produkter-tjanster/mobil-datakommunikation/mobiflex/ -->
 			<apn value="mobiflex.telia.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobiflex</name>
 			</apn>
 		</gsm>
@@ -5941,14 +8980,25 @@
 			<network-id mcc="240" mnc="06"/>
 			<network-id mcc="240" mnc="08"/>
 
+			<voicemail>888</voicemail>
+			<balance-check>
+				<ussd>*222#</ussd>
+			</balance-check>
+
 			<!-- http://www.telenor.se/privat/mobiltelefoni/alla-mobiltjanster/alla-mobiltjanster.html#C45-2100 -->
 			<apn value="internet.telenor.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobilt Internet</name>
 			</apn>
 			<apn value="services.telenor.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobilsurf med maxtaxa</name>
 			</apn>
 			<apn value="bredband.telenor.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobilt Bredband</name>
 			</apn>
 		</gsm>
@@ -5958,26 +9008,39 @@
 		<gsm>
 			<network-id mcc="240" mnc="01"/>
 			<network-id mcc="240" mnc="05"/>
+
+			<voicemail>*133#</voicemail>
 			<balance-check>
 				<ussd>*120#</ussd>
 				<ussd>*121#</ussd>
 			</balance-check>
+
 			<!-- http://www3.telia.se/foretag/mobilguiden/ -->
-			<apn value="online.telia.se"/>
+			<apn value="online.telia.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Telia 3G</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>TDC</name>
 		<gsm>
 			<network-id mcc="240" mnc="14"/>
-			<apn value="internet.se"/>
+			<apn value="internet.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>djuice</name>
 		<gsm>
 			<network-id mcc="240" mnc="09"/>
-			<apn value="internet.djuice.se"/>
+			<apn value="internet.djuice.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -5986,14 +9049,20 @@
 			<network-id mcc="240" mnc="02"/>
 			<network-id mcc="240" mnc="04"/>
 			<!-- MVNO operating on 3's network -->
-			<apn value="bredband.comhem.se"/>
+			<apn value="bredband.comhem.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Parlino</name>
 		<gsm>
 			<network-id mcc="240" mnc="07"/>
-			<apn value="internet.parlino.se"/>
+			<apn value="internet.parlino.se">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -6001,10 +9070,14 @@
 		<gsm>
 			<!-- http://www.uvtc.com/SWEDEN/internet/mobiltbredband/Default.aspx -->
 			<apn value="sp-internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobilt Bredband</name>
 			</apn>
 			<!-- http://www.uvtc.com/sweden/Mobil/Faq/default.aspx -->
 			<apn value="internet.uvtc.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobilt Internet</name>
 			</apn>
 		</gsm>
@@ -6019,11 +9092,39 @@
 			<network-id mcc="525" mnc="03"/>
 			<!-- http://m1.com.sg/filedownloads/popup/Miworld/popup_se2.5.html mid page -->
 			<apn value="sunsurf">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>SunSurf/Mobile Broadband (postpaid)</name>
+				<username>65</username>
+				<dns>202.79.64.21</dns>
+				<dns>202.79.64.26</dns>
+			</apn>
+			<!-- http://m1.com.sg/filedownloads/popup/Miworld/popup_se2.5.html top page-->
+			<apn value="miworld">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>MiWorld Mobile (postpaid)</name>
+				<username>65(mobilenumber)</username>
+				<password>user123</password>
+			</apn>
+			<!-- http://m1.com.sg/filedownloads/popup/Miworld/popup_se2.5.html lower page -->
+			<apn value="miworldcard">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>MiWorld Mobile (prepaid)</name>
+				<username>65(mobilenumber)</username>
+				<password>user123</password>
 			</apn>
 			<apn value="prepaidbb">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Mobile Broadband (prepaid)</name>
 			</apn>
+			<apn value="sunsurfmcard">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>M Card (prepaid)</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -6032,6 +9133,8 @@
 			<network-id mcc="525" mnc="01"/>
 			<network-id mcc="525" mnc="02"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>165.21.100.88</dns>
 				<dns>165.21.83.88</dns>
 			</apn>
@@ -6042,15 +9145,21 @@
 		<gsm>
 			<network-id mcc="525" mnc="05"/>
 			<apn value="shwap">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
 				<name>WAP</name>
 				<username>star</username>
 				<password>hub</password>
 				<dns>203.116.1.78</dns>
 			</apn>
 			<apn value="shppd">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>MaxMobile Broadband (prepaid)</name>
 			</apn>
 			<apn value="shinternet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>MaxMobile Broadband (postpaid)</name>
 			</apn>
 		</gsm>
@@ -6065,6 +9174,8 @@
 			<network-id mcc="293" mnc="41"/>
 
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Postpaid</name>
 				<username>mobitel</username>
 				<password>internet</password>
@@ -6072,6 +9183,8 @@
 				<dns>193.189.160.11</dns>
 			</apn>
 			<apn value="internetpro">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>mobitel</username>
 				<password>internet</password>
 				<dns>213.229.248.161</dns>
@@ -6083,9 +9196,16 @@
 		<name>Vodafone / Simobil</name>
 		<gsm>
 			<network-id mcc="293" mnc="40"/>
+			<msisdn-query>
+				<ussd>*100#</ussd>
+			</msisdn-query>
 			<apn value="internet.simobil.si">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>simobil</username>
 				<password>internet</password>
+				<dns>121.30.86.130</dns>
+				<dns>193.189.160.11</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -6093,7 +9213,10 @@
 		<name>T-2</name>
 		<gsm>
 			<network-id mcc="293" mnc="64"/>
-			<apn value="internet.t-2.net"/>
+			<apn value="internet.t-2.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -6106,8 +9229,10 @@
 			<network-id mcc="231" mnc="02"/>
 			<network-id mcc="231" mnc="04"/>
 			<apn value="internet">
-				<dns>194.154.230.66</dns>
-				<dns>194.154.230.74</dns>
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<dns>195.91.0.17</dns>
+				<dns>194.154.227.17</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -6116,8 +9241,10 @@
 		<gsm>
 			<network-id mcc="231" mnc="01"/>
 			<apn value="internet">
-				<dns>213.151.200.30</dns>
-				<dns>213.151.208.161</dns>
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<dns>213.151.200.31</dns>
+				<dns>213.151.208.162</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -6126,7 +9253,11 @@
 		<gsm>
 			<network-id mcc="231" mnc="06"/>
 			<apn value="o2internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
+				<dns>160.218.161.60</dns>
+				<dns>194.228.211.33</dns>
 			</apn>
 		</gsm>
 	</provider>
@@ -6139,6 +9270,8 @@
 		<gsm>
 			<network-id mcc="608" mnc="02"/>
 			<apn value="wap.sentelgsm.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>200.85.0.104</dns>
 				<dns>200.85.0.107</dns>
 			</apn>
@@ -6149,10 +9282,12 @@
 <!-- El Salvador -->
 <country code="sv">
 	<provider>
-		<name>movistar</name>
+		<name>Movistar</name>
 		<gsm>
 			<network-id mcc="706" mnc="04"/>
 			<apn value="internet.movistar.sv">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>movistarsv</username>
 				<password>movistarsv</password>
 			</apn>
@@ -6162,14 +9297,20 @@
 		<name>digicel</name>
 		<gsm>
 			<network-id mcc="706" mnc="02"/>
-			<apn value="wap.digicelsv.com"/>
+			<apn value="wap.digicelsv.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Tigo</name>
 		<gsm>
 			<network-id mcc="706" mnc="03"/>
-			<apn value="internet.tigo.sv"/>
+			<apn value="internet.tigo.sv">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -6177,6 +9318,8 @@
 		<gsm>
 			<network-id mcc="706" mnc="10"/>
 			<apn value="internet.ideasclaro">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet</name>
 			</apn>
 		</gsm>
@@ -6189,7 +9332,10 @@
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="634" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -6201,6 +9347,8 @@
 		<gsm>
 			<network-id mcc="520" mnc="01"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>202.183.255.20</dns>
 				<dns>202.183.255.21</dns>
 			</apn>
@@ -6211,6 +9359,8 @@
 		<gsm>
 			<network-id mcc="520" mnc="18"/>
 			<apn value="www.dtac.co.th">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>202.44.202.2</dns>
 				<dns>203.44.144.33</dns>
 			</apn>
@@ -6221,6 +9371,8 @@
 		<gsm>
 			<network-id mcc="520" mnc="99"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>true</username>
 				<password>true</password>
 			</apn>
@@ -6230,7 +9382,10 @@
 		<name>TOT 3G</name>
 		<gsm>
 			<network-id mcc="520" mnc="15"/>
-			<apn value="internet" />
+			<apn value="internet" >
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -6241,14 +9396,64 @@
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="605" mnc="01"/>
+			<apn value="weborange">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Internet</name>
+			</apn>
+			<apn value="mms.otun">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
+				<name>Internet + MMS</name>
+			</apn>
 			<apn value="keygp">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>Internet Everywhere Prepaid</name>
 			</apn>
 			<apn value="keypro">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet Everywhere Professional</name>
 			</apn>
 		</gsm>
 	</provider>
+	<provider>
+		<name>Tunisie Télécom / TUNTEL</name>
+		<gsm>
+			<network-id mcc="605" mnc="02"/>
+			<apn value="mms.tn">
+				<plan type="postpaid"/>
+				<usage type="mms"/>
+				<name>MMS</name>
+				<username>mms@tt1</username>
+				<password>mms</password>
+			</apn>
+			<apn value="gprs.tn">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>GPRS DATA</name>
+				<username>gprs</username>
+				<password>gprs</password>
+			</apn>
+			<apn value="internet.tn">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>WEB DATA</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Tunisiana</name>
+		<gsm>
+			<network-id mcc="605" mnc="03"/>
+			<apn value="internet.tunisiana.com">
+				<name>Internet</name>
+				<username>internet</username>
+				<password>internet</password>
+			</apn>
+		</gsm>
+	</provider>
 </country>
 
 <!-- Turkey -->
@@ -6259,11 +9464,15 @@
 			<network-id mcc="286" mnc="03"/>
 			<network-id mcc="286" mnc="04"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>212.156.4.4</dns>
 				<dns>212.156.4.20</dns>
 			</apn>
 
 			<apn value="aycell">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>(former Aycell)</name>
 				<dns>212.156.4.1</dns>
 				<dns>212.156.4.4</dns>
@@ -6275,6 +9484,8 @@
 		<gsm>
 			<network-id mcc="286" mnc="01"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>gprs</username>
 				<password>gprs</password>
 				<dns>86.108.136.27</dns>
@@ -6285,18 +9496,38 @@
 	<provider primary="true">
 		<name>Vodafone</name>
 		<gsm>
-			<network-id mcc="286" mnc="02"/>
+			<network-id mcc="286" mnc="02"/><!-- mnc="0251" in Vodofone XML -->
+			<msisdn-query>
+				<ussd>*101#</ussd>
+			</msisdn-query>
+			<apn value="edje.kktctelsim.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Faturali / Kontorlu</name>
+			</apn>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>KKTC Telsim</name>
 				<username>vodafone</username>
 				<password>vodafone</password>
 			</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>KKTC Telsim</name>
-		<gsm>
-			<network-id mcc="286" mnc="02"/><!-- mnc="0251" in Vodafone XML -->
-			<apn value="edge.kktctelsim.com"/>
+			<apn value="telsim">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Postpaid</name>
+				<username>telsim</username>
+				<password>telsim</password>
+				<dns>212.65.128.20</dns>
+				<dns>212.156.4.7</dns>
+			</apn>
+			<apn value="prepaidgprs">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
+				<name>Prepaid</name>
+				<dns>212.65.128.20</dns>
+				<dns>212.156.4.7</dns>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -6308,6 +9539,8 @@
 		<gsm>
 			<network-id mcc="374" mnc="13"/>
 			<apn value="wap.digiceltt.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
@@ -6318,6 +9551,8 @@
 		<gsm>
 			<network-id mcc="374" mnc="12"/>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>wap</username>
 				<password>wap</password>
 			</apn>
@@ -6332,13 +9567,18 @@
 		<name xml:lang="zh">中華電信 (emome)</name>
 		<gsm>
 			<network-id mcc="466" mnc="92"/>
-			<!-- Vodafone Broadband Connect version 10.1.0.23908 2010-06-07T17:47:01 lists username/pass = web. Others list empty -->
-			<apn value="internet"/>
 			<!-- http://www.nav4all.com/site2/www.nav4all.com/enguk/gprs_settings_taiwan_chunghwatelekom_nav4all.php?m=F3 -->
 			<apn value="emome">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>web</username>
 				<password>web</password>
 			</apn>
+			<!-- Vodafone Broadband Connect version 10.1.0.23908 2010-06-07T17:47:01 lists username/pass = web. Others list empty -->
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -6346,7 +9586,10 @@
 		<name xml:lang="zh">遠傳電信 / 和信電訊</name>
 		<gsm>
 			<network-id mcc="466" mnc="01"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -6354,7 +9597,10 @@
 		<name xml:lang="zh">台湾大哥大</name>
 		<gsm>
 			<network-id mcc="466" mnc="99"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -6362,7 +9608,10 @@
 		<name xml:lang="zh">泛亞電信</name>
 		<gsm>
 			<network-id mcc="466" mnc="97"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -6370,7 +9619,10 @@
 		<name xml:lang="zh">威寶電信 (Vibo) / 震旦電信 (Aurora)</name>
 		<gsm>
 			<network-id mcc="466" mnc="89"/>
-			<apn value="vibo"/>
+			<apn value="vibo">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -6383,24 +9635,33 @@
 <!-- Tanzania, United Republic of -->
 <country code="tz">
 	<provider>
-		<name>Zain</name>
+		<name>Airtel Tanzania</name>
 		<gsm>
 			<network-id mcc="640" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Vodacom</name>
 		<gsm>
 			<network-id mcc="640" mnc="04"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Zantel</name>
 		<gsm>
 			<network-id mcc="640" mnc="03"/>
-			<apn value="znet"/>
+			<apn value="znet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 		<cdma>
 			<username>@zantel.com</username>
@@ -6430,14 +9691,20 @@
 			<network-id mcc="255" mnc="03"/>
 
 			<apn value="www.ab.kyivstar.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Ace&amp;Base</name>
 				<username>igprs</username>
 				<password>internet</password>
 			</apn>
 			<apn value="www.kyivstar.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Contract GPRS</name>
 			</apn>
 			<apn value="3g.kyivstar.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet 3G</name>
 			</apn>
 		</gsm>
@@ -6448,12 +9715,18 @@
 			<network-id mcc="255" mnc="03"/>
 
 			<apn value="www.djuice.com.ua">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet GPRS</name>
 			</apn>
 			<apn value="xl.kyivstar.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet XL</name>
 			</apn>
 			<apn value="3g.kyivstar.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet 3G</name>
 			</apn>
 		</gsm>
@@ -6464,11 +9737,15 @@
 			<network-id mcc="255" mnc="06"/>
 
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Standard</name>
 				<dns>212.58.160.33</dns>
 				<dns>212.58.160.34</dns>
 			</apn>
 			<apn value="speed">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Faster</name>
 				<dns>212.58.160.33</dns>
 				<dns>212.58.160.34</dns>
@@ -6479,7 +9756,10 @@
 		<name>Beeline</name>
 		<gsm>
 			<network-id mcc="255" mnc="02"/>
-			<apn value="internet.beeline.ua"/>
+			<apn value="internet.beeline.ua">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -6487,10 +9767,14 @@
 		<gsm>
 			<network-id mcc="255" mnc="01"/>
 			<apn value="www.jeans.ua">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>80.255.64.23</dns>
 				<dns>80.255.64.24</dns>
 			</apn>
 			<apn value="hyper.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Hyper.NET</name>
 				<dns>212.58.160.33</dns>
 				<dns>212.58.160.34</dns>
@@ -6503,18 +9787,26 @@
 			<network-id mcc="255" mnc="01"/>
 
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>GPRS Internet</name>
 				<username>internet</username>
 				<dns>212.58.160.33</dns>
 				<dns>212.58.160.34</dns>
 			</apn>
 			<apn value="hyper.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Hyper.NET</name>
 			</apn>
 			<apn value="active">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>HyperActive</name>
 			</apn>
 			<apn value="www.umc.ua">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>umc.ua</name>
 				<dns>80.255.64.23</dns>
 				<dns>80.255.64.24</dns>
@@ -6531,7 +9823,10 @@
 		<name>Utel</name>
 		<gsm>
 			<network-id mcc="255" mnc="07"/>
-			<apn value="3g.utel.ua"/>
+			<apn value="3g.utel.ua">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -6562,6 +9857,8 @@
 		<gsm>
 			<network-id mcc="641" mnc="10"/>
 			<apn value="yellopix.mtn.co.ug">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>193.108.252.50</dns>
 				<dns>193.108.252.51</dns>
 			</apn>
@@ -6571,7 +9868,10 @@
 		<name>Orange</name>
 		<gsm>
 			<network-id mcc="641" mnc="14"/>
-			<apn value="orange.ug"/>
+			<apn value="orange.ug">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
     <provider>
@@ -6579,9 +9879,13 @@
 		<gsm>
 			<network-id mcc="641" mnc="11"/>
 			<apn value="utbroadband">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Broadband</name>
 			</apn>
 			<apn value="utweb">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Internet</name>
 			</apn>
 		</gsm>
@@ -6591,14 +9895,20 @@
 		<gsm>
 			<network-id mcc="641" mnc="22"/>
 			<!-- http://www.waridtel.co.ug/gprs.php -->
-			<apn value="web.waridtel.co.ug"/>
+			<apn value="web.waridtel.co.ug">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
     <provider>
 		<name>Zain</name>
 		<gsm>
 			<network-id mcc="641" mnc="01"/>
-			<apn value="web.ug.zain.com"/>
+			<apn value="web.ug.zain.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -6616,12 +9926,18 @@
 			<network-id mcc="310" mnc="680"/>
 			<!-- http://www.wireless.att.com/answer-center/main.jsp?solutionId=35078&t=solutionTab -->
 			<apn value="wap.cingular">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>MEdia Net (phones)</name>
 			</apn>
 			<apn value="Broadband">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>LaptopConnect (data cards)</name>
 			</apn>
 			<apn value="isp.cingular">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Data Connect (old)</name>
 			</apn>
 		</gsm>
@@ -6644,16 +9960,27 @@
 			<network-id mcc="310" mnc="660"/>
 			<network-id mcc="310" mnc="800"/>
 
+			<voicemail>123</voicemail>
 			<apn value="epc.tmobile.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet/WebConnect</name>
+				<dns>10.177.0.34</dns>
+				<dns>10.164.103.44</dns>
 			</apn>
 			<apn value="wap.voicestream.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Web2Go/t-zones</name>
 			</apn>
 			<apn value="internet2.voicestream.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet (old)</name>
 			</apn>
 			<apn value="internet3.voicestream.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Internet with VPN (old)</name>
 			</apn>
 		</gsm>
@@ -6663,6 +9990,8 @@
 		<gsm>
 			<network-id mcc="310" mnc="420"/>
 			<apn value="wap.gocbw.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>cbw</username>
 			</apn>
 		</gsm>
@@ -6728,6 +10057,27 @@
 	</provider>
 	<provider>
 		<name>Verizon</name>
+		<gsm>
+			<network-id mcc="310" mnc="995"/>
+			<network-id mcc="311" mnc="480"/>
+			<apn value="vzwims">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>4G LTE Contract</name>
+			</apn>
+			<apn value="vzwinternet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>4G LTE Contract</name>
+				<dns>66.174.92.14</dns>
+				<dns>69.78.96.14</dns>
+			</apn>
+			<apn value="vzwapp">
+				<plan type="postpaid"/>
+				<usage type="wap"/>
+				<name>4G LTE Contract</name>
+			</apn>
+		</gsm>
 		<cdma>
 			<!-- Assignments taken from IFAST: http://www.ifast.org/files/NationalSID.htm -->
 			<sid value="2"/>
@@ -7254,6 +10604,9 @@
 	</provider>
 	<provider>
 		<name>Cricket Communications</name>
+		<gsm>
+			<network-id mcc="310" mnc="000"/>
+		</gsm>
 		<cdma />
 	</provider>
 	<provider>
@@ -7283,7 +10636,9 @@
 	</provider>
 	<provider>
 		<name>Virgin Mobile / Helio</name>
-		<cdma />
+		<cdma>
+			<sid value="4183"/>
+		</cdma>
 	</provider>
 	<provider>
 		<name>Cellular South</name>
@@ -7307,14 +10662,20 @@
 		<name>BendBroadband</name>
 		<gsm>
 			<network-id mcc="311" mnc="570"/>
-			<apn value="ISP"/>
+			<apn value="ISP">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>MTPCS (Cellular One)</name>
 		<gsm>
 			<network-id mcc="310" mnc="570"/>
-			<apn value="wapgw.chinookwireless.net"/>
+			<apn value="wapgw.chinookwireless.net">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -7333,16 +10694,22 @@
 			<network-id mcc="748" mnc="00"/>
 			<network-id mcc="748" mnc="01"/>
 			<apn value="adslmovil">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>ADSL Móvil</name>
 				<dns>200.40.30.245</dns>
 				<dns>200.40.220.245</dns>
 			</apn>
 			<apn value="prepago.ancel">
+				<plan type="prepaid"/>
+				<usage type="internet"/>
 				<name>ADSL Móvil Prepago</name>
 				<username>BAM</username>
 				<password>BAM</password>
 			</apn>
 			<apn value="gprs.ancel">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>GPRS</name>
 				<dns>200.40.30.245</dns>
 				<dns>200.40.220.245</dns>
@@ -7354,11 +10721,15 @@
 		<gsm>
 			<network-id mcc="748" mnc="10"/>
 			<apn value="gprs.claro.com.uy">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>3G Internet</name>
 				<username>ctigprs</username>
 				<password>ctigprs999</password>
 			</apn>
 			<apn value="internet.ctimovil.com.uy">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>2G Internet</name>
 				<username>ctiweb</username>
 				<password>ctiweb999</password>
@@ -7370,11 +10741,15 @@
 		<gsm>
 			<network-id mcc="748" mnc="07"/>
 			<apn value="apnumt.movistar.com.uy">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>3G Internet</name>
 				<username>movistar</username>
 				<password>movistar</password>
 			</apn>
 			<apn value="webapn.movistar.com.uy">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>2G Internet</name>
 				<username>movistar</username>
 				<password>movistar</password>
@@ -7386,12 +10761,36 @@
 <!-- Uzbekistan -->
 <country code="uz">
 	<provider>
-		<name>Uzdunrobita / MTS</name>
+		<name>Beeline</name>
+		<gsm>
+			<network-id mcc="434" mnc="04"/>
+			<apn value="internet.beeline.uz">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<username>beeline</username>
+				<password>beeline</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>MTS (Uzdunrobita)</name>
 		<gsm>
 			<network-id mcc="434" mnc="07"/>
-			<apn value="net.urd.uz">
-				<username>user</username>
-				<password>pass</password>
+			<apn value="net.mts.uz">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<username>mts</username>
+				<password>mts</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Ucell</name>
+		<gsm>
+			<network-id mcc="434" mnc="05"/>
+			<apn value="internet">
+				<username></username>
+				<password></password>
 			</apn>
 		</gsm>
 	</provider>
@@ -7404,6 +10803,8 @@
 		<gsm>
 			<network-id mcc="360" mnc="070"/>
 			<apn value="wap.digiceloecs.com">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>wapoecs</username>
 				<password>wap03oecs</password>
 			</apn>
@@ -7420,6 +10821,8 @@
 			<network-id mcc="734" mnc="02"/>
 			<network-id mcc="734" mnc="03"/>
 			<apn value="gprsweb.digitel.ve">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>57.67.127.195</dns>
 			</apn>
 		</gsm>
@@ -7429,6 +10832,8 @@
 		<gsm>
 			<network-id mcc="734" mnc="06"/>
 			<apn value="int.movilnet.com.ve">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>200.44.32.12</dns>
 				<dns>200.11.248.12</dns>
 			</apn>
@@ -7439,6 +10844,8 @@
 		<gsm>
 			<network-id mcc="734" mnc="04"/>
 			<apn value="internet.movistar.ve">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>200.35.65.3</dns>
 				<dns>200.35.65.4</dns>
 			</apn>
@@ -7453,6 +10860,8 @@
 		<gsm>
 			<network-id mcc="452" mnc="01"/>
 			<apn value="m-wap">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<username>mms</username>
 				<password>mms</password>
 			</apn>
@@ -7463,11 +10872,15 @@
 		<gsm>
 			<network-id mcc="452" mnc="02"/>
 			<apn value="m3-world">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Internet</name>
 				<username>mms</username>
 				<password>mms</password>
 			</apn>
 			<apn value="m3-card">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Broadband</name>
 				<username>mms</username>
 				<password>mms</password>
@@ -7490,9 +10903,13 @@
 		<gsm>
 			<network-id mcc="452" mnc="04"/>
 			<apn value="v-internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>Mobile Internet</name>
 			</apn>
 			<apn value="e-connect">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>D-com 3G</name>
 			</apn>
 		</gsm>
@@ -7501,7 +10918,10 @@
 		<name>Vietnamobile</name>
 		<gsm>
 			<network-id mcc="452" mnc="05"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
@@ -7509,6 +10929,8 @@
 		<gsm>
 			<network-id mcc="452" mnc="08"/>
 			<apn value="e-internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<name>EVNTelecomNet</name>
 			</apn>
 		</gsm>
@@ -7521,7 +10943,10 @@
 		<name>Beeline VN</name>
 		<gsm>
 			<network-id mcc="452" mnc="07"/>
-			<apn value="internet"/>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -7532,7 +10957,18 @@
 		<name>Cell-c</name>
 		<gsm>
 			<network-id mcc="655" mnc="07"/>
+			<msisdn-query>
+				<ussd>*147*100#</ussd>
+			</msisdn-query>
+			<balance-check>
+				<ussd>*101#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*102*CODE#</ussd>
+			</balance-top-up>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>196.7.0.138</dns>
 				<dns>196.7.142.132</dns>
 			</apn>
@@ -7542,7 +10978,18 @@
 		<name>MTN</name>
 		<gsm>
 			<network-id mcc="655" mnc="10"/>
+			<msisdn-query>
+				<ussd>*123*888#</ussd>
+			</msisdn-query>
+			<balance-check>
+				<ussd>*141#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*141*CODE#</ussd>
+			</balance-top-up>
 			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>196.11.240.241</dns>
 				<dns>209.212.97.1</dns>
 			</apn>
@@ -7552,14 +10999,43 @@
 		<name>Vodacom</name>
 		<gsm>
 			<network-id mcc="655" mnc="01"/>
-			<apn value="internet"/>
+			<msisdn-query>
+				<ussd>*111*501#</ussd>
+			</msisdn-query>
+			<balance-check>
+				<ussd>*100#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*100*01*CODE#</ussd>
+			</balance-top-up>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<dns>196.207.40.165</dns>
+				<dns>196.43.46.190</dns>
+			</apn>
+			<apn value="unrestricted">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+				<name>Unrestricted</name>
+				<dns>196.207.32.69</dns>
+				<dns>196.43.45.190</dns>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Virgin Mobile</name>
 		<gsm>
 			<network-id mcc="655" mnc="07"/>
+			<balance-check>
+				<ussd>*101#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*102*CODE#</ussd>
+			</balance-top-up>
 			<apn value="vdata">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
 				<dns>196.7.0.138</dns>
 				<dns>196.7.142.132</dns>
 			</apn>
@@ -7569,7 +11045,19 @@
 		<name>8.ta</name>
 		<gsm>
 			<network-id mcc="655" mnc="02"/>
-			<apn value="internet"/>
+			<msisdn-query>
+				<ussd>*1#</ussd>
+			</msisdn-query>
+			<balance-check>
+				<ussd>*188#</ussd>
+			</balance-check>
+			<balance-top-up>
+				<ussd replacement="CODE">*188*CODE#</ussd>
+			</balance-top-up>
+			<apn value="internet">
+				<plan type="postpaid"/>
+				<usage type="internet"/>
+			</apn>
 		</gsm>
 	</provider>
 </country>