[mobile-broadband-provider-info] Reorganize by Country::Provider::APN/Plan, add many MCC/MNC, lots of cleanup



commit 392cc322f330aef902f010d7ceec65a23cf71a87
Author: Dan Williams <dcbw redhat com>
Date:   Sun May 31 14:08:06 2009 -0400

    Reorganize by Country::Provider::APN/Plan, add many MCC/MNC, lots of cleanup
---
 serviceproviders.dtd => serviceproviders.2.dtd |   36 +-
 serviceproviders.xml                           | 4621 +++++++++++++-----------
 2 files changed, 2535 insertions(+), 2122 deletions(-)

diff --git a/serviceproviders.dtd b/serviceproviders.2.dtd
similarity index 52%
rename from serviceproviders.dtd
rename to serviceproviders.2.dtd
index 75c866c..20541f2 100644
--- a/serviceproviders.dtd
+++ b/serviceproviders.2.dtd
@@ -4,25 +4,35 @@
 <!ELEMENT country (provider*)>
 <!ATTLIST country code CDATA #REQUIRED>
 
-<!ELEMENT provider ( name+,
-                     (gsm|cdma),
-                     username?,
-                     password?,
-                     dns*,
-                     gateway?)>
-                     
-<!ELEMENT name (#PCDATA)>
-<!ATTLIST name xml:lang CDATA #IMPLIED>
+<!ELEMENT provider (name+, gsm?, cdma?)>
+
+<!ELEMENT gsm (network-id*, apn+)>
+<!ELEMENT apn (name*,
+               gateway?,
+               username?,
+               password?,
+               dns*)>
+<!ATTLIST apn value CDATA #REQUIRED>
 
-<!ELEMENT gsm (apn, network-id*)>
-<!ELEMENT apn (#PCDATA)>
 <!ELEMENT network-id EMPTY>
 <!ATTLIST network-id mcc CDATA #REQUIRED>
 <!ATTLIST network-id mnc CDATA #REQUIRED>
 
-<!ELEMENT cdma EMPTY>
-
 <!ELEMENT username (#PCDATA)> 
 <!ELEMENT password (#PCDATA)>
 <!ELEMENT dns (#PCDATA)>
 <!ELEMENT gateway (#PCDATA)>
+
+<!ELEMENT cdma (name*,
+                username?,
+                password?,
+                dns*,
+                sid*)>
+
+<!ELEMENT sid EMPTY>
+<!ATTLIST sid value CDATA #REQUIRED>
+
+<!ELEMENT name (#PCDATA)>
+<!ATTLIST name xml:lang CDATA #IMPLIED>
+
+
diff --git a/serviceproviders.xml b/serviceproviders.xml
index c844356..ccf9aee 100644
--- a/serviceproviders.xml
+++ b/serviceproviders.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
-<!DOCTYPE serviceproviders SYSTEM "serviceproviders.dtd">
+<!DOCTYPE serviceproviders SYSTEM "serviceproviders.2.dtd">
 
 <!-- Authors:
      2008 Antti Kaijanmäki <antti kaijanmaki net>
+     2009 Dan Williams <dcbw redhat com>
 -->
 
 <!-- THIS WORK IS IN PUBLIC DOMAIN:
@@ -34,29 +35,27 @@ and in any way, including by methods that have not yet been invented or
 conceived.
 -->
 
-<serviceproviders format="1.0">
+<serviceproviders format="2.0">
 
 <!-- United Arab Emirates -->
 <country code="ae">
 	<provider>
 		<name>Etisalat</name>
 		<gsm>
-			<apn>mnet</apn>
 			<network-id mcc="424" mnc="02"/>
+			<apn value="mnet">
+				<name>Etisalat</name>
+				<username>mnet</username>
+				<password>mnet</password>
+				<dns>194.170.1.6</dns>
+				<dns>194.170.1.7</dns>
+			</apn>
+			<apn value="etisalat.ae">
+				<name>Etisalat 3G</name>
+				<username>etisalat.ae</username>
+				<password>etisalat.ae</password>
+			</apn>
 		</gsm>
-		<username>mnet</username>
-		<password>mnet</password>
-		<dns>194.170.1.6</dns>
-		<dns>194.170.1.7</dns>
-	</provider>
-	<provider>
-		<name>Etisalat 3G</name>
-		<gsm>
-			<apn>etisalat.ae</apn>		
-			<network-id mcc="424" mnc="02"/>
-		</gsm>
-		<username>etisalat.ae</username>
-		<password>etisalat.ae</password>
 	</provider>
 </country>
 
@@ -65,8 +64,8 @@ conceived.
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
-			<apn>Twa</apn>
 			<network-id mcc="276" mnc="02"/>
+			<apn value="Twa" />
 		</gsm>
 	</provider>
 </country>
@@ -75,14 +74,15 @@ conceived.
 <country code="ao">
 	<provider>
 		<name>Movinet</name>
-		<cdma />
-		<username>uname</username>
+		<cdma>
+			<username>uname</username>
+		</cdma>
 	</provider>
 	<provider>
 		<name>Unitel</name>
 		<gsm>
-			<apn>internet.unitel.co.ao</apn>
 			<network-id mcc="631" mnc="02"/>
+			<apn value="internet.unitel.co.ao" />
 		</gsm>
 	</provider>
 </country>
@@ -92,121 +92,121 @@ conceived.
 	<provider>
 		<name>Personal</name>
 		<gsm>
-			<apn>gprs.personal.com</apn>
 			<network-id mcc="722" mnc="340"/>
+			<apn value="gprs.personal.com">
+				<username>gprs</username>
+				<password>adgj</password>
+				<dns>172.25.7.6</dns>
+				<dns>172.25.7.7</dns>
+			</apn>
 		</gsm>
-		<username>gprs</username>
-		<password>adgj</password>
-		<dns>172.25.7.6</dns>
-		<dns>172.25.7.7</dns>
 	</provider>
 	<provider>
 		<name>Claro</name>
 		<gsm>
-			<apn>igprs.claro.com.ar</apn>
 			<network-id mcc="722" mnc="310"/>
 			<network-id mcc="722" mnc="320"/>
 			<network-id mcc="722" mnc="330"/>
+			<apn value="igprs.claro.com.ar">
+				<username>clarogprs</username>
+				<password>clarogprs999</password>
+				<dns>170.51.255.100</dns>
+				<dns>170.51.242.18</dns>
+			</apn>
 		</gsm>
-		<username>clarogprs</username>
-		<password>clarogprs999</password>
-		<dns>170.51.255.100</dns>
-		<dns>170.51.242.18</dns>
 	</provider>
 	<provider>
 		<name>Movistar</name>
 		<gsm>
-			<apn>internet.gprs.unifon.com.ar</apn>
 			<network-id mcc="722" mnc="010"/>
 			<network-id mcc="722" mnc="070"/>
+			<apn value="internet.gprs.unifon.com.ar">
+				<username>wap</username>
+				<password>wap</password>
+			</apn>
 		</gsm>
-		<username>wap</username>
-		<password>wap</password>
 	</provider>
 </country>
 
 <!-- Austria -->
 <country code="at">
 	<provider>
-		<name>Max Online</name>
-		<gsm>
-			<apn>gprsinternet</apn>
+		<name>Max</name>
+		<gsm>
+			<apn value="gprsinternet">
+				<name>Max Online</name>
+				<username>GPRS</username>
+				<dns>213.162.64.1</dns>
+				<dns>213.162.64.2</dns>
+			</apn>
+			<apn value="business.gprsinternet">
+				<name>Max Online (Business)</name>
+				<username>GPRS</username>
+				<dns>213.162.64.1</dns>
+				<dns>213.162.64.2</dns>
+			</apn>
+			<apn value="gprsmetro">
+				<name>Max Online (Metro)</name>
+				<username>GPRS</username>
+				<dns>213.162.64.1</dns>
+				<dns>213.162.64.2</dns>
+			</apn>
 		</gsm>
-		<username>GPRS</username>
-		<dns>213.162.64.1</dns>
-		<dns>213.162.64.2</dns>
-	</provider>
-	<provider>
-		<name>Max Online (Business)</name>
-		<gsm>
-			<apn>business.gprsinternet</apn>
-		</gsm>
-		<username>GPRS</username>
-		<dns>213.162.64.1</dns>
-		<dns>213.162.64.2</dns>
-	</provider>
-	<provider>
-		<name>Max Online (Metro)</name>
-		<gsm>
-			<apn>gprsmetro</apn>
-		</gsm>
-		<username>GPRS</username>
-		<dns>213.162.64.1</dns>
-		<dns>213.162.64.2</dns>
 	</provider>
 	<provider>
 		<name>Mobilkom/A1</name>
 		<gsm>
-			<apn>a1.net</apn>
 			<network-id mcc="232" mnc="01"/>
+			<apn value="a1.net">
+				<username>ppp a1plus at</username>
+				<password>ppp</password>
+				<dns>194.48.139.254</dns>
+				<dns>194.48.124.202</dns>
+			</apn>
 		</gsm>
-		<username>ppp a1plus at</username>
-		<password>ppp</password>
-		<dns>194.48.139.254</dns>
-		<dns>194.48.124.202</dns>
 	</provider>
 	<provider>
 		<name>T-Mobile</name>
 		<gsm>
-			<apn>gprsinternet</apn>
+			<network-id mcc="232" mnc="07"/>
 			<network-id mcc="232" mnc="03"/>
+			<apn value="gprsinternet">
+				<username>t-mobile</username>
+				<password>tm</password>
+			</apn>
+			<apn value="web">
+				<name>T-Mobile (formerly tele.ring)</name>
+				<username>web telering at</username>
+				<password>web</password>
+				<dns>212.95.31.167</dns>
+				<dns>212.95.31.168</dns>
+			</apn>
 		</gsm>
-		<username>t-mobile</username>
-		<password>tm</password>
 	</provider>
 	<provider>
 		<name>Orange</name>
 		<gsm>
-			<apn>web.one.at</apn>
 			<network-id mcc="232" mnc="05"/>
+			<apn value="web.one.at">
+				<username>web</username>
+				<password>web</password>
+				<dns>194.24.128.100</dns>
+				<dns>194.24.128.102</dns>
+			</apn>
 		</gsm>
-		<username>web</username>
-		<password>web</password>
-		<dns>194.24.128.100</dns>
-		<dns>194.24.128.102</dns>
-	</provider>
-	<provider>
-		<name>T-Mobile (formerly tele.ring)</name>
-		<gsm>
-			<apn>web</apn>
-			<network-id mcc="232" mnc="07"/>
-		</gsm>
-		<username>web telering at</username>
-		<password>web</password>
-		<dns>212.95.31.167</dns>
-		<dns>212.95.31.168</dns>
 	</provider>
 	<provider>
-		<name>Drei</name>
+		<name>Three</name>
+		<name xml:lang="de">Drei</name>
 		<gsm>
-			<apn>drei.at</apn>
 			<network-id mcc="232" mnc="10"/>
+			<apn value="drei.at"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Yesss</name>
 		<gsm>
-			<apn>web.yesss.at</apn>
+			<apn value="web.yesss.at"/>
 		</gsm>
 	</provider>
 </country>
@@ -216,113 +216,89 @@ conceived.
 	<provider>
 		<name>Exetel</name>
 		<gsm>
-			<apn>exetel1</apn>
+			<apn value="exetel1"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Optus</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="505" mnc="02"/>
+			<apn value="internet">
+				<dns>202.139.83.3</dns>
+				<dns>192.65.91.129</dns>
+			</apn>
+			<apn value="CONNECT">
+				<name>Optus 3G</name>
+				<dns>202.139.83.3</dns>
+				<dns>192.65.91.129</dns>
+			</apn>
 		</gsm>
-		<dns>202.139.83.3</dns>
-		<dns>192.65.91.129</dns>
-	</provider>
-	<provider>
-		<name>Optus 3G</name>
-		<gsm>
-			<apn>CONNECT</apn>
-			<network-id mcc="505" mnc="02"/>
-		</gsm>
-		<dns>202.139.83.3</dns>
-		<dns>192.65.91.129</dns>
 	</provider>
 	<provider>
 		<name>Telstra</name>
 		<gsm>
-			<apn>telstra.wap</apn>
-			<network-id mcc="505" mnc="01"/>
-		</gsm>
-		<dns>139.130.4.4</dns>
-		<dns>203.50.2.71</dns>
-	</provider>
-	<provider>
-		<name>Telstra (3G data pack)</name>
-		<gsm>
-			<apn>telstra.datapack</apn>
-			<network-id mcc="505" mnc="01"/>
-		</gsm>
-		<password>Telstra</password>
-		<dns>139.130.4.4</dns>
-		<dns>203.50.2.71</dns>
-	</provider>
-	<provider>
-		<name>Telstra (UMTS/HSDPA)</name>
-		<gsm>
-			<apn>telstra.internet</apn>
 			<network-id mcc="505" mnc="01"/>
+			<apn value="telstra.wap">
+				<dns>139.130.4.4</dns>
+				<dns>203.50.2.71</dns>
+			</apn>
+			<apn value="telstra.datapack">
+				<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">
+				<name>Telstra (Next G)</name>
+				<dns>139.130.4.4</dns>
+				<dns>203.50.2.71</dns>
+			</apn>
+			<apn value="telstra.pcpack">
+				<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>
 		</gsm>
-		<dns>139.130.4.4</dns>
-		<dns>203.50.170.2</dns>
-	</provider>
-	<provider>
-		<name>Telstra (3G PC pack - pay by time)</name>
-		<gsm>
-			<apn>telstra.pcpack</apn>
-			<network-id mcc="505" mnc="01"/>
-		</gsm>
-		<password>Telstra</password>
-		<dns>139.130.4.4</dns>
-		<dns>203.50.2.71</dns>
-	</provider>
-	<provider>
-		<name>Telstra (Next G)</name>
-		<gsm>
-			<apn>telstra.internet</apn>
-			<network-id mcc="505" mnc="01"/>
-		</gsm>
-		<dns>139.130.4.4</dns>
-		<dns>203.50.2.71</dns>
 	</provider>
 	<provider>
 		<name>Three</name>
 		<gsm>
-			<apn>3netaccess</apn>
-			<network-id mcc="505" mnc="06"/>
-		</gsm>
-		<username>a</username>
-		<password>a</password>
-		<dns>202.124.68.130</dns>
-		<dns>202.124.76.66</dns>
-	</provider>
-	<provider>
-		<name>Three Prepaid</name>
-		<gsm>
-			<apn>3services</apn>
 			<network-id mcc="505" mnc="06"/>
+			<apn value="3netaccess">
+				<username>a</username>
+				<password>a</password>
+				<dns>202.124.68.130</dns>
+				<dns>202.124.76.66</dns>
+			</apn>
+			<apn value="3services">
+				<name>Three Prepaid</name>
+				<username>a</username>
+				<password>a</password>
+				<dns>202.124.68.130</dns>
+				<dns>202.124.76.66</dns>
+			</apn>
 		</gsm>
-		<username>a</username>
-		<password>a</password>
-		<dns>202.124.68.130</dns>
-		<dns>202.124.76.66</dns>
 	</provider>
 	<provider>
 		<name>Virgin Mobile</name>	
 		<gsm>
-			<apn>VirginInternet</apn>		
+			<apn value="VirginInternet">
+				<username>guest</username>
+				<password>guest</password>
+				<dns>61.88.88.88</dns>
+			</apn>		
 		</gsm>
-		<username>guest</username>
-		<password>guest</password>
-		<dns>61.88.88.88</dns>
 	</provider>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
-			<apn>vfinternet.au</apn>
 			<network-id mcc="505" mnc="03"/>
+			<apn value="vfinternet.au">
+				<dns>192.189.54.33</dns>
+				<dns>210.80.58.3</dns>
+			</apn>
 		</gsm>
-		<dns>192.189.54.33</dns>
-		<dns>210.80.58.3</dns>
 	</provider>
 </country>
 
@@ -331,15 +307,15 @@ conceived.
 	<provider>
 		<name>Azercell</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="400" mnc="01"/>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Bakcell</name>	
 		<gsm>
-			<apn>mms</apn>
 			<network-id mcc="400" mnc="02"/>
+			<apn value="mms"/>
 		</gsm>
 	</provider>
 </country>
@@ -349,8 +325,8 @@ conceived.
 	<provider>
 		<name>BH GSM</name>
 		<gsm>
-			<apn>mms.bhmobile.ba</apn>
 			<network-id mcc="218" mnc="90"/>
+			<apn value="mms.bhmobile.ba"/>
 		</gsm>
 	</provider>
 </country>
@@ -360,8 +336,8 @@ conceived.
 	<provider>
 		<name>Digicel</name>
 		<gsm>
-			<apn>isp.digicelbarbados.com</apn>
 			<network-id mcc="342" mnc="750"/>
+			<apn value="isp.digicelbarbados.com"/>
 		</gsm>
 	</provider>
 </country>
@@ -371,96 +347,91 @@ conceived.
 	<provider>
 		<name>AKTel</name>
 		<gsm>
-			<apn>atmmms</apn>
 			<network-id mcc="470" mnc="02"/>
+			<apn value="atmmms">
+				<dns>192.168.023.007</dns>
+			</apn>
 		</gsm>
-		<dns>192.168.023.007</dns>
 	</provider>
 	<provider>
 		<name>Banglalink</name>
 		<gsm>
-			<apn>blweb</apn>	
 			<network-id mcc="470" mnc="03"/>
+			<apn value="blweb"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Grameen Phone</name>
 		<gsm>
-			<apn>gpinternet</apn>
 			<network-id mcc="470" mnc="01"/>
+			<apn value="gpinternet">
+				<dns>202.56.4.120</dns>
+				<dns>202.56.4.121</dns>
+			</apn>
 		</gsm>
-		<dns>202.56.4.120</dns>
-		<dns>202.56.4.121</dns>
 	</provider>
 </country>
 
 <!-- Belgium -->
 <country code="be">
 	<provider>
-		<name>Mobistar (business)</name>
-		<gsm>
-			<apn>web.pro.be</apn>
-			<network-id mcc="206" mnc="10"/>
-		</gsm>
-		<username>mobistar</username>
-		<password>mobistar</password>
-		<dns>212.65.63.10</dns>
-		<dns>212.65.63.145</dns>
-	</provider>
-	<provider>
-		<name>Mobistar (personal)</name>
-		<gsm>
-			<apn>internet.be</apn>
-			<network-id mcc="206" mnc="10"/>
-		</gsm>
-		<username>mobistar</username>
-		<password>mobistar</password>
-		<dns>212.65.63.10</dns>
-		<dns>212.65.63.145</dns>
-	</provider>
-	<provider>
-		<name>Mobistar (Internet Everywhere)</name>
+		<name>Mobistar</name>
 		<gsm>
-			<apn>iew.be</apn>
 			<network-id mcc="206" mnc="10"/>
+			<apn value="web.pro.be">
+				<name>Business</name>
+				<username>mobistar</username>
+				<password>mobistar</password>
+				<dns>212.65.63.10</dns>
+				<dns>212.65.63.145</dns>
+			</apn>
+			<apn value="internet.be">
+				<name>Personal</name>
+				<username>mobistar</username>
+				<password>mobistar</password>
+				<dns>212.65.63.10</dns>
+				<dns>212.65.63.145</dns>
+			</apn>
+			<apn value="iew.be">
+				<name>Internet Everywhere</name>
+				<username>mobistar</username>
+				<password>mobistar</password>
+				<dns>212.65.63.10</dns>
+				<dns>212.65.63.145</dns>
+			</apn>
 		</gsm>
-		<username>mobistar</username>
-		<password>mobistar</password>
-		<dns>212.65.63.10</dns>
-		<dns>212.65.63.145</dns>
 	</provider>
 	<provider>
 		<name>Orange</name>
 		<gsm>
-			<apn>orangeinternet</apn>
+			<apn value="orangeinternet"/>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Proximus Inter</name>
+		<name>Proximus</name>
 		<gsm>
-			<apn>internet.proximus.be</apn>
 			<network-id mcc="206" mnc="01"/>
+			<apn value="internet.proximus.be">
+				<name>Inter</name>
+				<dns>195.238.2.21</dns>
+				<dns>195.238.2.22</dns>
+			</apn>
+			<apn value="intraprox.be">
+				<name>Intra</name>
+				<dns>195.238.2.21</dns>
+				<dns>195.238.2.22</dns>
+			</apn>
 		</gsm>
-		<dns>195.238.2.21</dns>
-		<dns>195.238.2.22</dns>
-	</provider>
-	<provider>
-		<name>Proximus Intra</name>
-		<gsm>
-			<apn>intraprox.be</apn>
-			<network-id mcc="206" mnc="01"/>
-		</gsm>
-		<dns>195.238.2.21</dns>
-		<dns>195.238.2.22</dns>
 	</provider>
 	<provider>
 		<name>Base</name>
 		<gsm>
-			<apn>gprs.base.be</apn>
 			<network-id mcc="206" mnc="20"/>
+			<apn value="gprs.base.be">
+				<username>base</username>
+				<password>base</password>
+			</apn>
 		</gsm>
-		<username>base</username>
-		<password>base</password>
 	</provider>
 </country>
 
@@ -469,22 +440,24 @@ conceived.
 	<provider>
 		<name>GloBul</name>
 		<gsm>
-			<apn>internet.globul.bg</apn>
 			<network-id mcc="284" mnc="05"/>
+			<apn value="internet.globul.bg">
+				<username>globul</username>
+				<dns>192.168.88.11</dns>
+			</apn>
 		</gsm>
-		<username>globul</username>
-		<dns>192.168.88.11</dns>
 	</provider>
 	<provider>
 		<name>M-Tel</name>
 		<gsm>
-			<apn>inet-gprs.mtel.bg</apn>
 			<network-id mcc="284" mnc="01"/>
+			<apn value="inet-gprs.mtel.bg">
+				<username>mtel</username>
+				<password>mtel</password>
+				<dns>213.226.7.34</dns>
+				<dns>213.226.7.35</dns>
+			</apn>
 		</gsm>
-		<username>mtel</username>
-		<password>mtel</password>
-		<dns>213.226.7.34</dns>
-		<dns>213.226.7.35</dns>
 	</provider>
 </country>
 
@@ -493,67 +466,69 @@ conceived.
 	<provider>
 		<name>Claro</name>
 		<gsm>
-			<apn>claro.com.br</apn>
 			<network-id mcc="724" mnc="05"/>
+			<apn value="claro.com.br">
+				<username>claro</username>
+				<password>claro</password>
+			</apn>
 		</gsm>
-		<username>claro</username>
-		<password>claro</password>
 	</provider>
 	<provider>
 		<name>Oi</name>
 		<gsm>
-			<apn>gprs.oi.com.br</apn>
-			<network-id mcc="724" mnc="16"/>
-			<network-id mcc="724" mnc="31"/>
-			<network-id mcc="724" mnc="24"/>
-		</gsm>
-		<password>oioioi</password>
-	</provider>
-	<provider>
-		<name>Oi (WAP)</name>
-		<gsm>
-			<apn>wapgprs.oi.com.br</apn>
 			<network-id mcc="724" mnc="16"/>
 			<network-id mcc="724" mnc="31"/>
 			<network-id mcc="724" mnc="24"/>
+
+			<apn value="gprs.oi.com.br">
+				<password>oioioi</password>
+			</apn>
+			<apn value="wapgprs.oi.com.br">
+				<name>WAP</name>
+				<username>oiwap</username>
+				<password>oioioi</password>
+			</apn>
 		</gsm>
-		<username>oiwap</username>
-		<password>oioioi</password>
 	</provider>
 	<provider>
 		<name>TIM</name>
 		<gsm>
-			<apn>tim.br</apn>
 			<network-id mcc="724" mnc="02"/>
 			<network-id mcc="724" mnc="03"/>
 			<network-id mcc="724" mnc="04"/>
 			<network-id mcc="724" mnc="08"/>
+
+			<apn value="tim.br">
+				<username>tim</username>
+				<password>tim</password>
+				<dns>10.223.246.102</dns>
+				<dns>10.223.246.103</dns>
+			</apn>
 		</gsm>
-		<username>tim</username>
-		<password>tim</password>
-		<dns>10.223.246.102</dns>
-		<dns>10.223.246.103</dns>
 	</provider>
 	<provider>
 		<name>Velox</name>
 		<gsm>
-			<apn>wap.telcel.com</apn>
+			<apn value="wap.telcel.com">
+				<username>iesgprs</username>
+				<password>iesgprs2002</password>
+				<dns>66.36.250.14</dns>
+			</apn>
 		</gsm>
-		<username>iesgprs</username>
-		<password>iesgprs2002</password>
-		<dns>66.36.250.14</dns>
 	</provider>
 	<provider>
 		<name>Vivo</name>
 		<gsm>
-			<apn>zap.vivo.com.br</apn>
 			<network-id mcc="724" mnc="06"/>
 			<network-id mcc="724" mnc="10"/>
 			<network-id mcc="724" mnc="11"/>
 			<network-id mcc="724" mnc="23"/>
+
+			<apn value="zap.vivo.com.br">
+				<username>vivo</username>
+				<password>vivo</password>
+			</apn>
 		</gsm>
-		<username>vivo</username>
-		<password>vivo</password>
 	</provider>
 </country>
 
@@ -562,8 +537,8 @@ conceived.
 	<provider>
 		<name>Batelco</name>
 		<gsm>
-			<apn>internet.btcbahamas.com</apn>
 			<network-id mcc="364" mnc="390"/>
+			<apn value="internet.btcbahamas.com"/>
 		</gsm>
 	</provider>
 </country>
@@ -573,49 +548,41 @@ conceived.
 	<provider>
 		<name>VELCOM</name>
 		<gsm>
-			<apn>wap.velcom.by</apn>
-			<network-id mcc="257" mnc="01"/>
-		</gsm>
-		<username>wap</username>
-		<password>wap</password>
-	</provider>
-	<provider>
-		<name>VELCOM (Simple GPRS)</name>
-		<gsm>
-			<apn>web.velcom.by</apn>
-			<network-id mcc="257" mnc="01"/>
-		</gsm>
-		<username>web</username>
-		<password>web</password>
-		<dns>212.98.162.154</dns>
-		<dns>193.232.248.2</dns>
-	</provider>
-	<provider>
-		<name>VELCOM (Web Plus)</name>
-		<gsm>
-			<apn>plus.velcom.by</apn>
-			<network-id mcc="257" mnc="01"/>
-		</gsm>
-		<username>plus</username>
-		<password>plus</password>
-	</provider>
-	<provider>
-		<name>VELCOM (Privet)</name>
-		<gsm>
-			<apn>privet.velcom.by</apn>
 			<network-id mcc="257" mnc="01"/>
+
+			<apn value="wap.velcom.by">
+				<name>WAP</name>
+				<username>wap</username>
+				<password>wap</password>
+			</apn>
+			<apn value="web.velcom.by">
+				<name>Simple GPRS</name>
+				<username>web</username>
+				<password>web</password>
+				<dns>212.98.162.154</dns>
+				<dns>193.232.248.2</dns>
+			</apn>
+			<apn value="plus.velcom.by">
+				<name>Web Plus</name>
+				<username>plus</username>
+				<password>plus</password>
+			</apn>
+			<apn value="privet.velcom.by">
+				<name>VELCOM (Privet)</name>
+				<username>privet</username>
+				<password>privet</password>
+			</apn>
 		</gsm>
-		<username>privet</username>
-		<password>privet</password>
 	</provider>
 	<provider>
 		<name>MTS</name>
 		<gsm>
-			<apn>internet.mts.by</apn>
 			<network-id mcc="257" mnc="02"/>
+			<apn value="internet.mts.by">
+				<username>mts</username>
+				<password>mts</password>
+			</apn>
 		</gsm>
-		<username>mts</username>
-		<password>mts</password>
 	</provider>
 </country>
 
@@ -624,8 +591,8 @@ conceived.
 	<provider>
 		<name>Mascom Wireless</name>
 		<gsm>
-			<apn>internet.mascom</apn>
 			<network-id mcc="652" mnc="01"/>
+			<apn value="internet.mascom"/>
 		</gsm>
 	</provider>
 </country>
@@ -635,50 +602,98 @@ conceived.
 	<provider>
 		<name>Fido</name>
 		<gsm>
-			<apn>internet.fido.ca</apn>
 			<network-id mcc="302" mnc="370"/>
+			<apn value="internet.fido.ca">
+				<username>fido</username>
+				<password>fido</password>
+				<dns>204.92.15.211</dns>
+				<dns>207.181.101.4</dns>
+			</apn>
 		</gsm>
-		<username>fido</username>
-		<password>fido</password>
-		<dns>204.92.15.211</dns>
-		<dns>207.181.101.4</dns>
 	</provider>
 	<provider>
-		<name>Rogers AT&amp;T</name>
+		<name>Rogers</name>
 		<gsm>
-			<apn>internet.com</apn>
 			<network-id mcc="302" mnc="720"/>
-		</gsm>
-		<username>wapuser1</username>
-		<password>wap</password>
-		<dns>207.181.101.4</dns>
-		<dns>207.181.101.5</dns>
+			<apn value="internet.com">
+				<username>wapuser1</username>
+				<password>wap</password>
+				<dns>207.181.101.4</dns>
+				<dns>207.181.101.5</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Bell Mobility</name>
+		<cdma>
+			<sid value="16420"/>
+			<sid value="16440"/>
+			<sid value="16456"/>
+			<sid value="16410"/>
+			<sid value="16444"/>
+			<sid value="16390"/>
+			<sid value="16394"/>
+			<sid value="16402"/>
+			<sid value="16414"/>
+			<sid value="16416"/>
+			<sid value="16418"/>
+			<sid value="16462"/>
+			<sid value="16472"/>
+			<sid value="16408"/>
+			<sid value="16404"/>
+			<sid value="16430"/>
+			<sid value="16396"/>
+			<sid value="16426"/>
+			<sid value="16388"/>
+			<sid value="16390"/>
+			<sid value="16408"/>
+			<sid value="16414"/>
+			<sid value="16430"/>
+			<sid value="16460"/>
+			<sid value="16468"/>
+		</cdma>
+	</provider>
+	<provider>
+		<name>Telus Mobility</name>
+		<cdma>
+			<sid value="16422"/>
+			<sid value="17500"/>
+			<sid value="16438"/>
+			<sid value="16458"/>
+			<sid value="16436"/>
+			<sid value="16434"/>
+			<sid value="16384"/>
+		</cdma>
+	</provider>
+	<provider>
+		<name>Virgin Mobile</name>
+		<cdma/>
+	</provider>
+	<provider>
+		<name>SaskTel</name>
+		<cdma>
+			<sid value="16410"/>
+			<sid value="16412"/>
+		</cdma>
 	</provider>
 </country>
 
 <!-- Congo (Dem. Rep.) -->
 <country code="cd">
 	<provider>
-		<name>Vodafone</name>
+		<name>Vodacom</name>
 		<gsm>
-			<apn>vodanet</apn>
+			<network-id mcc="630" mnc="01"/>
+			<apn value="vodanet">
+				<username>vodalive</username>
+				<dns>172.24.97.1</dns>
+			</apn>
 		</gsm>
-		<username>vodalive</username>
-		<dns>172.24.97.1</dns>
 	</provider>
 </country>
 
 <!-- Congo (Rep.) -->
 <country code="cg">
-	<provider>
-		<name>Vodafone</name>
-		<gsm>
-			<apn>vodanet</apn>
-			<network-id mcc="630" mnc="01"/>
-		</gsm>
-		<username>vodalive</username>
-		<dns>172.24.97.1</dns>
-	</provider>
 </country>
 
 <!-- Switzerland -->
@@ -686,33 +701,36 @@ conceived.
 	<provider>
 		<name>Orange</name>
 		<gsm>
-			<apn>mobileoffice3g</apn>
 			<network-id mcc="228" mnc="03"/>
+			<apn value="mobileoffice3g">
+				<dns>213.55.128.1</dns>
+				<dns>213.55.128.2</dns>
+			</apn>
 		</gsm>
-		<dns>213.55.128.1</dns>
-		<dns>213.55.128.2</dns>
 	</provider>
 	<provider>
 		<name>Sunrise</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="228" mnc="02"/>
+			<apn value="internet">
+				<username>internet</username>
+				<password>internet</password>
+				<dns>212.35.35.35</dns>
+				<dns>212.35.35.5</dns>
+			</apn>
 		</gsm>
-		<username>internet</username>
-		<password>internet</password>
-		<dns>212.35.35.35</dns>
-		<dns>212.35.35.5</dns>
 	</provider>
 	<provider>
 		<name>Swisscom</name>
 		<gsm>
-			<apn>gprs.swisscom.ch</apn>
 			<network-id mcc="228" mnc="01"/>
+			<apn value="gprs.swisscom.ch">
+				<username>gprs</username>
+				<password>gprs</password>
+				<dns>164.128.36.34</dns>
+				<dns>164.128.76.39</dns>
+			</apn>
 		</gsm>
-		<username>gprs</username>
-		<password>gprs</password>
-		<dns>164.128.36.34</dns>
-		<dns>164.128.76.39</dns>
 	</provider>
 </country>
 
@@ -721,10 +739,11 @@ conceived.
 	<provider>
 		<name>MTN</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="612" mnc="05"/>
+			<apn value="internet">
+				<dns>172.16.100.5</dns>
+			</apn>
 		</gsm>
-		<dns>172.16.100.5</dns>
 	</provider>
 </country>
 
@@ -733,65 +752,53 @@ conceived.
 	<provider>
 		<name>Claro Chile</name>
 		<gsm>
-			<apn>bam.clarochile.cl</apn>
 			<network-id mcc="730" mnc="03"/>
+			<apn value="bam.clarochile.cl">
+				<username>clarochile</username>
+				<password>clarochile</password>
+			</apn>
+			<apn value="bap.clarochile.cl">
+				<name>Prepago</name>
+				<username>clarochile</username>
+				<password>clarochile</password>
+			</apn>
+			<apn value="wap.clarochile.cl">
+				<name>WAP</name>
+				<username>clarochile</username>
+				<password>clarochile</password>
+			</apn>
 		</gsm>
-		<username>clarochile</username>
-		<password>clarochile</password>
-	</provider>
-	<provider>
-		<name>Claro Chile - Prepago</name>
-		<gsm>
-			<apn>bap.clarochile.cl</apn>
-			<network-id mcc="730" mnc="03"/>
-		</gsm>
-		<username>clarochile</username>
-		<password>clarochile</password>
-	</provider>
-	<provider>
-		<name>Claro Chile - WAP</name>
-		<gsm>
-			<apn>wap.clarochile.cl</apn>
-			<network-id mcc="730" mnc="03"/>
-		</gsm>
-		<username>clarochile</username>
-		<password>clarochile</password>
 	</provider>
 	<provider>
 		<name>Entel PCS</name>
 		<gsm>
-			<apn>imovil.entelpcs.cl</apn>
 			<network-id mcc="730" mnc="01"/>
+			<apn value="imovil.entelpcs.cl">
+				<username>entelpcs</username>
+				<password>entelpcs</password>
+			</apn>
+			<apn value="bam.entelpcs.cl">
+				<name>WAP</name>
+				<username>entelpcs</username>
+				<password>entelpcs</password>
+			</apn>
 		</gsm>
-		<username>entelpcs</username>
-		<password>entelpcs</password>
-	</provider>
-	<provider>
-		<name>Entel PCS - WAP</name>
-		<gsm>
-			<apn>bam.entelpcs.cl</apn>
-			<network-id mcc="730" mnc="01"/>
-		</gsm>
-		<username>entelpcs</username>
-		<password>entelpcs</password>
 	</provider>
 	<provider>
 		<name>Movistar</name>
 		<gsm>
-			<apn>web.tmovil.cl</apn>
-			<network-id mcc="730" mnc="10"/>
-		</gsm>
-		<username>web</username>
-		<password>web</password>
-	</provider>
-	<provider>
-		<name>Movistar - WAP</name>
-		<gsm>
-			<apn>wap.tmovil.cl</apn>
 			<network-id mcc="730" mnc="10"/>
+			<apn value="web.tmovil.cl">
+				<name>Web</name>
+				<username>web</username>
+				<password>web</password>
+			</apn>
+			<apn value="wap.tmovil.cl">
+				<name>WAP</name>
+				<username>wap</username>
+				<password>wap</password>
+			</apn>
 		</gsm>
-		<username>wap</username>
-		<password>wap</password>
 	</provider>
 </country>
 
@@ -800,20 +807,22 @@ conceived.
 	<provider>
 		<name>Orange</name>
 		<gsm>
-			<apn>orangecmgprs</apn>
 			<network-id mcc="624" mnc="02"/>
+			<apn value="orangecmgprs">
+				<username>orange</username>
+				<password>orange</password>
+			</apn>
 		</gsm>
-		<username>orange</username>
-		<password>orange</password>
 	</provider>
 	<provider>
 		<name>MTN</name>
 		<gsm>
-			<apn>INTERNET</apn>
 			<network-id mcc="624" mnc="01"/>
+			<apn value="INTERNET">
+				<username>guest</username>
+				<password>guest</password>
+			</apn>
 		</gsm>
-		<username>guest</username>
-		<password>guest</password>
 	</provider>
 </country>
 
@@ -822,23 +831,23 @@ conceived.
 	<provider>
 		<name>China Mobile</name>
 		<gsm>
-			<apn>cmnet</apn>
 			<network-id mcc="460" mnc="00"/>
 			<network-id mcc="460" mnc="02"/>
+			<apn value="cmnet">
+				<username>guest</username>
+				<password>guest</password>
+				<dns>211.136.20.203</dns>
+			</apn>
 		</gsm>
-		<username>guest</username>
-		<password>guest</password>
-		<dns>211.136.20.203</dns>
-		<dns>211.136.20.203</dns>
 	</provider>
 	<provider>
 		<name>China Unicom</name>
 		<gsm>
-			<apn></apn>
 			<network-id mcc="460" mnc="01"/>
+			<apn value="uninet">
+				<username>uninet</username>
+			</apn>
 		</gsm>
-		<username>guest</username>
-		<password>guest</password>
 	</provider>
 </country>
 
@@ -847,14 +856,14 @@ conceived.
 	<provider>
 		<name>IceCelular</name>
 		<gsm>
-			<apn>icecelular</apn>
 			<network-id mcc="712" mnc="01"/>
 			<network-id mcc="712" mnc="02"/>
+			<apn value="icecelular">
+				<username>guest</username>
+				<password>guest</password>
+				<dns>208.133.206.44</dns>
+			</apn>
 		</gsm>
-		<username>guest</username>
-		<password>guest</password>
-		<dns>208.133.206.44</dns>
-		<dns>208.133.206.44</dns>
 	</provider>
 </country>
 
@@ -863,129 +872,121 @@ conceived.
 	<provider>
 		<name>Comcel</name>
 		<gsm>
-			<apn>internet.comcel.com.co</apn>
 			<network-id mcc="732" mnc="101"/>
+			<apn value="internet.comcel.com.co">
+				<username>COMCELWEB</username>
+				<password>COMCELWEB</password>
+			</apn>
 		</gsm>
-		<username>COMCELWEB</username>
-		<password>COMCELWEB</password>
 	</provider>
 	<provider>
 		<name>Tigo</name>
 		<gsm>
-			<apn>web.colombiamovil.com.co</apn>
 			<network-id mcc="732" mnc="103"/>
 			<network-id mcc="732" mnc="111"/>
+			<apn value="web.colombiamovil.com.co"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Movistar</name>
 		<gsm>
-			<apn>internet.movistar.com.co</apn>
 			<network-id mcc="732" mnc="102"/>
 			<network-id mcc="732" mnc="123"/>
+			<apn value="internet.movistar.com.co">
+				<username>movistar</username>
+				<password>movistar</password>
+			</apn>
 		</gsm>
-		<username>movistar</username>
-		<password>movistar</password>
 	</provider>
 </country>
 
 <!-- Czech Republic -->
 <country code="cz">
 	<provider>
-		<name>Cesky Mobil (postpaid)</name>
+		<name>Cesky Mobil</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="230" mnc="98"/>
+			<apn value="internet">
+				<name>Postpaid</name>
+				<dns>212.67.64.2</dns>
+				<dns>217.77.161.131</dns>
+			</apn>
+			<apn value="Cinternet">
+				<name>Prepaid</name>
+				<dns>212.67.64.2</dns>
+				<dns>217.77.161.131</dns>
+			</apn>
 		</gsm>
-		<dns>212.67.64.2</dns>
-		<dns>217.77.161.131</dns>
-	</provider>
-	<provider>
-		<name>Cesky Mobil (prepaid)</name>
-		<gsm>
-			<apn>Cinternet</apn>
-			<network-id mcc="230" mnc="98"/>
-		</gsm>
-		<dns>212.67.64.2</dns>
-		<dns>217.77.161.131</dns>
-	</provider>
-	<provider>
-		<name>EuroTel / Telefónica (Go)</name>
-		<gsm>
-			<apn>gointernet</apn>
-			<network-id mcc="230" mnc="02"/>
-		</gsm>
-		<dns>160.218.10.200</dns>
-		<dns>160.218.43.200</dns>
-	</provider>
-	<provider>
-		<name>EuroTel / Telefónica (contract)</name>
-		<gsm>
-			<apn>internet</apn>
-			<network-id mcc="230" mnc="02"/>
-		</gsm>
-		<dns>160.218.10.200</dns>
-		<dns>160.218.43.200</dns>
 	</provider>
 	<provider>
-		<name>Eurotel / Telefónica (contract - open)</name>
+		<name>EuroTel / Telefónica</name>
 		<gsm>
-			<apn>internet.open</apn>
 			<network-id mcc="230" mnc="02"/>
-		</gsm>
-		<dns>160.218.10.200</dns>
-		<dns>160.218.43.200</dns>
-	</provider>
-	<provider>
-		<name>Oscar (postpaid)</name>
+			<apn value="gointernet">
+				<name>Go</name>
+				<dns>160.218.10.200</dns>
+				<dns>160.218.43.200</dns>
+			</apn>
+			<apn value="internet">
+				<name>Contract</name>
+				<dns>160.218.10.200</dns>
+				<dns>160.218.43.200</dns>
+			</apn>
+			<apn value="internet.open">
+				<name>Contract (Open)</name>
+				<dns>160.218.10.200</dns>
+				<dns>160.218.43.200</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Oscar</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="230" mnc="03"/>
+			<apn value="internet">
+				<name>Postpaid</name>
+				<username>wap</username>
+				<password>wap</password>
+				<dns>217.77.161.130</dns>
+				<dns>217.77.161.131</dns>
+			</apn>
+			<apn value="ointernet">
+				<name>Prepaid</name>
+				<dns>217.77.161.130</dns>
+				<dns>217.77.161.131</dns>
+			</apn>
 		</gsm>
-		<username>wap</username>
-		<password>wap</password>
-		<dns>217.77.161.130</dns>
-		<dns>217.77.161.131</dns>
-	</provider>
-	<provider>
-		<name>Oscar (prepaid)</name>
-		<gsm>
-			<apn>ointernet</apn>
-			<network-id mcc="230" mnc="03"/>
-		</gsm>
-		<dns>217.77.161.130</dns>
-		<dns>217.77.161.131</dns>
 	</provider>
 	<provider>
 		<name>Paegas Internet</name>
 		<gsm>
-			<apn>internet.click.cz</apn>
+			<apn value="internet.click.cz">
+				<name>Internet</name>
+				<dns>62.141.0.1</dns>
+				<dns>62.141.0.2</dns>
+			</apn>
+			<apn value="profil.click.cz">
+				<name>Profil</name>
+				<dns>62.141.0.1</dns>
+				<dns>62.141.0.2</dns>
+			</apn>
 		</gsm>
-		<dns>62.141.0.1</dns>
-		<dns>62.141.0.2</dns>
-	</provider>
-	<provider>
-		<name>Paegas Profil</name>
-		<gsm>
-			<apn>profil.click.cz</apn>
-		</gsm>
-		<dns>62.141.0.1</dns>
-		<dns>62.141.0.2</dns>
 	</provider>
 	<provider>
 		<name>Radiomibil</name>
 		<gsm>
-			<apn>internet.click.cz</apn>
+			<apn value="internet.click.cz"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>T-Mobil</name>
 		<gsm>
-			<apn>internet.t-mobile.cz</apn>
 			<network-id mcc="230" mnc="01"/>
+			<apn value="internet.t-mobile.cz">
+				<dns>62.141.0.1</dns>
+				<dns>213.162.65.1</dns>
+			</apn>
 		</gsm>
-		<dns>62.141.0.1</dns>
-		<dns>213.162.65.1</dns>
 	</provider>
 </country>
 
@@ -994,119 +995,93 @@ conceived.
 	<provider>
 		<name>AldiTalk/MedionMobile</name>	
 		<gsm>
-			<apn>internet.eplus.de</apn>		
 			<network-id mcc="262" mnc="03"/>
 			<network-id mcc="262" mnc="05"/>
 			<network-id mcc="262" mnc="77"/>
+			<apn value="internet.eplus.de">
+				<username>eplus</username>
+				<password>gprs</password>
+				<dns>212.23.97.2</dns>
+				<dns>212.23.97.3</dns>
+			</apn>		
 		</gsm>
-		<username>eplus</username>
-		<password>gprs</password>
-		<dns>212.23.97.2</dns>
-		<dns>212.23.97.3</dns>
 	</provider>
 	<provider>
-		<name>E-Plus (pre-pay)</name>
+		<name>E-Plus</name>
 		<gsm>
-			<apn>internet.eplus.de</apn>
 			<network-id mcc="262" mnc="03"/>
 			<network-id mcc="262" mnc="05"/>
 			<network-id mcc="262" mnc="77"/>
+
+			<apn value="internet.eplus.de">
+				<username>eplus</username>
+				<password>gprs</password>
+				<dns>212.23.97.2</dns>
+				<dns>212.23.97.3</dns>
+			</apn>
 		</gsm>
-		<username>eplus</username>
-		<password>gprs</password>
-		<dns>212.23.97.2</dns>
-		<dns>212.23.97.3</dns>
-	</provider>
-	<provider>
-		<name>E-Plus (contract)</name>
-		<gsm>
-			<apn>internet.eplus.de</apn>
-			<network-id mcc="262" mnc="03"/>
-			<network-id mcc="262" mnc="05"/>
-			<network-id mcc="262" mnc="77"/>
-		</gsm>
-		<username>eplus</username>
-		<password>gprs</password>
-		<dns>212.23.97.2</dns>
-		<dns>212.23.97.3</dns>
-	</provider>
-	<provider>
-		<name>o2 (pay-by-MB)</name>
-		<gsm>
-			<apn>internet</apn>
-			<network-id mcc="262" mnc="07"/>
-			<network-id mcc="262" mnc="08"/>
-			<network-id mcc="262" mnc="11"/>
-		</gsm>
-		<dns>195.182.110.132</dns>
-		<dns>62.134.11.4</dns>
-	</provider>
-	<provider>
-		<name>o2 (pay-by-time)</name>
-		<gsm>
-			<apn>surfo2</apn>
-			<network-id mcc="262" mnc="07"/>
-			<network-id mcc="262" mnc="08"/>
-			<network-id mcc="262" mnc="11"/>
-		</gsm>
-		<dns>195.182.110.132</dns>
-		<dns>62.134.11.4</dns>
 	</provider>
 	<provider>
-		<name>o2 (Viag Interkom)</name>
+		<name>o2</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="262" mnc="07"/>
 			<network-id mcc="262" mnc="08"/>
 			<network-id mcc="262" mnc="11"/>
+
+			<apn value="internet">
+				<name>Pay-by-MB</name>
+				<dns>195.182.110.132</dns>
+				<dns>62.134.11.4</dns>
+			</apn>
+			<apn value="surfo2">
+				<name>Pay-by-time</name>
+				<dns>195.182.110.132</dns>
+				<dns>62.134.11.4</dns>
+			</apn>
 		</gsm>
-		<dns>195.182.110.132</dns>
-		<dns>62.134.11.4</dns>
 	</provider>
 	<provider>
 		<name>T-mobile (D1)</name>
 		<gsm>
-			<apn>internet.t-d1.de</apn>
 			<network-id mcc="262" mnc="01"/>
 			<network-id mcc="262" mnc="06"/>
+
+			<apn value="internet.t-d1.de">
+				<password>t-d1</password>
+				<dns>193.254.160.1</dns>
+				<dns>193.254.160.130</dns>
+			</apn>
 		</gsm>
-		<password>t-d1</password>
-		<dns>193.254.160.1</dns>
-		<dns>193.254.160.130</dns>
 	</provider>
 	<provider>
 		<name>Vodafone (D2)</name>
 		<gsm>
-			<apn>web.vodafone.de</apn>
-			<network-id mcc="262" mnc="02"/>
-			<network-id mcc="262" mnc="04"/>
-			<network-id mcc="262" mnc="09"/>
-		</gsm>
-		<username>vodafone</username>
-		<password>vodafone</password>
-		<dns>139.7.30.125</dns>
-		<dns>139.7.30.126</dns>
-	</provider>
-	<provider>
-		<name>Vodafone (D2) WebSessions</name>
-		<gsm>
-			<apn>event.vodafone.de</apn>
 			<network-id mcc="262" mnc="02"/>
 			<network-id mcc="262" mnc="04"/>
 			<network-id mcc="262" mnc="09"/>
+
+			<apn value="web.vodafone.de">
+				<username>vodafone</username>
+				<password>vodafone</password>
+				<dns>139.7.30.125</dns>
+				<dns>139.7.30.126</dns>
+			</apn>
+			<apn value="event.vodafone.de">
+				<name>WebSessions</name>
+				<username>vodafone</username>
+				<password>vodafone</password>
+				<dns>139.7.30.125</dns>
+				<dns>139.7.30.126</dns>
+			</apn>
 		</gsm>
-		<username>vodafone</username>
-		<password>vodafone</password>
-		<dns>139.7.30.125</dns>
-		<dns>139.7.30.126</dns>
 	</provider>
 	<provider>
 		<name>FONIC</name>
 		<gsm>
-			<apn>pinternet.interkom.de</apn>
 			<network-id mcc="262" mnc="07"/>
 			<network-id mcc="262" mnc="08"/>
 			<network-id mcc="262" mnc="11"/>
+			<apn value="pinternet.interkom.de"/>
 		</gsm>
 	</provider>
 </country>
@@ -1114,78 +1089,76 @@ conceived.
 <!-- Denmark -->
 <country code="dk">
 	<provider>
-		<name>3 (Bredbånd)</name>
-		<gsm>
-			<apn>bredband.tre.dk</apn>
-			<network-id mcc="238" mnc="06"/>
-		</gsm>
-	</provider>
-	<provider>
-		<name>3 (Bredbånd Premium Kontant)</name>
-		<gsm>
-			<apn>net.tre.dk</apn>
-			<network-id mcc="238" mnc="06"/>
-		</gsm>
-	</provider>
-	<provider>
-		<name>3 (Mobil Abonnement)</name>
+		<name>3</name>
 		<gsm>
-			<apn>data.tre.dk</apn>
 			<network-id mcc="238" mnc="06"/>
+			<apn value="bredband.tre.dk">
+				<name>Bredbånd</name>
+ 			</apn>
+			<apn value="net.tre.dk">
+				<name>Bredbånd Premium Kontant</name>
+			</apn>
+			<apn value="data.tre.dk">
+				<name>3 (Mobil Abonnement)</name>
+			</apn>
 		</gsm>
 	</provider>
 	<!-- http://oister.dk - Same network as 3.dk -->
 	<provider>
 		<name>OiSTER</name>
 		<gsm>
-			<apn>bredband.oister.dk</apn>
 			<network-id mcc="238" mnc="06"/>
+			<apn value="bredband.oister.dk"/>
 		</gsm>
 	</provider>
 
 	<!-- http://www.ice-net.dk/mobiltbredbaand.php -->
 	<provider>
 		<name>ice.net (Nordisk Mobiltelefon)</name>
-		<cdma />
-		<username>cdma</username>
-		<password>cdma</password>
+		<cdma>
+			<username>cdma</username>
+			<password>cdma</password>
+		</cdma>
 	</provider>
 	<provider>
 		<name>Sonofon</name>
 		<gsm>
-			<apn>internet</apn>
+			<apn value="internet">
+				<dns>212.88.64.199</dns>
+				<dns>212.88.64.14</dns>
+			</apn>
 		</gsm>
-		<dns>212.88.64.199</dns>
-		<dns>212.88.64.14</dns>
 	</provider>
 	<provider>
 		<name>TDC</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="238" mnc="01"/>
+			<apn value="internet">
+				<dns>194.239.134.83</dns>
+				<dns>193.162.153.164</dns>
+			</apn>
 		</gsm>
-		<dns>194.239.134.83</dns>
-		<dns>193.162.153.164</dns>
 	</provider>
 	<provider>
 		<name>Fullrate</name>
 		<gsm>
-			<apn>internet</apn>
+			<apn value="internet">
+				<username>Fullrate</username>
+				<password>Fullrate</password>
+			</apn>
 		</gsm>
-		<username>Fullrate</username>
-		<password>Fullrate</password>
 	</provider>
 	<provider>
 		<name>Telia</name>
 		<gsm>
-			<apn>www.internet.mtelia.dk</apn>
 			<network-id mcc="238" mnc="30"/>
+			<apn value="www.internet.mtelia.dk"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>BiBoB</name>
 		<gsm>
-			<apn>internet.bibob.dk</apn>
+			<apn value="internet.bibob.dk"/>
 		</gsm>
 	</provider>
 </country>
@@ -1195,8 +1168,8 @@ conceived.
 	<provider>
 		<name>Orange</name>
 		<gsm>
-			<apn>orangenet.com.do</apn>
 			<network-id mcc="370" mnc="01"/>
+			<apn value="orangenet.com.do"/>
 		</gsm>
 	</provider>
 </country>
@@ -1206,8 +1179,8 @@ conceived.
 	<provider>
 		<name>Porta 3G</name>
 		<gsm>
-			<apn>internet.porta.com.ec</apn>
 			<network-id mcc="740" mnc="01"/>
+			<apn value="internet.porta.com.ec"/>
 		</gsm>
 	</provider>
 </country>
@@ -1217,40 +1190,43 @@ conceived.
 	<provider>
 		<name>EMT</name>
 		<gsm>
-			<apn>internet.emt.ee</apn>
 			<network-id mcc="248" mnc="01"/>
+			<apn value="internet.emt.ee">
+				<dns>217.71.32.116</dns>
+				<dns>217.71.32.115</dns>
+			</apn>
 		</gsm>
-		<dns>217.71.32.116</dns>
-		<dns>217.71.32.115</dns>
 	</provider>
 	<provider>
 		<name>Nordea</name>
 		<gsm>
-			<apn>internet.emt.ee</apn>
 			<network-id mcc="248" mnc="01"/>
+			<apn value="internet.emt.ee"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Radiolinja</name>
 		<gsm>
-			<apn>internet</apn>
+			<apn value="internet">
+				<dns>194.204.0.1</dns>
+			</apn>
 		</gsm>
-		<dns>194.204.0.1</dns>
 	</provider>
 	<provider>
 		<name>RLE</name>
 		<gsm>
-			<apn>internet</apn>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Tele2</name>
 		<gsm>
-			<apn>internet.tele2.ee</apn>
 			<network-id mcc="248" mnc="03"/>
+			<apn value="internet.tele2.ee">
+				<username>wap</username>
+				<password>wap</password>
+			</apn>
 		</gsm>
-		<username>wap</username>
-		<password>wap</password>
 	</provider>
 </country>
 
@@ -1259,27 +1235,29 @@ conceived.
 	<provider>
 		<name>Click Vodafone</name>
 		<gsm>
-			<apn>internet.vodafone.net</apn>
 			<network-id mcc="602" mnc="02"/>
+			<apn value="internet.vodafone.net">
+				<username>internet</username>
+				<password>internet</password>
+			</apn>
 		</gsm>
-		<username>internet</username>
-		<password>internet</password>
 	</provider>
 	<provider>
 		<name>Etisalat</name>
 		<gsm>
-			<apn>etisalat</apn>
 			<network-id mcc="602" mnc="03"/>
+			<apn value="etisalat"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>MobiNil</name>
 		<gsm>
-			<apn>mobinilweb</apn>
 			<network-id mcc="602" mnc="01"/>
+			<apn value="mobinilweb">
+				<dns>80.75.166.250</dns>
+				<dns>163.121.163.201</dns>
+			</apn>
 		</gsm>
-		<dns>80.75.166.250</dns>
-		<dns>163.121.163.201</dns>
 	</provider>
 </country>
 
@@ -1288,56 +1266,59 @@ conceived.
 	<provider>
 		<name>Orange (Amena)</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="214" mnc="03"/>
 			<network-id mcc="214" mnc="09"/>
+			<apn value="internet">
+				<username>CLIENTE</username>
+				<password>AMENA</password>
+				<dns>213.143.32.20</dns>
+				<dns>213.143.33.8</dns>
+			</apn>
 		</gsm>
-		<username>CLIENTE</username>
-		<password>AMENA</password>
-		<dns>213.143.32.20</dns>
-		<dns>213.143.33.8</dns>
 	</provider>
 	<provider>
 		<name>Simyo</name>
 		<gsm>
-			<apn>gprs-service.com</apn>
 			<network-id mcc="214" mnc="19"/>
+			<apn value="gprs-service.com"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>movistar (Telefonica)</name>
 		<gsm>
-			<apn>movistar.es</apn>
 			<network-id mcc="214" mnc="07"/>
+			<apn value="movistar.es">
+				<username>movistar</username>
+				<password>movistar</password>
+				<dns>194.179.1.100</dns>
+				<dns>194.179.1.101</dns>
+			</apn>
 		</gsm>
-		<username>movistar</username>
-		<password>movistar</password>
-		<dns>194.179.1.100</dns>
-		<dns>194.179.1.101</dns>
 	</provider>
 	<provider>
 		<name>Vodafone (Airtel)</name>
 		<gsm>
-			<apn>airtelnet.es</apn>
 			<network-id mcc="214" mnc="01"/>
 			<network-id mcc="214" mnc="06"/>
+			<apn value="airtelnet.es">
+				<username>vodafone</username>
+				<password>vodafone</password>
+				<dns>212.73.32.3</dns>
+				<dns>212.73.32.67</dns>
+			</apn>
 		</gsm>
-		<username>vodafone</username>
-		<password>vodafone</password>
-		<dns>212.73.32.3</dns>
-		<dns>212.73.32.67</dns>
 	</provider>
 	<provider>
 		<name>Yoigo</name>
 		<gsm>
-			<apn>Internet</apn>
 			<network-id mcc="214" mnc="04"/>
+			<apn value="Internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Jazztel</name>
 		<gsm>
-			<apn>jazzinternet</apn>
+			<apn value="jazzinternet"/>
 		</gsm>
 	</provider>
 </country>
@@ -1347,43 +1328,42 @@ conceived.
 	<provider>
 		<name>Dna</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="244" mnc="03"/>
+			<apn value="internet">
+				<dns>217.78.192.22</dns>
+				<dns>217.78.192.78</dns>
+			</apn>
 		</gsm>
-		<dns>217.78.192.22</dns>
-		<dns>217.78.192.78</dns>
 	</provider>
 	<provider>
 		<name>Elisa</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="244" mnc="05"/>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Saunalahti</name>
 		<gsm>
-			<apn>internet.saunalahti</apn>
 			<network-id mcc="244" mnc="21"/>
+			<apn value="internet.saunalahti"/>
 		</gsm>	
 	</provider>
 	<provider>
 		<name>Sonera</name>
 		<gsm>
-			<apn>internet</apn>
-			<network-id mcc="244" mnc="91"/>
-		</gsm>
-		<dns>192.89.123.230</dns>
-		<dns>192.89.123.231</dns>
-	</provider>
-	<provider>
-		<name>Sonera prointernet</name>
-		<gsm>
-			<apn>prointernet</apn>
 			<network-id mcc="244" mnc="91"/>
+
+			<apn value="internet">
+				<dns>192.89.123.230</dns>
+				<dns>192.89.123.231</dns>
+			</apn>
+			<apn value="prointernet">
+				<name>Prointernet</name>
+				<dns>192.89.123.230</dns>
+				<dns>192.89.123.231</dns>
+			</apn>
 		</gsm>
-		<dns>192.89.123.230</dns>
-		<dns>192.89.123.231</dns>
 	</provider>
 </country>
 
@@ -1392,8 +1372,8 @@ conceived.
 	<provider>
 		<name>Vodafone</name>	
 		<gsm>
-			<apn>vfinternet.fj</apn>
 			<network-id mcc="542" mnc="01"/>
+			<apn value="vfinternet.fj"/>
 		</gsm>
 	</provider>
 </country>
@@ -1403,135 +1383,101 @@ conceived.
 	<provider>
 		<name>A Mobile (Auchan Telecom)</name>
 		<gsm>
-			<apn>wap65</apn>
+			<apn value="wap65"/>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Bouygues Telecom (B2Bouygtel)</name>
-		<gsm>
-			<apn>b2bouygtel.com</apn>
-			<network-id mcc="208" mnc="20"/>
-			<network-id mcc="208" mnc="21"/>
-		</gsm>
-		<dns>62.201.129.99</dns>
-	</provider>
-	<provider>
 		<name>Bouygues Telecom</name>
 		<gsm>
-			<apn>ebouygtel.com</apn>
 			<network-id mcc="208" mnc="20"/>
 			<network-id mcc="208" mnc="21"/>
+			<apn value="b2bouygtel.com">
+				<name>B2Bouygtel</name>
+				<dns>62.201.129.99</dns>
+			</apn>
+			<apn value="ebouygtel.com">
+				<dns>62.201.129.99</dns>
+			</apn>
 		</gsm>
-		<dns>62.201.129.99</dns>
-		<dns>62.201.159.99</dns>
 	</provider>
 	<provider>
 		<name>France Telecom</name>
 		<gsm>
-			<apn>orange.fr.mnc001.mcc208.gprs</apn>
-			<network-id mcc="208" mnc="01"/>
-			<network-id mcc="208" mnc="00"/>
-		</gsm>
-		<username>gprs</username>
-	</provider>
-	<provider>
-		<name>Orange (contract)</name>
-		<gsm>
-			<apn>orange.fr</apn>
 			<network-id mcc="208" mnc="01"/>
 			<network-id mcc="208" mnc="00"/>
+			<apn value="orange.fr.mnc001.mcc208.gprs">
+				<username>gprs</username>
+			</apn>
 		</gsm>
-		<username>orange</username>
-		<password>orange</password>
-		<dns>194.51.3.56</dns>
-		<dns>194.51.3.76</dns>
 	</provider>
 	<provider>
-		<name>Orange (business contract)</name>
-		<gsm>
-			<apn>internet-entreprise</apn>
-			<network-id mcc="208" mnc="01"/>
-			<network-id mcc="208" mnc="00"/>
-		</gsm>
-		<username>orange</username>
-		<password>orange</password>
-		<dns>194.51.3.56</dns>
-		<dns>194.51.3.76</dns>
-	</provider>
-	<provider>
-		<name>Orange (no contract)</name>
-		<gsm>
-			<apn>orange</apn>
-			<network-id mcc="208" mnc="01"/>
-			<network-id mcc="208" mnc="00"/>
-		</gsm>
-		<username>orange</username>
-		<password>orange</password>
-		<dns>194.51.3.56</dns>
-		<dns>194.51.3.76</dns>
-	</provider>
-	<provider>
-		<name>Orange MIB</name>
-		<gsm>
-			<apn>orange-mib</apn>
-			<network-id mcc="208" mnc="01"/>
-			<network-id mcc="208" mnc="00"/>
-		</gsm>
-		<username>mportail</username>
-		<password>mib</password>
-		<dns>172.17.0.2</dns>
-		<dns>172.17.0.4</dns>
-	</provider>
-	<provider>
-		<name>Orange Mobicarte</name>
-		<gsm>
-			<apn>orange</apn>
-			<network-id mcc="208" mnc="01"/>
-			<network-id mcc="208" mnc="00"/>
-		</gsm>
-		<username>orange</username>
-		<password>orange</password>
-	</provider>
-	<provider>
-		<name>Orange Internet Everywhere 3G</name>
+		<name>Orange</name>
 		<gsm>
-			<apn>orange.ie</apn>
 			<network-id mcc="208" mnc="01"/>
 			<network-id mcc="208" mnc="00"/>
+			<apn value="orange.fr">
+				<name>Contract</name>
+				<username>orange</username>
+				<password>orange</password>
+				<dns>194.51.3.56</dns>
+				<dns>194.51.3.76</dns>
+			</apn>
+			<apn value="internet-entreprise">
+				<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">
+				<name>No Contract / Mobicarte</name>
+				<username>orange</username>
+				<password>orange</password>
+				<dns>194.51.3.56</dns>
+				<dns>194.51.3.76</dns>
+			</apn>
+			<apn value="orange-mib">
+				<name>Orange MIB</name>
+				<username>mportail</username>
+				<password>mib</password>
+				<dns>172.17.0.2</dns>
+				<dns>172.17.0.4</dns>
+			</apn>
+			<apn value="orange.ie">
+				<name>Internet Everywhere 3G</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>SFR</name>
 		<gsm>
-			<apn>websfr</apn>
 			<network-id mcc="208" mnc="10"/>
 			<network-id mcc="208" mnc="11"/>
-			<network-id mcc="208" mnc="13"/>
+			<apn value="websfr">
+				<dns>172.20.2.10</dns>
+				<dns>172.20.2.39</dns>
+			</apn>
 		</gsm>
-		<dns>172.20.2.10</dns>
-		<dns>172.20.2.39</dns>
 	</provider>
 	<provider>
 		<name>Transatel Telecom</name>
 		<gsm>
-			<apn>netgprs.com</apn>
+			<apn value="netgprs.com"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>TEN</name>
 		<gsm>
-			<apn>ao.fr</apn>
-		</gsm>
-		<username>orange</username>
-		<password>orange</password>
-	</provider>
-	<provider>
-		<name>TEN (pay-by-MB)</name>
-		<gsm>
-			<apn>ofnew.fr</apn>
+			<apn value="ao.fr">
+				<username>orange</username>
+				<password>orange</password>
+			</apn>
+			<apn value="ofnew.fr">
+				<name>Pay-by-MB</name>
+				<username>orange</username>
+				<password>orange</password>
+			</apn>
 		</gsm>
-		<username>orange</username>
-		<password>orange</password>
 	</provider>
 </country>
 
@@ -1540,144 +1486,128 @@ conceived.
 	<provider>
 		<name>airtel vodaphone</name>
 		<gsm>
-			<apn>airtel-ci-gprs.com</apn>
+			<apn value="airtel-ci-gprs.com"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Jersey Telecom</name>
 		<gsm>
-			<apn>pepper</apn>
 			<network-id mcc="234" mnc="50"/>
+			<apn value="pepper">
+				<username>abc</username>
+				<password>abc</password>
+				<dns>212.9.0.135</dns>
+				<dns>212.9.0.136</dns>
+			</apn>
 		</gsm>
-		<username>abc</username>
-		<password>abc</password>
-		<dns>212.9.0.135</dns>
-		<dns>212.9.0.136</dns>
 	</provider>
 	<provider>
-		<name>o2 (contract)</name>
-		<gsm>
-			<apn>mobile.o2.co.uk</apn>
-			<network-id mcc="234" mnc="02"/>
-			<network-id mcc="234" mnc="10"/>
-			<network-id mcc="234" mnc="11"/>
-		</gsm>
-		<username>o2web</username>
-		<password>password</password>
-		<dns>193.113.200.200</dns>
-		<dns>193.113.200.201</dns>
-	</provider>
-	<provider>
-		<name>o2 (contract-faster)</name>
-		<gsm>
-			<apn>mobile.o2.co.uk</apn>
-			<network-id mcc="234" mnc="02"/>
-			<network-id mcc="234" mnc="10"/>
-			<network-id mcc="234" mnc="11"/>
-		</gsm>
-		<username>faster</username>
-		<password>password</password>
-		<dns>193.113.200.200</dns>
-		<dns>193.113.200.201</dns>
-	</provider>
-	<provider>
-		<name>o2 (pre-pay)</name>
+		<name>o2</name>
 		<gsm>
-			<apn>payandgo.o2.co.uk</apn>
 			<network-id mcc="234" mnc="02"/>
 			<network-id mcc="234" mnc="10"/>
 			<network-id mcc="234" mnc="11"/>
+
+			<apn value="mobile.o2.co.uk">
+				<name>Contract</name>
+				<username>o2web</username>
+				<password>password</password>
+				<dns>193.113.200.200</dns>
+				<dns>193.113.200.201</dns>
+			</apn>
+			<apn value="mobile.o2.co.uk">
+				<name>Contract (faster)</name>
+				<username>faster</username>
+				<password>password</password>
+				<dns>193.113.200.200</dns>
+				<dns>193.113.200.201</dns>
+			</apn>
+			<apn value="payandgo.o2.co.uk">
+				<name>Prepaid</name>
+				<username>payandgo</username>
+				<password>payandgo</password>
+			</apn>
 		</gsm>
-		<username>payandgo</username>
-		<password>payandgo</password>
 	</provider>
 	<provider>
 		<name>T-Mobile</name>
 		<gsm>
-			<apn>general.t-mobile.uk</apn>
 			<network-id mcc="234" mnc="30"/>
+			<apn value="general.t-mobile.uk">
+				<username>User</username>
+				<password>mms</password>
+				<dns>149.254.201.126</dns>
+				<dns>149.254.192.126</dns>
+			</apn>
 		</gsm>
-		<username>User</username>
-		<password>mms</password>
-		<dns>149.254.201.126</dns>
-		<dns>149.254.192.126</dns>
 	</provider>
 	<provider>
 		<name>Virgin Mobile</name>
 		<gsm>
-			<apn>vdata</apn>
 			<network-id mcc="234" mnc="31"/>
 			<network-id mcc="234" mnc="32"/>
+			<apn value="vdata">
+				<dns>196.7.0.138</dns>
+				<dns>196.7.142.132</dns>
+			</apn>
 		</gsm>
-		<dns>196.7.0.138</dns>
-		<dns>196.7.142.132</dns>
 	</provider>
 	<provider>
-		<name>Vodafone (contract)</name>
-		<gsm>
-			<apn>internet</apn>
-			<network-id mcc="234" mnc="15"/>
-		</gsm>
-		<username>web</username>
-		<password>web</password>
-		<dns>10.206.65.68</dns>
-		<dns>10.203.65.68</dns>
-	</provider>
-	<provider>
-		<name>Vodafone (pre-pay)</name>
-		<gsm>
-			<apn>pp.vodafone.co.uk</apn>
-			<network-id mcc="234" mnc="15"/>
-		</gsm>
-		<username>wap</username>
-		<password>wap</password>
-		<dns>172.29.1.11</dns>
-		<dns>172.29.1.11</dns>
-	</provider>
-	<provider>
-		<name>Vodafone (TopUp and Go)</name>
+		<name>Vodafone</name>
 		<gsm>
-			<apn>pp.internet</apn>
 			<network-id mcc="234" mnc="15"/>
+			<apn value="internet">
+				<name>Contract</name>
+				<username>web</username>
+				<password>web</password>
+				<dns>10.206.65.68</dns>
+				<dns>10.203.65.68</dns>
+			</apn>
+			<apn value="pp.vodafone.co.uk">
+				<name>Prepaid</name>
+				<username>wap</username>
+				<password>wap</password>
+				<dns>172.29.1.11</dns>
+				<dns>172.29.1.11</dns>
+			</apn>
+			<apn value="pp.internet">
+				<name>TopUp and Go</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>3</name>
 		<gsm>
-			<apn>3internet</apn>
-			<network-id mcc="234" mnc="20"/>
-		</gsm>
-	</provider>
-	<provider>
-		<name>3 (handsets)</name>
-		<gsm>
-			<apn>three.co.uk</apn>
 			<network-id mcc="234" mnc="20"/>
+			<apn value="3internet">
+				<name>Internet</name>
+			</apn>
+			<apn value="three.co.uk">
+				<name>Handsets</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Orange (contract)</name>
-		<gsm>
-			<apn>orangeinternet</apn>
-			<network-id mcc="234" mnc="33"/>
-			<network-id mcc="234" mnc="34"/>
-		</gsm>
-		<username>orange</username>
-		<password>orange</password>
-		<dns>193.35.133.10</dns>
-		<dns>193.35.134.10</dns>
-	</provider>
-	<provider>
-		<name>Orange (Pay and Go)</name>
+		<name>Orange</name>
 		<gsm>
-			<apn>orangewap</apn>
 			<network-id mcc="234" mnc="33"/>
 			<network-id mcc="234" mnc="34"/>
+
+			<apn value="orangeinternet">
+				<name>Contract</name>
+				<username>orange</username>
+				<password>orange</password>
+				<dns>193.35.133.10</dns>
+				<dns>193.35.134.10</dns>
+			</apn>
+			<apn value="orangewap">
+				<name>Pay and Go</name>
+				<username>orange</username>
+				<password>multimedia</password>
+				<dns>158.43.192.1</dns>
+				<dns>158.43.128.1</dns>
+			</apn>
 		</gsm>
-		<username>orange</username>
-		<password>multimedia</password>
-		<dns>158.43.192.1</dns>
-		<dns>158.43.128.1</dns>
 	</provider>
 </country>
 
@@ -1686,11 +1616,12 @@ conceived.
 	<provider>
 		<name>Geocell</name>
 		<gsm>
-			<apn>Internet</apn>
 			<network-id mcc="282" mnc="01"/>
+			<apn value="Internet">
+				<dns>212.72.130.20</dns>
+				<dns>212.72.152.001</dns>
+			</apn>
 		</gsm>
-		<dns>212.72.130.20</dns>
-		<dns>212.72.152.001</dns>
 	</provider>
 </country>
 
@@ -1699,31 +1630,32 @@ conceived.
 	<provider>
 		<name>Areeba</name>
 		<gsm>
-			<apn>internet.areeba.com.gh</apn>
+			<apn value="internet.areeba.com.gh">
+				<dns>196.201.34.5</dns>
+				<dns>213.137.131.3</dns>
+			</apn>
 		</gsm>
-		<dns>196.201.34.5</dns>
-		<dns>213.137.131.3</dns>
 	</provider>
 	<provider>
 		<name>ONETouch / Ghana Telecom</name>
 		<gsm>
-			<apn>browse</apn>
 			<network-id mcc="620" mnc="02"/>
+			<apn value="browse"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Tigo</name>
 		<gsm>
-			<apn>web.tigo.com.gh</apn>
 			<network-id mcc="620" mnc="03"/>
+			<apn value="web.tigo.com.gh">
+				<username>web</username>
+			</apn>
 		</gsm>
-		<username>web</username>
-		<password></password>
 	</provider>
 	<provider>
 		<name>Zain</name>
 		<gsm>
-			<apn>internet</apn>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 </country>
@@ -1733,34 +1665,37 @@ conceived.
 	<provider>
 		<name>Cosmote</name>
 		<gsm>
-			<apn>3g-internet</apn>
 			<network-id mcc="202" mnc="01"/>
+			<apn value="3g-internet">
+				<dns>195.167.65.194</dns>
+			</apn>
 		</gsm>
-		<dns>195.167.65.194</dns>
 	</provider>
 	<provider>
 		<name>Telestet</name>
 		<gsm>
-			<apn>gnet.b-online.gr</apn>
+			<apn value="gnet.b-online.gr">
+				<password>24680</password>
+				<dns>212.152.79.19</dns>
+				<dns>212.152.79.20</dns>
+			</apn>
 		</gsm>
-		<password>24680</password>
-		<dns>212.152.79.19</dns>
-		<dns>212.152.79.20</dns>
 	</provider>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="202" mnc="05"/>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>TIM</name>
 		<gsm>
-			<apn>gint.b-online.gr</apn>
+			<apn value="gint.b-online.gr">
+				<username>web</username>
+				<password>web</password>
+			</apn>
 		</gsm>
-		<username>web</username>
-		<password>web</password>
 	</provider>
 </country>
 
@@ -1769,18 +1704,19 @@ conceived.
 	<provider>
 		<name>Claro</name>
 		<gsm>
-			<apn>internet.ideasclaro</apn>
 			<network-id mcc="704" mnc="01"/>
+			<apn value="internet.ideasclaro"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Comcel / Tigo</name>
 		<gsm>
-			<apn>Wap.tigo.gt</apn>
 			<network-id mcc="704" mnc="02"/>
+			<apn value="Wap.tigo.gt">
+				<username>Wap</username>
+				<password>Wap</password>
+			</apn>
 		</gsm>
-		<username>Wap</username>
-		<password>Wap</password>
 	</provider>
 </country>
 
@@ -1789,10 +1725,21 @@ conceived.
 	<provider>
 		<name>GT&amp;T Cellink Plus</name>
 		<gsm>
-			<apn>wap.cellinkgy.com</apn>
+			<apn value="wap.cellinkgy.com">
+				<username>test</username>
+				<password>test</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>DigiCel</name>
+		<gsm>
+			<network-id mcc="738" mnc="01"/>
+			<apn value="internet">
+				<username>web</username>
+				<password>web</password>
+			</apn>
 		</gsm>
-		<username>test</username>
-		<password>test</password>
 	</provider>
 </country>
 
@@ -1801,54 +1748,56 @@ conceived.
 	<provider>
 		<name>CSL</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="454" mnc="00"/>
 			<network-id mcc="454" mnc="02"/>
+			<apn value="internet">
+				<dns>202.84.255.1</dns>
+				<dns>203.116.254.150</dns>
+			</apn>
 		</gsm>
-		<dns>202.84.255.1</dns>
-		<dns>203.116.254.150</dns>
 	</provider>
 	<provider>
 		<name>New World</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="454" mnc="10"/>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>People</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="454" mnc="12"/>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>SmarTone</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="454" mnc="06"/>
+			<apn value="internet">
+				<dns>202.140.96.51</dns>
+				<dns>202.140.96.52</dns>
+			</apn>
 		</gsm>
-		<dns>202.140.96.51</dns>
-		<dns>202.140.96.52</dns>
 	</provider>
 	<provider>
 		<name>Sunday</name>
 		<gsm>
-			<apn>internet</apn>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Orange</name>
 		<gsm>
-			<apn>web.orangehk.com</apn>
+			<apn value="web.orangehk.com"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Three</name>
 		<gsm>
-			<apn>mobile.three.com.hk</apn>
 			<network-id mcc="454" mnc="03"/>
 			<network-id mcc="454" mnc="04"/>
+			<apn value="mobile.three.com.hk"/>
 		</gsm>
 	</provider>
 </country>
@@ -1856,10 +1805,10 @@ conceived.
 <!-- Honduras -->
 <country code="hn">
 	<provider>
-		<name>Tigo</name>	
+		<name>Tigo</name>
 		<gsm>
-			<apn>internet.tigo.hn</apn>		
 			<network-id mcc="708" mnc="02"/>
+			<apn value="internet.tigo.hn"/>
 		</gsm>
 	</provider>
 </country>
@@ -1869,131 +1818,107 @@ conceived.
 	<provider>
 		<name>T-Mobile</name>
 		<gsm>
-			<apn>web.htgpr</apn>
 			<network-id mcc="219" mnc="01"/>
+			<apn value="web.htgpr">
+				<dns>10.12.0.1</dns>
+			</apn>
 		</gsm>
-		<dns>10.12.0.1</dns>
 	</provider>
 	<provider>
 		<name>VIPNET</name>
 		<gsm>
-			<apn>gprs5.vipnet.hr</apn>
 			<network-id mcc="219" mnc="10"/>
+			<apn value="gprs5.vipnet.hr">
+				<name>GPRS 5</name>
+				<username>38591</username>
+				<password>38591</password>
+				<dns>195.29.159.15</dns>
+			</apn>
+			<apn value="gprs0.vipnet.hr">
+				<name>GPRS 0</name>
+				<username>38591</username>
+				<password>38591</password>
+				<dns>195.29.159.15</dns>
+			</apn>
+			<apn value="3g.vipnet.hr">
+				<name>3G</name>
+				<username>38591</username>
+				<password>38591</password>
+				<dns>212.91.97.3</dns>
+				<dns>212.91.97.4</dns>
+			</apn>
 		</gsm>
-		<username>38591</username>
-		<password>38591</password>
-		<dns>195.29.159.15</dns>
-	</provider>
-	<provider>
-		<name>VIPNET</name>
-		<gsm>
-			<apn>gprs0.vipnet.hr</apn>
-			<network-id mcc="219" mnc="10"/>
-		</gsm>
-		<username>38591</username>
-		<password>38591</password>
-		<dns>195.29.159.15</dns>
-	</provider>
-	<provider>
-		<name>VIPNET</name>
-		<gsm>
-			<apn>3g.vip.hr</apn>
-			<network-id mcc="219" mnc="10"/>
-		</gsm>
-		<username>38591</username>
-		<password>38591</password>
-		<dns>212.91.97.3</dns>
-		<dns>212.91.97.4</dns>
 	</provider>
 </country>
 
 <!-- Hungary -->
 <country code="hu">
 	<provider>
-		<name>Pannon (átalánydíjas)</name>
+		<name>Pannon</name>
 		<gsm>
-			<apn>netx</apn>
 			<network-id mcc="216" mnc="01"/>
+			<apn value="netx">
+				<name>átalánydíjas</name>
+				<dns>193.225.155.254</dns>
+				<dns>194.149.0.157</dns>
+			</apn>
+			<apn value="net">
+				<name>Normál</name>
+				<dns>193.225.153.17</dns>
+				<dns>195.56.172.113</dns>
+			</apn>
+			<apn value="snet">
+				<name>Tömörített</name>
+				<dns>193.225.153.17</dns>
+				<dns>194.149.0.157</dns>
+			</apn>
 		</gsm>
-		<dns>193.225.155.254</dns>
-		<dns>194.149.0.157</dns>
-	</provider>
-	<provider>
-		<name>Pannon (normál)</name>
-		<gsm>
-			<apn>net</apn>
-			<network-id mcc="216" mnc="01"/>
-		</gsm>
-		<dns>193.225.153.17</dns>
-		<dns>195.56.172.113</dns>
-	</provider>
-	<provider>
-		<name>Pannon (tömörített)</name>
-		<gsm>
-			<apn>snet</apn>
-			<network-id mcc="216" mnc="01"/>
-		</gsm>
-		<dns>193.225.153.17</dns>
-		<dns>194.149.0.157</dns>
 	</provider>
 	<provider>
 		<name>T-Mobile</name>
 		<gsm>
-			<apn>internet</apn>
 			<network-id mcc="216" mnc="30"/>
+			<apn value="internet">
+				<dns>212.51.115.1</dns>
+				<dns>194.176.224.6</dns>
+			</apn>
+			<apn value="mms-westel">
+				<name>MMS</name>
+				<username>mms</username>
+				<dns>212.51.115.1</dns>
+				<dns>194.176.224.3</dns>
+			</apn>
 		</gsm>
-		<dns>212.51.115.1</dns>
-		<dns>194.176.224.6</dns>
 	</provider>
 	<provider>
-		<name>T-Mobile (mms)</name>
-		<gsm>
-			<apn>mms-westel</apn>
-			<network-id mcc="216" mnc="30"/>
-		</gsm>
-		<username>mms</username>
-		<dns>212.51.115.1</dns>
-		<dns>194.176.224.3</dns>
-	</provider>
-	<provider>
-		<name>Vodafone (elÅ?f. norm.)</name>
-		<gsm>
-			<apn>standardnet.vodafone.net</apn>
-			<network-id mcc="216" mnc="70"/>
-		</gsm>
-		<username>vodawap</username>
-		<password>vodawap</password>
-		<dns>80.244.97.30</dns>
-		<dns>80.244.96.1</dns>
-	</provider>
-	<provider>
-		<name>Vodafone (elÅ?f. töm.)</name>
-		<gsm>
-			<apn>internet.vodafone.net</apn>
-			<network-id mcc="216" mnc="70"/>
-		</gsm>
-		<username>vodawap</username>
-		<password>vodawap</password>
-		<dns>80.244.97.30</dns>
-		<dns>80.244.96.1</dns>
-	</provider>
-	<provider>
-		<name>Vodafone (felt. norm.)</name>
-		<gsm>
-			<apn>vitamax.snet.vodafone.net</apn>
-			<network-id mcc="216" mnc="70"/>
-		</gsm>
-		<dns>80.244.97.30</dns>
-		<dns>80.244.96.1</dns>
-	</provider>
-	<provider>
-		<name>Vodafone (felt. töm.)</name>
+		<name>Vodafone</name>
 		<gsm>
-			<apn>vitamax.internet.vodafone.net</apn>
 			<network-id mcc="216" mnc="70"/>
+			<apn value="standardnet.vodafone.net">
+				<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>
+			<apn value="internet.vodafone.net">
+				<name>ElÅ?f. töm.</name>
+				<username>vodawap</username>
+				<password>vodawap</password>
+				<dns>80.244.97.30</dns>
+				<dns>80.244.96.1</dns>
+			</apn>
+			<apn value="vitamax.snet.vodafone.net">
+				<name>Felt. norm.</name>
+				<dns>80.244.97.30</dns>
+				<dns>80.244.96.1</dns>
+			</apn>
+			<apn value="vitamax.internet.vodafone.net">
+				<name>Vodafone (felt. töm.)</name>
+				<dns>80.244.97.30</dns>
+				<dns>80.244.96.1</dns>
+			</apn>
 		</gsm>
-		<dns>80.244.97.30</dns>
-		<dns>80.244.96.1</dns>
 	</provider>
 </country>
 
@@ -2002,120 +1927,130 @@ conceived.
 	<provider>
 		<name>AXIS</name>
 		<gsm>
-			<apn>AXIS</apn>
+			<network-id mcc="510" mnc="08"/>
+			<apn value="AXIS">
+				<username>axis</username>
+				<password>123456</password>
+			</apn>
 		</gsm>
-		<username>axis</username>
-		<password>123456</password>
 	</provider>
 	<provider>
 		<name>IM3</name>
 		<gsm>
-			<apn>www.imdosat-m3.net</apn>
+			<network-id mcc="510" mnc="21"/>
+			<apn value="www.imdosat-m3.net">
+				<username>gprs</username>
+				<password>im3</password>
+				<dns>202.155.46.66</dns>
+				<dns>202.155.46.77</dns>
+			</apn>
 		</gsm>
-		<username>gprs</username>
-		<password>im3</password>
-		<dns>202.155.46.66</dns>
-		<dns>202.155.46.77</dns>
 	</provider>
 	<provider>
 		<name>Indosat</name>
 		<gsm>
-			<apn>satelindogprs.com</apn>
+			<network-id mcc="510" mnc="01"/>
+			<apn value="satelindogprs.com">
+				<dns>202.152.162.250</dns>
+			</apn>
+			<apn value="indosatgprs">
+				<name>Matrix 3G</name>
+				<username>indosat</username>
+				<password>indosat</password>
+				<dns>202.155.46.66</dns>
+				<dns>202.155.46.77</dns>
+			</apn>
 		</gsm>
-		<dns>202.152.162.250</dns>
 	</provider>
 	<provider>
 		<name>Telkomsel</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="510" mnc="10"/>
+			<network-id mcc="510" mnc="20"/>
+			<apn value="internet">
+				<username>wap</username>
+				<password>wap123</password>
+				<dns>202.152.0.2</dns>
+				<dns>202.155.14.251</dns>
+			</apn>
 		</gsm>
-		<username>wap</username>
-		<password>wap123</password>
-		<dns>202.152.0.2</dns>
-		<dns>202.155.14.251</dns>
 	</provider>
 	<provider>
 		<name>Excelcomindo (XL)</name>
 		<gsm>
-			<apn>www.xlgprs.net</apn>
-		</gsm>
-		<username>xlgprs</username>
-		<password>proxl</password>
-		<dns>202.152.254.245</dns>
-		<dns>202.152.254.246</dns>
-	</provider>
-	<provider>
-		<name>Indosat (Matrix)</name>
-		<gsm>
-			<apn>satelindogprs.com indosatgprs</apn>
+			<network-id mcc="510" mnc="11"/>
+			<apn value="www.xlgprs.net">
+				<username>xlgprs</username>
+				<password>proxl</password>
+				<dns>202.152.254.245</dns>
+				<dns>202.152.254.246</dns>
+			</apn>
 		</gsm>
-		<dns>202.155.46.66</dns>
-		<dns>202.155.46.77</dns>
 	</provider>
 </country>
 
 <!-- Ireland -->
 <country code="ie">
 	<provider>
-		<name>o2 (contract)</name>
-		<gsm>
-			<apn>open.internet</apn>
-		</gsm>
-		<username>gprs</username>
-		<password>gprs</password>
-		<dns>62.40.32.33</dns>
-		<dns>62.40.32.34</dns>
-	</provider>
-	<provider>
-		<name>o2 (pre-pay)</name>
-		<gsm>
-			<apn>pp.internet</apn>
-		</gsm>
-		<username>faster</username>
-		<password>web</password>
-		<dns>62.40.32.33</dns>
-		<dns>62.40.32.34</dns>
-	</provider>
-	<provider>
-		<name>Vodafone (HSDPA/GPRS/EDGE/UMTS)</name>
+		<name>o2</name>
 		<gsm>
-			<apn>hs.vodafone.ie</apn>
+			<network-id mcc="272" mnc="02"/>
+			<apn value="open.internet">
+				<name>Contract</name>
+				<username>gprs</username>
+				<password>gprs</password>
+				<dns>62.40.32.33</dns>
+				<dns>62.40.32.34</dns>
+			</apn>
+			<apn value="pp.internet">
+				<name>Prepaid</name>
+				<username>faster</username>
+				<password>web</password>
+				<dns>62.40.32.33</dns>
+				<dns>62.40.32.34</dns>
+			</apn>
 		</gsm>
-		<username>vodafone</username>
-		<password>vodafone</password>
 	</provider>
 	<provider>
-		<name>Vodafone (GPRS/EDGE/UMTS) (old)</name>
+		<name>Vodafone</name>
 		<gsm>
-			<apn>isp.vodafone.ie</apn>
+			<network-id mcc="272" mnc="01"/>
+			<apn value="hs.vodafone.ie">
+				<username>vodafone</username>
+				<password>vodafone</password>
+			</apn>
+			<apn value="isp.vodafone.ie">
+				<name>Old</name>
+				<username>vodafone</username>
+				<password>vodafone</password>
+			</apn>
+			<apn value="live.vodafone.com">
+				<name>Prepaid</name>
+				<username>vodafone</username>
+				<password>vodafone</password>
+				<dns>10.24.59.100</dns>
+			</apn>
 		</gsm>
-		<username>vodafone</username>
-		<password>vodafone</password>
 	</provider>
 	<provider>
 		<name>Meteor</name>
 		<gsm>
-			<apn>isp.mymeteor.ie</apn>
-		</gsm>
-		<username>my</username>
-		<password>meteor</password>
-	</provider>
-	<provider>
-		<name>Vodafone (pre-pay)</name>
-		<gsm>
-			<apn>live.vodafone.com</apn>
+			<network-id mcc="272" mnc="03"/>
+			<apn value="isp.mymeteor.ie">
+				<username>my</username>
+				<password>meteor</password>
+			</apn>
 		</gsm>
-		<username>vodafone</username>
-		<password>vodafone</password>
-		<dns>10.24.59.100</dns>
 	</provider>
 	<provider>
 		<name>Three Ireland</name>
 		<gsm>
-			<apn>3ireland.ie</apn>
+			<network-id mcc="272" mnc="05"/>
+			<apn value="3ireland.ie">
+				<dns>172.31.140.69</dns>
+				<dns>172.30.140.69</dns>
+			</apn>
 		</gsm>
-		<dns>172.31.140.69</dns>
-		<dns>172.30.140.69</dns>
 	</provider>
 </country>
 
@@ -2124,26 +2059,30 @@ conceived.
 	<provider>
 		<name>CellCom</name>
 		<gsm>
-			<apn>etecsa</apn>
+			<network-id mcc="425" mnc="02"/>
+			<apn value="internetg"/>
 		</gsm>
-		<username>etecsa</username>
-		<dns>192.168.91.10</dns>
-		<dns>192.168.91.4</dns>
 	</provider>
 	<provider>
 		<name>Orange</name>
 		<gsm>
-			<apn>orangeinternet</apn>
+			<network-id mcc="425" mnc="01"/>
+			<apn value="orangeinternet">
+				<dns>158.43.192.1</dns>
+				<dns>158.43.128.1</dns>
+			</apn>
 		</gsm>
-		<dns>158.43.192.1</dns>
-		<dns>158.43.128.1</dns>
 	</provider>
 	<provider>
-		<name>Vodafone (MTC)</name>
+		<name>Pelephone</name>
 		<gsm>
-			<apn>apn01</apn>
+			<network-id mcc="425" mnc="03"/>
+			<apn value="internet.pelephone.net.il ">
+				<name>3G</name>
+				<username>pcl 3g</username>
+				<password>pcl</password>
+			</apn>
 		</gsm>
-		<dns>10.10.10.30</dns>
 	</provider>
 </country>
 
@@ -2152,97 +2091,134 @@ conceived.
 	<provider>
 		<name>Airtel</name>
 		<gsm>
-			<apn>airtelgprs.com</apn>
+			<network-id mcc="404" mnc="02"/>
+			<network-id mcc="404" mnc="03"/>
+			<network-id mcc="404" mnc="06"/>
+			<network-id mcc="404" mnc="10"/>
+			<network-id mcc="404" mnc="28"/>
+			<network-id mcc="404" mnc="31"/>
+			<network-id mcc="404" mnc="37"/>
+			<network-id mcc="404" mnc="40"/>
+			<network-id mcc="404" mnc="41"/>
+			<network-id mcc="404" mnc="42"/>
+			<network-id mcc="404" mnc="45"/>
+			<network-id mcc="404" mnc="49"/>
+			<network-id mcc="404" mnc="70"/>
+			<network-id mcc="404" mnc="90"/>
+			<network-id mcc="404" mnc="91"/>
+			<network-id mcc="404" mnc="94"/>
+			<network-id mcc="404" mnc="95"/>
+			<network-id mcc="404" mnc="96"/>
+			<network-id mcc="404" mnc="97"/>
+			<network-id mcc="404" mnc="98"/>
+			<network-id mcc="405" mnc="51"/>
+			<network-id mcc="405" mnc="52"/>
+
+			<apn value="airtelgprs.com">
+				<dns>202.56.230.5</dns>
+				<dns>202.56.240.5</dns>
+			</apn>
 		</gsm>
-		<dns>202.56.230.5</dns>
-		<dns>202.56.240.5</dns>
 	</provider>
 	<provider>
-		<name>BPL</name>
+		<name>Vodafone</name>
 		<gsm>
-			<apn>bplgprs.com</apn>
+			<network-id mcc="404" mnc="01"/>
+			<network-id mcc="404" mnc="05"/>
+			<network-id mcc="404" mnc="11"/>
+			<network-id mcc="404" mnc="13"/>
+			<network-id mcc="404" mnc="20"/>
+			<network-id mcc="404" mnc="27"/>
+			<network-id mcc="404" mnc="30"/>
+			<network-id mcc="404" mnc="46"/>
+			<network-id mcc="404" mnc="67"/>
+			<network-id mcc="404" mnc="84"/>
+			<network-id mcc="404" mnc="86"/>
+			<network-id mcc="405" mnc="752"/>
+			<network-id mcc="405" mnc="753"/>
+			<apn value="www"/>
 		</gsm>
-		<username>bplmobile</username>
-		<dns>202.169.145.34</dns>
-		<dns>202.169.129.40</dns>
 	</provider>
 	<provider>
 		<name>BSNL</name>
 		<gsm>
-			<apn>celloneportal</apn>
-		</gsm>
-		<dns>192.168.051.163</dns>
-	</provider>
-	<provider>
-		<name>BSNL Prepaid (West Bengal)</name>
-		<gsm>
-			<apn>www.e.pr</apn>
-		</gsm>
-		<dns>218.248.240.208</dns>
-		<dns>218.248.240.135</dns>
-	</provider>
-	<provider>
-		<name>Hutch (normal)</name>
-		<gsm>
-			<apn>www</apn>
-		</gsm>
-		<dns>10.11.206.51</dns>
-		<dns>10.11.206.50</dns>
-	</provider>
-	<provider>
-		<name>Hutch (Gujarat)</name>
-		<gsm>
-			<apn>web</apn>
+			<network-id mcc="404" mnc="34"/>
+			<network-id mcc="404" mnc="38"/>
+			<network-id mcc="404" mnc="51"/>
+			<network-id mcc="404" mnc="53"/>
+			<network-id mcc="404" mnc="54"/>
+			<network-id mcc="404" mnc="55"/>
+			<network-id mcc="404" mnc="57"/>
+			<network-id mcc="404" mnc="58"/>
+			<network-id mcc="404" mnc="59"/>
+			<network-id mcc="404" mnc="62"/>
+			<network-id mcc="404" mnc="64"/>
+			<network-id mcc="404" mnc="66"/>
+			<network-id mcc="404" mnc="71"/>
+			<network-id mcc="404" mnc="72"/>
+			<network-id mcc="404" mnc="73"/>
+			<network-id mcc="404" mnc="74"/>
+			<network-id mcc="404" mnc="75"/>
+			<network-id mcc="404" mnc="76"/>
+			<network-id mcc="404" mnc="77"/>
+			<network-id mcc="404" mnc="80"/>
+			<network-id mcc="404" mnc="81"/>
+
+			<apn value="bsnlsouth">
+				<name>South A</name>
+			</apn>
+			<apn value="gprssouth.cellone.in">
+				<name>South B</name>
+			</apn>
+			<apn value="gprsnorth.cellone.in">
+				<name>North</name>
+			</apn>
+			<apn value="gprswest.cellone.in">
+				<name>West</name>
+			</apn>
+			<apn value="www.e.pr">
+				<name>East</name>
+				<dns>218.248.240.208</dns>
+				<dns>218.248.240.135</dns>
+			</apn>
 		</gsm>
-		<dns>10.11.206.51</dns>
-		<dns>10.11.206.50</dns>
 	</provider>
 	<provider>
 		<name>Idea Cellular</name>
 		<gsm>
-			<apn>internet</apn>
-		</gsm>
-		<dns>10.4.42.15</dns>
-	</provider>
-	<provider>
-		<name>MTNL Delhi</name>
-		<gsm>
-			<apn>gprsmtnldel</apn>
-		</gsm>
-		<username>mtnl</username>
-		<password>mtnl123</password>
-	</provider>
-	<provider>
-		<name>MTNL Mumbai (pre-paid)</name>
-		<gsm>
-			<apn>gprsppsmum</apn>
-		</gsm>
-		<username>mtnl</username>
-		<password>mtnl123</password>
-	</provider>
-	<provider>
-		<name>MTNL Mumbai (post-paid)</name>
-		<gsm>
-			<apn>gprsmtnlmum</apn>
-		</gsm>
-		<username>mtnl</username>
-		<password>mtnl123</password>
-	</provider>
-	<provider>
-		<name>MTNL Mumbai (Plan 2)</name>
-		<gsm>
-			<apn>gprsmtnlmum</apn>
+			<network-id mcc="404" mnc="04"/>
+			<network-id mcc="404" mnc="12"/>
+			<network-id mcc="404" mnc="22"/>
+			<network-id mcc="404" mnc="24"/>
+			<network-id mcc="404" mnc="56"/>
+			<network-id mcc="404" mnc="82"/>
+			<network-id mcc="405" mnc="850"/>
+			<apn value="internet">
+				<dns>10.4.42.15</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>MTNL</name>
+		<gsm>
+			<network-id mcc="404" mnc="68"/>
+			<network-id mcc="404" mnc="69"/>
+			<apn value="gprsmtnldel">
+				<name>Delhi</name>
+				<username>mtnl</username>
+				<password>mtnl123</password>
+			</apn>
+			<apn value="gprsppsmum">
+				<name>Mumbai (Prepaid)</name>
+				<username>mtnl</username>
+				<password>mtnl123</password>
+			</apn>
+			<apn value="gprsmtnlmum">
+				<name>Mumbai (Postpaid / Plan 2)</name>
+				<username>mtnl</username>
+				<password>mtnl123</password>
+			</apn>
 		</gsm>
-		<username>mtnl</username>
-		<password>mtnl123</password>
-	</provider>
-	<provider>
-		<name>Orange</name>
-		<gsm>
-			<apn>portalnmms</apn>
-		</gsm>
-		<dns>10.11.206.51</dns>
-		<dns>10.11.206.50</dns>
 	</provider>
 	<provider>
 		<name>Reliance Netconnect</name>
@@ -2251,58 +2227,49 @@ conceived.
 	<provider>
 		<name>Spice telecom</name>
 		<gsm>
-			<apn>Simplyenjoy</apn>
-		</gsm>
-		<username>Mobile number</username>
-		<password>spice</password>
-	</provider>
-	<provider>
-		<name>Spice telecom (kar)</name>
-		<gsm>
-			<apn>simplydownload</apn>
+			<network-id mcc="404" mnc="14"/>
+			<network-id mcc="404" mnc="44"/>
+
+			<apn value="Simplyenjoy">
+				<username>spice</username>
+				<password>spice</password>
+			</apn>
+			<apn value="simplydownload">
+				<name>kar</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Tata Indicom (Plug2Surf)</name>
-		<cdma/>
-		<username>internet</username>
-		<password>internet</password>
-	</provider>
-	<provider>
-		<name>Telekomsel</name>
-		<gsm>
-			<apn>internet</apn>
-		</gsm>
-		<username>wap</username>
-		<password>wap123</password>
-	</provider>
-	<provider>
-		<name>Vodafone</name>
-		<gsm>
-			<apn>www</apn>
-		</gsm>
-		<username>guest</username>
-		<password>guest</password>
+		<cdma>
+			<username>internet</username>
+			<password>internet</password>
+		</cdma>
 	</provider>
 </country>
 
 <!-- Iceland -->
 <country code="is">
 	<provider>
-		<name>Islandssimi</name>
+		<name>Vodafone</name>
 		<gsm>
-			<apn>gprs.islandssimi.is</apn>
+			<network-id mcc="274" mnc="02"/>
+			<network-id mcc="274" mnc="03"/>
+			<apn value="vmc.gprs.is">
+				<dns>213.176.128.51</dns>
+				<dns>213.176.128.50</dns>
+			</apn>
 		</gsm>
-		<dns>213.176.128.51</dns>
-		<dns>213.176.128.50</dns>
 	</provider>
 	<provider>
 		<name>Nova</name>
 		<gsm>
-			<apn>internet.nova.is</apn>
+			<network-id mcc="274" mnc="11"/>
+			<apn value="internet.nova.is">
+				<dns>192.168.190.54</dns>
+				<dns>192.168.190.55</dns>
+			</apn>
 		</gsm>
-		<dns>192.168.190.54</dns>
-		<dns>192.168.190.55</dns>
 	</provider>
 </country>
 
@@ -2311,58 +2278,58 @@ conceived.
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
-			<apn>web.omnitel.it</apn>
+			<network-id mcc="222" mnc="10"/>
+			<apn value="web.omnitel.it"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>TIM</name>
 		<gsm>
-			<apn>ibox.tim.it</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>TIM (WAP)</name>
-		<gsm>
-			<apn>wap.tim.it</apn>
+			<network-id mcc="222" mnc="01"/>
+			<apn value="ibox.tim.it">
+				<name>ibox</name>
+			</apn>
+			<apn value="wap.tim.it">
+				<name>WAP</name>
+				<username>WAPTIM</username>
+				<dns>213.230.155.94</dns>
+				<dns>213.230.130.222</dns>
+			</apn>
 		</gsm>
-		<username>WAPTIM</username>
-		<dns>213.230.155.94</dns>
-		<dns>213.230.130.222</dns>
 	</provider>
 	<provider>
 		<name>Wind</name>
 		<gsm>
-			<apn>internet.wind</apn>
+			<network-id mcc="222" mnc="88"/>
+			<apn value="internet.wind">
+				<name>Non-business</name>
+			</apn>
+			<apn value="internet.wind.biz">
+				<name>Business</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Wind (business)</name>
-		<gsm>
-			<apn>internet.wind.biz</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>3 (ricaricabile)</name>
-		<gsm>
-			<apn>tre.it</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>3 (abbonamento)</name>
-		<gsm>
-			<apn>datacard.tre.it</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>Fastweb (SIM voce/dati)</name>
+		<name>3</name>
 		<gsm>
-			<apn>apn.fastweb.it</apn>
+			<network-id mcc="222" mnc="99"/>
+			<apn value="tre.it">
+				<name>Ricaricabile</name>
+			</apn>
+			<apn value="datacard.tre.it">
+				<name>Abbonamento</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Fastweb (SIM solo dati)</name>
+		<name>Fastweb</name>
 		<gsm>
-			<apn>datacard.fastweb.it</apn>
+			<apn value="apn.fastweb.it">
+				<name>Voce/dati</name>
+			</apn>
+			<apn value="datacard.fastweb.it">
+				<name>Solo dati</name>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -2372,79 +2339,158 @@ conceived.
 	<provider>
 		<name>Cable &amp; Wireless</name>
 		<gsm>
-			<apn>wap</apn>
+			<network-id mcc="338" mnc="020"/>
+			<apn value="wap"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Digicel</name>
 		<gsm>
-			<apn>web.digiceljamaica.com</apn>
+			<network-id mcc="338" mnc="050"/>
+			<apn value="web.digiceljamaica.com">
+				<username>wapuser</username>
+				<password>wap03jam</password>
+				<dns>208.131.176.126</dns>
+				<dns>200.10.152.232</dns>
+			</apn>
 		</gsm>
-		<username>wapuser</username>
-		<password>wap03jam</password>
-		<dns>208.131.176.126</dns>
-		<dns>200.10.152.232</dns>
 	</provider>
 </country>
 
 <!-- Japan -->
 <country code="jp">
 	<provider>
-		<name>Vodafone (J-Phone)</name>
+		<name>Softbank Mobile</name>
 		<gsm>
-			<apn>vodafone</apn>
+			<network-id mcc="440" mnc="04"/>
+			<network-id mcc="440" mnc="06"/>
+			<network-id mcc="440" mnc="20"/>
+			<network-id mcc="440" mnc="40"/>
+			<network-id mcc="440" mnc="41"/>
+			<network-id mcc="440" mnc="42"/>
+			<network-id mcc="440" mnc="43"/>
+			<network-id mcc="440" mnc="44"/>
+			<network-id mcc="440" mnc="45"/>
+			<network-id mcc="440" mnc="46"/>
+			<network-id mcc="440" mnc="47"/>
+			<network-id mcc="440" mnc="48"/>
+			<network-id mcc="440" mnc="90"/>
+			<network-id mcc="440" mnc="92"/>
+			<network-id mcc="440" mnc="93"/>
+			<network-id mcc="440" mnc="94"/>
+			<network-id mcc="440" mnc="95"/>
+			<network-id mcc="440" mnc="96"/>
+			<network-id mcc="440" mnc="97"/>
+			<network-id mcc="440" mnc="98"/>
+			<apn value="softbank">
+				<username>ai softbank</username>
+				<password>softbank</password>
+			</apn>
 		</gsm>
-		<username>ai vodafone</username>
-		<password>vodafone</password>
-		<dns>61.195.195.153</dns>
-		<dns>61.195.194.26</dns>
-	</provider>
-	<provider>
-		<name>Softbank Mobile</name>
-		<cdma />
-		<username>ai softbank</username>
-		<password>softbank</password>
 	</provider>
 	<provider>
 		<name>e-mobile</name>
-		<cdma />
-		<username>em</username>
-		<password>em</password>
+		<gsm>
+			<network-id mcc="440" mnc="00"/>
+			<apn value="emb.ne.jp">
+				<username>em</username>
+				<password>em</password>
+			</apn>
+		</gsm>
 	</provider>
 	<provider>
 		<name>NTTdocomo</name>
-		<cdma />
+		<gsm>
+			<network-id mcc="440" mnc="01"/>
+			<network-id mcc="440" mnc="02"/>
+			<network-id mcc="440" mnc="03"/>
+			<network-id mcc="440" mnc="09"/>
+			<network-id mcc="440" mnc="10"/>
+			<network-id mcc="440" mnc="11"/>
+			<network-id mcc="440" mnc="12"/>
+			<network-id mcc="440" mnc="13"/>
+			<network-id mcc="440" mnc="14"/>
+			<network-id mcc="440" mnc="15"/>
+			<network-id mcc="440" mnc="16"/>
+			<network-id mcc="440" mnc="17"/>
+			<network-id mcc="440" mnc="18"/>
+			<network-id mcc="440" mnc="19"/>
+			<network-id mcc="440" mnc="21"/>
+			<network-id mcc="440" mnc="22"/>
+			<network-id mcc="440" mnc="23"/>
+			<network-id mcc="440" mnc="24"/>
+			<network-id mcc="440" mnc="25"/>
+			<network-id mcc="440" mnc="26"/>
+			<network-id mcc="440" mnc="27"/>
+			<network-id mcc="440" mnc="28"/>
+			<network-id mcc="440" mnc="29"/>
+			<network-id mcc="440" mnc="30"/>
+			<network-id mcc="440" mnc="31"/>
+			<network-id mcc="440" mnc="32"/>
+			<network-id mcc="440" mnc="33"/>
+			<network-id mcc="440" mnc="34"/>
+			<network-id mcc="440" mnc="35"/>
+			<network-id mcc="440" mnc="36"/>
+			<network-id mcc="440" mnc="37"/>
+			<network-id mcc="440" mnc="38"/>
+			<network-id mcc="440" mnc="39"/>
+			<network-id mcc="440" mnc="49"/>
+			<network-id mcc="440" mnc="58"/>
+			<network-id mcc="440" mnc="60"/>
+			<network-id mcc="440" mnc="61"/>
+			<network-id mcc="440" mnc="62"/>
+			<network-id mcc="440" mnc="63"/>
+			<network-id mcc="440" mnc="64"/>
+			<network-id mcc="440" mnc="65"/>
+			<network-id mcc="440" mnc="66"/>
+			<network-id mcc="440" mnc="67"/>
+			<network-id mcc="440" mnc="68"/>
+			<network-id mcc="440" mnc="69"/>
+			<network-id mcc="440" mnc="87"/>
+			<network-id mcc="440" mnc="99"/>
+
+			<apn value="mopera.ne.jp">
+				<name>mopera</name>
+			</apn>
+			<apn value="mopera.net">
+				<name>mopera U</name>
+			</apn>
+		</gsm>
 	</provider>
 	<provider>
 		<name>au(KDDI)</name>
-		<cdma />
-		<username>au au-win ne jp</username>
-		<password>au</password>
-		<dns>210.196.3.183</dns>
-		<dns>210.141.112.163</dns>
+		<cdma>
+			<username>au au-win ne jp</username>
+			<password>au</password>
+			<dns>210.196.3.183</dns>
+			<dns>210.141.112.163</dns>
+		</cdma>
 	</provider>
 </country>
 
 <!-- Kenya -->
 <country code="ke">
 	<provider>
-		<name>Celtel</name>
+		<name>Zain / Celtel</name>
 		<gsm>
-			<apn>ke.celtel.com</apn>
+			<network-id mcc="639" mnc="03"/>
+			<apn value="ke.celtel.com"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Safaricom</name>
 		<gsm>
-			<apn>web.safaricom.com</apn>
+			<network-id mcc="639" mnc="02"/>
+			<apn value="web.safaricom.com">
+				<username>web</username>
+				<password>web</password>
+			</apn>
 		</gsm>
-		<username>web</username>
-		<password>web</password>
 	</provider>
 	<provider>
 		<name>Econet</name>
 		<gsm>
-			<apn>internet.econet.co.ke</apn>
+			<apn value="internet.econet.co.ke"/>
 		</gsm>
 	</provider>
 </country>
@@ -2452,16 +2498,17 @@ conceived.
 <!-- Kuwait -->
 <country code="kw">
 	<provider>
-		<name>Vodafone</name>
+		<name>Zain</name>
 		<gsm>
-			<apn>apn01</apn>
+			<network-id mcc="419" mnc="02"/>
+			<apn value="pps"/>
 		</gsm>
-		<dns>10.10.10.30</dns>
 	</provider>
 	<provider>
 		<name>Wataniya</name>
 		<gsm>
-			<apn>action.wataniya.com</apn>
+			<network-id mcc="419" mnc="03"/>
+			<apn value="action.wataniya.com"/>
 		</gsm>
 	</provider>
 </country>
@@ -2471,11 +2518,13 @@ conceived.
 	<provider>
 		<name>Beeline</name>
 		<gsm>
-			<apn>internet.beeline.kz</apn>
+			<network-id mcc="401" mnc="01"/>
+			<apn value="internet.beeline.kz">
+				<username>@internet.beeline</username>
+				<dns>212.19.149.53</dns>
+				<dns>194.226.128.1</dns>
+			</apn>
 		</gsm>
-		<username>@internet.beeline</username>
-		<dns>212.19.149.53</dns>
-		<dns>194.226.128.1</dns>
 	</provider>
 </country>
 
@@ -2484,32 +2533,21 @@ conceived.
 	<provider>
 		<name>ETL</name>
 		<gsm>
-			<apn>etlnet</apn>
+			<network-id mcc="457" mnc="02"/>
+			<apn value="etlnet">
+				<dns>192.168.4.130</dns>
+			</apn>
 		</gsm>
-		<dns>192.168.4.130</dns>
 	</provider>
 </country>
 
 <!-- Lebanon -->
 <country code="lb">
 	<provider>
-		<name>Cellis FTML</name>
-		<gsm>
-			<apn>internet.ftml.com.lb</apn>
-		</gsm>
-		<username>plugged</username>
-		<password>plugged</password>
-	</provider>
-	<provider>
 		<name>MTC Touch</name>
 		<gsm>
-			<apn>gprs.mtctouch.com.lb</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>LibanCell</name>
-		<gsm>
-			<apn>isurf.libancell.com.lb</apn>
+			<network-id mcc="415" mnc="03"/>
+			<apn value="gprs.mtctouch.com.lb"/>
 		</gsm>
 	</provider>
 </country>
@@ -2519,9 +2557,9 @@ conceived.
 	<provider>
 		<name>Cable &amp; Wireless</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="358" mnc="110"/>
+			<apn value="internet"/>
 		</gsm>
-		<dns>-</dns>
 	</provider>
 </country>
 
@@ -2530,37 +2568,41 @@ conceived.
 	<provider>
 		<name>Airtel</name>
 		<gsm>
-			<apn>www.wap.airtel.lk</apn>
+			<network-id mcc="413" mnc="05"/>
+			<apn value="www.wap.airtel.lk"/>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Dialog GSM (Post-Paid)</name>
+		<name>Dialog GSM</name>
 		<gsm>
-			<apn>www.dialogsl.com</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>Dialog GSM (Pre-Paid)</name>
-		<gsm>
-			<apn>ppinternet</apn>
+			<network-id mcc="413" mnc="02"/>
+			<apn value="www.dialogsl.com">
+				<name>Postpaid</name>
+			</apn>
+			<apn value="ppinternet">
+				<name>Prepaid</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Hutch</name>
 		<gsm>
-			<apn>htwap</apn>		
+			<network-id mcc="413" mnc="08"/>
+			<apn value="htwap"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Mobitel</name>
 		<gsm>
-			<apn>isp</apn>
+			<network-id mcc="413" mnc="01"/>
+			<apn value="isp"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Tigo</name>
 		<gsm>
-			<apn>wap</apn>		
+			<network-id mcc="413" mnc="03"/>
+			<apn value="wap"/>
 		</gsm>
 	</provider>
 </country>
@@ -2570,36 +2612,38 @@ conceived.
 	<provider>
 		<name>Bite</name>
 		<gsm>
-			<apn>banga</apn>
+			<network-id mcc="246" mnc="02"/>
+			<apn value="banga">
+				<username>bite</username>
+				<dns>213.226.131.131</dns>
+				<dns>193.219.88.36</dns>
+			</apn>
 		</gsm>
-		<username>bite</username>
-		<dns>213.226.131.131</dns>
-		<dns>193.219.88.36</dns>
 	</provider>
 	<provider>
 		<name>TELE2 GPRS</name>
 		<gsm>
-			<apn>internet.tele2.lt</apn>
+			<network-id mcc="246" mnc="03"/>
+			<apn value="internet.tele2.lt"/>
 		</gsm>
-		<gateway>130.244.196.90</gateway>
 	</provider>
 	<provider>
 		<name>Omnitel (contract)</name>
 		<gsm>
-			<apn>gprs.omnitel.net</apn>
+			<network-id mcc="246" mnc="01"/>
+			<apn value="gprs.omnitel.net">
+				<name>Contract</name>
+				<dns>194.176.32.129</dns>
+				<dns>195.22.175.1</dns>
+			</apn>
+			<apn value="gprs.startas.lt">
+				<name>No contract</name>
+				<username>omni</username>
+				<password>omni</password>
+				<dns>194.176.32.129</dns>
+				<dns>195.22.175.1</dns>
+			</apn>
 		</gsm>
-		<dns>194.176.32.129</dns>
-		<dns>195.22.175.1</dns>
-	</provider>
-	<provider>
-		<name>Omnitel (no contract)</name>
-		<gsm>
-			<apn>gprs.startas.lt</apn>
-		</gsm>
-		<username>omni</username>
-		<password>omni</password>
-		<dns>194.176.32.129</dns>
-		<dns>195.22.175.1</dns>
 	</provider>
 </country>
 
@@ -2608,23 +2652,28 @@ conceived.
 	<provider>
 		<name>LUXGSM</name>
 		<gsm>
-			<apn>webp.pt.lu</apn>
+			<network-id mcc="270" mnc="01"/>
+			<apn value="webp.pt.lu">
+				<dns>194.154.192.101</dns>
+				<dns>194.154.192.102</dns>
+			</apn>
 		</gsm>
-		<dns>194.154.192.101</dns>
-		<dns>194.154.192.102</dns>
 	</provider>
 	<provider>
 		<name>Tango</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="270" mnc="77"/>
+			<apn value="internet">
+				<username>tango</username>
+				<password>tango</password>
+			</apn>
 		</gsm>
-		<username>tango</username>
-		<password>tango</password>
 	</provider>
 	<provider>
 		<name>VOXmobile</name>
 		<gsm>
-			<apn>vox.lu</apn>
+			<network-id mcc="270" mnc="99"/>
+			<apn value="vox.lu"/>
 		</gsm>
 	</provider>
 </country>
@@ -2634,38 +2683,46 @@ conceived.
 	<provider>
 		<name>LMT</name>
 		<gsm>
-			<apn>internet.lmt.lv</apn>
+			<network-id mcc="247" mnc="01"/>
+			<apn value="internet.lmt.lv">
+				<dns>212.93.96.2</dns>
+				<dns>212.93.96.4</dns>
+			</apn>
 		</gsm>
-		<dns>212.93.96.2</dns>
-		<dns>212.93.96.4</dns>
 	</provider>
 	<provider>
 		<name>Tele2</name>
 		<gsm>
-			<apn>internet.tele2.lv</apn>
+			<network-id mcc="247" mnc="02"/>
+			<apn value="internet.tele2.lv">
+				<username>gprs</username>
+				<password>internet</password>
+			</apn>
 		</gsm>
-		<username>gprs</username>
-		<password>internet</password>
 	</provider>
 </country>
 
 <!-- Morocco -->
 <country code="ma">
 	<provider>
-		<name>Maroc Telecom</name>
+		<name>Ittissalat Al Maghrib</name>
 		<gsm>
-			<apn>iam</apn>
+			<network-id mcc="604" mnc="01"/>
+			<apn value="iam">
+				<username>wac</username>
+				<password>1987</password>
+			</apn>
 		</gsm>
-		<username>wac</username>
-		<password>1987</password>
 	</provider>
 	<provider>
 		<name>Medi Telecom</name>
 		<gsm>
-			<apn>wap.meditel.ma</apn>
+			<network-id mcc="604" mnc="00"/>
+			<apn value="wap.meditel.ma">
+				<username>MEDIWAP</username>
+				<password>MEDIWAP</password>
+			</apn>
 		</gsm>
-		<username>MEDIWAP</username>
-		<password>MEDIWAP</password>
 	</provider>
 </country>
 
@@ -2674,15 +2731,18 @@ conceived.
 	<provider>
 		<name>Moldcell</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="259" mnc="02"/>
+			<apn value="internet">
+				<username>gprs</username>
+				<password>gprs</password>
+			</apn>
 		</gsm>
-		<username>gprs</username>
-		<password>gprs</password>
 	</provider>
 	<provider>
 		<name>Eventis</name>
 		<gsm>
-			<apn>internet.md</apn>
+			<network-id mcc="259" mnc="04"/>
+			<apn value="internet.md"/>
 		</gsm>
 	</provider>
 </country>
@@ -2690,55 +2750,25 @@ conceived.
 <!-- Montenegro -->
 <country code="me">
 	<provider>
-		<name>Mobtel Srbija</name>
-		<gsm>
-			<apn>internet</apn>
-		</gsm>
-		<username>mobtel</username>
-		<password>gprs</password>
-		<dns>217.65.192.1</dns>
-		<dns>217.65.192.52</dns>
-	</provider>
-	<provider>
-		<name>Promonte GSM</name>
+		<name>ProMonte GSM</name>
 		<gsm>
-			<apn>gprs.promonte.com</apn>
+			<network-id mcc="297" mnc="01"/>
+			<apn value="gprs.promonte.com"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>T-Mobile</name>
 		<gsm>
-			<apn>internet-postpaid</apn>		
-		</gsm>
-		<username>38167</username>
-		<password>38167</password>
-	</provider>
-	<provider>
-		<name>Telekom Srbija (default)</name>
-		<gsm>
-			<apn>gprsinternet</apn>
+			<network-id mcc="297" mnc="02"/>
+			<apn value="internet-postpaid"/>
 		</gsm>
-		<username>mts</username>
-		<password>64</password>
-		<dns>195.178.38.3</dns>
 	</provider>
 	<provider>
-		<name>Telekom Srbija (via MMS)</name>
+		<name>m:tel</name>
 		<gsm>
-			<apn>mms</apn>
+			<network-id mcc="297" mnc="03"/>
+			<apn value="gprsinternet"/>
 		</gsm>
-		<username>mts</username>
-		<password>64</password>
-		<dns>195.178.38.3</dns>
-	</provider>
-	<provider>
-		<name>Telekom Srbija (via wap)</name>
-		<gsm>
-			<apn>gprswap</apn>
-		</gsm>
-		<username>mts</username>
-		<password>64</password>
-		<dns>195.178.38.3</dns>
 	</provider>
 </country>
 
@@ -2747,7 +2777,8 @@ conceived.
 	<provider>
 		<name>MobiCom</name>
 		<gsm>
-			<apn>internet</apn>		
+			<network-id mcc="428" mnc="99"/>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 </country>
@@ -2755,56 +2786,53 @@ conceived.
 <!-- Macau -->
 <country code="mo">
 	<provider>
-		<name>Macau Hutchison Telecom</name>
-		<gsm>
-			<apn>ctm-mobile</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>Macau Hutchison Telecom (MMS)</name>
+		<name>3 / Hutchison</name>
 		<gsm>
-			<apn>mms.hutchisonmacau.com</apn>
+			<network-id mcc="455" mnc="03"/>
+			<network-id mcc="455" mnc="05"/>
+			<apn value="web.hutchisonmacau.com">
+				<username>hutchison</username>
+				<password>1234</password>
+			</apn>
 		</gsm>
-		<username>hutchison</username>
-		<password>1234</password>
 	</provider>
 	<provider>
 		<name>CTM</name>
 		<gsm>
-			<apn>ctm-mobile</apn>
+			<network-id mcc="455" mnc="01"/>
+			<network-id mcc="455" mnc="04"/>
+			<apn value="ctm-mobile"/>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Macau Hutchison Telecom (Internet)</name>
-		<gsm>
-			<apn>web.hutchisonmacau.com</apn>
-		</gsm>
-		<username>hutchison</username>
-		<password>1234</password>
+		<name>China Telecom</name>
+		<cdma/>
 	</provider>
 </country>
 
 <!-- Malta -->
 <country code="mt">
 	<provider>
-		<name>Go Mobile (Post-paid)</name>
-		<gsm>
-			<apn>gosurfing</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>Go Mobile (Pre-paid)</name>
+		<name>GO Mobile</name>
 		<gsm>
-			<apn>rtgsurfing</apn>
+			<network-id mcc="278" mnc="21"/>
+			<apn value="gosurfing">
+				<name>Postpaid</name>
+			</apn>
+			<apn value="rtgsurfing">
+				<name>Prepaid</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
-			<apn>Internet</apn>
+			<network-id mcc="278" mnc="01"/>
+			<apn value="Internet">
+				<username>Internet</username>
+				<password>Internet</password>
+			</apn>
 		</gsm>
-		<username>Internet</username>
-		<password>Internet</password>
 	</provider>
 </country>
 
@@ -2813,7 +2841,8 @@ conceived.
 	<provider>
 		<name>Emtel</name>
 		<gsm>
-			<apn>WEB</apn>
+			<network-id mcc="617" mnc="10"/>
+			<apn value="WEB"/>
 		</gsm>
 	</provider>
 </country>
@@ -2823,86 +2852,92 @@ conceived.
 	<provider>
 		<name>Dhiraagu</name>
 		<gsm>
-			<apn>internet.dhimobile</apn>
+			<network-id mcc="472" mnc="01"/>
+			<apn value="internet.dhimobile"/>
 		</gsm>
 	</provider>
-</country>
-
-<!-- Mexico -->
-<country code="mx">
 	<provider>
-		<name>TELCEL</name>
+		<name>Wataniya</name>
 		<gsm>
-			<apn>internet.itelcel.com</apn>
+			<network-id mcc="472" mnc="02"/>
+			<apn value="WataniyaNet"/>
 		</gsm>
-		<username>webgprs</username>
-		<password>webgprs2002</password>
-		<dns>148.233.151.245</dns>
-		<dns>148.233.151.245</dns>
-	</provider>
-	<provider>
-		<name>Iusacell</name>
-		<cdma />
 	</provider>
 </country>
 
-<!-- Malaysia -->
-<country code="my">
+<!-- Mexico -->
+<country code="mx">
 	<provider>
-		<name>DIGI</name>
+		<name>Telcel</name>
 		<gsm>
-			<apn>diginet</apn>
+			<network-id mcc="334" mnc="02"/>
+			<apn value="internet.itelcel.com">
+				<username>webgprs</username>
+				<password>webgprs2002</password>
+				<dns>148.233.151.245</dns>
+			</apn>
 		</gsm>
-		<dns>203.92.128.131</dns>
-		<dns>203.92.128.132</dns>
 	</provider>
 	<provider>
-		<name>Maxis (contract)</name>
+		<name>Movistar</name>
 		<gsm>
-			<apn>internet.gprs.maxis</apn>
+			<network-id mcc="334" mnc="03"/>
+			<apn value="internet.movistar.mx">
+				<username>movistar</username>
+				<password>movistar</password>
+			</apn>
 		</gsm>
-		<dns>202.75.129.101</dns>
-		<dns>10.216.4.21</dns>
 	</provider>
 	<provider>
-		<name>Maxis (pre-pay)</name>
-		<gsm>
-			<apn>net</apn>
-		</gsm>
-		<username>maxis</username>
-		<password>net</password>
+		<name>Iusacell</name>
+		<cdma/>
 	</provider>
+</country>
+
+<!-- Malaysia -->
+<country code="my">
 	<provider>
-		<name>Timecel</name>
+		<name>DiGi</name>
 		<gsm>
-			<apn>timenett.com.my</apn>
+			<network-id mcc="502" mnc="16"/>
+			<apn value="diginet">
+				<dns>203.92.128.131</dns>
+				<dns>203.92.128.132</dns>
+			</apn>
 		</gsm>
-		<dns>203.121.16.85</dns>
-		<dns>203.121.16.120</dns>
 	</provider>
 	<provider>
-		<name>TM Touch</name>
+		<name>Maxis</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="502" mnc="12"/>
+			<network-id mcc="502" mnc="17"/>
+			<apn value="maxisbb">
+				<name>Broadband</name>
+				<username>maxis</username>
+				<password>wap</password>
+			</apn>
+			<apn value="net">
+				<name>GPRS</name>
+				<username>maxis</username>
+				<password>net</password>
+			</apn>
+			<apn value="unet">
+				<name>3G (handsets)</name>
+				<username>maxis</username>
+				<password>wap</password>
+				<dns>10.213.17.1</dns>
+				<dns>10.213.17.2</dns>
+			</apn>
 		</gsm>
-		<dns>202.188.0.133</dns>
 	</provider>
 	<provider>
 		<name>Celcom</name>
 		<gsm>
-			<apn>celcom.net.my</apn>
+			<network-id mcc="502" mnc="13"/>
+			<network-id mcc="502" mnc="19"/>
+			<apn value="celcom.net.my"/>
 		</gsm>
 	</provider>
-	<provider>
-		<name>Maxis 3G (contract)</name>
-		<gsm>
-			<apn>unet</apn>
-		</gsm>
-		<username>maxis</username>
-		<password>wap</password>
-		<dns>10.213.17.1</dns>
-		<dns>10.213.17.2</dns>
-	</provider>
 </country>
 
 <!-- Mozambique -->
@@ -2910,62 +2945,80 @@ conceived.
 	<provider>
 		<name>MCel</name>
 		<gsm>
-			<apn>isp.mcel.mz</apn>
+			<network-id mcc="643" mnc="01"/>
+			<apn value="isp.mcel.mz">
+				<username>guest</username>
+				<password>guest</password>
+				<dns>212.96.24.2</dns>
+				<dns>212.96.24.1</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Vodacom</name>
+		<gsm>
+			<network-id mcc="643" mnc="04"/>
+			<apn value="internet"/>
 		</gsm>
-		<username>guest</username>
-		<password>guest</password>
-		<dns>212.96.24.2</dns>
-		<dns>212.96.24.1</dns>
 	</provider>
 </country>
 
 <!-- Nigeria -->
 <country code="ng">
-
 	<provider>
 		<name>Zain</name>
 		<gsm>
-			<apn>wap</apn>
+			<network-id mcc="621" mnc="20"/>
+			<apn value="wap">
+				<username>web</username>
+				<password>web</password>
+			</apn>
 		</gsm>
-		<username>wap</username>
-		<password>wap</password>
 	</provider>
 	<provider>
 		<name>MTN</name>
 		<gsm>
-			<apn>web.gprs.mtnnigeria.net</apn>
+			<network-id mcc="621" mnc="30"/>
+			<apn value="web.gprs.mtnnigeria.net">
+				<username>web</username>
+				<password>web</password>
+			</apn>
 		</gsm>
-		<username>web</username>
-		<password>web</password>
 	</provider>
 	<provider>
 		<name>Glo-Ng</name>
 		<gsm>
-			<apn>glosecure</apn>
+			<network-id mcc="621" mnc="50"/>
+			<apn value="glosecure">
+				<username>gprs</username>
+				<password>gprs</password>
+			</apn>
 		</gsm>
-		<username>gprs</username>
-		<password>gprs</password>
-		<dns>-</dns>
 	</provider>
 </country>
 
 <!-- Nicaragua -->
 <country code="ni">
 	<provider>
-		<name>Alo Pcs</name>
+		<name>Claro</name>
 		<gsm>
-			<apn>internet.ideasalo.ni</apn>
+			<network-id mcc="710" mnc="21"/>
+			<network-id mcc="710" mnc="73"/>
+			<apn value="internet.ideasalo.ni">
+				<username>internet</username>
+				<password>internet</password>
+			</apn>
 		</gsm>
-		<username>internet</username>
-		<password>internet</password>
 	</provider>
 	<provider>
 		<name>Movistar</name>
 		<gsm>
-			<apn>internet.movistar.ni</apn>		
+			<network-id mcc="710" mnc="30"/>
+			<apn value="internet.movistar.ni">
+				<username>internet</username>
+				<password>internet</password>
+			</apn>		
 		</gsm>
-		<username>internet</username>
-		<password>internet</password>
 	</provider>
 </country>
 
@@ -2974,62 +3027,70 @@ conceived.
 	<provider>
 		<name>Hi</name>
 		<gsm>
-			<apn>portalmmm.nl</apn>
+			<apn value="portalmmm.nl"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>KPN Mobile</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="204" mnc="08"/>
+			<apn value="internet">
+				<username>KPN</username>
+				<password>gprs</password>
+				<dns>62.133.126.28</dns>
+				<dns>62.133.126.29</dns>
+			</apn>
 		</gsm>
-		<username>KPN</username>
-		<password>gprs</password>
-		<dns>62.133.126.28</dns>
-		<dns>62.133.126.29</dns>
 	</provider>
 	<provider>
-		<name>o2</name>
+		<name>Telfort</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="204" mnc="12"/>
+			<apn value="internet">
+				<username>telfortnl</username>
+			</apn>
 		</gsm>
-		<dns>195.99.65.220</dns>
-		<dns>195.99.66.220</dns>
 	</provider>
 	<provider>
 		<name>T-Mobile</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="204" mnc="16"/>
+			<apn value="internet">
+				<dns>193.78.240.12</dns>
+				<dns>193.79.242.39</dns>
+			</apn>
 		</gsm>
-		<dns>193.78.240.12</dns>
-		<dns>193.79.242.39</dns>
 	</provider>
 	<provider>
-		<name>Telfort</name>
-		<gsm>
-			<apn>internet</apn>
-		</gsm>
-		<username>telfortnl</username>
-	</provider>
-	<provider>
-		<name>Vodafone</name>
+		<name>Orange</name>
 		<gsm>
-			<apn>live.vodafone.com</apn>
+			<network-id mcc="204" mnc="20"/>
+			<apn value="internet">
+				<username>orange</username>
+				<password>orange</password>
+			</apn>
 		</gsm>
-		<username>vodafone</username>
-		<password>vodafone</password>
 	</provider>
 	<provider>
-		<name>Vodafone (business)</name>
+		<name>XS4ALL Mobiel Internet</name>
 		<gsm>
-			<apn>office.vodafone.nl</apn>
+			<apn value="umts.xs4all.nl"/>
 		</gsm>
-		<username>vodafone</username>
-		<password>vodafone</password>
 	</provider>
 	<provider>
-		<name>XS4ALL Mobiel Internet</name>
+		<name>Vodafone</name>
 		<gsm>
-			<apn>umts.xs4all.nl</apn>
+			<network-id mcc="204" mnc="04"/>
+			<apn value="live.vodafone.com">
+				<name>Non-business</name>
+				<username>vodafone</username>
+				<password>vodafone</password>
+			</apn>
+			<apn value="office.vodafone.nl">
+				<name>Business</name>
+				<username>vodafone</username>
+				<password>vodafone</password>
+			</apn>
 		</gsm>
 	</provider>
 </country>
@@ -3039,70 +3100,77 @@ conceived.
 	<provider>
 		<name>Netcom</name>
 		<gsm>
-			<apn>internet.netcom.no</apn>
+			<network-id mcc="242" mnc="02"/>
+			<apn value="internet.netcom.no">
+				<username>netcom</username>
+				<password>netcom</password>
+				<dns>212.169.123.67</dns>
+				<dns>212.45.188.254</dns>
+			</apn>
 		</gsm>
-		<username>netcom</username>
-		<password>netcom</password>
-		<dns>212.169.123.67</dns>
-		<dns>212.45.188.254</dns>
 	</provider>
 	<!-- http://www.ice.no/Mobilt-bredb%C3%A5nd-1046.aspx -->
 	<provider>
 		<name>ice.net (Nordisk Mobiltelefon)</name>
-		<cdma />
-		<username>cdma</username>
-		<password>cdma</password>
+		<cdma>
+			<username>cdma</username>
+			<password>cdma</password>
+		</cdma>
 	</provider>
 	<provider>
 		<name>Telenor</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="242" mnc="01"/>
+			<apn value="internet">
+				<dns>212.17.131.3</dns>
+				<dns>148.122.161.2</dns>
+			</apn>
 		</gsm>
-		<dns>212.17.131.3</dns>
-		<dns>148.122.161.2</dns>
 	</provider>
 	<provider>
 		<name>TDC</name>
 		<gsm>
-			<apn>internet.no</apn>
+			<apn value="internet.no">
+				<dns>80.232.41.10</dns>
+				<dns>80.232.41.20</dns>
+			</apn>
 		</gsm>
-		<dns>80.232.41.10</dns>
-		<dns>80.232.41.20</dns>
 	</provider>
 	<provider>
 		<name>NetworkNorway</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="242" mnc="05"/>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>OneCall</name>
 		<gsm>
-			<apn>internet</apn>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Lebara</name>
 		<gsm>
-			<apn>internet</apn>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Altibox</name>
 		<gsm>
-			<apn>internet</apn>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>SheTalks</name>
 		<gsm>
-			<apn>internet</apn>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Telipol</name>
 		<gsm>
-			<apn>internet</apn>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 </country>
@@ -3110,38 +3178,80 @@ conceived.
 <!-- Nepal -->
 <country code="np">
 	<provider>
+		<name>Nepal Telecom</name>	
+		<gsm>
+			<network-id mcc="429" mnc="01"/>
+			<apn value="ntnet"/>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Mero Mobile</name>	
 		<gsm>
-			<apn>mero</apn>
-		</gsm>		
+			<network-id mcc="429" mnc="02"/>
+			<apn value="mero"/>
+		</gsm>
 	</provider>
 </country>
 
 <!-- New Zealand -->
 <country code="nz">
 	<provider>
+		<name>Telecom New Zealand</name>
+		<gsm>
+			<network-id mcc="530" mnc="00"/>
+			<network-id mcc="530" mnc="05"/>
+			<apn value="wap.telecom.co.nz">
+				<name>XT mobile (WAP)</name>
+			</apn>
+			<apn value="internet.telecom.co.nz">
+				<name>XT mobile (Internet with Firewall)</name>
+			</apn>
+			<apn value="direct.telecom.co.nz">
+				<name>XT mobile (Direct Internet)</name>
+			</apn>
+			<apn value="oa.telecom.co.nz">
+				<name>XT mobile (One Office/Remote Office)</name>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
 		<name>Vodafone</name>
 		<gsm>
-			<apn> live.vodafone.com</apn>
+			<network-id mcc="530" mnc="01"/>
+			<apn value="live.vodafone.com">
+				<name>WAP</name>
+				<dns>202.20.93.10</dns>
+				<dns>203.97.191.189</dns>
+			</apn>
+			<apn value="www.vodafone.net.nz">
+				<name>Restricted</name>
+				<dns>202.20.93.10</dns>
+				<dns>203.97.191.189</dns>
+			</apn>
+			<apn value="internet">
+				<name>Unrestricted (public)</name>
+				<dns>202.20.93.10</dns>
+				<dns>203.97.191.189</dns>
+			</apn>
 		</gsm>
-		<dns>202.20.93.10</dns>
-		<dns>203.97.191.189</dns>
 	</provider>
+</country>
+
+<!-- Oman -->
+<country code="om">
 	<provider>
-		<name>Vodafone (restricted)</name>
+		<name>Oman Mobile</name>
 		<gsm>
-			<apn>www.vodafone.net.nz</apn>
+			<network-id mcc="422" mnc="02"/>
+			<apn value="internet"/>
 		</gsm>
-		<dns>202.20.93.10</dns>
-		<dns>203.97.191.189</dns>
 	</provider>
 	<provider>
-		<name>Vodafone (unrestricted)</name>
+		<name>Nawras</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="422" mnc="03"/>
+			<apn value="isp.nawras.com.om"/>
 		</gsm>
-		<dns>202.20.93.10</dns>
-		<dns>203.97.191.189</dns>
 	</provider>
 </country>
 
@@ -3150,40 +3260,46 @@ conceived.
 	<provider>
 		<name>Cable and Wireless</name>
 		<gsm>
-			<apn>apn01.cwpanama.com.pa</apn>
+			<network-id mcc="714" mnc="01"/>
+			<apn value="apn01.cwpanama.com.pa">
+			</apn>
 		</gsm>
-		<username>xxx</username>
-		<password>xxx</password>
 	</provider>
 	<provider>
 		<name>Movistar</name>	
 		<gsm>
-			<apn>internet.movistar.pa</apn>		
+			<network-id mcc="714" mnc="02"/>
+			<apn value="internet.movistar.pa">
+				<username>movistarpa</username>
+				<password>movistarpa</password>
+				<dns>200.39.10.1</dns>
+				<dns>200.36.160.237</dns>
+			</apn>
 		</gsm>
-		<username>movistarpa</username>
-		<password>movistarpa</password>
 	</provider>
 </country>
 
-<!-- Oman -->
-<country code="om">
+<!-- Peru -->
+<country code="pe">
 	<provider>
-		<name>Nawras</name>
+		<name>Claro</name>
 		<gsm>
-			<apn>isp.nawras.com.om</apn>
+			<network-id mcc="716" mnc="10"/>
+			<apn value="tim.pe">
+				<username>tim</username>
+				<password>tulibertad</password>
+			</apn>
 		</gsm>
 	</provider>
-</country>
-
-<!-- Peru -->
-<country code="pe">
 	<provider>
-		<name>Claro</name>
+		<name>Movistar</name>
 		<gsm>
-			<apn>tim.pe</apn>
+			<network-id mcc="716" mnc="06"/>
+			<apn value="movistar.pe">
+				<username>movistar datos</username>
+				<password>movistar</password>
+			</apn>
 		</gsm>
-		<username>tim</username>
-		<password>tulibertad</password>
 	</provider>
 </country>
 
@@ -3192,39 +3308,42 @@ conceived.
 	<provider>
 		<name>Globe Telecom</name>
 		<gsm>
-			<apn>internet.globe.com.ph</apn>
+			<network-id mcc="515" mnc="02"/>
+			<apn value="internet.globe.com.ph">
+				<name>Internet</name>
+				<username>globe</username>
+				<password>globe</password>
+				<dns>203.127.225.10</dns>
+				<dns>203.127.225.11</dns>
+			</apn>
+			<apn value="www.globe.com.ph">
+				<name>WAP</name>
+				<username>globe</username>
+				<password>globe</password>
+				<dns>203.127.225.10</dns>
+				<dns>203.127.225.11</dns>
+			</apn>
 		</gsm>
-		<username>globe</username>
-		<password>globe</password>
-		<dns>203.127.225.10</dns>
-		<dns>203.127.225.11</dns>
 	</provider>
 	<provider>
 		<name>Smart</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="515" mnc="03"/>
+			<apn value="internet">
+				<username>witsductoor</username>
+				<password>banonoy</password>
+				<dns>202.57.96.3</dns>
+				<dns>202.57.96.4</dns>
+			</apn>
 		</gsm>
-		<username>witsductoor</username>
-		<password>banonoy</password>
-		<dns>202.57.96.3</dns>
-		<dns>202.57.96.4</dns>
 	</provider>
 	<provider>
-		<name>Sun Cellular</name>
+		<name>Digitel (Sun Cellular)</name>
 		<gsm>
-			<apn>minternet</apn>
+			<network-id mcc="515" mnc="05"/>
+			<apn value="minternet"/>
 		</gsm>
 	</provider>
-	<provider>
-		<name>Globe Telecoms (WAP)</name>
-		<gsm>
-			<apn>www.globe.com.ph</apn>
-		</gsm>
-		<username>globe</username>
-		<password>globe</password>
-		<dns>203.127.225.10</dns>
-		<dns>203.127.225.11</dns>
-	</provider>
 </country>
 
 <!-- Pakistan -->
@@ -3232,43 +3351,57 @@ conceived.
 	<provider>
 		<name>Djuice</name>
 		<gsm>
-			<apn>172.18.19.11</apn>		
+			<network-id mcc="515" mnc="06"/>
+			<apn value="internet">
+				<username>telenor</username>
+				<password>telenor</password>
+			</apn>
 		</gsm>
-		<username>telenor</username>
-		<password>telenor</password>
 	</provider>
 	<provider>
-		<name>Mobilink GSM</name>
+		<name>Mobilink</name>
 		<gsm>
-			<apn>connect.mobilinkworld.com</apn>
+			<network-id mcc="515" mnc="01"/>
+			<apn value="connect.mobilinkworld.com">
+				<name>Internet</name>
+			</apn>
+			<apn value="jazzconnect.mobilinkworld.com">
+				<name>Jazz</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Mobilink GSM (jazz)</name>
+		<name>Telenor</name>
 		<gsm>
-			<apn>jazzconnect.mobilinkworld.com</apn>
+			<network-id mcc="515" mnc="06"/>
+			<apn value="internet">
+				<username>telenor</username>
+				<password>telenor</password>
+			</apn>		
 		</gsm>
 	</provider>
 	<provider>
-		<name>Telenor</name>
+		<name>Ufone</name>
 		<gsm>
-			<apn>internet</apn>		
+			<network-id mcc="410" mnc="03"/>
+			<apn value="ufone.internet">
+				<username>ufone</username>
+				<password>ufone</password>
+			</apn>
 		</gsm>
-		<username>telenor</username>
-		<password>telenor</password>
 	</provider>
 	<provider>
-		<name>Ufone</name>
+		<name>Warid</name>
 		<gsm>
-			<apn>ufone.internet</apn>
+			<network-id mcc="515" mnc="07"/>
+			<apn value="warid"/>
 		</gsm>
-		<username>ufone</username>
-		<password>ufone</password>
 	</provider>
 	<provider>
 		<name>ZONG</name>
 		<gsm>
-			<apn>zonginternet</apn>
+			<network-id mcc="515" mnc="04"/>
+			<apn value="zonginternet"/>
 		</gsm>
 	</provider>
 </country>
@@ -3278,64 +3411,54 @@ conceived.
 	<provider>
 		<name>ERA</name>
 		<gsm>
-			<apn>erainternet</apn>
+			<network-id mcc="260" mnc="02"/>
+			<apn value="erainternet">
+				<username>erainternet</username>
+				<password>erainternet</password>
+				<dns>213.158.194.1</dns>
+				<dns>213.158.193.38</dns>
+			</apn>
 		</gsm>
-		<username>erainternet</username>
-		<password>erainternet</password>
-		<dns>213.158.194.1</dns>
-		<dns>213.158.193.38</dns>
-	</provider>
-	<provider>
-		<name>Idea</name>
-		<gsm>
-			<apn>www.idea.pl</apn>
-		</gsm>
-		<username>idea</username>
-		<password>idea</password>
-		<dns>194.9.223.79</dns>
-		<dns>217.17.34.10</dns>
 	</provider>
 	<provider>
 		<name>Play Online</name>
 		<gsm>
-			<apn>Internet</apn>
+			<network-id mcc="260" mnc="06"/>
+			<apn value="Internet"/>
 		</gsm>
 	</provider>
 	<provider>
-		<name>Polkomtel</name>
-		<gsm>
-			<apn>www.plusgsm.pl</apn>
-		</gsm>
-		<dns>212.2.96.51</dns>
-		<dns>212.2.96.52</dns>
-	</provider>
-	<provider>
 		<name>Heyah</name>
 		<gsm>
-			<apn>heyah.pl</apn>
+			<apn value="heyah.pl">
+				<username>heyah</username>
+				<password>heyah</password>
+				<dns>213.158.194.1</dns>
+				<dns>213.158.193.38</dns>
+			</apn>
 		</gsm>
-		<username>heyah</username>
-		<password>heyah</password>
-		<dns>213.158.194.1</dns>
-		<dns>213.158.193.38</dns>
 	</provider>
 	<provider>
 		<name>Orange</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="260" mnc="03"/>
+			<apn value="internet">
+				<username>internet</username>
+				<password>internet</password>
+				<dns>194.9.223.79</dns>
+				<dns>194.204.159.1</dns>
+			</apn>
 		</gsm>
-		<username>internet</username>
-		<password>internet</password>
-		<dns>194.9.223.79</dns>
-		<dns>194.204.159.1</dns>
 	</provider>
 	<provider>
 		<name>iPlus</name>
 		<gsm>
-			<apn>www.plusgsm.pl</apn>
+			<network-id mcc="260" mnc="01"/>
+			<apn value="www.plusgsm.pl">
+				<dns>212.2.96.51</dns>
+				<dns>212.2.96.52</dns>
+			</apn>
 		</gsm>
-		<dns>212.2.96.51</dns>
-		<dns>212.2.96.52</dns>
 	</provider>
 </country>
 
@@ -3344,53 +3467,71 @@ conceived.
 	<provider>
 		<name>Kanguru</name>
 		<gsm>
-			<apn>myconnection</apn>
-		</gsm>
-		<dns>62.169.67.172</dns>
-		<dns>62.169.67.171</dns>
-	</provider>
-	<provider>
-		<name>Kanguru (fixo)</name>
-		<gsm>
-			<apn>kangurufixo</apn>
+			<network-id mcc="286" mnc="03"/>
+			<apn value="myconnection">
+				<dns>62.169.67.172</dns>
+				<dns>62.169.67.171</dns>
+			</apn>
+			<apn value="kangurufixo">
+				<name>Fixo</name>
+				<dns>62.169.67.172</dns>
+				<dns>62.169.67.171</dns>
+			</apn>			
 		</gsm>
-		<dns>62.169.67.172</dns>
-		<dns>62.169.67.171</dns>
 	</provider>
 	<provider>
 		<name>Optimus</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="286" mnc="03"/>
+			<apn value="internet">
+				<dns>194.79.69.129</dns>
+			</apn>
 		</gsm>
-		<dns>194.79.69.129</dns>
 	</provider>
 	<provider>
 		<name>TMN</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="286" mnc="06"/>
+			<apn value="internet">
+				<dns>194.65.3.20</dns>
+				<dns>194.65.3.21</dns>
+			</apn>
 		</gsm>
-		<dns>194.65.3.20</dns>
-		<dns>194.65.3.21</dns>
 	</provider>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
-			<apn>internet.vodafone.pt</apn>
+			<network-id mcc="286" mnc="01"/>
+			<apn value="internet.vodafone.pt">
+				<dns>212.18.160.133</dns>
+				<dns>212.18.160.134</dns>
+			</apn>
 		</gsm>
-		<dns>212.18.160.133</dns>
-		<dns>212.18.160.134</dns>
 	</provider>
 </country>
 
 <!-- Paraguay -->
 <country code="py">
 	<provider>
-		<name>CTI</name>
+		<name>VOX</name>
+		<gsm>
+			<network-id mcc="744" mnc="01"/>
+			<apn value="vox.wap"></apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Personal</name>
 		<gsm>
-			<apn>internet.ctimovil.com.py</apn>
+			<network-id mcc="744" mnc="05"/>
+			<apn value="internet"></apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Tigo</name>
+		<gsm>
+			<network-id mcc="744" mnc="04"/>
+			<apn value="internet.tigo.py "></apn>
 		</gsm>
-		<username>ctigprs</username>
-		<password>ctigprs999</password>
 	</provider>
 </country>
 
@@ -3399,67 +3540,66 @@ conceived.
 	<provider>
 		<name>Orange</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="226" mnc="10"/>
+			<apn value="internet">
+				<dns>172.22.7.21</dns>
+				<dns>172.22.7.20</dns>
+			</apn>
 		</gsm>
-		<dns>172.22.7.21</dns>
-		<dns>172.22.7.20</dns>
 	</provider>
 	<provider>
 		<name>Vodafone</name>
 		<gsm>
-			<apn>internet.vodafone.ro</apn>
+			<network-id mcc="226" mnc="01"/>
+			<apn value="internet.vodafone.ro">
+				<username>internet.vodafone.ro</username>
+				<password>vodafone</password>
+				<dns>193.230.161.3</dns>
+				<dns>193.230.161.4</dns>
+			</apn>
 		</gsm>
-		<username>internet.vodafone.ro</username>
-		<password>vodafone</password>
-		<dns>193.230.161.3</dns>
-		<dns>193.230.161.4</dns>
 	</provider>
 	<provider>
 		<name>Zapp</name>
-		<cdma />
-		<username>zapp</username>
-		<password>zapp</password>
+		<cdma>
+			<username>zapp</username>
+			<password>zapp</password>
+		</cdma>
 	</provider>
 </country>
 
 <!-- Serbia -->
 <country code="rs">
 	<provider>
-		<name>Mobtel Srbija</name>
-		<gsm>
-			<apn>internet</apn>
-		</gsm>
-		<username>mobtel</username>
-		<password>gprs</password>
-		<dns>217.65.192.1</dns>
-		<dns>217.65.192.52</dns>
-	</provider>
-	<provider>
-		<name>Telekom Srbija (default)</name>
+		<name>Telenor</name>
 		<gsm>
-			<apn>gprsinternet</apn>
+			<network-id mcc="220" mnc="01"/>
+			<apn value="internet">
+				<username>telenor</username>
+				<password>grps</password>
+			</apn>
 		</gsm>
-		<username>mts</username>
-		<password>64</password>
-		<dns>195.178.38.3</dns>
 	</provider>
 	<provider>
-		<name>Telekom Srbija (via MMS)</name>
+		<name>Telekom Srbija</name>
 		<gsm>
-			<apn>mms</apn>
+			<network-id mcc="220" mnc="03"/>
+			<apn value="gprsinternet">
+				<username>mts</username>
+				<password>64</password>
+				<dns>195.178.38.3</dns>
+			</apn>
 		</gsm>
-		<username>mts</username>
-		<password>64</password>
-		<dns>195.178.38.3</dns>
 	</provider>
 	<provider>
-		<name>Telekom Srbija (via wap)</name>
+		<name>VIP Mobile</name>
 		<gsm>
-			<apn>gprswap</apn>
+			<network-id mcc="220" mnc="05"/>
+			<apn value="vipmobile">
+				<username>vipmobile</username>
+				<password>vipmobile</password>
+			</apn>
 		</gsm>
-		<username>mts</username>
-		<password>64</password>
-		<dns>195.178.38.3</dns>
 	</provider>
 </country>
 
@@ -3469,194 +3609,198 @@ conceived.
 		<name>BaikalWestCom</name>
 		<name xml:lang="ru">Ð?айкалÐ?еÑ?Ñ?Ð?ом</name>
 		<gsm>
-			<apn>inet.bwc.ru</apn>
+			<network-id mcc="250" mnc="12"/>
+			<apn value="inet.bwc.ru">
+				<username>bwc</username>
+				<password>bwc</password>
+				<dns>81.18.113.2</dns>
+				<dns>81.18.112.50</dns>
+			</apn>
 		</gsm>
-		<username>bwc</username>
-		<password>bwc</password>
-		<dns>81.18.113.2</dns>
-		<dns>81.18.112.50</dns>
 	</provider>
 	<provider>
 		<name>Beeline</name>
 		<name xml:lang="ru">Ð?илайн</name>
 		<gsm>
-			<apn>internet.beeline.ru</apn>
+			<network-id mcc="250" mnc="28"/>
+			<network-id mcc="250" mnc="99"/>
+			<apn value="internet.beeline.ru">
+				<username>beeline</username>
+				<password>beeline</password>
+				<dns>217.118.66.243</dns>
+				<dns>217.118.66.244</dns>
+			</apn>
 		</gsm>
-		<username>beeline</username>
-		<password>beeline</password>
-		<dns>217.118.66.243</dns>
-		<dns>217.118.66.244</dns>
 	</provider>
 	<provider>
-		<name>Megafon (nw)</name>
-		<name xml:lang="ru">Ð?егаÑ?он - СевеÑ?о-Ð?апад</name>
+		<name>ETK</name>
 		<gsm>
-			<apn>internet.nw</apn>
+			<network-id mcc="250" mnc="05"/>
+			<apn value="wap.etk.ru"/>
 		</gsm>
-		<dns>10.140.142.42</dns>
-		<dns>10.140.142.45</dns>
 	</provider>
 	<provider>
 		<name>MTS</name>
-		<name>Ð?ТС</name>
 		<gsm>
-			<apn>internet.mts.ru</apn>
+			<network-id mcc="250" mnc="01"/>
+			<apn value="internet.mts.ru">
+				<username>mts</username>
+				<password>mts</password>
+				<dns>213.87.0.1</dns>
+				<dns>213.87.1.1</dns>
+			</apn>
 		</gsm>
-		<username>mts</username>
-		<password>mts</password>
-		<dns>213.87.0.1</dns>
-		<dns>213.87.1.1</dns>
 	</provider>
 	<provider>
-		<name>PrimTelephone</name>
-		<gsm>
-			<apn>internet.primtel.ru</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>Megafon (ugsm)</name>
-		<name xml:lang="ru">Ð?егаÑ?он - УÑ?ал</name>
-		<gsm>
-			<apn>internet.ugsm</apn>
-		</gsm>
-		<dns>83.149.32.2</dns>
-		<dns>83.149.33.2</dns>
-	</provider>
-	<provider>
-		<name>Megafon (usi)</name>
-		<name xml:lang="ru">Ð?егаÑ?он (usi)</name>
-		<gsm>
-			<apn>internet.usi.ru</apn>
-		</gsm>
-		<dns>212.120.160.130</dns>
-		<dns>212.120.160.130</dns>
-	</provider>
-	<provider>
-		<name>Megafon (dv)</name>
-		<name xml:lang="ru">Ð?егаÑ?он - Ð?алÑ?ний Ð?оÑ?Ñ?ок</name>
-		<gsm>
-			<apn>internet.dv</apn>
-		</gsm>
-		<dns>83.149.52.77</dns>
-		<dns>194.186.112.18</dns>
-	</provider>
-	<provider>
-		<name>Megafon (kvk)</name>
-		<name xml:lang="ru">Megafon - Ð?авказ</name>
-		<gsm>
-			<apn>internet.kvk</apn>
-		</gsm>
-		<dns>83.149.24.244</dns>
-		<dns>62.183.50.230</dns>
-	</provider>
-	<provider>
-		<name>Megafon (ltmsk)</name>
-		<gsm>
-			<apn>internet.ltmsk</apn>
-		</gsm>
-		<dns>10.22.10.20</dns>
-		<dns>10.22.10.21</dns>
-	</provider>
-	<provider>
-		<name>Megafon (sib)</name>
-		<name xml:lang="ru">Ð?егаÑ?он - СибиÑ?Ñ?</name>
-		<gsm>
-			<apn>internet.sib</apn>
-		</gsm>
-		<dns>83.149.51.65</dns>
-		<dns>83.149.50.65</dns>
-	</provider>
-	<provider>
-		<name>Megafon (volga)</name>
-		<name>Megafon - Ð?оволжÑ?е</name>
-		<gsm>
-			<apn>internet.volga</apn>
-		</gsm>
-		<dns>83.149.16.7</dns>
-		<dns>195.128.128.1</dns>
-	</provider>
-	<provider>
-		<name>Megafon (mc)</name>
-		<name xml:lang="ru">Ð?егаÑ?он - ЦенÑ?Ñ?</name>
+		<name>Megafon</name>
+		<name xml:lang="ru">Ð?егаÑ?он</name>
+
 		<gsm>
-			<apn>internet.mc</apn>
+			<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>
+				<username>gdata</username>
+				<password>gdata</password>
+			</apn>
 		</gsm>
-		<dns>81.18.129.252</dns>
-		<dns>217.150.34.1</dns>
 	</provider>
 	<provider>
 		<name>NCC</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="250" mnc="03"/>
+			<apn value="internet">
+				<username>ncc</username>
+				<dns>10.0.3.5</dns>
+				<dns>10.0.3.2</dns>
+			</apn>
 		</gsm>
-		<username>ncc</username>
-		<dns>10.0.3.5</dns>
-		<dns>10.0.3.2</dns>
 	</provider>
 	<provider>
 		<name>NTC</name>
 		<gsm>
-			<apn>internet.ntc</apn>
-		</gsm>
-		<dns>80.243.64.67</dns>
-		<dns>80.243.68.34</dns>
-	</provider>
-	<provider>
-		<name>Megafon (Moscow)</name>
-		<name xml:lang="ru">Ð?егаÑ?он - Ð?оÑ?ква</name>
-		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="250" mnc="16"/>
+			<apn value="internet.ntc">
+				<dns>80.243.64.67</dns>
+				<dns>80.243.68.34</dns>
+			</apn>
 		</gsm>
-		<username>gdata</username>
-		<password>gdata</password>
 	</provider>
 	<provider>
 		<name>Enisey TeleCom</name>
 		<name xml:lang="ru">Ð?ниÑ?ей Телеком</name>
 		<gsm>
-			<apn>internet.etk.ru</apn>
+			<network-id mcc="250" mnc="05"/>
+			<apn value="internet.etk.ru">
+				<username>etk</username>
+				<dns>10.10.30.3</dns>
+				<dns>10.10.30.4</dns>
+			</apn>
 		</gsm>
-		<username>etk</username>
-		<dns>10.10.30.3</dns>
-		<dns>10.10.30.4</dns>
 	</provider>
 	<provider>
 		<name>Motiv</name>
 		<name xml:lang="ru">Ð?оÑ?ив</name>
 		<gsm>
-			<apn>inet.ycc.ru</apn>
+			<network-id mcc="250" mnc="35"/>
+			<apn value="inet.ycc.ru">
+				<username>motiv</username>
+				<dns>217.148.52.34</dns>
+				<dns>217.148.52.3</dns>
+			</apn>
 		</gsm>
-		<username>motiv</username>
-		<dns>217.148.52.34</dns>
-		<dns>217.148.52.3</dns>
 	</provider>
 	<provider>
 		<name>Tatincom</name>
 		<name xml:lang="ru">ТаÑ?инком</name>
 		<gsm>
-			<apn>internet.tatincom.ru</apn>
+			<apn value="internet.tatincom.ru">
+				<username>tatincom</username>
+				<password>tatincom</password>
+				<dns>89.207.96.2</dns>
+				<dns>89.207.97.18</dns>
+			</apn>
 		</gsm>
-		<username>tatincom</username>
-		<password>tatincom</password>
-		<dns>89.207.96.2</dns>
-		<dns>89.207.97.18</dns>
 	</provider>
 	<provider>
 		<name>Tele2</name>
 		<name xml:lang="ru">Теле2</name>
 		<gsm>
-			<apn>wap.tele2.ru</apn>
+			<network-id mcc="250" mnc="20"/>
+			<apn value="wap.tele2.ru">
+				<username>gprs</username>
+				<dns>130.244.127.161</dns>
+				<dns>130.244.127.169</dns>
+			</apn>
 		</gsm>
-		<username>gprs</username>
-		<dns>130.244.127.161</dns>
-		<dns>130.244.127.169</dns>
 	</provider>
 	<provider>
 		<name>Skylink (Moscow)</name>
 		<name xml:lang="ru">Скайлинк Ð?оÑ?ква</name>
-		<cdma />
-		<username>mobile skylink msk ru</username>
-		<password>internet</password>
+		<cdma>
+			<username>mobile skylink msk ru</username>
+			<password>internet</password>
+		</cdma>
+	</provider>
+	<provider>
+		<name>U-tel</name>
+		<gsm>
+			<network-id mcc="250" mnc="39"/>
+			<apn value="internet.usi.ru"/>
+		</gsm>
 	</provider>
 </country>
 
@@ -3665,84 +3809,108 @@ conceived.
 	<provider>
 		<name>Mobily</name>
 		<gsm>
-			<apn>web2</apn>
+			<network-id mcc="420" mnc="03"/>
+			<apn value="web1">
+				<name>Postpaid</name>
+			</apn>
+			<apn value="web2">
+				<name>Prepaid</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>STC</name>
 		<gsm>
-			<apn>jawalnet.com.sa</apn>
+			<network-id mcc="420" mnc="01"/>
+			<apn value="jawalnet.com.sa">
+				<dns>212.118.133.101</dns>
+				<dns>212.118.133.102</dns>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Zain</name>
+		<gsm>
+			<network-id mcc="420" mnc="04"/>
+			<apn value="zain"/>
 		</gsm>
-		<dns>212.118.133.101</dns>
-		<dns>212.118.133.102</dns>
 	</provider>
 </country>
 
 
 <!-- Sweden -->
 <country code="se">
-	<!-- http://www.tre.se/templates/Sporg3_02.aspx?id=4231 -->
-	<provider>
-		<name>3 (Mobiltelefon)</name>
-		<gsm>
-			<apn>data.tre.se</apn>
-		</gsm>
-	</provider>
-	<!-- http://www.tre.se/templates/Sporg3_02.aspx?id=4231 -->
 	<provider>
-		<name>3 (Bredband)</name>
-		<gsm>
-			<apn>bredband.tre.se</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>3 (Bredband Kontantkort)</name>
+		<name>3</name>
 		<gsm>
-			<apn>net.tre.se</apn>
+			<network-id mcc="240" mnc="02"/>
+
+			<!-- http://www.tre.se/templates/Sporg3_02.aspx?id=4231 -->
+			<apn value="data.tre.se">
+				<name>Mobiltelefon</name>
+			</apn>
+
+			<!-- http://www.tre.se/templates/Sporg3_02.aspx?id=4231 -->
+			<apn value="bredband.tre.se">
+				<name>Bredband</name>
+			</apn>
+			<apn value="net.tre.se">
+				<name>Bredband Kontantkort</name>
+			</apn>
 		</gsm>
 	</provider>
-	<!-- http://mobiltbredband.glocalnet.se/ -->
 	<provider>
 		<name>Glocalnet</name>
 		<gsm>
-			<apn>internet.glocalnet.se</apn>
-	</gsm>
+			<!-- http://mobiltbredband.glocalnet.se/ -->
+			<apn value="internet.glocalnet.se"/>
+		</gsm>
 	</provider>
-	<!-- http://www.halebop.se/halebop_kundtjanst/vanliga_fragor_kontantkort/ -->
 	<provider>
 		<name>Halebop</name>
 		<gsm>
-			<apn>halebop.telia.se</apn>
+			<network-id mcc="240" mnc="01"/>
+
+			<!-- http://www.halebop.se/halebop_kundtjanst/vanliga_fragor_kontantkort/ -->
+			<apn value="halebop.telia.se"/>
 		</gsm>
 	</provider>
-	<!-- http://www.ice.net/Mobilt-bredband-1373.aspx -->
 	<provider>
+		<!-- http://www.ice.net/Mobilt-bredband-1373.aspx -->
 		<name>ice.net (Nordisk Mobiltelefon)</name>
-		<cdma />
-		<username>cdma</username>
-		<password>cdma</password>
+		<cdma>
+			<username>cdma</username>
+			<password>cdma</password>
+		</cdma>
 	</provider>
 	<!-- http://www.tele2.se/internet-via-gprs.html -->
 	<provider>
 		<name>Tele2/Comviq</name>
 		<gsm>
-			<apn>internet.tele2.se</apn>
+			<network-id mcc="240" mnc="07"/>
+			<apn value="internet.tele2.se"/>
 		</gsm>
 	</provider>
-	<!-- http://www.telenor.se/224.jsp -->
 	<provider>
 		<name>Telenor</name>
 		<gsm>
-			<apn>internet.telenor.se</apn>
+			<network-id mcc="240" mnc="06"/>
+			<network-id mcc="240" mnc="08"/>
+
+			<!-- http://www.telenor.se/224.jsp -->
+			<apn value="internet.telenor.se">
+				<username>dummy</username>
+				<password>dummy</password>
+			</apn>
 		</gsm>
-		<username>dummy</username>
-		<password>dummy</password>
 	</provider>
-	<!-- http://www3.telia.se/foretag/mobilguiden/ -->
 	<provider>
 		<name>Telia</name>
 		<gsm>
-			<apn>online.telia.se</apn>
+			<network-id mcc="240" mnc="01"/>
+
+			<!-- http://www3.telia.se/foretag/mobilguiden/ -->
+			<apn value="online.telia.se"/>
 		</gsm>
 	</provider>
 
@@ -3753,61 +3921,72 @@ conceived.
 	<provider>
 		<name>M1</name>
 		<gsm>
-			<apn>sunsurf</apn>
+			<network-id mcc="525" mnc="03"/>
+			<apn value="sunsurf">
+				<username>65</username>
+				<password>user123</password>
+				<dns>202.79.64.21</dns>
+				<dns>202.79.64.26</dns>
+			</apn>
 		</gsm>
-		<username>65</username>
-		<password>user123</password>
-		<dns>202.79.64.21</dns>
-		<dns>202.79.64.26</dns>
 	</provider>
 	<provider>
 		<name>SingTel</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="525" mnc="01"/>
+			<network-id mcc="525" mnc="02"/>
+			<apn value="internet">
+				<dns>165.21.100.88</dns>
+				<dns>165.21.83.88</dns>
+			</apn>
 		</gsm>
-		<dns>165.21.100.88</dns>
-		<dns>165.21.83.88</dns>
 	</provider>
 	<provider>
 		<name>Starhub</name>
 		<gsm>
-			<apn>shwap</apn>
+			<network-id mcc="525" mnc="05"/>
+			<apn value="shwap">
+				<username>star</username>
+				<password>hub</password>
+				<dns>203.116.1.78</dns>
+			</apn>
 		</gsm>
-		<username>star</username>
-		<password>hub</password>
-		<dns>203.116.1.78</dns>
 	</provider>
 </country>
 
 <!-- Slovenia -->
 <country code="si">
 	<provider>
-		<name>Mobitel (postpaid)</name>
-		<gsm>
-			<apn>internet</apn>
-		</gsm>
-		<username>mobitel</username>
-		<password>internet</password>
-		<dns>213.229.248.161</dns>
-		<dns>193.189.160.11</dns>
-	</provider>
-	<provider>
-		<name>Mobitel (prepaid)</name>
+		<name>Mobitel</name>
 		<gsm>
-			<apn>internetpro</apn>
+			<network-id mcc="293" mnc="41"/>
+
+			<apn value="internet">
+				<name>Postpaid</name>
+				<username>mobitel</username>
+				<password>internet</password>
+				<dns>213.229.248.161</dns>
+				<dns>193.189.160.11</dns>
+			</apn>
+			<apn value="internetpro">
+				<username>mobitel</username>
+				<password>internet</password>
+				<dns>213.229.248.161</dns>
+				<dns>193.189.160.11</dns>
+			</apn>
 		</gsm>
-		<username>mobitel</username>
-		<password>internet</password>
-		<dns>213.229.248.161</dns>
-		<dns>193.189.160.11</dns>
 	</provider>
 	<provider>
-		<name>Simobil</name>
+		<name>Vodafone / Simobil</name>
 		<gsm>
-			<apn>none</apn>
+			<network-id mcc="525" mnc="40"/>
+			<apn value="internet.simobil.si">
+				<username>simobil</username>
+				<password>internet</password>
+				<dns>121.30.86.130</dns>
+				<dns>193.189.160.11</dns>
+			</apn>
 		</gsm>
-		<dns>121.30.86.130</dns>
-		<dns>193.189.160.11</dns>
 	</provider>
 </country>
 
@@ -3816,36 +3995,23 @@ conceived.
 	<provider>
 		<name>T-Mobile (EuroTel)</name>
 		<gsm>
-			<apn>internet</apn>
-		</gsm>
-		<dns>194.154.230.66</dns>
-		<dns>194.154.230.74</dns>
-	</provider>
-	<provider>
-		<name>Globtel</name>
-		<gsm>
-			<apn>internet</apn>
+			<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>
+			</apn>
 		</gsm>
-		<dns>213.151.200.3</dns>
-		<dns>195.12.140.130</dns>
 	</provider>
 	<provider>
 		<name>Orange</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="231" mnc="01"/>
+			<apn value="internet">
+				<dns>213.151.200.30</dns>
+				<dns>213.151.208.161</dns>
+			</apn>
 		</gsm>
-		<username>jusernejm</username>
-		<password>pasvord</password>
-		<dns>213.151.200.30</dns>
-		<dns>213.151.208.161</dns>
-	</provider>
-	<provider>
-		<name>Eurotel</name>
-		<gsm>
-			<apn>internet</apn>
-		</gsm>
-		<dns>194.154.230.64</dns>
-		<dns>194.154.230.74</dns>
 	</provider>
 </country>
 
@@ -3854,10 +4020,12 @@ conceived.
 	<provider>
 		<name>Tigo</name>
 		<gsm>
-			<apn>internet.tigo.hn</apn>
+			<network-id mcc="608" mnc="02"/>
+			<apn value="wap.sentelgsm.com">
+				<dns>200.85.0.104</dns>
+				<dns>200.85.0.107</dns>
+			</apn>
 		</gsm>
-		<dns>200.85.0.104</dns>
-		<dns>200.85.0.107</dns>
 	</provider>
 </country>
 
@@ -3866,10 +4034,35 @@ conceived.
 	<provider>
 		<name>movistar</name>
 		<gsm>
-			<apn>movistar.sv</apn>
+			<network-id mcc="706" mnc="04"/>
+			<apn value="movistar.sv">
+				<username>movistarsv</username>
+				<password>movistarsv</password>
+			</apn>
+		</gsm>
+	</provider>
+	<provider>
+		<name>digicel</name>
+		<gsm>
+			<network-id mcc="706" mnc="02"/>
+			<apn value="wap.digicelsv.com"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Tigo</name>
+		<gsm>
+			<network-id mcc="706" mnc="03"/>
+			<apn value="internet.tigo.sv"/>
+		</gsm>
+	</provider>
+	<provider>
+		<name>Claro</name>
+		<gsm>
+			<network-id mcc="706" mnc="10"/>
+			<apn value="internet.ideasclaro">
+				<name>Internet</name>
+			</apn>
 		</gsm>
-		<username>movistarsv</username>
-		<password>movistarsv</password>
 	</provider>
 </country>
 
@@ -3878,74 +4071,83 @@ conceived.
 	<provider>
 		<name>AIS</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="520" mnc="01"/>
+			<apn value="internet">
+				<dns>202.183.255.20</dns>
+				<dns>202.183.255.21</dns>
+			</apn>
 		</gsm>
-		<dns>202.183.255.20</dns>
-		<dns>202.183.255.21</dns>
 	</provider>
 	<provider>
 		<name>DTAC</name>
 		<gsm>
-			<apn>www.dtac.co.th</apn>
+			<network-id mcc="520" mnc="18"/>
+			<apn value="www.dtac.co.th">
+				<dns>202.44.202.2</dns>
+				<dns>203.44.144.33</dns>
+			</apn>
 		</gsm>
-		<dns>202.44.202.2</dns>
-		<dns>203.44.144.33</dns>
 	</provider>
 	<provider>
-		<name>True</name>
+		<name>True Move</name>
 		<gsm>
-			<apn>internet</apn>		
+			<network-id mcc="520" mnc="99"/>
+			<apn value="internet">
+				<username>true</username>
+				<password>true</password>
+			</apn>		
 		</gsm>
-		<username>true</username>
-		<password>true</password>
 	</provider>
 </country>
 
 <!-- Turkey -->
 <country code="tr">
 	<provider>
-		<name>Aria</name>
-		<gsm>
-			<apn>internet</apn>
-		</gsm>
-		<dns>212.156.4.4</dns>
-		<dns>212.156.4.20</dns>
-	</provider>
-	<provider>
-		<name>Aycell</name>
+		<name>Avea</name>
 		<gsm>
-			<apn>aycell</apn>
+			<network-id mcc="286" mnc="03"/>
+			<network-id mcc="286" mnc="04"/>
+			<apn value="internet">
+				<dns>212.156.4.4</dns>
+				<dns>212.156.4.20</dns>
+			</apn>
+
+			<apn value="aycell">
+				<name>(former Aycell)</name>
+				<dns>212.156.4.1</dns>
+				<dns>212.156.4.4</dns>
+			</apn>
 		</gsm>
-		<dns>212.156.4.1</dns>
-		<dns>212.156.4.4</dns>
 	</provider>
 	<provider>
 		<name>Turkcell</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="286" mnc="01"/>
+			<apn value="internet">
+				<username>gprs</username>
+				<password>gprs</password>
+				<dns>86.108.136.27</dns>
+				<dns>86.108.136.26</dns>
+			</apn>
 		</gsm>
-		<username>gprs</username>
-		<password>gprs</password>
-		<dns>86.108.136.27</dns>
-		<dns>86.108.136.26</dns>
 	</provider>
 	<provider>
-		<name>Telsim (Post-paid)</name>
-		<gsm>
-			<apn>telsim</apn>
-		</gsm>
-		<username>telsim</username>
-		<password>telsim</password>
-		<dns>212.65.128.20</dns>
-		<dns>212.156.4.7</dns>
-	</provider>
-		<provider>
-		<name>Telsim (pre-paid)</name>
+		<name>Vodafone</name>
 		<gsm>
-			<apn>prepaidgprs</apn>
+			<network-id mcc="286" mnc="02"/>
+			<apn value="telsim">
+				<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">
+				<name>Prepaid</name>
+				<dns>212.65.128.20</dns>
+				<dns>212.156.4.7</dns>
+			</apn>
 		</gsm>
-		<dns>212.65.128.20</dns>
-		<dns>212.156.4.7</dns>
 	</provider>
 </country>
 
@@ -3954,18 +4156,22 @@ conceived.
 	<provider>
 		<name>Digicel</name>
 		<gsm>
-			<apn>wap.digiceltt.com</apn>		
+			<network-id mcc="374" mnc="13"/>
+			<apn value="wap.digiceltt.com">
+				<username>wap</username>
+				<password>wap</password>
+			</apn>		
 		</gsm>
-		<username>wap</username>
-		<password>wap</password>
 	</provider>
 	<provider>
-		<name>TSTT</name>
+		<name>bmobile / TSTT</name>
 		<gsm>
-			<apn>internet</apn>	
+			<network-id mcc="374" mnc="12"/>
+			<apn value="internet">
+				<username>wap</username>
+				<password>wap</password>
+			</apn>	
 		</gsm>
-		<username>wap</username>
-		<password>wap</password>
 	</provider>
 </country>
 
@@ -3975,130 +4181,121 @@ conceived.
 		<name>Chunghwa Telecom (emome)</name>
 		<name xml:lang="zh">中��信 (emome)</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="466" mnc="92"/>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Far EasTone / KGT</name>
 		<name xml:lang="zh">é? å?³é?»ä¿¡ / å??ä¿¡é?»è¨?</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="466" mnc="01"/>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>TW Mobile / TransAsia</name>
 		<name xml:lang="zh">�湾大�大 / ���信</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="466" mnc="99"/>
+			<apn value="internet"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Vibo Telecom / Aurora</name>
 		<name xml:lang="zh">å¨?寶é?»ä¿¡ (Vibo) / é??æ?¦é?»ä¿¡ (Aurora)</name>
 		<gsm>
-			<apn>vibo</apn>
+			<network-id mcc="466" mnc="89"/>
+			<apn value="vibo"/>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Asia Pacific Telecom (APBW)</name>
 		<name xml:lang="zh">äº?太é?»ä¿¡ (äº?太è¡?å??寬頻é?»ä¿¡)</name>
-		<cdma />
+		<cdma/>
 	</provider>
 </country>
 
 <!-- Ukraine -->
 <country code="ua">
 	<provider>
-		<name>Jeans</name>
+		<name>kyivstar</name>
 		<gsm>
-			<apn>www.jeans.ua</apn>
-		</gsm>
-		<dns>80.255.64.23</dns>
-		<dns>80.255.64.24</dns>
-	</provider>
-	<provider>
-		<name>Djuice</name>
-		<gsm>
-			<apn>www.djuice.com.ua</apn>
-		</gsm>
-		<dns>212.58.160.33</dns>
-		<dns>212.58.160.34</dns>
-	</provider>
-	<provider>
-		<name>Mobi-GSM</name>
-		<gsm>
-			<apn>internet.urs</apn>
-		</gsm>
-		<dns>213.186.192.254</dns>
-		<dns>193.239.128.5</dns>
-	</provider>
-	<provider>
-		<name>Ace&amp;Base</name>
-		<gsm>
-			<apn>www.ab.kyivstar.net</apn>
+			<network-id mcc="255" mnc="03"/>
+
+			<apn value="www.ab.kyivstar.net">
+				<name>Ace&amp;Base</name>
+				<username>igprs</username>
+				<password>internet</password>
+			</apn>
+			<apn value="www.djuice.com.ua">
+				<name>Djuice</name>
+				<dns>212.58.160.33</dns>
+				<dns>212.58.160.34</dns>
+			</apn>
 		</gsm>
-		<username>igprs</username>
-		<password>internet</password>
 	</provider>
 	<provider>
-		<name>Life (standard)</name>
+		<name>Life</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="255" mnc="06"/>
+
+			<apn value="internet">
+				<name>Standard</name>
+				<dns>212.58.160.33</dns>
+				<dns>212.58.160.34</dns>
+			</apn>
+			<apn value="speed">
+				<name>Faster</name>
+				<dns>212.58.160.33</dns>
+				<dns>212.58.160.34</dns>
+			</apn>
 		</gsm>
-		<dns>212.58.160.33</dns>
-		<dns>212.58.160.34</dns>
 	</provider>
 	<provider>
 		<name>Beeline</name>
 		<gsm>
-			<apn>internet.beeline.ua</apn>
-		</gsm>
-	</provider>
-	<provider>
-		<name>Life (faster)</name>
-		<gsm>
-			<apn>speed</apn>
+			<network-id mcc="255" mnc="02"/>
+			<apn value="internet.beeline.ua"/>
 		</gsm>
-		<dns>212.58.160.33</dns>
-		<dns>212.58.160.34</dns>
 	</provider>
 	<provider>
-		<name>Wellcome</name>
-		<gsm>
-			<apn>internet.urs</apn>
-		</gsm>
-		<dns>213.186.192.254</dns>
-		<dns>193.239.128.5</dns>
-	</provider>
-	<provider>
-		<name>Jeans (Hyper)</name>
-		<gsm>
-			<apn>hyper.net</apn>
-		</gsm>
-		<dns>212.58.160.33</dns>
-		<dns>212.58.160.34</dns>
-	</provider>
-	<provider>
-		<name>UMC (internet)</name>
+		<name>Jeans</name>
 		<gsm>
-			<apn>internet</apn>
+			<apn value="www.jeans.ua">
+				<dns>80.255.64.23</dns>
+				<dns>80.255.64.24</dns>
+			</apn>
+			<apn value="hyper.net">
+				<name>Hyper</name>
+				<dns>212.58.160.33</dns>
+				<dns>212.58.160.34</dns>
+			</apn>
 		</gsm>
-		<username>internet</username>
-		<dns>212.58.160.33</dns>
-		<dns>212.58.160.34</dns>
 	</provider>
 	<provider>
-		<name>UMC (umc.ua)</name>
+		<name>MTS</name>
 		<gsm>
-			<apn>www.umc.ua</apn>
+			<network-id mcc="255" mnc="01"/>
+
+			<apn value="internet">
+				<name>Internet</name>
+				<username>internet</username>
+				<dns>212.58.160.33</dns>
+				<dns>212.58.160.34</dns>
+			</apn>
+			<apn value="www.umc.ua">
+				<name>umc.ua</name>
+				<dns>80.255.64.23</dns>
+				<dns>80.255.64.24</dns>
+			</apn>
 		</gsm>
-		<dns>80.255.64.23</dns>
-		<dns>80.255.64.24</dns>
 	</provider>
 	<provider>
 		<name>Utel</name>
 		<gsm>
-			<apn>3g.utel.ua</apn>
+			<network-id mcc="255" mnc="07"/>
+			<apn value="3g.utel.ua"/>
 		</gsm>
 	</provider>
 </country>
@@ -4108,10 +4305,11 @@ conceived.
 	<provider>
 		<name>MTN</name>
 		<gsm>
-			<apn>yellopix.mtn.co.ug</apn>
+			<apn value="yellopix.mtn.co.ug">
+				<dns>212.88.97.20</dns>
+				<dns>212.88.97.67</dns>
+			</apn>
 		</gsm>
-		<dns>212.88.97.20</dns>
-		<dns>212.88.97.67</dns>
 	</provider>
 </country>
 
@@ -4120,69 +4318,32 @@ conceived.
 	<provider>
 		<name>AT&amp;T</name>
 		<gsm>
-			<apn>WAP.CINGULAR</apn>
-			<network-id mcc="310" mnc="038"/>
-			<network-id mcc="310" mnc="090"/>
-			<network-id mcc="310" mnc="150"/>
-			<network-id mcc="310" mnc="410"/>
-			<network-id mcc="310" mnc="560"/>
-			<network-id mcc="310" mnc="680"/>
-		</gsm>
-		<username>WAP CINGULARGPRS COM</username>
-		<password>CINGULAR1</password>
-	</provider>
-	<provider>
-		<name>AT&amp;T (Tethering)</name>
-		<gsm>
-			<apn>ISP.CINGULAR</apn>
 			<network-id mcc="310" mnc="038"/>
 			<network-id mcc="310" mnc="090"/>
 			<network-id mcc="310" mnc="150"/>
 			<network-id mcc="310" mnc="410"/>
 			<network-id mcc="310" mnc="560"/>
 			<network-id mcc="310" mnc="680"/>
+			<apn value="WAP.CINGULAR">
+				<name>MEdia Net</name>
+				<username>WAP CINGULARGPRS COM</username>
+				<password>CINGULAR1</password>
+			</apn>
+			<apn value="ISP.CINGULAR">
+				<name>Data Connect</name>
+				<username>ISP CINGULARGPRS COM</username>
+				<password>CINGULAR1</password>
+			</apn>
+			<apn value="ISP.CINGULAR">
+				<name>Data Connect (Accelerated)</name>
+				<username>ISPDA CINGULARGPRS COM</username>
+				<password>CINGULAR1</password>
+			</apn>
 		</gsm>
-		<username>ISP CINGULARGPRS COM</username>
-		<password>CINGULAR1</password>
-	</provider>
-	<provider>
-		<name>AT&amp;T (Tethering with data acceleration)</name>
-		<gsm>
-			<apn>ISP.CINGULAR</apn>
-			<network-id mcc="310" mnc="038"/>
-			<network-id mcc="310" mnc="090"/>
-			<network-id mcc="310" mnc="150"/>
-			<network-id mcc="310" mnc="410"/>
-			<network-id mcc="310" mnc="560"/>
-			<network-id mcc="310" mnc="680"/>
-		</gsm>
-		<username>ISPDA CINGULARGPRS COM</username>
-		<password>CINGULAR1</password>
 	</provider>
 	<provider>
 		<name>T-Mobile (Web)</name>
 		<gsm>
-			<apn>wap.voicestream.com</apn>
-			<network-id mcc="310" mnc="160"/>
-			<network-id mcc="310" mnc="200"/>
-			<network-id mcc="310" mnc="210"/>
-			<network-id mcc="310" mnc="220"/>
-			<network-id mcc="310" mnc="230"/>
-			<network-id mcc="310" mnc="240"/>
-			<network-id mcc="310" mnc="250"/>
-			<network-id mcc="310" mnc="260"/>
-			<network-id mcc="310" mnc="270"/>
-			<network-id mcc="310" mnc="310"/>
-			<network-id mcc="310" mnc="490"/>
-			<network-id mcc="310" mnc="580"/>
-			<network-id mcc="310" mnc="660"/>
-			<network-id mcc="310" mnc="800"/>
-		</gsm>
-	</provider>
-	<provider>
-		<name>T-Mobile (Internet)</name>
-		<gsm>
-			<apn>internet2.voicestream.com</apn>
 			<network-id mcc="310" mnc="160"/>
 			<network-id mcc="310" mnc="200"/>
 			<network-id mcc="310" mnc="210"/>
@@ -4197,31 +4358,79 @@ conceived.
 			<network-id mcc="310" mnc="580"/>
 			<network-id mcc="310" mnc="660"/>
 			<network-id mcc="310" mnc="800"/>
+
+			<apn value="wap.voicestream.com">
+				<name>Web</name>
+			</apn>
+			<apn value="internet2.voicestream.com">
+				<name>Internet</name>
+			</apn>
+			<apn value="internet3.voicestream.com">
+				<name>Internet with VPN</name>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
-		<name>T-Mobile (Internet with VPN)</name>
+		<name>Cincinnati Bell Wireless</name>
 		<gsm>
-			<apn>internet3.voicestream.com</apn>
-			<network-id mcc="310" mnc="160"/>
-			<network-id mcc="310" mnc="200"/>
-			<network-id mcc="310" mnc="210"/>
-			<network-id mcc="310" mnc="220"/>
-			<network-id mcc="310" mnc="230"/>
-			<network-id mcc="310" mnc="240"/>
-			<network-id mcc="310" mnc="250"/>
-			<network-id mcc="310" mnc="260"/>
-			<network-id mcc="310" mnc="270"/>
-			<network-id mcc="310" mnc="310"/>
-			<network-id mcc="310" mnc="490"/>
-			<network-id mcc="310" mnc="580"/>
-			<network-id mcc="310" mnc="660"/>
-			<network-id mcc="310" mnc="800"/>
+			<network-id mcc="310" mnc="420"/>
+			<apn value="wap.gocbw.com">
+				<username>cbw</username>
+			</apn>
 		</gsm>
 	</provider>
 	<provider>
 		<name>Sprint</name>
-		<cdma />
+		<cdma>
+			<sid value="4103"/>
+			<sid value="4106"/>
+			<sid value="4107"/>
+			<sid value="4120"/>
+			<sid value="4121"/>
+			<sid value="4124"/>
+			<sid value="4126"/>
+			<sid value="4132"/>
+			<sid value="4135"/>
+			<sid value="4139"/>
+			<sid value="4144"/>
+			<sid value="4145"/>
+			<sid value="4148"/>
+			<sid value="4151"/>
+			<sid value="4153"/>
+			<sid value="4155"/>
+			<sid value="4157"/>
+			<sid value="4159"/>
+			<sid value="4162"/>
+			<sid value="4164"/>
+			<sid value="4166"/>
+			<sid value="4168"/>
+			<sid value="4170"/>
+			<sid value="4171"/>
+			<sid value="4174"/>
+			<sid value="4180"/>
+			<sid value="4181"/>
+			<sid value="4183"/>
+			<sid value="4184"/>
+			<sid value="4186"/>
+			<sid value="4188"/>
+			<sid value="4190"/>
+			<sid value="4194"/>
+			<sid value="4195"/>
+			<sid value="4274"/>
+			<sid value="4376"/>
+			<sid value="4379"/>
+			<sid value="4384"/>
+			<sid value="4390"/>
+			<sid value="4396"/>
+			<sid value="4418"/>
+			<sid value="4622"/>
+			<sid value="4654"/>
+			<sid value="4694"/>
+			<sid value="4812"/>
+			<sid value="4982"/>
+			<sid value="5116"/>
+			<sid value="5142"/>
+		</cdma>
 	</provider>
 	<provider>
 		<name>Boost Mobile (Prepaid)</name>
@@ -4229,15 +4438,191 @@ conceived.
 	</provider>
 	<provider>
 		<name>Verizon</name>
-		<cdma />
+		<cdma>
+			<sid value="2"/>
+			<sid value="4"/>
+			<sid value="5"/>
+			<sid value="6"/>
+			<sid value="8"/>
+			<sid value="12"/>
+			<sid value="15"/>
+			<sid value="17"/>
+			<sid value="18"/>
+			<sid value="20"/>
+			<sid value="21"/>
+			<sid value="22"/>
+			<sid value="26"/>
+			<sid value="28"/>
+			<sid value="30"/>
+			<sid value="32"/>
+			<sid value="33"/>
+			<sid value="37"/>
+			<sid value="40"/>
+			<sid value="41"/>
+			<sid value="48"/>
+			<sid value="51"/>
+			<sid value="56"/>
+			<sid value="58"/>
+			<sid value="59"/>
+			<sid value="60"/>
+			<sid value="64"/>
+			<sid value="65"/>
+			<sid value="69"/>
+			<sid value="73"/>
+			<sid value="75"/>
+			<sid value="78"/>
+			<sid value="80"/>
+			<sid value="86"/>
+			<sid value="92"/>
+			<sid value="93"/>
+			<sid value="94"/>
+			<sid value="95"/>
+			<sid value="96"/>
+			<sid value="104"/>
+			<sid value="107"/>
+			<sid value="110"/>
+		</cdma>
 	</provider>
 	<provider>
 		<name>US Cellular</name>
-		<cdma />
+		<cdma>
+			<sid value="193"/>
+			<sid value="217"/>
+			<sid value="221"/>
+			<sid value="246"/>
+			<sid value="309"/>
+			<sid value="331"/>
+			<sid value="393"/>
+			<sid value="413"/>
+			<sid value="445"/>
+			<sid value="599"/>
+			<sid value="1061"/>
+			<sid value="1075"/>
+			<sid value="1173"/>
+			<sid value="1175"/>
+			<sid value="1213"/>
+			<sid value="1219"/>
+			<sid value="1223"/>
+			<sid value="1228"/>
+			<sid value="1229"/>
+			<sid value="1272"/>
+			<sid value="1399"/>
+			<sid value="1403"/>
+			<sid value="1406"/>
+			<sid value="1419"/>
+			<sid value="1425"/>
+			<sid value="1427"/>
+			<sid value="1484"/>
+			<sid value="1541"/>
+			<sid value="1574"/>
+			<sid value="1595"/>
+			<sid value="1607"/>
+			<sid value="1610"/>
+			<sid value="1643"/>
+			<sid value="1729"/>
+			<sid value="1779"/>
+			<sid value="1784"/>
+		</cdma>
 	</provider>
 	<provider>
 		<name>Alltel</name>
-		<cdma />
+		<cdma>
+			<sid value="42"/>
+			<sid value="53"/>
+			<sid value="54"/>
+			<sid value="57"/>
+			<sid value="74"/>
+			<sid value="79"/>
+			<sid value="83"/>
+			<sid value="84"/>
+			<sid value="85"/>
+			<sid value="97"/>
+			<sid value="100"/>
+			<sid value="114"/>
+			<sid value="116"/>
+			<sid value="120"/>
+			<sid value="126"/>
+			<sid value="130"/>
+			<sid value="142"/>
+			<sid value="144"/>
+			<sid value="152"/>
+			<sid value="156"/>
+			<sid value="182"/>
+			<sid value="188"/>
+			<sid value="204"/>
+			<sid value="205"/>
+			<sid value="208"/>
+			<sid value="212"/>
+			<sid value="216"/>
+			<sid value="220"/>
+			<sid value="240"/>
+			<sid value="244"/>
+			<sid value="256"/>
+			<sid value="260"/>
+			<sid value="281"/>
+			<sid value="312"/>
+			<sid value="318"/>
+			<sid value="342"/>
+			<sid value="348"/>
+			<sid value="350"/>
+			<sid value="368"/>
+			<sid value="374"/>
+			<sid value="376"/>
+			<sid value="386"/>
+			<sid value="392"/>
+			<sid value="396"/>
+			<sid value="416"/>
+			<sid value="418"/>
+			<sid value="424"/>
+			<sid value="440"/>
+			<sid value="444"/>
+			<sid value="448"/>
+			<sid value="478"/>
+			<sid value="520"/>
+			<sid value="544"/>
+			<sid value="546"/>
+			<sid value="550"/>
+			<sid value="578"/>
+			<sid value="1038"/>
+			<sid value="1058"/>
+			<sid value="1093"/>
+			<sid value="1124"/>
+			<sid value="1148"/>
+			<sid value="1258"/>
+			<sid value="1271"/>
+			<sid value="1332"/>
+			<sid value="1336"/>
+			<sid value="1338"/>
+			<sid value="1375"/>
+			<sid value="1383"/>
+			<sid value="1385"/>
+			<sid value="1400"/>
+			<sid value="1466"/>
+			<sid value="1493"/>
+			<sid value="1499"/>
+			<sid value="1528"/>
+			<sid value="1530"/>
+			<sid value="1532"/>
+			<sid value="1534"/>
+			<sid value="1536"/>
+			<sid value="1538"/>
+			<sid value="1540"/>
+			<sid value="1542"/>
+			<sid value="1544"/>
+			<sid value="1546"/>
+			<sid value="1640"/>
+			<sid value="1650"/>
+			<sid value="1652"/>
+			<sid value="1750"/>
+			<sid value="1752"/>
+			<sid value="1818"/>
+			<sid value="1872"/>
+			<sid value="1989"/>
+			<sid value="2038"/>
+			<sid value="3226"/>
+			<sid value="5667"/>
+			<sid value="30524"/>
+		</cdma>
 	</provider>
 	<provider>
 		<name>Leap Wireless</name>
@@ -4266,38 +4651,46 @@ conceived.
 	<provider>
 		<name>Ancel</name>
 		<gsm>
-			<apn>gprs.ancel</apn>
+			<network-id mcc="748" mnc="00"/>
+			<network-id mcc="748" mnc="01"/>
+			<apn value="gprs.ancel">
+				<dns>200.40.30.245</dns>
+				<dns>200.40.220.245</dns>
+			</apn>
 		</gsm>
-		<dns>200.40.30.245</dns>
-		<dns>200.40.220.245</dns>
 	</provider>
 	<provider>
 		<name>CTI</name>
 		<gsm>
-			<apn>internet.ctimovil.com.uy</apn>
+			<apn value="internet.ctimovil.com.uy">
+				<username>ctiweb</username>
+				<password>ctiweb999</password>
+			</apn>
 		</gsm>
-		<username>ctiweb</username>
-		<password>ctiweb999</password>
 	</provider>
 	<provider>
 		<name>Movistar</name>
 		<gsm>
-			<apn>webapn.movistar.com.uy</apn>
+			<network-id mcc="748" mnc="07"/>
+			<apn value="webapn.movistar.com.uy">
+				<username>movistar</username>
+				<password>movistar</password>
+			</apn>
 		</gsm>
-		<username>movistar</username>
-		<password>movistar</password>
 	</provider>
 </country>
 
 <!-- Uzbekistan -->
 <country code="uz">
 	<provider>
-		<name>Uzdunrobita</name>
+		<name>Uzdunrobita / MTS</name>
 		<gsm>
-			<apn>net.urd.uz</apn>
+			<network-id mcc="434" mnc="07"/>
+			<apn value="net.urd.uz">
+				<username>user</username>
+				<password>pass</password>
+			</apn>
 		</gsm>
-		<username>user</username>
-		<password>pass</password>
 	</provider>
 </country>
 
@@ -4306,10 +4699,12 @@ conceived.
 	<provider>
 		<name>Digicel</name>
 		<gsm>
-			<apn>wap.digiceloecs.com</apn>
+			<network-id mcc="360" mnc="070"/>
+			<apn value="wap.digiceloecs.com">
+				<username>wapoecs</username>
+				<password>wap03oecs</password>
+			</apn>
 		</gsm>
-		<username>wapoecs</username>
-		<password>wap03oecs</password>
 	</provider>
 </country>
 
@@ -4318,9 +4713,13 @@ conceived.
 	<provider>
 		<name>Digitel TIM</name>
 		<gsm>
-			<apn>gprsweb.digitel.ve</apn>
+			<network-id mcc="734" mnc="01"/>
+			<network-id mcc="734" mnc="02"/>
+			<network-id mcc="734" mnc="03"/>
+			<apn value="gprsweb.digitel.ve">
+				<dns>57.67.127.195</dns>
+			</apn>
 		</gsm>
-		<dns>57.67.127.195</dns>
 	</provider>
 </country>
 
@@ -4329,45 +4728,49 @@ conceived.
 	<provider>
 		<name>Cell-c</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="655" mnc="07"/>
+			<apn value="internet">
+				<username>Cellcis</username>
+				<dns>196.7.0.138</dns>
+				<dns>196.7.142.132</dns>
+			</apn>
 		</gsm>
-		<username>Cellcis</username>
-		<password>Crap</password>
-		<dns>196.7.0.138</dns>
-		<dns>196.7.142.132</dns>
 	</provider>
 	<provider>
 		<name>MTN</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="655" mnc="10"/>
+			<apn value="internet">
+				<dns>196.11.240.241</dns>
+				<dns>209.212.97.1</dns>
+			</apn>
 		</gsm>
-		<dns>196.11.240.241</dns>
-		<dns>209.212.97.1</dns>
 	</provider>
 	<provider>
 		<name>Vodacom</name>
 		<gsm>
-			<apn>internet</apn>
+			<network-id mcc="655" mnc="01"/>
+			<apn value="internet">
+				<dns>196.207.40.165</dns>
+				<dns>196.43.46.190</dns>
+			</apn>
+			<apn value="unrestricted">
+				<name>Unrestricted</name>
+				<dns>196.207.32.69</dns>
+				<dns>196.43.45.190</dns>
+			</apn>		
 		</gsm>
-		<dns>196.207.40.165</dns>
-		<dns>196.43.46.190</dns>
 	</provider>
 	<provider>
 		<name>Virgin Mobile</name>
 		<gsm>
-			<apn>vdata</apn>
-		</gsm>
-		<dns>196.7.0.138</dns>
-		<dns>196.7.142.132</dns>
-	</provider>
-	<provider>
-		<name>Vodacom (unrestricted APN)</name>
-		<gsm>
-			<apn>unrestricted</apn>
+			<apn value="vdata">
+				<dns>196.7.0.138</dns>
+				<dns>196.7.142.132</dns>
+			</apn>
 		</gsm>
-		<dns>196.207.32.69</dns>
-		<dns>196.43.45.190</dns>
 	</provider>
 </country>
 
 </serviceproviders>
+



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]